main/linux-virt-grsec: upgrade to version 3.12.4

11 files changed, 15840 insertions, 13538 deletions

diff --git a/main/linux-virt-grsec/0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch b/main/linux-virt-grsec/0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
deleted file mode 100644
index 7357a330f8..0000000000
--- a/main/linux-virt-grsec/0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 1225b1090991bdcab819bdab96be329397563f1c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 23 May 2013 11:30:23 +0300
-Subject: [PATCH 1/6] net: inform NETDEV_CHANGE callbacks which flags were
- changed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In certain cases (like the follow up commit to arp.c) will need to
-check which flags actually changed to avoid excessive work.
-
-Ben Hutchings nicely worded why to put these transient flags to
-struct net_device for the time being:
-> It's inelegant to put transient data associated with an event in a
-> persistent data structure.  On the other hand, having every user cache
-> the old state is pretty awful as well.
->
-> Really, netdev notifiers should be changed to accept a structure that
-> encapsulates the changes rather than just a pointer to the net_device.
-> But making such a change would be an enormous pain and error-prone
-> because notifier functions aren't type-safe.
->
-> As an interim solution, I think either the general flags_changed or
-> old_flags would be preferable to defining extra transient flags.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
-Acked-by: Ben Hutchings <bhutchings@solarflare.com>
----
- include/linux/netdevice.h | 4 +++-
- net/core/dev.c            | 5 ++++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 6151e90..8b3c649 100644
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -1112,7 +1112,9 @@ struct net_device {
- 	/* Hardware header description */
- 	const struct header_ops *header_ops;
- 
--	unsigned int		flags;	/* interface flags (a la BSD)	*/
-+	unsigned int		flags;		/* interface flags (a la BSD)	*/
-+	unsigned int		flags_changed;	/* flags that are being changed
-+						 * valid during NETDEV_CHANGE notifier */
- 	unsigned int		priv_flags; /* Like 'flags' but invisible to userspace.
- 					     * See if.h for definitions. */
- 	unsigned short		gflags;
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 9a278e9..2f3feae 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -4683,8 +4683,11 @@ void __dev_notify_flags(struct net_device *dev, unsigned int old_flags)
- 	}
- 
- 	if (dev->flags & IFF_UP &&
--	    (changes & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | IFF_VOLATILE)))
-+	    (changes & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | IFF_VOLATILE))) {
-+		dev->flags_changed = changes;
- 		call_netdevice_notifiers(NETDEV_CHANGE, dev);
-+		dev->flags_changed = 0;
-+	}
- }
- 
- /**
--- 
-1.8.2.3
-
diff --git a/main/linux-virt-grsec/0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch b/main/linux-virt-grsec/0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
deleted file mode 100644
index 0e364f4718..0000000000
--- a/main/linux-virt-grsec/0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 36fbd62c47d800705d9989c69994359711514165 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 23 May 2013 11:43:55 +0300
-Subject: [PATCH 2/6] arp: flush arp cache on IFF_NOARP change
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-IFF_NOARP affects what kind of neighbor entries are created
-(nud NOARP or nud INCOMPLETE). If the flag changes, flush the arp
-cache to refresh all entries.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- net/ipv4/arp.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
-index fea4929..2a06ecf 100644
---- a/net/ipv4/arp.c
-+++ b/net/ipv4/arp.c
-@@ -1226,6 +1226,10 @@ static int arp_netdev_event(struct notifier_block *this, unsigned long event,
- 		neigh_changeaddr(&arp_tbl, dev);
- 		rt_cache_flush(dev_net(dev));
- 		break;
-+	case NETDEV_CHANGE:
-+		if (dev->flags_changed & IFF_NOARP)
-+			neigh_changeaddr(&arp_tbl, dev);
-+		break;
- 	default:
- 		break;
- 	}
--- 
-1.8.2.3
-
diff --git a/main/linux-virt-grsec/0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch b/main/linux-virt-grsec/0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
deleted file mode 100644
index 807dba0b3c..0000000000
--- a/main/linux-virt-grsec/0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From 777eadba40c19bcfdb48807e7b0547ef30555671 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Sat, 25 May 2013 15:42:30 +0300
-Subject: [PATCH 3/6] ipv4: properly refresh rtable entries on pmtu/redirect
- events
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 05ab86c5 (xfrm4: Invalidate all ipv4 routes on
-IPsec pmtu events). Flushing all cached entries is not needed.
-
-Instead, invalidate only the related next hop dsts to recheck for
-the added next hop exception where needed. This also fixes a subtle
-race due to bumping generation id's before updating the pmtu.
-
-Cc: Steffen Klassert <steffen.klassert@secunet.com>
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- net/ipv4/ah4.c    |  7 ++-----
- net/ipv4/esp4.c   |  7 ++-----
- net/ipv4/ipcomp.c |  7 ++-----
- net/ipv4/route.c  | 63 ++++++++++++++++++++++++++++++++-----------------------
- 4 files changed, 43 insertions(+), 41 deletions(-)
-
-diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
-index 2e7f194..7179026 100644
---- a/net/ipv4/ah4.c
-+++ b/net/ipv4/ah4.c
-@@ -419,12 +419,9 @@ static void ah4_err(struct sk_buff *skb, u32 info)
- 	if (!x)
- 		return;
- 
--	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) {
--		atomic_inc_unchecked(&flow_cache_genid);
--		rt_genid_bump(net);
--
-+	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
- 		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0);
--	} else
-+	else
- 		ipv4_redirect(skb, net, 0, 0, IPPROTO_AH, 0);
- 	xfrm_state_put(x);
- }
-diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
-index 4cfe34d..ab3d814 100644
---- a/net/ipv4/esp4.c
-+++ b/net/ipv4/esp4.c
-@@ -502,12 +502,9 @@ static void esp4_err(struct sk_buff *skb, u32 info)
- 	if (!x)
- 		return;
- 
--	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) {
--		atomic_inc_unchecked(&flow_cache_genid);
--		rt_genid_bump(net);
--
-+	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
- 		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ESP, 0);
--	} else
-+	else
- 		ipv4_redirect(skb, net, 0, 0, IPPROTO_ESP, 0);
- 	xfrm_state_put(x);
- }
-diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
-index f01d1b1..48b3f0b 100644
---- a/net/ipv4/ipcomp.c
-+++ b/net/ipv4/ipcomp.c
-@@ -47,12 +47,9 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info)
- 	if (!x)
- 		return;
- 
--	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) {
--		atomic_inc_unchecked(&flow_cache_genid);
--		rt_genid_bump(net);
--
-+	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH)
- 		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0);
--	} else
-+	else
- 		ipv4_redirect(skb, net, 0, 0, IPPROTO_COMP, 0);
- 	xfrm_state_put(x);
- }
-diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index 6e28514..8dedfeb 100644
---- a/net/ipv4/route.c
-+++ b/net/ipv4/route.c
-@@ -594,11 +594,25 @@ static inline u32 fnhe_hashfun(__be32 daddr)
- 	return hval & (FNHE_HASH_SIZE - 1);
- }
- 
-+static void fill_route_from_fnhe(struct rtable *rt, struct fib_nh_exception *fnhe)
-+{
-+	rt->rt_pmtu = fnhe->fnhe_pmtu;
-+	rt->dst.expires = fnhe->fnhe_expires;
-+
-+	if (fnhe->fnhe_gw) {
-+		rt->rt_flags |= RTCF_REDIRECTED;
-+		rt->rt_gateway = fnhe->fnhe_gw;
-+		rt->rt_uses_gateway = 1;
-+	}
-+}
-+
- static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,
- 				  u32 pmtu, unsigned long expires)
- {
- 	struct fnhe_hash_bucket *hash;
- 	struct fib_nh_exception *fnhe;
-+	struct rtable *rt;
-+	unsigned int i;
- 	int depth;
- 	u32 hval = fnhe_hashfun(daddr);
- 
-@@ -627,8 +641,12 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,
- 			fnhe->fnhe_gw = gw;
- 		if (pmtu) {
- 			fnhe->fnhe_pmtu = pmtu;
--			fnhe->fnhe_expires = expires;
-+			fnhe->fnhe_expires = max(1UL, expires);
- 		}
-+		/* Update all cached dsts too */
-+		rt = rcu_dereference(fnhe->fnhe_rth);
-+		if (rt)
-+			fill_route_from_fnhe(rt, fnhe);
- 	} else {
- 		if (depth > FNHE_RECLAIM_DEPTH)
- 			fnhe = fnhe_oldest(hash);
-@@ -644,6 +662,18 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,
- 		fnhe->fnhe_gw = gw;
- 		fnhe->fnhe_pmtu = pmtu;
- 		fnhe->fnhe_expires = expires;
-+
-+		/* Exception created; mark the cached routes for the nexthop
-+		 * stale, so anyone caching it rechecks if this exception
-+		 * applies to them.
-+		 */
-+		for_each_possible_cpu(i) {
-+			struct rtable __rcu **prt;
-+			prt = per_cpu_ptr(nh->nh_pcpu_rth_output, i);
-+			rt = rcu_dereference(*prt);
-+			if (rt)
-+				rt->dst.obsolete = DST_OBSOLETE_KILL;
-+		}
- 	}
- 
- 	fnhe->fnhe_stamp = jiffies;
-@@ -917,13 +947,6 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
- 	if (mtu < ip_rt_min_pmtu)
- 		mtu = ip_rt_min_pmtu;
- 
--	if (!rt->rt_pmtu) {
--		dst->obsolete = DST_OBSOLETE_KILL;
--	} else {
--		rt->rt_pmtu = mtu;
--		dst->expires = max(1UL, jiffies + ip_rt_mtu_expires);
--	}
--
- 	rcu_read_lock();
- 	if (fib_lookup(dev_net(dst->dev), fl4, &res) == 0) {
- 		struct fib_nh *nh = &FIB_RES_NH(res);
-@@ -1063,11 +1086,11 @@ static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie)
- 	 * DST_OBSOLETE_FORCE_CHK which forces validation calls down
- 	 * into this function always.
- 	 *
--	 * When a PMTU/redirect information update invalidates a
--	 * route, this is indicated by setting obsolete to
--	 * DST_OBSOLETE_KILL.
-+	 * When a PMTU/redirect information update invalidates a route,
-+	 * this is indicated by setting obsolete to DST_OBSOLETE_KILL or
-+	 * DST_OBSOLETE_DEAD by dst_free().
- 	 */
--	if (dst->obsolete == DST_OBSOLETE_KILL || rt_is_expired(rt))
-+	if (dst->obsolete != DST_OBSOLETE_FORCE_CHK || rt_is_expired(rt))
- 		return NULL;
- 	return dst;
- }
-@@ -1215,20 +1238,8 @@ static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe,
- 			fnhe->fnhe_pmtu = 0;
- 			fnhe->fnhe_expires = 0;
- 		}
--		if (fnhe->fnhe_pmtu) {
--			unsigned long expires = fnhe->fnhe_expires;
--			unsigned long diff = expires - jiffies;
--
--			if (time_before(jiffies, expires)) {
--				rt->rt_pmtu = fnhe->fnhe_pmtu;
--				dst_set_expires(&rt->dst, diff);
--			}
--		}
--		if (fnhe->fnhe_gw) {
--			rt->rt_flags |= RTCF_REDIRECTED;
--			rt->rt_gateway = fnhe->fnhe_gw;
--			rt->rt_uses_gateway = 1;
--		} else if (!rt->rt_gateway)
-+		fill_route_from_fnhe(rt, fnhe);
-+		if (!rt->rt_gateway)
- 			rt->rt_gateway = daddr;
- 
- 		rcu_assign_pointer(fnhe->fnhe_rth, rt);
--- 
-1.8.2.3
-
diff --git a/main/linux-virt-grsec/0004-ipv4-rate-limit-updating-of-next-hop-exceptions-with.patch b/main/linux-virt-grsec/0004-ipv4-rate-limit-updating-of-next-hop-exceptions-with.patch
deleted file mode 100644
index 9b2ad89132..0000000000
--- a/main/linux-virt-grsec/0004-ipv4-rate-limit-updating-of-next-hop-exceptions-with.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 90f586dba1465a73295d752abe2451e924ba1888 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 27 May 2013 08:33:10 +0300
-Subject: [PATCH 4/6] ipv4: rate limit updating of next hop exceptions with
- same pmtu
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The tunnel devices call update_pmtu for each packet sent, this causes
-contention on the fnhe_lock. Ignore the pmtu update if pmtu is not
-actually changed, and there is still plenty of time before the entry
-expires.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- net/ipv4/route.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index 8dedfeb..85b9c07 100644
---- a/net/ipv4/route.c
-+++ b/net/ipv4/route.c
-@@ -947,6 +947,10 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu)
- 	if (mtu < ip_rt_min_pmtu)
- 		mtu = ip_rt_min_pmtu;
- 
-+	if (rt->rt_pmtu == mtu &&
-+	    time_before(jiffies, dst->expires - ip_rt_mtu_expires / 2))
-+		return;
-+
- 	rcu_read_lock();
- 	if (fib_lookup(dev_net(dst->dev), fl4, &res) == 0) {
- 		struct fib_nh *nh = &FIB_RES_NH(res);
--- 
-1.8.2.3
-
diff --git a/main/linux-virt-grsec/0005-ipv4-use-separate-genid-for-next-hop-exceptions.patch b/main/linux-virt-grsec/0005-ipv4-use-separate-genid-for-next-hop-exceptions.patch
deleted file mode 100644
index 40cd4fc6c1..0000000000
--- a/main/linux-virt-grsec/0005-ipv4-use-separate-genid-for-next-hop-exceptions.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 4a7dbb238480fac2b1ad02a74240efcf225c1f45 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 27 May 2013 10:55:52 +0300
-Subject: [PATCH 5/6] ipv4: use separate genid for next hop exceptions
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 13d82bf5 (ipv4: Fix flushing of cached routing informations)
-added the support to flush learned pmtu information.
-
-However, using rt_genid is quite heavy as it is bumped on route
-add/change and multicast events amongst other places. These can
-happen quote often, especially if using dynamic routing protocols.
-
-While this is ok with routes (as they are just recreated locally),
-the pmtu information is learned from remote systems and the icmp
-notification can come with long delays. It is worthy to have separate
-genid to avoid excessive pmtu resets.
-
-Cc: Steffen Klassert <steffen.klassert@secunet.com>
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- include/net/ip_fib.h        |  1 +
- include/net/net_namespace.h | 11 +++++++++++
- net/ipv4/route.c            | 12 ++++++++++--
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
-index e49db91..44424e9 100644
---- a/include/net/ip_fib.h
-+++ b/include/net/ip_fib.h
-@@ -51,6 +51,7 @@ struct rtable;
- 
- struct fib_nh_exception {
- 	struct fib_nh_exception __rcu	*fnhe_next;
-+	int				fnhe_genid;
- 	__be32				fnhe_daddr;
- 	u32				fnhe_pmtu;
- 	__be32				fnhe_gw;
-diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
-index de644bc..b5a5baf 100644
---- a/include/net/net_namespace.h
-+++ b/include/net/net_namespace.h
-@@ -116,6 +116,7 @@ struct net {
- 	struct netns_ipvs	*ipvs;
- 	struct sock		*diag_nlsk;
- 	atomic_unchecked_t	rt_genid;
-+	atomic_unchecked_t	fnhe_genid;
- };
- 
- /*
-@@ -338,4 +339,14 @@ static inline void rt_genid_bump(struct net *net)
- 	atomic_inc_unchecked(&net->rt_genid);
- }
- 
-+static inline int fnhe_genid(struct net *net)
-+{
-+	return atomic_read_unchecked(&net->fnhe_genid);
-+}
-+
-+static inline void fnhe_genid_bump(struct net *net)
-+{
-+	atomic_inc_unchecked(&net->fnhe_genid);
-+}
-+
- #endif /* __NET_NET_NAMESPACE_H */
-diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index 85b9c07..f44a4bb 100644
---- a/net/ipv4/route.c
-+++ b/net/ipv4/route.c
-@@ -658,6 +658,7 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,
- 			fnhe->fnhe_next = hash->chain;
- 			rcu_assign_pointer(hash->chain, fnhe);
- 		}
-+		fnhe->fnhe_genid = fnhe_genid(dev_net(nh->nh_dev));
- 		fnhe->fnhe_daddr = daddr;
- 		fnhe->fnhe_gw = gw;
- 		fnhe->fnhe_pmtu = pmtu;
-@@ -1236,8 +1237,11 @@ static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe,
- 	spin_lock_bh(&fnhe_lock);
- 
- 	if (daddr == fnhe->fnhe_daddr) {
-+		int genid = fnhe_genid(dev_net(rt->dst.dev));
- 		struct rtable *orig = rcu_dereference(fnhe->fnhe_rth);
--		if (orig && rt_is_expired(orig)) {
-+
-+		if (fnhe->fnhe_genid != genid) {
-+			fnhe->fnhe_genid = genid;
- 			fnhe->fnhe_gw = 0;
- 			fnhe->fnhe_pmtu = 0;
- 			fnhe->fnhe_expires = 0;
-@@ -2443,8 +2447,11 @@ static int ipv4_sysctl_rtcache_flush(ctl_table *__ctl, int write,
- 					void __user *buffer,
- 					size_t *lenp, loff_t *ppos)
- {
-+	struct net *net = (struct net *)__ctl->extra1;
-+
- 	if (write) {
--		rt_cache_flush((struct net *)__ctl->extra1);
-+		rt_cache_flush(net);
-+		fnhe_genid_bump(net);
- 		return 0;
- 	}
- 
-@@ -2619,6 +2626,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
- static __net_init int rt_genid_init(struct net *net)
- {
- 	atomic_set_unchecked(&net->rt_genid, 0);
-+	atomic_set_unchecked(&net->fnhe_genid, 0);
- 	get_random_bytes(&net->ipv4.dev_addr_genid,
- 			 sizeof(net->ipv4.dev_addr_genid));
- 	return 0;
--- 
-1.8.2.3
-
diff --git a/main/linux-virt-grsec/0006-ipv4-use-next-hop-exceptions-also-for-input-routes.patch b/main/linux-virt-grsec/0006-ipv4-use-next-hop-exceptions-also-for-input-routes.patch
deleted file mode 100644
index 9b78e76b2c..0000000000
--- a/main/linux-virt-grsec/0006-ipv4-use-next-hop-exceptions-also-for-input-routes.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-From 87151ab93a08bcc4abe23aa2e87fbc2b956ae2cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 27 May 2013 08:40:22 +0300
-Subject: [PATCH 6/6] ipv4: use next hop exceptions also for input routes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit d2d68ba9 (ipv4: Cache input routes in fib_info nexthops)
-assmued that "locally destined, and routed packets, never trigger
-PMTU events or redirects that will be processed by us".
-
-However, it seems that tunnel devices do trigger PMTU events in certain
-cases. At least ip_gre, ip6_gre, sit, and ipip do use the inner flow's
-skb_dst(skb)->ops->update_pmtu to propage mtu information from the
-outer flows. These can cause the inner flow mtu to be decreased. If
-next hop exceptions are not consulted for pmtu, IP fragmentation will
-not be done properly for these routes.
-
-It also seems that we really need to have the PMTU information always
-for netfilter TCPMSS clamp-to-pmtu feature to work properly.
-
-So for the time being, cache separate copies of input routes for
-each next hop exception.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- include/net/ip_fib.h     |  3 ++-
- net/ipv4/fib_semantics.c |  3 ++-
- net/ipv4/route.c         | 65 +++++++++++++++++++++++++++++++++++++-----------
- 3 files changed, 54 insertions(+), 17 deletions(-)
-
-diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
-index 44424e9..aac8553 100644
---- a/include/net/ip_fib.h
-+++ b/include/net/ip_fib.h
-@@ -56,7 +56,8 @@ struct fib_nh_exception {
- 	u32				fnhe_pmtu;
- 	__be32				fnhe_gw;
- 	unsigned long			fnhe_expires;
--	struct rtable __rcu		*fnhe_rth;
-+	struct rtable __rcu		*fnhe_rth_input;
-+	struct rtable __rcu		*fnhe_rth_output;
- 	unsigned long			fnhe_stamp;
- };
- 
-diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
-index 8f6cb7a..d5dbca5 100644
---- a/net/ipv4/fib_semantics.c
-+++ b/net/ipv4/fib_semantics.c
-@@ -169,7 +169,8 @@ static void free_nh_exceptions(struct fib_nh *nh)
- 			
- 			next = rcu_dereference_protected(fnhe->fnhe_next, 1);
- 
--			rt_fibinfo_free(&fnhe->fnhe_rth);
-+			rt_fibinfo_free(&fnhe->fnhe_rth_input);
-+			rt_fibinfo_free(&fnhe->fnhe_rth_output);
- 
- 			kfree(fnhe);
- 
-diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index f44a4bb..a7a36f7 100644
---- a/net/ipv4/route.c
-+++ b/net/ipv4/route.c
-@@ -565,10 +565,25 @@ static inline void rt_free(struct rtable *rt)
- 
- static DEFINE_SPINLOCK(fnhe_lock);
- 
-+static void fnhe_flush_routes(struct fib_nh_exception *fnhe)
-+{
-+	struct rtable *rt;
-+
-+	rt = rcu_dereference(fnhe->fnhe_rth_input);
-+	if (rt) {
-+		RCU_INIT_POINTER(fnhe->fnhe_rth_input, NULL);
-+		rt_free(rt);
-+	}
-+	rt = rcu_dereference(fnhe->fnhe_rth_output);
-+	if (rt) {
-+		RCU_INIT_POINTER(fnhe->fnhe_rth_output, NULL);
-+		rt_free(rt);
-+	}
-+}
-+
- static struct fib_nh_exception *fnhe_oldest(struct fnhe_hash_bucket *hash)
- {
- 	struct fib_nh_exception *fnhe, *oldest;
--	struct rtable *orig;
- 
- 	oldest = rcu_dereference(hash->chain);
- 	for (fnhe = rcu_dereference(oldest->fnhe_next); fnhe;
-@@ -576,11 +591,7 @@ static struct fib_nh_exception *fnhe_oldest(struct fnhe_hash_bucket *hash)
- 		if (time_before(fnhe->fnhe_stamp, oldest->fnhe_stamp))
- 			oldest = fnhe;
- 	}
--	orig = rcu_dereference(oldest->fnhe_rth);
--	if (orig) {
--		RCU_INIT_POINTER(oldest->fnhe_rth, NULL);
--		rt_free(orig);
--	}
-+	fnhe_flush_routes(oldest);
- 	return oldest;
- }
- 
-@@ -644,7 +655,10 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,
- 			fnhe->fnhe_expires = max(1UL, expires);
- 		}
- 		/* Update all cached dsts too */
--		rt = rcu_dereference(fnhe->fnhe_rth);
-+		rt = rcu_dereference(fnhe->fnhe_rth_input);
-+		if (rt)
-+			fill_route_from_fnhe(rt, fnhe);
-+		rt = rcu_dereference(fnhe->fnhe_rth_output);
- 		if (rt)
- 			fill_route_from_fnhe(rt, fnhe);
- 	} else {
-@@ -668,6 +682,10 @@ static void update_or_create_fnhe(struct fib_nh *nh, __be32 daddr, __be32 gw,
- 		 * stale, so anyone caching it rechecks if this exception
- 		 * applies to them.
- 		 */
-+		rt = rcu_dereference(nh->nh_rth_input);
-+		if (rt)
-+			rt->dst.obsolete = DST_OBSOLETE_KILL;
-+
- 		for_each_possible_cpu(i) {
- 			struct rtable __rcu **prt;
- 			prt = per_cpu_ptr(nh->nh_pcpu_rth_output, i);
-@@ -1237,25 +1255,36 @@ static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe,
- 	spin_lock_bh(&fnhe_lock);
- 
- 	if (daddr == fnhe->fnhe_daddr) {
-+		struct rtable __rcu **porig;
-+		struct rtable *orig;
- 		int genid = fnhe_genid(dev_net(rt->dst.dev));
--		struct rtable *orig = rcu_dereference(fnhe->fnhe_rth);
-+
-+		if (rt_is_input_route(rt))
-+			porig = &fnhe->fnhe_rth_input;
-+		else
-+			porig = &fnhe->fnhe_rth_output;
-+		orig = rcu_dereference(*porig);
- 
- 		if (fnhe->fnhe_genid != genid) {
- 			fnhe->fnhe_genid = genid;
- 			fnhe->fnhe_gw = 0;
- 			fnhe->fnhe_pmtu = 0;
- 			fnhe->fnhe_expires = 0;
-+			fnhe_flush_routes(fnhe);
-+			orig = NULL;
- 		}
- 		fill_route_from_fnhe(rt, fnhe);
- 		if (!rt->rt_gateway)
- 			rt->rt_gateway = daddr;
- 
--		rcu_assign_pointer(fnhe->fnhe_rth, rt);
--		if (orig)
--			rt_free(orig);
-+		if (!(rt->dst.flags & DST_NOCACHE)) {
-+			rcu_assign_pointer(*porig, rt);
-+			if (orig)
-+				rt_free(orig);
-+			ret = true;
-+		}
- 
- 		fnhe->fnhe_stamp = jiffies;
--		ret = true;
- 	}
- 	spin_unlock_bh(&fnhe_lock);
- 
-@@ -1487,6 +1516,7 @@ static int __mkroute_input(struct sk_buff *skb,
- 			   struct in_device *in_dev,
- 			   __be32 daddr, __be32 saddr, u32 tos)
- {
-+	struct fib_nh_exception *fnhe;
- 	struct rtable *rth;
- 	int err;
- 	struct in_device *out_dev;
-@@ -1533,8 +1563,13 @@ static int __mkroute_input(struct sk_buff *skb,
- 		}
- 	}
- 
-+	fnhe = find_exception(&FIB_RES_NH(*res), daddr);
- 	if (do_cache) {
--		rth = rcu_dereference(FIB_RES_NH(*res).nh_rth_input);
-+		if (fnhe != NULL)
-+			rth = rcu_dereference(fnhe->fnhe_rth_input);
-+		else
-+			rth = rcu_dereference(FIB_RES_NH(*res).nh_rth_input);
-+
- 		if (rt_cache_valid(rth)) {
- 			skb_dst_set_noref(skb, &rth->dst);
- 			goto out;
-@@ -1562,7 +1597,7 @@ static int __mkroute_input(struct sk_buff *skb,
- 	rth->dst.input = ip_forward;
- 	rth->dst.output = ip_output;
- 
--	rt_set_nexthop(rth, daddr, res, NULL, res->fi, res->type, itag);
-+	rt_set_nexthop(rth, daddr, res, fnhe, res->fi, res->type, itag);
- 	skb_dst_set(skb, &rth->dst);
- out:
- 	err = 0;
-@@ -1877,7 +1912,7 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
- 
- 		fnhe = find_exception(nh, fl4->daddr);
- 		if (fnhe)
--			prth = &fnhe->fnhe_rth;
-+			prth = &fnhe->fnhe_rth_output;
- 		else {
- 			if (unlikely(fl4->flowi4_flags &
- 				     FLOWI_FLAG_KNOWN_NH &&
--- 
-1.8.2.3
-
diff --git a/main/linux-virt-grsec/APKBUILD b/main/linux-virt-grsec/APKBUILD
index d844817155..7ff29e78ec 100644
--- a/main/linux-virt-grsec/APKBUILD
+++ b/main/linux-virt-grsec/APKBUILD
@@ -3,7 +3,7 @@
 
 _flavor=grsec
 pkgname=linux-virt-${_flavor}
-pkgver=3.10.23
+pkgver=3.12.4
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
@@ -18,15 +18,8 @@ _config=${config:-kernelconfig.${CARCH}}
 install=
 source="http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$_kernver.tar.xz
 	http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.xz
-	grsecurity-2.9.1-$pkgver-unofficial.patch
-	0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
-	0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
-	0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
-	0004-ipv4-rate-limit-updating-of-next-hop-exceptions-with.patch
-	0005-ipv4-use-separate-genid-for-next-hop-exceptions.patch
-	0006-ipv4-use-next-hop-exceptions-also-for-input-routes.patch
+	grsecurity-3.0-$pkgver-201312081754.patch
 	fix-memory-map-for-PIE-applications.patch
-	sysctl_lxc.patch
 
 	kernelconfig.x86
 	kernelconfig.x86_64
@@ -150,42 +143,21 @@ dev() {
 		"$subpkgdir"/lib/modules/${_abi_release}/build
 }
 
-md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481  linux-3.10.tar.xz
-8b9650e10f8beee769545b51202766a5  patch-3.10.23.xz
-82efe899230f7246ca99f3d334c0c1b8  grsecurity-2.9.1-3.10.23-unofficial.patch
-a16f11b12381efb3bec79b9bfb329836  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
-656ae7b10dd2f18dbfa1011041d08d60  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
-aa454ffb96428586447775c21449e284  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
-2a12a3717052e878c0cd42aa935bfcf4  0004-ipv4-rate-limit-updating-of-next-hop-exceptions-with.patch
-6ce5fed63aad3f1a1ff1b9ba7b741822  0005-ipv4-use-separate-genid-for-next-hop-exceptions.patch
-1a5800a2122ba0cc0d06733cb3bb8b8f  0006-ipv4-use-next-hop-exceptions-also-for-input-routes.patch
+md5sums="cc6ee608854e0da4b64f6c1ff8b6398c  linux-3.12.tar.xz
+511b5a2f0de55b5e91fd293766ce182b  patch-3.12.4.xz
+97395c529c1dd1826fff077c1ba9814e  grsecurity-3.0-3.12.4-201312081754.patch
 c6a4ae7e8ca6159e1631545515805216  fix-memory-map-for-PIE-applications.patch
-b3c0153d53e508e03d73b94d15b24a96  sysctl_lxc.patch
-539c848d541c1656851fe865018273df  kernelconfig.x86
-82cd965fc82651f2e6b35e75c17d8031  kernelconfig.x86_64"
-sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544  linux-3.10.tar.xz
-bdf3983ff3e26c5781edb19a8d0d7765e2e0282cfabda2b0652cc0deff53f445  patch-3.10.23.xz
-f0dfa654e64e79c96127a0f8cd4867a0170f099c7116e7f45e27572294b1b818  grsecurity-2.9.1-3.10.23-unofficial.patch
-6af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
-dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
-0985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
-260fd1807838b68305a96992bf7d3302a2a8ef3a3b08fe079ba9a07e6422f736  0004-ipv4-rate-limit-updating-of-next-hop-exceptions-with.patch
-ae32bb72afa170e6c3788c564b342763aba5945afacc1e2ebfc096adf50d77a3  0005-ipv4-use-separate-genid-for-next-hop-exceptions.patch
-fc613ac466610b866b721c41836fd5bfb2d4b75bceb67972dc6369d7f62ff47e  0006-ipv4-use-next-hop-exceptions-also-for-input-routes.patch
+cc0bc34dd6d4f4396fa70ceaa5aa4a1a  kernelconfig.x86
+93a67bcefa885e0089247694c3e1fa25  kernelconfig.x86_64"
+sha256sums="2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02  linux-3.12.tar.xz
+b1e21b37e29c7f32f1395356958019ff1ac2f2e75bcc7dda2a60ba79cfffd845  patch-3.12.4.xz
+695fb49d9a8960f5ed8d11b24ce0286346b7dde9876d65a283210a8579b3b09e  grsecurity-3.0-3.12.4-201312081754.patch
 500f3577310be52e87b9fecdc2e9c4ca43210fd97d69089f9005d484563f74c7  fix-memory-map-for-PIE-applications.patch
-9ba55b0f45d5aa97503e376a13be6d249a10f32e36687055b2fa1e5a39fa0584  sysctl_lxc.patch
-997d4c8a5a2b911047d26fe1bf8ee8d5cd3b7133e6abdc07b7deacd0b3eb2330  kernelconfig.x86
-7845194551137fbc3b69a75249696bc843bb7fe7f4a4e6b0582c0ca0856caa64  kernelconfig.x86_64"
-sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35  linux-3.10.tar.xz
-0fdb65f1c45e490e1f2206589273e4b8f0f142ab6b16341cb52977e0c6a983b359f01456a9cae3e1c139d5ead5de106c10909b7fdb6a156675cad5d39374e97f  patch-3.10.23.xz
-8905d7215d9f82662e0e7b897fc2fb258c5978d12fed9cf618e60c7b0926af2f76e3b242140e9d3ab4988cee684f350aaf26270d1a8518297cde9928361d146d  grsecurity-2.9.1-3.10.23-unofficial.patch
-81e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
-51ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
-57d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
-d2f578ad1d6e1fe52b55863e5bf338ae8201b828a498ec3e42e549c55295d3d1c6c3adfa9e226d711e3486628ed56ab996484e219d79ac4b0c0ec684ebd380aa  0004-ipv4-rate-limit-updating-of-next-hop-exceptions-with.patch
-28a33e644bf2faf99c8dd6dbccfe14e140dfdd8824a8fb2d58aa7deb9e572f130d92b6b35ee181084050d82166bdf2e498a451a2a538a67b7ab84204405d2d87  0005-ipv4-use-separate-genid-for-next-hop-exceptions.patch
-249140374c19a5599876268ff5b3cda2e136681aee103b4a9fff5d7d346f8e3295a907fb43db0701b8a9fece64c299ad2abac0434259cce6631307ce84090205  0006-ipv4-use-next-hop-exceptions-also-for-input-routes.patch
+bb7418bfdfbe45476331412b17a06abb08f8a0f44fe8ff978fd3413e8671ae66  kernelconfig.x86
+4a11a2edd0dc69687f96f6c80140537b8ba74684244af59a1ffe74cd69712c6c  kernelconfig.x86_64"
+sha512sums="4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff  linux-3.12.tar.xz
+efbb8e2a343935651101b43e7b977dd8c69aca7871b75d221edb32f93bd8ad83c6d0ae8d6622249019f8448fee8d3d754192bf7947602b8ed435bd786f1bb241  patch-3.12.4.xz
+f9a9bfee3977624fa2e4cc047e35dad42c71fd9eaec1c73f7bd9ad951d23809cc690bb5070c6d56879db9bcf88f04ad8365aa0f8c302fb756dac2cfd720ac88d  grsecurity-3.0-3.12.4-201312081754.patch
 4665c56ae1bbac311f9205d64918e84ee8b01d47d6e2396ff6b8adfb10aada7f7254531ce62e31edbb65c2a54a830f09ad05d314dfcd75d6272f4068945ad7c7  fix-memory-map-for-PIE-applications.patch
-41071e21c59997604a380575d3c4171d35a12eaae6ddcf158d95e4fd5ccc69d61753cbd38b7bd08d879cce5bfea3fed2df15e5a3dca944f6f7cbd95d5d2daa23  sysctl_lxc.patch
-08f5bb86f03415f60e9bb171ffa192fa70fa85dafeada10817a4b8ae7932fffd1b0f2df01750407e576bb71cd6c3f2c5fe76f2613922cd77f398bce134fd3ec2  kernelconfig.x86
-7a373bec279fe00601bff7ed64c5a09bb4318bf07557fece194afb426d78bf13191b0510642192518f3ffa68b9a36aa6f971f77f55ea09ae4f42c4a84afc00a5  kernelconfig.x86_64"
+b2245e3eeb020651eb36289d658b32a0ace45e00c392113e8589dbc31f5bd602fb3284b915b4924c235c7886f5e773ad731ddb392ca9e7b10528e0344bdafaef  kernelconfig.x86
+203ef17038ebdb92dbdd6547875816012442f6d4c3d5ea43d9f4898b4c074feda85c485c3bf2aa1b6de127985292aaeef3596e66f06282c7853f9ff7db0a5df4  kernelconfig.x86_64"
diff --git a/main/linux-virt-grsec/grsecurity-2.9.1-3.10.23-unofficial.patch b/main/linux-virt-grsec/grsecurity-3.0-3.12.4-201312081754.patch
index cc4eeaf731..fa9c2c7fdf 100644
--- a/main/linux-virt-grsec/grsecurity-2.9.1-3.10.23-unofficial.patch
+++ b/main/linux-virt-grsec/grsecurity-3.0-3.12.4-201312081754.patch
@@ -229,10 +229,10 @@ index b89a739..79768fb 100644
 +zconf.lex.c
  zoffset.h
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 2fe6e76..889ee23 100644
+index fcbb736..5508d8c 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -976,6 +976,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -1031,6 +1031,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
  			Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
  			Default: 1024
  
@@ -243,7 +243,7 @@ index 2fe6e76..889ee23 100644
  	hashdist=	[KNL,NUMA] Large hashes allocated during boot
  			are distributed across NUMA nodes.  Defaults on
  			for 64-bit NUMA, off otherwise.
-@@ -1928,6 +1932,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -1999,6 +2003,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
  			noexec=on: enable non-executable mappings (default)
  			noexec=off: disable non-executable mappings
  
@@ -254,7 +254,7 @@ index 2fe6e76..889ee23 100644
  	nosmap		[X86]
  			Disable SMAP (Supervisor Mode Access Prevention)
  			even if it is supported by processor.
-@@ -2195,6 +2203,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -2266,6 +2274,25 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
  			the specified number of seconds.  This is to be used if
  			your oopses keep scrolling off the screen.
  
@@ -281,7 +281,7 @@ index 2fe6e76..889ee23 100644
  
  	pcd.		[PARIDE]
 diff --git a/Makefile b/Makefile
-index c6d2ec5..b2bfe62 100644
+index 3b7165e..9112a63 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -399,8 +399,8 @@ index c6d2ec5..b2bfe62 100644
 +$(vmlinux-dirs): gcc-plugins prepare scripts
  	$(Q)$(MAKE) $(build)=$@
  
- # Store (new) KERNELRELASE string in include/config/kernel.release
-@@ -835,6 +897,7 @@ prepare0: archprepare FORCE
+ define filechk_kernel.release
+@@ -838,6 +900,7 @@ prepare0: archprepare FORCE
  	$(Q)$(MAKE) $(build)=.
  
  # All the preparing..
@@ -408,7 +408,7 @@ index c6d2ec5..b2bfe62 100644
  prepare: prepare0
  
  # Generate some files
-@@ -942,6 +1005,8 @@ all: modules
+@@ -945,6 +1008,8 @@ all: modules
  #	using awk while concatenating to the final file.
  
  PHONY += modules
@@ -417,7 +417,7 @@ index c6d2ec5..b2bfe62 100644
  modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
  	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
  	@$(kecho) '  Building modules, stage 2.';
-@@ -957,7 +1022,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
+@@ -960,7 +1025,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
  
  # Target to prepare building external modules
  PHONY += modules_prepare
@@ -426,7 +426,7 @@ index c6d2ec5..b2bfe62 100644
  
  # Target to install modules
  PHONY += modules_install
-@@ -1023,7 +1088,7 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
+@@ -1026,7 +1091,7 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
  		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
  		  signing_key.priv signing_key.x509 x509.genkey		\
  		  extra_certificates signing_key.x509.keyid		\
@@ -435,7 +435,7 @@ index c6d2ec5..b2bfe62 100644
  
  # clean - Delete most, but leave enough to build external modules
  #
-@@ -1063,6 +1128,7 @@ distclean: mrproper
+@@ -1066,6 +1131,7 @@ distclean: mrproper
  		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
  		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
  		-o -name '.*.rej' \
@@ -443,7 +443,7 @@ index c6d2ec5..b2bfe62 100644
  		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
  		-type f -print | xargs rm -f
  
-@@ -1223,6 +1289,8 @@ PHONY += $(module-dirs) modules
+@@ -1227,6 +1293,8 @@ PHONY += $(module-dirs) modules
  $(module-dirs): crmodverdir $(objtree)/Module.symvers
  	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
  
@@ -452,7 +452,7 @@ index c6d2ec5..b2bfe62 100644
  modules: $(module-dirs)
  	@$(kecho) '  Building modules, stage 2.';
  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1359,17 +1427,21 @@ else
+@@ -1366,17 +1434,21 @@ else
          target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
  endif
  
@@ -478,7 +478,7 @@ index c6d2ec5..b2bfe62 100644
  	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
  %.symtypes: %.c prepare scripts FORCE
  	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-@@ -1379,11 +1451,15 @@ endif
+@@ -1386,11 +1458,15 @@ endif
  	$(cmd_crmodverdir)
  	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
  	$(build)=$(build-dir)
@@ -497,10 +497,10 @@ index c6d2ec5..b2bfe62 100644
  	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
  	$(build)=$(build-dir) $(@:.ko=.o)
 diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
-index c2cbe4f..f7264b4 100644
+index 78b03ef..da28a51 100644
 --- a/arch/alpha/include/asm/atomic.h
 +++ b/arch/alpha/include/asm/atomic.h
-@@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -292,6 +292,16 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
  #define atomic_dec(v) atomic_sub(1,(v))
  #define atomic64_dec(v) atomic64_sub(1,(v))
  
@@ -579,7 +579,7 @@ index bc2a0da..8ad11ee 100644
  
  static inline void
 diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
-index 81a4342..348b927 100644
+index d8f9b7e..f6222fa 100644
 --- a/arch/alpha/include/asm/pgtable.h
 +++ b/arch/alpha/include/asm/pgtable.h
 @@ -102,6 +102,17 @@ struct vm_area_struct;
@@ -614,10 +614,10 @@ index 2fd00b7..cfd5069 100644
  
  	for (i = 0; i < n; i++) {
 diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
-index b9e37ad..44c24e7 100644
+index 1402fcc..0b1abd2 100644
 --- a/arch/alpha/kernel/osf_sys.c
 +++ b/arch/alpha/kernel/osf_sys.c
-@@ -1297,10 +1297,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
+@@ -1298,10 +1298,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
     generic version except that we know how to honor ADDR_LIMIT_32BIT.  */
  
  static unsigned long
@@ -631,7 +631,7 @@ index b9e37ad..44c24e7 100644
  
  	info.flags = 0;
  	info.length = len;
-@@ -1308,6 +1309,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
+@@ -1309,6 +1310,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
  	info.high_limit = limit;
  	info.align_mask = 0;
  	info.align_offset = 0;
@@ -639,7 +639,7 @@ index b9e37ad..44c24e7 100644
  	return vm_unmapped_area(&info);
  }
  
-@@ -1340,20 +1342,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1341,20 +1343,24 @@ 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?  */
  
@@ -669,7 +669,7 @@ index b9e37ad..44c24e7 100644
  	return addr;
  }
 diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
-index 0c4132d..88f0d53 100644
+index 98838a0..b304fb4 100644
 --- a/arch/alpha/mm/fault.c
 +++ b/arch/alpha/mm/fault.c
 @@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
@@ -829,10 +829,10 @@ index 0c4132d..88f0d53 100644
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 18a9f5e..ca910b7 100644
+index 1ad6fb6..9406b3d 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1766,7 +1766,7 @@ config ALIGNMENT_TRAP
+@@ -1832,7 +1832,7 @@ config ALIGNMENT_TRAP
  
  config UACCESS_WITH_MEMCPY
  	bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
@@ -841,6 +841,14 @@ index 18a9f5e..ca910b7 100644
  	default y if CPU_FEROCEON
  	help
  	  Implement faster copy_to_user and clear_user methods for CPU
+@@ -2097,6 +2097,7 @@ config XIP_PHYS_ADDR
+ config KEXEC
+ 	bool "Kexec system call (EXPERIMENTAL)"
+ 	depends on (!SMP || PM_SLEEP_SMP)
++	depends on !GRKERNSEC_KMEM
+ 	help
+ 	  kexec is a system call that implements the ability to shutdown your
+ 	  current kernel, and to start another kernel.  It is like a reboot
 diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
 index da1c77d..2ee6056 100644
 --- a/arch/arm/include/asm/atomic.h
@@ -1267,11 +1275,13 @@ index da1c77d..2ee6056 100644
  
  static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
  {
+-	u64 result;
+-	unsigned long tmp;
 +	u64 result, tmp;
-+
-+	smp_mb();
-+
-+	__asm__ __volatile__("@ atomic64_add_return\n"
+ 
+ 	smp_mb();
+ 
+ 	__asm__ __volatile__("@ atomic64_add_return\n"
 +"1:	ldrexd	%1, %H1, [%3]\n"
 +"	adds	%0, %1, %4\n"
 +"	adcs	%H0, %H1, %H4\n"
@@ -1304,21 +1314,19 @@ index da1c77d..2ee6056 100644
 +
 +static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
 +{
- 	u64 result;
- 	unsigned long tmp;
- 
- 	smp_mb();
- 
--	__asm__ __volatile__("@ atomic64_add_return\n"
++	u64 result;
++	unsigned long tmp;
++
++	smp_mb();
++
 +	__asm__ __volatile__("@ atomic64_add_return_unchecked\n"
  "1:	ldrexd	%0, %H0, [%3]\n"
  "	adds	%0, %0, %4\n"
  "	adc	%H0, %H0, %H4\n"
-@@ -342,23 +654,34 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
+@@ -342,6 +654,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
  	__asm__ __volatile__("@ atomic64_sub\n"
  "1:	ldrexd	%0, %H0, [%3]\n"
  "	subs	%0, %0, %4\n"
--"	sbc	%H0, %H0, %H4\n"
 +"	sbcs	%H0, %H0, %H4\n"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
@@ -1327,46 +1335,45 @@ index da1c77d..2ee6056 100644
 +"3:\n"
 +#endif
 +
- "	strexd	%1, %0, %H0, [%3]\n"
- "	teq	%1, #0\n"
- "	bne	1b"
++"	strexd	%1, %0, %H0, [%3]\n"
++"	teq	%1, #0\n"
++"	bne	1b"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +"\n4:\n"
 +	_ASM_EXTABLE(2b, 4b)
 +#endif
 +
- 	: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
- 	: "r" (&v->counter), "r" (i)
- 	: "cc");
- }
- 
--static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
-+static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
- {
- 	u64 result;
- 	unsigned long tmp;
- 
--	smp_mb();
--
--	__asm__ __volatile__("@ atomic64_sub_return\n"
-+	__asm__ __volatile__("@ atomic64_sub_unchecked\n"
- "1:	ldrexd	%0, %H0, [%3]\n"
- "	subs	%0, %0, %4\n"
- "	sbc	%H0, %H0, %H4\n"
-@@ -368,6 +691,39 @@ static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
- 	: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
- 	: "r" (&v->counter), "r" (i)
- 	: "cc");
++	: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
++	: "r" (&v->counter), "r" (i)
++	: "cc");
 +}
 +
-+static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
++static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
 +{
-+	u64 result, tmp;
-+
-+	smp_mb();
++	u64 result;
++	unsigned long tmp;
 +
-+	__asm__ __volatile__("@ atomic64_sub_return\n"
++	__asm__ __volatile__("@ atomic64_sub_unchecked\n"
++"1:	ldrexd	%0, %H0, [%3]\n"
++"	subs	%0, %0, %4\n"
+ "	sbc	%H0, %H0, %H4\n"
+ "	strexd	%1, %0, %H0, [%3]\n"
+ "	teq	%1, #0\n"
+@@ -353,18 +695,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
+ 
+ static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
+ {
+-	u64 result;
+-	unsigned long tmp;
++	u64 result, tmp;
+ 
+ 	smp_mb();
+ 
+ 	__asm__ __volatile__("@ atomic64_sub_return\n"
+-"1:	ldrexd	%0, %H0, [%3]\n"
+-"	subs	%0, %0, %4\n"
+-"	sbc	%H0, %H0, %H4\n"
 +"1:	ldrexd	%1, %H1, [%3]\n"
 +"	subs	%0, %1, %4\n"
 +"	sbcs	%H0, %H1, %H4\n"
@@ -1379,21 +1386,18 @@ index da1c77d..2ee6056 100644
 +"3:\n"
 +#endif
 +
-+"	strexd	%1, %0, %H0, [%3]\n"
-+"	teq	%1, #0\n"
-+"	bne	1b"
+ "	strexd	%1, %0, %H0, [%3]\n"
+ "	teq	%1, #0\n"
+ "	bne	1b"
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +"\n4:\n"
 +	_ASM_EXTABLE(2b, 4b)
 +#endif
 +
-+	: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
-+	: "r" (&v->counter), "r" (i)
-+	: "cc");
- 
- 	smp_mb();
- 
+ 	: "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
+ 	: "r" (&v->counter), "r" (i)
+ 	: "cc");
 @@ -398,6 +754,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
  	return oldval;
  }
@@ -1534,7 +1538,7 @@ index 75fe66b..ba3dee4 100644
  
  #endif
 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
-index 17d0ae8..014e350 100644
+index 15f2d5b..43ffa53 100644
 --- a/arch/arm/include/asm/cacheflush.h
 +++ b/arch/arm/include/asm/cacheflush.h
 @@ -116,7 +116,7 @@ struct cpu_cache_fns {
@@ -1598,15 +1602,15 @@ index 6ddbe44..b5e38b1 100644
 +#define DOMAIN_KERNELCLIENT	1
  #define DOMAIN_MANAGER	3
 +#define DOMAIN_VECTORS		DOMAIN_USER
-+#else
+ #else
 +
 +#ifdef CONFIG_PAX_KERNEXEC
-+#define DOMAIN_MANAGER	1
-+#define DOMAIN_KERNEXEC	3
- #else
  #define DOMAIN_MANAGER	1
- #endif
- 
++#define DOMAIN_KERNEXEC	3
++#else
++#define DOMAIN_MANAGER	1
++#endif
++
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +#define DOMAIN_USERCLIENT	0
 +#define DOMAIN_UDEREF		1
@@ -1617,8 +1621,8 @@ index 6ddbe44..b5e38b1 100644
 +#endif
 +#define DOMAIN_KERNELCLIENT	1
 +
-+#endif
-+
+ #endif
+ 
  #define domain_val(dom,type)	((type) << (2*(dom)))
  
  #ifndef __ASSEMBLY__
@@ -1646,10 +1650,10 @@ index 6ddbe44..b5e38b1 100644
  static inline void set_domain(unsigned val) { }
  static inline void modify_domain(unsigned dom, unsigned type)	{ }
 diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
-index 56211f2..17e8a25 100644
+index f4b46d3..abc9b2b 100644
 --- a/arch/arm/include/asm/elf.h
 +++ b/arch/arm/include/asm/elf.h
-@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
+@@ -114,7 +114,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.  */
  
@@ -1665,7 +1669,7 @@ index 56211f2..17e8a25 100644
  
  /* When the program starts, a1 contains a pointer to a function to be 
     registered with atexit, as per the SVR4 ABI.  A value of 0 means we 
-@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
+@@ -124,10 +131,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
  extern void elf_set_personality(const struct elf32_hdr *);
  #define SET_PERSONALITY(ex)	elf_set_personality(&(ex))
  
@@ -1795,7 +1799,7 @@ index 2fe141f..192dc01 100644
  #ifdef CONFIG_MMU
  extern void iotable_init(struct map_desc *, int);
 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
-index 12f71a1..04e063c 100644
+index f94784f..9a09a4a 100644
 --- a/arch/arm/include/asm/outercache.h
 +++ b/arch/arm/include/asm/outercache.h
 @@ -35,7 +35,7 @@ struct outer_cache_fns {
@@ -1805,10 +1809,10 @@ index 12f71a1..04e063c 100644
 -};
 +} __no_const;
  
- #ifdef CONFIG_OUTER_CACHE
+ extern struct outer_cache_fns outer_cache;
  
 diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
-index cbdc7a2..32f44fe 100644
+index 4355f0e..c229913 100644
 --- a/arch/arm/include/asm/page.h
 +++ b/arch/arm/include/asm/page.h
 @@ -114,7 +114,7 @@ struct cpu_user_fns {
@@ -1932,18 +1936,10 @@ index f97ee02..cc9fe9e 100644
   * These are the memory types, defined to be compatible with
   * pre-ARMv6 CPUs cacheable and bufferable bits:   XXCB
 diff --git a/arch/arm/include/asm/pgtable-3level-hwdef.h b/arch/arm/include/asm/pgtable-3level-hwdef.h
-index 18f5cef..25b8f43 100644
+index 626989f..9d67a33 100644
 --- a/arch/arm/include/asm/pgtable-3level-hwdef.h
 +++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
-@@ -41,6 +41,7 @@
-  */
- #define PMD_SECT_BUFFERABLE	(_AT(pmdval_t, 1) << 2)
- #define PMD_SECT_CACHEABLE	(_AT(pmdval_t, 1) << 3)
-+#define PMD_SECT_RDONLY		(_AT(pmdval_t, 1) << 7)
- #define PMD_SECT_S		(_AT(pmdval_t, 3) << 8)
- #define PMD_SECT_AF		(_AT(pmdval_t, 1) << 10)
- #define PMD_SECT_nG		(_AT(pmdval_t, 1) << 11)
-@@ -71,6 +72,7 @@
+@@ -75,6 +75,7 @@
  #define PTE_EXT_SHARED		(_AT(pteval_t, 3) << 8)		/* SH[1:0], inner shareable */
  #define PTE_EXT_AF		(_AT(pteval_t, 1) << 10)	/* Access Flag */
  #define PTE_EXT_NG		(_AT(pteval_t, 1) << 11)	/* nG */
@@ -1952,10 +1948,10 @@ index 18f5cef..25b8f43 100644
  
  /*
 diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
-index 86b8fe3..e25f975 100644
+index 5689c18..eea12f9 100644
 --- a/arch/arm/include/asm/pgtable-3level.h
 +++ b/arch/arm/include/asm/pgtable-3level.h
-@@ -74,6 +74,7 @@
+@@ -82,6 +82,7 @@
  #define L_PTE_RDONLY		(_AT(pteval_t, 1) << 7)		/* AP[2] */
  #define L_PTE_SHARED		(_AT(pteval_t, 3) << 8)		/* SH[1:0], inner shareable */
  #define L_PTE_YOUNG		(_AT(pteval_t, 1) << 10)	/* AF */
@@ -1963,7 +1959,7 @@ index 86b8fe3..e25f975 100644
  #define L_PTE_XN		(_AT(pteval_t, 1) << 54)	/* XN */
  #define L_PTE_DIRTY		(_AT(pteval_t, 1) << 55)	/* unused */
  #define L_PTE_SPECIAL		(_AT(pteval_t, 1) << 56)	/* unused */
-@@ -82,6 +83,7 @@
+@@ -95,6 +96,7 @@
  /*
   * To be used in assembly code with the upper page attributes.
   */
@@ -1972,10 +1968,10 @@ index 86b8fe3..e25f975 100644
  #define L_PTE_DIRTY_HIGH	(1 << (55 - 32))
  
 diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
-index 9bcd262..1ff999b 100644
+index be956db..c8f25e2 100644
 --- a/arch/arm/include/asm/pgtable.h
 +++ b/arch/arm/include/asm/pgtable.h
-@@ -30,6 +30,9 @@
+@@ -33,6 +33,9 @@
  #include <asm/pgtable-2level.h>
  #endif
  
@@ -1985,7 +1981,7 @@ index 9bcd262..1ff999b 100644
  /*
   * Just any arbitrary offset to the start of the vmalloc VM area: the
   * current 8MB value just means that there will be a 8MB "hole" after the
-@@ -45,6 +48,9 @@
+@@ -48,6 +51,9 @@
  #define LIBRARY_TEXT_START	0x0c000000
  
  #ifndef __ASSEMBLY__
@@ -1995,7 +1991,7 @@ index 9bcd262..1ff999b 100644
  extern void __pte_error(const char *file, int line, pte_t);
  extern void __pmd_error(const char *file, int line, pmd_t);
  extern void __pgd_error(const char *file, int line, pgd_t);
-@@ -53,6 +59,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
+@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
  #define pmd_ERROR(pmd)		__pmd_error(__FILE__, __LINE__, pmd)
  #define pgd_ERROR(pgd)		__pgd_error(__FILE__, __LINE__, pgd)
  
@@ -2044,7 +2040,7 @@ index 9bcd262..1ff999b 100644
  /*
   * This is the lowest virtual address we can permit any user space
   * mapping to be mapped at.  This is particularly important for
-@@ -72,8 +120,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
+@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
  /*
   * The pgprot_* and protection_map entries will be fixed up in runtime
   * to include the cachable and bufferable bits based on memory policy,
@@ -2055,7 +2051,7 @@ index 9bcd262..1ff999b 100644
   */
  #define _L_PTE_DEFAULT	L_PTE_PRESENT | L_PTE_YOUNG
  
-@@ -257,7 +305,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
+@@ -260,7 +308,7 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; }
  static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
  {
  	const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
@@ -2065,7 +2061,7 @@ index 9bcd262..1ff999b 100644
  	return pte;
  }
 diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h
-index f3628fb..a0672dd 100644
+index 5324c11..bcae5f0 100644
 --- a/arch/arm/include/asm/proc-fns.h
 +++ b/arch/arm/include/asm/proc-fns.h
 @@ -75,7 +75,7 @@ extern struct processor {
@@ -2078,7 +2074,7 @@ index f3628fb..a0672dd 100644
  #ifndef MULTI_CPU
  extern void cpu_proc_init(void);
 diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
-index ce0dbe7..c085b6f 100644
+index c4ae171..ea0c0c2 100644
 --- a/arch/arm/include/asm/psci.h
 +++ b/arch/arm/include/asm/psci.h
 @@ -29,7 +29,7 @@ struct psci_operations {
@@ -2089,12 +2085,12 @@ index ce0dbe7..c085b6f 100644
 +} __no_const;
  
  extern struct psci_operations psci_ops;
- 
+ extern struct smp_operations psci_smp_ops;
 diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
-index d3a22be..3a69ad5 100644
+index a8cae71c..65dd797 100644
 --- a/arch/arm/include/asm/smp.h
 +++ b/arch/arm/include/asm/smp.h
-@@ -107,7 +107,7 @@ struct smp_operations {
+@@ -110,7 +110,7 @@ struct smp_operations {
  	int  (*cpu_disable)(unsigned int cpu);
  #endif
  #endif
@@ -2104,10 +2100,10 @@ index d3a22be..3a69ad5 100644
  /*
   * set platform specific SMP operations
 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
-index f00b569..aa5bb41 100644
+index df5e13d..97efb82 100644
 --- a/arch/arm/include/asm/thread_info.h
 +++ b/arch/arm/include/asm/thread_info.h
-@@ -77,9 +77,9 @@ struct thread_info {
+@@ -88,9 +88,9 @@ struct thread_info {
  	.flags		= 0,						\
  	.preempt_count	= INIT_PREEMPT_COUNT,				\
  	.addr_limit	= KERNEL_DS,					\
@@ -2120,7 +2116,7 @@ index f00b569..aa5bb41 100644
  	.restart_block	= {						\
  		.fn	= do_no_restart_syscall,			\
  	},								\
-@@ -152,7 +152,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -163,7 +163,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
  #define TIF_SYSCALL_AUDIT	9
  #define TIF_SYSCALL_TRACEPOINT	10
  #define TIF_SECCOMP		11	/* seccomp syscall filtering active */
@@ -2133,7 +2129,7 @@ index f00b569..aa5bb41 100644
  #define TIF_USING_IWMMXT	17
  #define TIF_MEMDIE		18	/* is terminating due to OOM killer */
  #define TIF_RESTORE_SIGMASK	20
-@@ -165,10 +169,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -176,10 +180,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
  #define _TIF_SYSCALL_TRACEPOINT	(1 << TIF_SYSCALL_TRACEPOINT)
  #define _TIF_SECCOMP		(1 << TIF_SECCOMP)
  #define _TIF_USING_IWMMXT	(1 << TIF_USING_IWMMXT)
@@ -2147,7 +2143,7 @@ index f00b569..aa5bb41 100644
  /*
   * Change these and you break ASM code in entry-common.S
 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index 7e1f760..de33b13 100644
+index 72abdc5..9eba222 100644
 --- a/arch/arm/include/asm/uaccess.h
 +++ b/arch/arm/include/asm/uaccess.h
 @@ -18,6 +18,7 @@
@@ -2156,9 +2152,9 @@ index 7e1f760..de33b13 100644
  #include <asm/compiler.h>
 +#include <asm/pgtable.h>
  
- #define VERIFY_READ 0
- #define VERIFY_WRITE 1
-@@ -63,11 +64,38 @@ extern int __put_user_bad(void);
+ #if __LINUX_ARM_ARCH__ < 6
+ #include <asm-generic/uaccess-unaligned.h>
+@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
  static inline void set_fs(mm_segment_t fs)
  {
  	current_thread_info()->addr_limit = fs;
@@ -2198,7 +2194,7 @@ index 7e1f760..de33b13 100644
  #define __addr_ok(addr) ({ \
  	unsigned long flag; \
  	__asm__("cmp %2, %0; movlo %0, #0" \
-@@ -143,8 +171,12 @@ extern int __get_user_4(void *);
+@@ -150,8 +178,12 @@ extern int __get_user_4(void *);
  
  #define get_user(x,p)							\
  	({								\
@@ -2212,7 +2208,7 @@ index 7e1f760..de33b13 100644
  	 })
  
  extern int __put_user_1(void *, unsigned int);
-@@ -188,8 +220,12 @@ extern int __put_user_8(void *, unsigned long long);
+@@ -195,8 +227,12 @@ extern int __put_user_8(void *, unsigned long long);
  
  #define put_user(x,p)							\
  	({								\
@@ -2226,7 +2222,7 @@ index 7e1f760..de33b13 100644
  	 })
  
  #else /* CONFIG_MMU */
-@@ -230,13 +266,17 @@ static inline void set_fs(mm_segment_t fs)
+@@ -237,13 +273,17 @@ static inline void set_fs(mm_segment_t fs)
  #define __get_user(x,ptr)						\
  ({									\
  	long __gu_err = 0;						\
@@ -2244,7 +2240,7 @@ index 7e1f760..de33b13 100644
  	(void) 0;							\
  })
  
-@@ -312,13 +352,17 @@ do {									\
+@@ -319,13 +359,17 @@ do {									\
  #define __put_user(x,ptr)						\
  ({									\
  	long __pu_err = 0;						\
@@ -2262,7 +2258,7 @@ index 7e1f760..de33b13 100644
  	(void) 0;							\
  })
  
-@@ -418,11 +462,44 @@ do {									\
+@@ -425,11 +469,44 @@ do {									\
  
  
  #ifdef CONFIG_MMU
@@ -2310,7 +2306,7 @@ index 7e1f760..de33b13 100644
  #else
  #define __copy_from_user(to,from,n)	(memcpy(to, (void __force *)from, n), 0)
  #define __copy_to_user(to,from,n)	(memcpy((void __force *)to, from, n), 0)
-@@ -431,6 +508,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
+@@ -438,6 +515,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
  
  static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
  {
@@ -2320,7 +2316,7 @@ index 7e1f760..de33b13 100644
  	if (access_ok(VERIFY_READ, from, n))
  		n = __copy_from_user(to, from, n);
  	else /* security hole - plug it */
-@@ -440,6 +520,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
+@@ -447,6 +527,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)
  {
@@ -2331,10 +2327,10 @@ index 7e1f760..de33b13 100644
  		n = __copy_to_user(to, from, n);
  	return n;
 diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
-index 96ee092..37f1844 100644
+index 5af0ed1..cea83883 100644
 --- a/arch/arm/include/uapi/asm/ptrace.h
 +++ b/arch/arm/include/uapi/asm/ptrace.h
-@@ -73,7 +73,7 @@
+@@ -92,7 +92,7 @@
   * ARMv7 groups of PSR bits
   */
  #define APSR_MASK	0xf80f0000	/* N, Z, C, V, Q and GE flags */
@@ -2370,7 +2366,7 @@ index 60d3b73..e5a0f22 100644
  EXPORT_SYMBOL(__get_user_1);
  EXPORT_SYMBOL(__get_user_2);
 diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
-index 32640ae..7034750 100644
+index ec3e5cf..b450ee3 100644
 --- a/arch/arm/kernel/entry-armv.S
 +++ b/arch/arm/kernel/entry-armv.S
 @@ -47,6 +47,87 @@
@@ -2512,17 +2508,7 @@ index 32640ae..7034750 100644
  	sub	sp, sp, #S_FRAME_SIZE
   ARM(	stmib	sp, {r1 - r12}	)
   THUMB(	stmia	sp, {r0 - r12}	)
-@@ -358,7 +455,8 @@ ENDPROC(__pabt_svc)
- 	.endm
- 
- 	.macro	kuser_cmpxchg_check
--#if !defined(CONFIG_CPU_32v6K) && !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)
-+#if !defined(CONFIG_CPU_32v6K) && defined(CONFIG_KUSER_HELPERS) && \
-+    !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)
- #ifndef CONFIG_MMU
- #warning "NPTL on non MMU needs fixing"
- #else
-@@ -415,7 +513,9 @@ __und_usr:
+@@ -416,7 +513,9 @@ __und_usr:
  	tst	r3, #PSR_T_BIT			@ Thumb mode?
  	bne	__und_usr_thumb
  	sub	r4, r2, #4			@ ARM instr at LR - 4
@@ -2532,7 +2518,7 @@ index 32640ae..7034750 100644
  #ifdef CONFIG_CPU_ENDIAN_BE8
  	rev	r0, r0				@ little endian instruction
  #endif
-@@ -450,10 +550,14 @@ __und_usr_thumb:
+@@ -451,10 +550,14 @@ __und_usr_thumb:
   */
  	.arch	armv6t2
  #endif
@@ -2547,7 +2533,7 @@ index 32640ae..7034750 100644
  	add	r2, r2, #2			@ r2 is PC + 2, make it PC + 4
  	str	r2, [sp, #S_PC]			@ it's a 2x16bit instr, update
  	orr	r0, r0, r5, lsl #16
-@@ -482,7 +586,8 @@ ENDPROC(__und_usr)
+@@ -483,7 +586,8 @@ ENDPROC(__und_usr)
   */
  	.pushsection .fixup, "ax"
  	.align	2
@@ -2557,16 +2543,16 @@ index 32640ae..7034750 100644
  	.popsection
  	.pushsection __ex_table,"a"
  	.long	1b, 4b
-@@ -691,7 +796,7 @@ ENTRY(__switch_to)
-  THUMB(	stmia	ip!, {r4 - sl, fp}	   )	@ Store most regs on stack
-  THUMB(	str	sp, [ip], #4		   )
+@@ -693,7 +797,7 @@ ENTRY(__switch_to)
   THUMB(	str	lr, [ip], #4		   )
+ 	ldr	r4, [r2, #TI_TP_VALUE]
+ 	ldr	r5, [r2, #TI_TP_VALUE + 4]
 -#ifdef CONFIG_CPU_USE_DOMAINS
 +#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
  	ldr	r6, [r2, #TI_CPU_DOMAIN]
  #endif
- 	set_tls	r3, r4, r5
-@@ -700,7 +805,7 @@ ENTRY(__switch_to)
+ 	switch_tls r1, r4, r5, r3, r7
+@@ -702,7 +806,7 @@ ENTRY(__switch_to)
  	ldr	r8, =__stack_chk_guard
  	ldr	r7, [r7, #TSK_STACK_CANARY]
  #endif
@@ -2576,7 +2562,7 @@ index 32640ae..7034750 100644
  #endif
  	mov	r5, r0
 diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
-index bc5bc0a..d0998ca 100644
+index bc6bd96..bd026cb 100644
 --- a/arch/arm/kernel/entry-common.S
 +++ b/arch/arm/kernel/entry-common.S
 @@ -10,18 +10,46 @@
@@ -2629,16 +2615,8 @@ index bc5bc0a..d0998ca 100644
  	.align	5
  /*
   * This is the fast syscall return path.  We do as little as
-@@ -350,6 +378,7 @@ ENDPROC(ftrace_stub)
- 
- 	.align	5
- ENTRY(vector_swi)
-+
- 	sub	sp, sp, #S_FRAME_SIZE
- 	stmia	sp, {r0 - r12}			@ Calling r0 - r12
-  ARM(	add	r8, sp, #S_PC		)
-@@ -399,6 +428,12 @@ ENTRY(vector_swi)
- 	ldr	scno, [lr, #-4]			@ get SWI instruction
+@@ -413,6 +441,12 @@ ENTRY(vector_swi)
+  USER(	ldr	scno, [lr, #-4]		)	@ get SWI instruction
  #endif
  
 +	/*
@@ -2647,14 +2625,14 @@ index bc5bc0a..d0998ca 100644
 +	 */
 +	pax_enter_kernel_user
 +
- #ifdef CONFIG_ALIGNMENT_TRAP
- 	ldr	ip, __cr_alignment
- 	ldr	ip, [ip]
+ 	adr	tbl, sys_call_table		@ load syscall table pointer
+ 
+ #if defined(CONFIG_OABI_COMPAT)
 diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
-index 160f337..db67ee4 100644
+index 39f89fb..d612bd9 100644
 --- a/arch/arm/kernel/entry-header.S
 +++ b/arch/arm/kernel/entry-header.S
-@@ -73,6 +73,60 @@
+@@ -184,6 +184,60 @@
  	msr	cpsr_c, \rtemp			@ switch back to the SVC mode
  	.endm
  
@@ -2715,7 +2693,7 @@ index 160f337..db67ee4 100644
  #ifndef CONFIG_THUMB2_KERNEL
  	.macro	svc_exit, rpsr, irq = 0
  	.if	\irq != 0
-@@ -92,6 +146,9 @@
+@@ -203,6 +257,9 @@
  	blne	trace_hardirqs_off
  #endif
  	.endif
@@ -2725,7 +2703,7 @@ index 160f337..db67ee4 100644
  	msr	spsr_cxsf, \rpsr
  #if defined(CONFIG_CPU_V6)
  	ldr	r0, [sp]
-@@ -155,6 +212,9 @@
+@@ -266,6 +323,9 @@
  	blne	trace_hardirqs_off
  #endif
  	.endif
@@ -2736,34 +2714,22 @@ index 160f337..db67ee4 100644
  	ldrd	r0, r1, [sp, #S_LR]		@ calling lr and pc
  	clrex					@ clear the exclusive monitor
 diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
-index 25442f4..d4948fc 100644
+index 918875d..cd5fa27 100644
 --- a/arch/arm/kernel/fiq.c
 +++ b/arch/arm/kernel/fiq.c
-@@ -84,17 +84,16 @@ int show_fiq_list(struct seq_file *p, int prec)
- 
- void set_fiq_handler(void *start, unsigned int length)
- {
--#if defined(CONFIG_CPU_USE_DOMAINS)
--	void *base = (void *)0xffff0000;
--#else
+@@ -87,7 +87,10 @@ void set_fiq_handler(void *start, unsigned int length)
  	void *base = vectors_page;
--#endif
  	unsigned offset = FIQ_OFFSET;
  
 +	pax_open_kernel();
  	memcpy(base + offset, start, length);
 +	pax_close_kernel();
 +
-+	if (!cache_is_vipt_nonaliasing())
-+		flush_icache_range(base + offset, offset + length);
- 	flush_icache_range(0xffff0000 + offset, 0xffff0000 + offset + length);
--	if (!vectors_high())
--		flush_icache_range(offset, offset + length);
- }
- 
- int claim_fiq(struct fiq_handler *f)
+ 	if (!cache_is_vipt_nonaliasing())
+ 		flush_icache_range((unsigned long)base + offset, offset +
+ 				   length);
 diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
-index 8bac553..caee108 100644
+index 476de57..4857a76 100644
 --- a/arch/arm/kernel/head.S
 +++ b/arch/arm/kernel/head.S
 @@ -52,7 +52,9 @@
@@ -2777,7 +2743,7 @@ index 8bac553..caee108 100644
  	.endm
  
  /*
-@@ -434,7 +436,7 @@ __enable_mmu:
+@@ -432,7 +434,7 @@ __enable_mmu:
  	mov	r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
  		      domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
  		      domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
@@ -2786,24 +2752,11 @@ index 8bac553..caee108 100644
  	mcr	p15, 0, r5, c3, c0, 0		@ load domain access register
  	mcr	p15, 0, r4, c2, c0, 0		@ load page table pointer
  #endif
-diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c
-index 1fd749e..47adb08 100644
---- a/arch/arm/kernel/hw_breakpoint.c
-+++ b/arch/arm/kernel/hw_breakpoint.c
-@@ -1029,7 +1029,7 @@ static int __cpuinit dbg_reset_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata dbg_reset_nb = {
-+static struct notifier_block dbg_reset_nb = {
- 	.notifier_call = dbg_reset_notify,
- };
- 
 diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
-index 1e9be5d..03edbc2 100644
+index 084dc88..fce4e68 100644
 --- a/arch/arm/kernel/module.c
 +++ b/arch/arm/kernel/module.c
-@@ -37,12 +37,37 @@
+@@ -37,12 +37,39 @@
  #endif
  
  #ifdef CONFIG_MMU
@@ -2834,11 +2787,13 @@ index 1e9be5d..03edbc2 100644
 +{
 +	module_free(mod, module_region);
 +}
++EXPORT_SYMBOL(module_free_exec);
 +
 +void *module_alloc_exec(unsigned long size)
 +{
 +	return __module_alloc(size, PAGE_KERNEL_EXEC);
 +}
++EXPORT_SYMBOL(module_alloc_exec);
 +#endif
  #endif
  
@@ -2863,37 +2818,11 @@ index 07314af..c46655c 100644
  
  	flush_icache_range((uintptr_t)(addr),
  			   (uintptr_t)(addr) + size);
-diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
-index e19edc6..e186ee1 100644
---- a/arch/arm/kernel/perf_event.c
-+++ b/arch/arm/kernel/perf_event.c
-@@ -56,7 +56,7 @@ armpmu_map_hw_event(const unsigned (*event_map)[PERF_COUNT_HW_MAX], u64 config)
- 	int mapping;
- 
- 	if (config >= PERF_COUNT_HW_MAX)
--		return -ENOENT;
-+		return -EINVAL;
- 
- 	mapping = (*event_map)[config];
- 	return mapping == HW_OP_UNSUPPORTED ? -ENOENT : mapping;
-diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
-index 1f2740e..b36e225 100644
---- a/arch/arm/kernel/perf_event_cpu.c
-+++ b/arch/arm/kernel/perf_event_cpu.c
-@@ -171,7 +171,7 @@ static int __cpuinit cpu_pmu_notify(struct notifier_block *b,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata cpu_pmu_hotplug_notifier = {
-+static struct notifier_block cpu_pmu_hotplug_notifier = {
- 	.notifier_call = cpu_pmu_notify,
- };
- 
 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index ab1fe3b..dcd439f 100644
+index 94f6b05..efd7312 100644
 --- a/arch/arm/kernel/process.c
 +++ b/arch/arm/kernel/process.c
-@@ -223,6 +223,7 @@ void machine_power_off(void)
+@@ -217,6 +217,7 @@ void machine_power_off(void)
  
  	if (pm_power_off)
  		pm_power_off();
@@ -2901,16 +2830,16 @@ index ab1fe3b..dcd439f 100644
  }
  
  /*
-@@ -236,7 +237,7 @@ void machine_power_off(void)
+@@ -230,7 +231,7 @@ void machine_power_off(void)
   * executing pre-reset code, and using RAM that the primary CPU's code wishes
   * to use. Implementing such co-ordination would be essentially impossible.
   */
 -void machine_restart(char *cmd)
 +__noreturn void machine_restart(char *cmd)
  {
+ 	local_irq_disable();
  	smp_send_stop();
- 
-@@ -258,8 +259,8 @@ void __show_regs(struct pt_regs *regs)
+@@ -253,8 +254,8 @@ void __show_regs(struct pt_regs *regs)
  
  	show_regs_print_info(KERN_DEFAULT);
  
@@ -2921,7 +2850,7 @@ index ab1fe3b..dcd439f 100644
  	printk("pc : [<%08lx>]    lr : [<%08lx>]    psr: %08lx\n"
  	       "sp : %08lx  ip : %08lx  fp : %08lx\n",
  		regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
-@@ -426,12 +427,6 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -422,12 +423,6 @@ unsigned long get_wchan(struct task_struct *p)
  	return 0;
  }
  
@@ -2934,7 +2863,7 @@ index ab1fe3b..dcd439f 100644
  #ifdef CONFIG_MMU
  #ifdef CONFIG_KUSER_HELPERS
  /*
-@@ -447,7 +442,7 @@ static struct vm_area_struct gate_vma = {
+@@ -443,7 +438,7 @@ static struct vm_area_struct gate_vma = {
  
  static int __init gate_vma_init(void)
  {
@@ -2943,7 +2872,7 @@ index ab1fe3b..dcd439f 100644
  	return 0;
  }
  arch_initcall(gate_vma_init);
-@@ -473,41 +468,16 @@ int in_gate_area_no_mm(unsigned long addr)
+@@ -469,41 +464,16 @@ int in_gate_area_no_mm(unsigned long addr)
  
  const char *arch_vma_name(struct vm_area_struct *vma)
  {
@@ -2989,7 +2918,7 @@ index ab1fe3b..dcd439f 100644
  }
  #endif
 diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
-index 3653164..d83e55d 100644
+index 4693188..4596c5e 100644
 --- a/arch/arm/kernel/psci.c
 +++ b/arch/arm/kernel/psci.c
 @@ -24,7 +24,7 @@
@@ -3002,10 +2931,10 @@ index 3653164..d83e55d 100644
  static int (*invoke_psci_fn)(u32, u32, u32, u32);
  
 diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
-index 03deeff..741ce88 100644
+index 0dd3b79..e018f64 100644
 --- a/arch/arm/kernel/ptrace.c
 +++ b/arch/arm/kernel/ptrace.c
-@@ -937,10 +937,19 @@ static int tracehook_report_syscall(struct pt_regs *regs,
+@@ -929,10 +929,19 @@ static int tracehook_report_syscall(struct pt_regs *regs,
  	return current_thread_info()->syscall;
  }
  
@@ -3026,10 +2955,10 @@ index 03deeff..741ce88 100644
  	if (secure_computing(scno) == -1)
  		return -1;
 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index b4b1d39..efdc9be 100644
+index 0e1e2b3..c0e821d 100644
 --- a/arch/arm/kernel/setup.c
 +++ b/arch/arm/kernel/setup.c
-@@ -97,21 +97,23 @@ EXPORT_SYMBOL(system_serial_high);
+@@ -98,21 +98,23 @@ EXPORT_SYMBOL(system_serial_high);
  unsigned int elf_hwcap __read_mostly;
  EXPORT_SYMBOL(elf_hwcap);
  
@@ -3058,7 +2987,7 @@ index b4b1d39..efdc9be 100644
  EXPORT_SYMBOL(outer_cache);
  #endif
  
-@@ -236,9 +238,13 @@ static int __get_cpu_architecture(void)
+@@ -245,9 +247,13 @@ static int __get_cpu_architecture(void)
  		asm("mrc	p15, 0, %0, c0, c1, 4"
  		    : "=r" (mmfr0));
  		if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
@@ -3074,7 +3003,7 @@ index b4b1d39..efdc9be 100644
  			 (mmfr0 & 0x000000f0) == 0x00000020)
  			cpu_arch = CPU_ARCH_ARMv6;
  		else
-@@ -479,7 +485,7 @@ static void __init setup_processor(void)
+@@ -571,7 +577,7 @@ static void __init setup_processor(void)
  	__cpu_architecture = __get_cpu_architecture();
  
  #ifdef MULTI_CPU
@@ -3084,7 +3013,7 @@ index b4b1d39..efdc9be 100644
  #ifdef MULTI_TLB
  	cpu_tlb = *list->tlb;
 diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
-index 5a42c12..a2bb7c6 100644
+index ab33042..11248a8 100644
 --- a/arch/arm/kernel/signal.c
 +++ b/arch/arm/kernel/signal.c
 @@ -45,8 +45,6 @@ static const unsigned long sigreturn_codes[7] = {
@@ -3096,7 +3025,7 @@ index 5a42c12..a2bb7c6 100644
  #ifdef CONFIG_CRUNCH
  static int preserve_crunch_context(struct crunch_sigframe __user *frame)
  {
-@@ -406,8 +404,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
+@@ -411,8 +409,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
  			 * except when the MPU has protected the vectors
  			 * page from PL0
  			 */
@@ -3106,7 +3035,7 @@ index 5a42c12..a2bb7c6 100644
  		} else
  #endif
  		{
-@@ -611,33 +608,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
+@@ -616,33 +613,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
  	} while (thread_flags & _TIF_WORK_MASK);
  	return 0;
  }
@@ -3141,7 +3070,7 @@ index 5a42c12..a2bb7c6 100644
 -	return page;
 -}
 diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
-index 5919eb4..b5d6dfe 100644
+index 72024ea..ae302dd 100644
 --- a/arch/arm/kernel/smp.c
 +++ b/arch/arm/kernel/smp.c
 @@ -70,7 +70,7 @@ enum ipi_msg_type {
@@ -3154,7 +3083,7 @@ index 5919eb4..b5d6dfe 100644
  void __init smp_set_ops(struct smp_operations *ops)
  {
 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
-index 6b9567e..b8af2d6 100644
+index 8fcda14..4512b9d 100644
 --- a/arch/arm/kernel/traps.c
 +++ b/arch/arm/kernel/traps.c
 @@ -55,7 +55,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
@@ -3185,7 +3114,7 @@ index 6b9567e..b8af2d6 100644
  	if (signr)
  		do_exit(signr);
  }
-@@ -592,7 +597,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
+@@ -628,7 +633,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs)
  			 * The user helper at 0xffff0fe0 must be used instead.
  			 * (see entry-armv.S for details)
  			 */
@@ -3195,7 +3124,7 @@ index 6b9567e..b8af2d6 100644
  		}
  		return 0;
  
-@@ -848,5 +855,9 @@ void __init early_trap_init(void *vectors_base)
+@@ -885,7 +892,11 @@ void __init early_trap_init(void *vectors_base)
  	kuser_init(vectors_base);
  
  	flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
@@ -3205,9 +3134,11 @@ index 6b9567e..b8af2d6 100644
 +	modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
 +#endif
 +
- }
+ #else /* ifndef CONFIG_CPU_V7M */
+ 	/*
+ 	 * on V7-M there is no need to copy the vector table to a dedicated
 diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
-index 33f2ea3..0b91824 100644
+index 7bcee5c..e2f3249 100644
 --- a/arch/arm/kernel/vmlinux.lds.S
 +++ b/arch/arm/kernel/vmlinux.lds.S
 @@ -8,7 +8,11 @@
@@ -3223,7 +3154,16 @@ index 33f2ea3..0b91824 100644
  #define PROC_INFO							\
  	. = ALIGN(4);							\
  	VMLINUX_SYMBOL(__proc_info_begin) = .;				\
-@@ -94,6 +98,11 @@ SECTIONS
+@@ -34,7 +38,7 @@
+ #endif
+ 
+ #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
+-	defined(CONFIG_GENERIC_BUG)
++	defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
+ #define ARM_EXIT_KEEP(x)	x
+ #define ARM_EXIT_DISCARD(x)
+ #else
+@@ -90,6 +94,11 @@ SECTIONS
  		_text = .;
  		HEAD_TEXT
  	}
@@ -3235,7 +3175,7 @@ index 33f2ea3..0b91824 100644
  	.text : {			/* Real text segment		*/
  		_stext = .;		/* Text and read-only data	*/
  			__exception_text_start = .;
-@@ -116,6 +125,8 @@ SECTIONS
+@@ -112,6 +121,8 @@ SECTIONS
  			ARM_CPU_KEEP(PROC_INFO)
  	}
  
@@ -3244,7 +3184,7 @@ index 33f2ea3..0b91824 100644
  	RO_DATA(PAGE_SIZE)
  
  	. = ALIGN(4);
-@@ -146,7 +157,9 @@ SECTIONS
+@@ -142,7 +153,9 @@ SECTIONS
  
  	NOTES
  
@@ -3255,7 +3195,7 @@ index 33f2ea3..0b91824 100644
  
  #ifndef CONFIG_XIP_KERNEL
  	. = ALIGN(PAGE_SIZE);
-@@ -224,6 +237,11 @@ SECTIONS
+@@ -220,6 +233,11 @@ SECTIONS
  	. = PAGE_OFFSET + TEXT_OFFSET;
  #else
  	__init_end = .;
@@ -3268,7 +3208,7 @@ index 33f2ea3..0b91824 100644
  	__data_loc = .;
  #endif
 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
-index ef1703b..46b77f3 100644
+index 9c697db..115237f 100644
 --- a/arch/arm/kvm/arm.c
 +++ b/arch/arm/kvm/arm.c
 @@ -56,7 +56,7 @@ static unsigned long hyp_default_vectors;
@@ -3280,7 +3220,7 @@ index ef1703b..46b77f3 100644
  static u8 kvm_next_vmid;
  static DEFINE_SPINLOCK(kvm_vmid_lock);
  
-@@ -392,7 +392,7 @@ void force_vm_exit(const cpumask_t *mask)
+@@ -396,7 +396,7 @@ void force_vm_exit(const cpumask_t *mask)
   */
  static bool need_new_vmid_gen(struct kvm *kvm)
  {
@@ -3289,7 +3229,7 @@ index ef1703b..46b77f3 100644
  }
  
  /**
-@@ -425,7 +425,7 @@ static void update_vttbr(struct kvm *kvm)
+@@ -429,7 +429,7 @@ static void update_vttbr(struct kvm *kvm)
  
  	/* First user of a new VMID generation? */
  	if (unlikely(kvm_next_vmid == 0)) {
@@ -3298,7 +3238,7 @@ index ef1703b..46b77f3 100644
  		kvm_next_vmid = 1;
  
  		/*
-@@ -442,7 +442,7 @@ static void update_vttbr(struct kvm *kvm)
+@@ -446,7 +446,7 @@ static void update_vttbr(struct kvm *kvm)
  		kvm_call_hyp(__kvm_flush_vm_context);
  	}
  
@@ -3419,7 +3359,7 @@ index 7d08b43..f7ca7ea 100644
  #include "csumpartialcopygeneric.S"
  
 diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
-index 64dbfa5..84a3fd9 100644
+index 5306de3..aed6d03 100644
 --- a/arch/arm/lib/delay.c
 +++ b/arch/arm/lib/delay.c
 @@ -28,7 +28,7 @@
@@ -3432,7 +3372,7 @@ index 64dbfa5..84a3fd9 100644
  	.const_udelay	= __loop_const_udelay,
  	.udelay		= __loop_udelay,
 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
-index 025f742..8432b08 100644
+index 025f742..a9e5b3b 100644
 --- a/arch/arm/lib/uaccess_with_memcpy.c
 +++ b/arch/arm/lib/uaccess_with_memcpy.c
 @@ -104,7 +104,7 @@ out:
@@ -3444,11 +3384,20 @@ index 025f742..8432b08 100644
  {
  	/*
  	 * This test is stubbed out of the main function above to keep
+@@ -155,7 +155,7 @@ out:
+ 	return n;
+ }
+ 
+-unsigned long __clear_user(void __user *addr, unsigned long n)
++unsigned long ___clear_user(void __user *addr, unsigned long n)
+ {
+ 	/* See rational for this in __copy_to_user() above. */
+ 	if (n < 64)
 diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
-index f389228..592ef66 100644
+index 1767611..d2e7e24 100644
 --- a/arch/arm/mach-kirkwood/common.c
 +++ b/arch/arm/mach-kirkwood/common.c
-@@ -149,7 +149,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
+@@ -156,7 +156,16 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
  	clk_gate_ops.disable(hw);
  }
  
@@ -3466,7 +3415,7 @@ index f389228..592ef66 100644
  
  static struct clk __init *clk_register_gate_fn(struct device *dev,
  		const char *name,
-@@ -183,14 +192,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
+@@ -190,14 +199,6 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
  	gate_fn->fn_en = fn_en;
  	gate_fn->fn_dis = fn_dis;
  
@@ -3482,10 +3431,10 @@ index f389228..592ef66 100644
  
  	if (IS_ERR(clk))
 diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
-index f6eeb87..cc90868 100644
+index 827d1500..2885dc6 100644
 --- a/arch/arm/mach-omap2/board-n8x0.c
 +++ b/arch/arm/mach-omap2/board-n8x0.c
-@@ -631,7 +631,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
+@@ -627,7 +627,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
  }
  #endif
  
@@ -3495,18 +3444,18 @@ index f6eeb87..cc90868 100644
  };
  
 diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
-index 6c4da12..d9ca72d 100644
+index 579697a..1d5a3b2 100644
 --- a/arch/arm/mach-omap2/gpmc.c
 +++ b/arch/arm/mach-omap2/gpmc.c
-@@ -147,7 +147,6 @@ struct omap3_gpmc_regs {
+@@ -148,7 +148,6 @@ struct omap3_gpmc_regs {
  };
  
  static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
 -static struct irq_chip gpmc_irq_chip;
- static unsigned gpmc_irq_start;
+ static int gpmc_irq_start;
  
  static struct resource	gpmc_mem_root;
-@@ -711,6 +710,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
+@@ -716,6 +715,18 @@ static void gpmc_irq_noop(struct irq_data *data) { }
  
  static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
  
@@ -3525,7 +3474,7 @@ index 6c4da12..d9ca72d 100644
  static int gpmc_setup_irq(void)
  {
  	int i;
-@@ -725,15 +736,6 @@ static int gpmc_setup_irq(void)
+@@ -730,15 +741,6 @@ static int gpmc_setup_irq(void)
  		return gpmc_irq_start;
  	}
  
@@ -3541,11 +3490,33 @@ index 6c4da12..d9ca72d 100644
  	gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
  	gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
  
+diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+index f991016..145ebeb 100644
+--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
++++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+@@ -84,7 +84,7 @@ struct cpu_pm_ops {
+ 	int (*finish_suspend)(unsigned long cpu_state);
+ 	void (*resume)(void);
+ 	void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
+-};
++} __no_const;
+ 
+ static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
+ static struct powerdomain *mpuss_pd;
+@@ -102,7 +102,7 @@ static void dummy_cpu_resume(void)
+ static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
+ {}
+ 
+-struct cpu_pm_ops omap_pm_ops = {
++static struct cpu_pm_ops omap_pm_ops __read_only = {
+ 	.finish_suspend		= default_finish_suspend,
+ 	.resume			= dummy_cpu_resume,
+ 	.scu_prepare		= dummy_scu_prepare,
 diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
-index f8bb3b9..831e7b8 100644
+index 813c615..ce467c6 100644
 --- a/arch/arm/mach-omap2/omap-wakeupgen.c
 +++ b/arch/arm/mach-omap2/omap-wakeupgen.c
-@@ -339,7 +339,7 @@ static int __cpuinit irq_cpu_hotplug_notify(struct notifier_block *self,
+@@ -339,7 +339,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
  	return NOTIFY_OK;
  }
  
@@ -3555,10 +3526,10 @@ index f8bb3b9..831e7b8 100644
  };
  
 diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
-index e6d2307..d057195 100644
+index 53f0735..5b54eb6 100644
 --- a/arch/arm/mach-omap2/omap_device.c
 +++ b/arch/arm/mach-omap2/omap_device.c
-@@ -499,7 +499,7 @@ void omap_device_delete(struct omap_device *od)
+@@ -504,7 +504,7 @@ void omap_device_delete(struct omap_device *od)
  struct platform_device __init *omap_device_build(const char *pdev_name,
  						 int pdev_id,
  						 struct omap_hwmod *oh,
@@ -3567,7 +3538,7 @@ index e6d2307..d057195 100644
  {
  	struct omap_hwmod *ohs[] = { oh };
  
-@@ -527,7 +527,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
+@@ -532,7 +532,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
  struct platform_device __init *omap_device_build_ss(const char *pdev_name,
  						    int pdev_id,
  						    struct omap_hwmod **ohs,
@@ -3577,10 +3548,10 @@ index e6d2307..d057195 100644
  {
  	int ret = -ENOMEM;
 diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
-index 044c31d..2ee0861 100644
+index 17ca1ae..beba869 100644
 --- a/arch/arm/mach-omap2/omap_device.h
 +++ b/arch/arm/mach-omap2/omap_device.h
-@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
+@@ -71,12 +71,12 @@ int omap_device_idle(struct platform_device *pdev);
  /* Core code interface */
  
  struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
@@ -3596,7 +3567,7 @@ index 044c31d..2ee0861 100644
  struct omap_device *omap_device_alloc(struct platform_device *pdev,
  				      struct omap_hwmod **ohs, int oh_cnt);
 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index 7341eff..fd75e34 100644
+index 3d5db8c..ddfa144 100644
 --- a/arch/arm/mach-omap2/omap_hwmod.c
 +++ b/arch/arm/mach-omap2/omap_hwmod.c
 @@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
@@ -3637,10 +3608,10 @@ index d15c7bb..b2d1f0c 100644
  				 sizeof(struct omap_wd_timer_platform_data));
  	WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
 diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
-index 0cdba8d..297993e 100644
+index b82dcae..44ee5b6 100644
 --- a/arch/arm/mach-tegra/cpuidle-tegra20.c
 +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
-@@ -181,7 +181,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
+@@ -180,7 +180,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
  	bool entered_lp2 = false;
  
  	if (tegra_pending_sgi())
@@ -3650,10 +3621,10 @@ index 0cdba8d..297993e 100644
  	cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
  
 diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
-index cad3ca8..1d79e0f 100644
+index 656324a..0beba28 100644
 --- a/arch/arm/mach-ux500/setup.h
 +++ b/arch/arm/mach-ux500/setup.h
-@@ -37,13 +37,6 @@ extern void ux500_timer_init(void);
+@@ -40,13 +40,6 @@ extern void ux500_timer_init(void);
  	.type		= MT_DEVICE,		\
  }
  
@@ -3668,10 +3639,10 @@ index cad3ca8..1d79e0f 100644
  extern void ux500_cpu_die(unsigned int cpu);
  
 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
-index 08c9fe9..191320c 100644
+index cd2c88e..4dd9b67 100644
 --- a/arch/arm/mm/Kconfig
 +++ b/arch/arm/mm/Kconfig
-@@ -436,7 +436,7 @@ config CPU_32v5
+@@ -446,7 +446,7 @@ config CPU_32v5
  
  config CPU_32v6
  	bool
@@ -3680,23 +3651,23 @@ index 08c9fe9..191320c 100644
  	select TLS_REG_EMUL if !CPU_32v6K && !MMU
  
  config CPU_32v6K
-@@ -585,6 +585,7 @@ config CPU_CP15_MPU
+@@ -601,6 +601,7 @@ config CPU_CP15_MPU
  
  config CPU_USE_DOMAINS
  	bool
-+	depends on !ARM_LPAE && !PAX_KERNEXEC
++	depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
  	help
  	  This option enables or disables the use of domain switching
  	  via the set_fs() function.
-@@ -780,6 +781,7 @@ config NEED_KUSER_HELPERS
+@@ -800,6 +801,7 @@ config NEED_KUSER_HELPERS
  config KUSER_HELPERS
  	bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
  	default y
-+	depends on !(CPU_V6 || CPU_V6K || CPU_V7)
++	depends on !(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND
  	help
  	  Warning: disabling this option may break user programs.
  
-@@ -792,7 +794,7 @@ config KUSER_HELPERS
+@@ -812,7 +814,7 @@ config KUSER_HELPERS
  	  See Documentation/arm/kernel_user_helpers.txt for details.
  
  	  However, the fixed address nature of these helpers can be used
@@ -3770,11 +3741,24 @@ index 6f4585b..7b6f52b 100644
  		if (err)					\
  			goto fault;				\
  	} while (0)
+diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
+index 447da6f..77a5057 100644
+--- a/arch/arm/mm/cache-l2x0.c
++++ b/arch/arm/mm/cache-l2x0.c
+@@ -45,7 +45,7 @@ struct l2x0_of_data {
+ 	void (*setup)(const struct device_node *, u32 *, u32 *);
+ 	void (*save)(void);
+ 	struct outer_cache_fns outer_cache;
+-};
++} __do_const;
+ 
+ static bool of_init = false;
+ 
 diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
-index eeab06e..2638dc2 100644
+index 84e6f77..0b52f31 100644
 --- a/arch/arm/mm/context.c
 +++ b/arch/arm/mm/context.c
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
  #define NUM_USER_ASIDS		ASID_FIRST_VERSION
  
  static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
@@ -3783,7 +3767,7 @@ index eeab06e..2638dc2 100644
  static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
  
  static DEFINE_PER_CPU(atomic64_t, active_asids);
-@@ -188,7 +188,7 @@ static int is_reserved_asid(u64 asid)
+@@ -180,7 +180,7 @@ static int is_reserved_asid(u64 asid)
  static u64 new_context(struct mm_struct *mm, unsigned int cpu)
  {
  	u64 asid = atomic64_read(&mm->context.id);
@@ -3792,7 +3776,7 @@ index eeab06e..2638dc2 100644
  
  	if (asid != 0 && is_reserved_asid(asid)) {
  		/*
-@@ -206,7 +206,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
+@@ -198,7 +198,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
  		 */
  		asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
  		if (asid == NUM_USER_ASIDS) {
@@ -3801,7 +3785,7 @@ index eeab06e..2638dc2 100644
  							 &asid_generation);
  			flush_context(cpu);
  			asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
-@@ -235,14 +235,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
+@@ -227,14 +227,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
  	cpu_set_reserved_ttbr0();
  
  	asid = atomic64_read(&mm->context.id);
@@ -3819,7 +3803,7 @@ index eeab06e..2638dc2 100644
  		atomic64_set(&mm->context.id, asid);
  	}
 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
-index 5dbf13f..a2d1876 100644
+index eb8830a..5360ce7 100644
 --- a/arch/arm/mm/fault.c
 +++ b/arch/arm/mm/fault.c
 @@ -25,6 +25,7 @@
@@ -3830,10 +3814,21 @@ index 5dbf13f..a2d1876 100644
  
  #include "fault.h"
  
-@@ -138,6 +139,20 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
+@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
  	if (fixup_exception(regs))
  		return;
  
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++	if (addr < TASK_SIZE) {
++		if (current->signal->curr_ip)
++			printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", &current->signal->curr_ip, current->comm, task_pid_nr(current),
++					from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
++		else
++			printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
++					from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
++	}
++#endif
++
 +#ifdef CONFIG_PAX_KERNEXEC
 +	if ((fsr & FSR_WRITE) &&
 +	    (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
@@ -3851,7 +3846,7 @@ index 5dbf13f..a2d1876 100644
  	/*
  	 * No handler, we'll have to terminate things with extreme prejudice.
  	 */
-@@ -174,6 +189,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
+@@ -174,6 +200,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
  	}
  #endif
  
@@ -3865,7 +3860,7 @@ index 5dbf13f..a2d1876 100644
  	tsk->thread.address = addr;
  	tsk->thread.error_code = fsr;
  	tsk->thread.trap_no = 14;
-@@ -398,6 +420,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
+@@ -401,6 +434,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
  }
  #endif					/* CONFIG_MMU */
  
@@ -3899,7 +3894,7 @@ index 5dbf13f..a2d1876 100644
  /*
   * First Level Translation Fault Handler
   *
-@@ -543,9 +592,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
+@@ -548,9 +608,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
  	const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
  	struct siginfo info;
  
@@ -3922,7 +3917,7 @@ index 5dbf13f..a2d1876 100644
  	printk(KERN_ALERT "Unhandled fault: %s (0x%03x) at 0x%08lx\n",
  		inf->name, fsr, addr);
  
-@@ -569,15 +631,68 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
+@@ -574,15 +647,98 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
  	ifsr_info[nr].name = name;
  }
  
@@ -3946,11 +3941,41 @@ index 5dbf13f..a2d1876 100644
 +				sys_rt_sigreturn(regs);
 +			return;
 +		}
++		if (pc == 0xffff0f60UL) {
++			/*
++			 * PaX: __kuser_cmpxchg64 emulation
++			 */
++			// TODO
++			//regs->ARM_pc = regs->ARM_lr;
++			//return;
++		}
++		if (pc == 0xffff0fa0UL) {
++			/*
++			 * PaX: __kuser_memory_barrier emulation
++			 */
++			// dmb(); implied by the exception
++			regs->ARM_pc = regs->ARM_lr;
++			return;
++		}
++		if (pc == 0xffff0fc0UL) {
++			/*
++			 * PaX: __kuser_cmpxchg emulation
++			 */
++			// TODO
++			//long new;
++			//int op;
++
++			//op = FUTEX_OP_SET << 28;
++			//new = futex_atomic_op_inuser(op, regs->ARM_r2);
++			//regs->ARM_r0 = old != new;
++			//regs->ARM_pc = regs->ARM_lr;
++			//return;
++		}
 +		if (pc == 0xffff0fe0UL) {
 +			/*
 +			 * PaX: __kuser_get_tls emulation
 +			 */
-+			regs->ARM_r0 = current_thread_info()->tp_value;
++			regs->ARM_r0 = current_thread_info()->tp_value[0];
 +			regs->ARM_pc = regs->ARM_lr;
 +			return;
 +		}
@@ -3974,7 +3999,7 @@ index 5dbf13f..a2d1876 100644
 +	if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
 +		unsigned int bkpt;
 +
-+		if (!probe_kernel_address((unsigned int *)pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
++		if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
 +			current->thread.error_code = ifsr;
 +			current->thread.trap_no = 0;
 +			pax_report_refcount_overflow(regs);
@@ -4022,7 +4047,7 @@ index cf08bdf..772656c 100644
  unsigned long search_exception_table(unsigned long addr);
  
 diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
-index 0ecc43f..190b956 100644
+index 18ec4c5..479bb6a 100644
 --- a/arch/arm/mm/init.c
 +++ b/arch/arm/mm/init.c
 @@ -30,6 +30,8 @@
@@ -4034,12 +4059,12 @@ index 0ecc43f..190b956 100644
  
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
-@@ -726,7 +728,46 @@ void free_initmem(void)
+@@ -684,7 +686,46 @@ void free_initmem(void)
  {
  #ifdef CONFIG_HAVE_TCM
  	extern char __tcm_start, __tcm_end;
 +#endif
-+
+ 
 +#ifdef CONFIG_PAX_KERNEXEC
 +	unsigned long addr;
 +	pgd_t *pgd;
@@ -4076,16 +4101,16 @@ index 0ecc43f..190b956 100644
 +		}
 +	}
 +#endif
- 
++
 +#ifdef CONFIG_HAVE_TCM
  	poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
- 	free_reserved_area(&__tcm_start, &__tcm_end, 0, "TCM link");
+ 	free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
  #endif
 diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
-index 04d9006..c547d85 100644
+index f123d6e..04bf569 100644
 --- a/arch/arm/mm/ioremap.c
 +++ b/arch/arm/mm/ioremap.c
-@@ -392,9 +392,9 @@ __arm_ioremap_exec(unsigned long phys_addr, size_t size, bool cached)
+@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
  	unsigned int mtype;
  
  	if (cached)
@@ -4098,7 +4123,7 @@ index 04d9006..c547d85 100644
  	return __arm_ioremap_caller(phys_addr, size, mtype,
  			__builtin_return_address(0));
 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
-index 10062ce..8695745 100644
+index 0c63562..7128a90 100644
 --- a/arch/arm/mm/mmap.c
 +++ b/arch/arm/mm/mmap.c
 @@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
@@ -4186,7 +4211,7 @@ index 10062ce..8695745 100644
  	/* 8 bits of randomness in 20 address space bits */
  	if ((current->flags & PF_RANDOMIZE) &&
  	    !(current->personality & ADDR_NO_RANDOMIZE))
-@@ -180,10 +194,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
@@ -4197,7 +4222,6 @@ index 10062ce..8695745 100644
 +#endif
 +
  		mm->get_unmapped_area = arch_get_unmapped_area;
- 		mm->unmap_area = arch_unmap_area;
  	} else {
  		mm->mmap_base = mmap_base(random_factor);
 +
@@ -4207,10 +4231,10 @@ index 10062ce..8695745 100644
 +#endif
 +
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
- 		mm->unmap_area = arch_unmap_area_topdown;
  	}
+ }
 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
-index daf336f..4e6392c 100644
+index b1d17ee..7a6f4d3 100644
 --- a/arch/arm/mm/mmu.c
 +++ b/arch/arm/mm/mmu.c
 @@ -36,6 +36,22 @@
@@ -4473,30 +4497,30 @@ index daf336f..4e6392c 100644
  	mem_types[MT_ROM].prot_sect |= cp->pmd;
  
  	switch (cp->pmd) {
-@@ -1166,18 +1255,15 @@ void __init arm_mm_memblock_reserve(void)
+@@ -1186,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
   * called function.  This means you can't use any function or debugging
   * method which may touch any device, otherwise the kernel _will_ crash.
   */
 +
 +static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
 +
- static void __init devicemaps_init(struct machine_desc *mdesc)
+ static void __init devicemaps_init(const struct machine_desc *mdesc)
  {
  	struct map_desc map;
  	unsigned long addr;
 -	void *vectors;
--
+ 
 -	/*
 -	 * Allocate the vector page early.
 -	 */
 -	vectors = early_alloc(PAGE_SIZE * 2);
- 
+-
 -	early_trap_init(vectors);
 +	early_trap_init(&vectors);
  
  	for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
  		pmd_clear(pmd_off_k(addr));
-@@ -1217,7 +1303,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc)
+@@ -1237,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
  	 * location (0xffff0000).  If we aren't using high-vectors, also
  	 * create a mapping at the low-vectors virtual address.
  	 */
@@ -4505,7 +4529,7 @@ index daf336f..4e6392c 100644
  	map.virtual = 0xffff0000;
  	map.length = PAGE_SIZE;
  #ifdef CONFIG_KUSER_HELPERS
-@@ -1287,8 +1373,39 @@ static void __init map_lowmem(void)
+@@ -1309,8 +1395,39 @@ static void __init map_lowmem(void)
  		map.pfn = __phys_to_pfn(start);
  		map.virtual = __phys_to_virt(start);
  		map.length = end - start;
@@ -4572,32 +4596,6 @@ index ce6d763..cfea917 100644
  
  extern void *samsung_dmadev_get_ops(void);
  extern void *s3c_dma_get_ops(void);
-diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
-index f4726dc..39ed646 100644
---- a/arch/arm64/kernel/debug-monitors.c
-+++ b/arch/arm64/kernel/debug-monitors.c
-@@ -149,7 +149,7 @@ static int __cpuinit os_lock_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata os_lock_nb = {
-+static struct notifier_block os_lock_nb = {
- 	.notifier_call = os_lock_notify,
- };
- 
-diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c
-index 5ab825c..96aaec8 100644
---- a/arch/arm64/kernel/hw_breakpoint.c
-+++ b/arch/arm64/kernel/hw_breakpoint.c
-@@ -831,7 +831,7 @@ static int __cpuinit hw_breakpoint_reset_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata hw_breakpoint_reset_nb = {
-+static struct notifier_block hw_breakpoint_reset_nb = {
- 	.notifier_call = hw_breakpoint_reset_notify,
- };
- 
 diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
 index c3a58a1..78fbf54 100644
 --- a/arch/avr32/include/asm/cache.h
@@ -4651,7 +4649,7 @@ index 479330b..53717a8 100644
  
  #endif /* __ASM_AVR32_KMAP_TYPES_H */
 diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
-index b2f2d2d..d1c85cb 100644
+index 0eca933..eb78c7b 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)
@@ -4678,7 +4676,7 @@ index b2f2d2d..d1c85cb 100644
  /*
   * This routine handles page faults. It determines the address and the
   * problem, and then passes it off to one of the appropriate routines.
-@@ -174,6 +191,16 @@ bad_area:
+@@ -176,6 +193,16 @@ bad_area:
  	up_read(&mm->mmap_sem);
  
  	if (user_mode(regs)) {
@@ -4847,6 +4845,18 @@ index f4ca594..adc72fd6 100644
  
  #define __cacheline_aligned	__aligned(L1_CACHE_BYTES)
  #define ____cacheline_aligned	__aligned(L1_CACHE_BYTES)
+diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
+index 7740ab1..17fa8c5 100644
+--- a/arch/ia64/Kconfig
++++ b/arch/ia64/Kconfig
+@@ -554,6 +554,7 @@ source "drivers/sn/Kconfig"
+ config KEXEC
+ 	bool "kexec system call"
+ 	depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
++	depends on !GRKERNSEC_KMEM
+ 	help
+ 	  kexec is a system call that implements the ability to shutdown your
+ 	  current kernel, and to start another kernel.  It is like a reboot
 diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
 index 6e6fe18..a6ae668 100644
 --- a/arch/ia64/include/asm/atomic.h
@@ -4938,7 +4948,7 @@ index 96a8d92..617a1cf 100644
  {
  	return quicklist_alloc(0, GFP_KERNEL, NULL);
 diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
-index 815810c..d60bd4c 100644
+index 7935115..c0eca6a 100644
 --- a/arch/ia64/include/asm/pgtable.h
 +++ b/arch/ia64/include/asm/pgtable.h
 @@ -12,7 +12,7 @@
@@ -4969,7 +4979,7 @@ index 815810c..d60bd4c 100644
  #define PAGE_KERNEL	__pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
 diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
-index 54ff557..70c88b7 100644
+index 45698cd..e8e2dbc 100644
 --- a/arch/ia64/include/asm/spinlock.h
 +++ b/arch/ia64/include/asm/spinlock.h
 @@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
@@ -5043,32 +5053,6 @@ index 449c8c0..18965fb 100644
  	__cu_len;									\
  })
  
-diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
-index 2d67317..07d8bfa 100644
---- a/arch/ia64/kernel/err_inject.c
-+++ b/arch/ia64/kernel/err_inject.c
-@@ -256,7 +256,7 @@ static int __cpuinit err_inject_cpu_callback(struct notifier_block *nfb,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata err_inject_cpu_notifier =
-+static struct notifier_block err_inject_cpu_notifier =
- {
- 	.notifier_call = err_inject_cpu_callback,
- };
-diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
-index d7396db..b33e873 100644
---- a/arch/ia64/kernel/mca.c
-+++ b/arch/ia64/kernel/mca.c
-@@ -1922,7 +1922,7 @@ static int __cpuinit mca_cpu_callback(struct notifier_block *nfb,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block mca_cpu_notifier __cpuinitdata = {
-+static struct notifier_block mca_cpu_notifier = {
- 	.notifier_call = mca_cpu_callback
- };
- 
 diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
 index 24603be..948052d 100644
 --- a/arch/ia64/kernel/module.c
@@ -5162,10 +5146,10 @@ index 24603be..948052d 100644
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
 diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
-index 2b3c2d7..a318d84 100644
+index ab33328..f39506c 100644
 --- a/arch/ia64/kernel/palinfo.c
 +++ b/arch/ia64/kernel/palinfo.c
-@@ -980,7 +980,7 @@ static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
+@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
  	return NOTIFY_OK;
  }
  
@@ -5174,21 +5158,8 @@ index 2b3c2d7..a318d84 100644
  {
  	.notifier_call = palinfo_cpu_callback,
  	.priority = 0,
-diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
-index 4bc580a..7767f24 100644
---- a/arch/ia64/kernel/salinfo.c
-+++ b/arch/ia64/kernel/salinfo.c
-@@ -609,7 +609,7 @@ salinfo_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block salinfo_cpu_notifier __cpuinitdata =
-+static struct notifier_block salinfo_cpu_notifier =
- {
- 	.notifier_call = salinfo_cpu_callback,
- 	.priority = 0,
 diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
-index 41e33f8..65180b2 100644
+index 41e33f8..65180b2a 100644
 --- a/arch/ia64/kernel/sys_ia64.c
 +++ b/arch/ia64/kernel/sys_ia64.c
 @@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
@@ -5221,19 +5192,6 @@ index 41e33f8..65180b2 100644
  	return vm_unmapped_area(&info);
  }
  
-diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
-index dc00b2c..cce53c2 100644
---- a/arch/ia64/kernel/topology.c
-+++ b/arch/ia64/kernel/topology.c
-@@ -445,7 +445,7 @@ static int __cpuinit cache_cpu_callback(struct notifier_block *nfb,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata cache_cpu_notifier =
-+static struct notifier_block cache_cpu_notifier =
- {
- 	.notifier_call = cache_cpu_callback
- };
 diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
 index 0ccb28f..8992469 100644
 --- a/arch/ia64/kernel/vmlinux.lds.S
@@ -5248,7 +5206,7 @@ index 0ccb28f..8992469 100644
  	 * ensure percpu data fits
  	 * into percpu page size
 diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
-index 6cf0341..d352594 100644
+index 7225dad..2a7c8256 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)
@@ -5275,7 +5233,7 @@ index 6cf0341..d352594 100644
  #	define VM_READ_BIT	0
  #	define VM_WRITE_BIT	1
  #	define VM_EXEC_BIT	2
-@@ -149,8 +166,21 @@ retry:
+@@ -151,8 +168,21 @@ retry:
  	if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
  		goto bad_area;
  
@@ -5299,10 +5257,10 @@ index 6cf0341..d352594 100644
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
 diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
-index 76069c1..c2aa816 100644
+index 68232db..6ca80af 100644
 --- a/arch/ia64/mm/hugetlbpage.c
 +++ b/arch/ia64/mm/hugetlbpage.c
-@@ -149,6 +149,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
+@@ -154,6 +154,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
  		unsigned long pgoff, unsigned long flags)
  {
  	struct vm_unmapped_area_info info;
@@ -5310,7 +5268,7 @@ index 76069c1..c2aa816 100644
  
  	if (len > RGN_MAP_LIMIT)
  		return -ENOMEM;
-@@ -172,6 +173,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
+@@ -177,6 +178,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
  	info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
  	info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
  	info.align_offset = 0;
@@ -5319,7 +5277,7 @@ index 76069c1..c2aa816 100644
  }
  
 diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
-index d1fe4b4..2628f37 100644
+index b6f7f43..c04320d 100644
 --- a/arch/ia64/mm/init.c
 +++ b/arch/ia64/mm/init.c
 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
@@ -5400,10 +5358,10 @@ index 0395c51..5f26031 100644
  #define ARCH_DMA_MINALIGN	L1_CACHE_BYTES
  
 diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
-index 3c52fa6..11b2ad8 100644
+index 0424315..defcca9 100644
 --- a/arch/metag/mm/hugetlbpage.c
 +++ b/arch/metag/mm/hugetlbpage.c
-@@ -200,6 +200,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
+@@ -205,6 +205,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
  	info.high_limit = TASK_SIZE;
  	info.align_mask = PAGE_MASK & HUGEPT_MASK;
  	info.align_offset = 0;
@@ -5429,6 +5387,18 @@ index 4efe96a..60e8699 100644
  
  #define SMP_CACHE_BYTES	L1_CACHE_BYTES
  
+diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
+index f75ab4a..adc6968 100644
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -2283,6 +2283,7 @@ source "kernel/Kconfig.preempt"
+ 
+ config KEXEC
+ 	bool "Kexec system call"
++	depends on !GRKERNSEC_KMEM
+ 	help
+ 	  kexec is a system call that implements the ability to shutdown your
+ 	  current kernel, and to start another kernel.  It is like a reboot
 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
 index 08b6079..8b554d2 100644
 --- a/arch/mips/include/asm/atomic.h
@@ -6482,7 +6452,7 @@ index d44622c..64990d2 100644
  
  /**
 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
-index f59552f..3abe9b9 100644
+index f6be474..12ad554 100644
 --- a/arch/mips/include/asm/page.h
 +++ b/arch/mips/include/asm/page.h
 @@ -95,7 +95,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
@@ -6510,11 +6480,23 @@ index 881d18b..cea38bc 100644
  #endif
  
  /*
+diff --git a/arch/mips/include/asm/smtc_proc.h b/arch/mips/include/asm/smtc_proc.h
+index 25da651..ae2a259 100644
+--- a/arch/mips/include/asm/smtc_proc.h
++++ b/arch/mips/include/asm/smtc_proc.h
+@@ -18,6 +18,6 @@ extern struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
+ 
+ /* Count of number of recoveries of "stolen" FPU access rights on 34K */
+ 
+-extern atomic_t smtc_fpu_recoveries;
++extern atomic_unchecked_t smtc_fpu_recoveries;
+ 
+ #endif /* __ASM_SMTC_PROC_H */
 diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
-index 895320e..bf63e10 100644
+index 61215a3..213ee0e 100644
 --- a/arch/mips/include/asm/thread_info.h
 +++ b/arch/mips/include/asm/thread_info.h
-@@ -115,6 +115,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -116,6 +116,8 @@ static inline struct thread_info *current_thread_info(void)
  #define TIF_32BIT_ADDR		23	/* 32-bit address space (o32/n32) */
  #define TIF_FPUBOUND		24	/* thread bound to FPU-full CPU set */
  #define TIF_LOAD_WATCH		25	/* If set, load watch registers */
@@ -6523,24 +6505,28 @@ index 895320e..bf63e10 100644
  #define TIF_SYSCALL_TRACE	31	/* syscall trace active */
  
  #define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)
-@@ -130,15 +132,18 @@ static inline struct thread_info *current_thread_info(void)
+@@ -132,20 +134,18 @@ static inline struct thread_info *current_thread_info(void)
  #define _TIF_32BIT_ADDR		(1<<TIF_32BIT_ADDR)
  #define _TIF_FPUBOUND		(1<<TIF_FPUBOUND)
  #define _TIF_LOAD_WATCH		(1<<TIF_LOAD_WATCH)
 +#define _TIF_GRSEC_SETXID	(1<<TIF_GRSEC_SETXID)
-+
-+#define _TIF_SYSCALL_WORK	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
+ 
+-#define _TIF_WORK_SYSCALL_ENTRY	(_TIF_NOHZ | _TIF_SYSCALL_TRACE |	\
+-				 _TIF_SYSCALL_AUDIT)
++#define _TIF_WORK_SYSCALL_ENTRY	(_TIF_NOHZ | _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
  
  /* work to do in syscall_trace_leave() */
--#define _TIF_WORK_SYSCALL_EXIT	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)
-+#define _TIF_WORK_SYSCALL_EXIT	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
+-#define _TIF_WORK_SYSCALL_EXIT	(_TIF_NOHZ | _TIF_SYSCALL_TRACE |	\
+-				 _TIF_SYSCALL_AUDIT)
++#define _TIF_WORK_SYSCALL_EXIT	(_TIF_NOHZ | _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
  
  /* work to do on interrupt/exception return */
  #define _TIF_WORK_MASK		\
  	(_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME)
  /* work to do on any return to u-space */
--#define _TIF_ALLWORK_MASK	(_TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT)
-+#define _TIF_ALLWORK_MASK	(_TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT | _TIF_GRSEC_SETXID)
+-#define _TIF_ALLWORK_MASK	(_TIF_NOHZ | _TIF_WORK_MASK |		\
+-				 _TIF_WORK_SYSCALL_EXIT)
++#define _TIF_ALLWORK_MASK	(_TIF_NOHZ | _TIF_WORK_MASK | _TIF_WORK_SYSCALL_EXIT | _TIF_GRSEC_SETXID)
  
  #endif /* __KERNEL__ */
  
@@ -6606,10 +6592,10 @@ index d1fea7a..45602ea 100644
  
  void __init init_IRQ(void)
 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
-index c6a041d..b3e7318 100644
+index ddc7610..8c58f17 100644
 --- a/arch/mips/kernel/process.c
 +++ b/arch/mips/kernel/process.c
-@@ -563,15 +563,3 @@ unsigned long get_wchan(struct task_struct *task)
+@@ -566,15 +566,3 @@ unsigned long get_wchan(struct task_struct *task)
  out:
  	return pc;
  }
@@ -6626,10 +6612,10 @@ index c6a041d..b3e7318 100644
 -	return sp & ALMASK;
 -}
 diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
-index 9c6299c..2fb4c22 100644
+index 8ae1ebe..1bcbf47 100644
 --- a/arch/mips/kernel/ptrace.c
 +++ b/arch/mips/kernel/ptrace.c
-@@ -528,6 +528,10 @@ static inline int audit_arch(void)
+@@ -529,6 +529,10 @@ static inline int audit_arch(void)
  	return arch;
  }
  
@@ -6640,7 +6626,7 @@ index 9c6299c..2fb4c22 100644
  /*
   * Notification of system call entry/exit
   * - triggered by current->work.syscall_trace
-@@ -537,6 +541,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
+@@ -540,6 +544,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
  	/* do the secure computing check first */
  	secure_computing_strict(regs->regs[2]);
  
@@ -6652,74 +6638,66 @@ index 9c6299c..2fb4c22 100644
  	if (!(current->ptrace & PT_PTRACED))
  		goto out;
  
-diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
-index 9b36424..e7f4154 100644
---- a/arch/mips/kernel/scall32-o32.S
-+++ b/arch/mips/kernel/scall32-o32.S
-@@ -52,7 +52,7 @@ NESTED(handle_sys, PT_SIZE, sp)
- 
- stack_done:
- 	lw	t0, TI_FLAGS($28)	# syscall tracing enabled?
--	li	t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
-+	li	t1, _TIF_SYSCALL_WORK
- 	and	t0, t1
- 	bnez	t0, syscall_trace_entry # -> yes
- 
-diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
-index 97a5909..59622f8 100644
---- a/arch/mips/kernel/scall64-64.S
-+++ b/arch/mips/kernel/scall64-64.S
-@@ -54,7 +54,7 @@ NESTED(handle_sys64, PT_SIZE, sp)
- 
- 	sd	a3, PT_R26(sp)		# save a3 for syscall restarting
- 
--	li	t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
-+	li	t1, _TIF_SYSCALL_WORK
- 	LONG_L	t0, TI_FLAGS($28)	# syscall tracing enabled?
- 	and	t0, t1, t0
- 	bnez	t0, syscall_trace_entry
-diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
-index edcb659..fb2ab09 100644
---- a/arch/mips/kernel/scall64-n32.S
-+++ b/arch/mips/kernel/scall64-n32.S
-@@ -47,7 +47,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
- 
- 	sd	a3, PT_R26(sp)		# save a3 for syscall restarting
- 
--	li	t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
-+	li	t1, _TIF_SYSCALL_WORK
- 	LONG_L	t0, TI_FLAGS($28)	# syscall tracing enabled?
- 	and	t0, t1, t0
- 	bnez	t0, n32_syscall_trace_entry
-diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
-index 74f485d..47d2c38 100644
---- a/arch/mips/kernel/scall64-o32.S
-+++ b/arch/mips/kernel/scall64-o32.S
-@@ -81,7 +81,7 @@ NESTED(handle_sys, PT_SIZE, sp)
- 	PTR	4b, bad_stack
- 	.previous
+diff --git a/arch/mips/kernel/smtc-proc.c b/arch/mips/kernel/smtc-proc.c
+index c10aa84..9ec2e60 100644
+--- a/arch/mips/kernel/smtc-proc.c
++++ b/arch/mips/kernel/smtc-proc.c
+@@ -31,7 +31,7 @@ unsigned long selfipis[NR_CPUS];
+ 
+ struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
+ 
+-atomic_t smtc_fpu_recoveries;
++atomic_unchecked_t smtc_fpu_recoveries;
+ 
+ static int smtc_proc_show(struct seq_file *m, void *v)
+ {
+@@ -48,7 +48,7 @@ static int smtc_proc_show(struct seq_file *m, void *v)
+ 	for(i = 0; i < NR_CPUS; i++)
+ 		seq_printf(m, "%d: %ld\n", i, smtc_cpu_stats[i].selfipis);
+ 	seq_printf(m, "%d Recoveries of \"stolen\" FPU\n",
+-		   atomic_read(&smtc_fpu_recoveries));
++		   atomic_read_unchecked(&smtc_fpu_recoveries));
+ 	return 0;
+ }
+ 
+@@ -73,7 +73,7 @@ void init_smtc_stats(void)
+ 		smtc_cpu_stats[i].selfipis = 0;
+ 	}
+ 
+-	atomic_set(&smtc_fpu_recoveries, 0);
++	atomic_set_unchecked(&smtc_fpu_recoveries, 0);
+ 
+ 	proc_create("smtc", 0444, NULL, &smtc_proc_fops);
+ }
+diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c
+index dfc1b91..11a2c07 100644
+--- a/arch/mips/kernel/smtc.c
++++ b/arch/mips/kernel/smtc.c
+@@ -1359,7 +1359,7 @@ void smtc_soft_dump(void)
+ 	}
+ 	smtc_ipi_qdump();
+ 	printk("%d Recoveries of \"stolen\" FPU\n",
+-	       atomic_read(&smtc_fpu_recoveries));
++	       atomic_read_unchecked(&smtc_fpu_recoveries));
+ }
+ 
  
--	li	t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
-+	li	t1, _TIF_SYSCALL_WORK
- 	LONG_L	t0, TI_FLAGS($28)	# syscall tracing enabled?
- 	and	t0, t1, t0
- 	bnez	t0, trace_a_syscall
 diff --git a/arch/mips/kernel/sync-r4k.c b/arch/mips/kernel/sync-r4k.c
-index 1ff43d5..96fec68 100644
+index 84536bf..79caa4d 100644
 --- a/arch/mips/kernel/sync-r4k.c
 +++ b/arch/mips/kernel/sync-r4k.c
 @@ -21,8 +21,8 @@
  #include <asm/mipsregs.h>
  
- static atomic_t __cpuinitdata count_start_flag = ATOMIC_INIT(0);
--static atomic_t __cpuinitdata count_count_start = ATOMIC_INIT(0);
--static atomic_t __cpuinitdata count_count_stop = ATOMIC_INIT(0);
-+static atomic_unchecked_t __cpuinitdata count_count_start = ATOMIC_INIT(0);
-+static atomic_unchecked_t __cpuinitdata count_count_stop = ATOMIC_INIT(0);
- static atomic_t __cpuinitdata count_reference = ATOMIC_INIT(0);
+ static atomic_t count_start_flag = ATOMIC_INIT(0);
+-static atomic_t count_count_start = ATOMIC_INIT(0);
+-static atomic_t count_count_stop = ATOMIC_INIT(0);
++static atomic_unchecked_t count_count_start = ATOMIC_INIT(0);
++static atomic_unchecked_t count_count_stop = ATOMIC_INIT(0);
+ static atomic_t count_reference = ATOMIC_INIT(0);
  
  #define COUNTON 100
-@@ -69,13 +69,13 @@ void __cpuinit synchronise_count_master(int cpu)
+@@ -69,13 +69,13 @@ void synchronise_count_master(int cpu)
  
  	for (i = 0; i < NR_LOOPS; i++) {
  		/* slaves loop on '!= 2' */
@@ -6736,7 +6714,7 @@ index 1ff43d5..96fec68 100644
  
  		/*
  		 * Everyone initialises count in the last loop:
-@@ -86,11 +86,11 @@ void __cpuinit synchronise_count_master(int cpu)
+@@ -86,11 +86,11 @@ void synchronise_count_master(int cpu)
  		/*
  		 * Wait for all slaves to leave the synchronization point:
  		 */
@@ -6751,7 +6729,7 @@ index 1ff43d5..96fec68 100644
  	}
  	/* Arrange for an interrupt in a short while */
  	write_c0_compare(read_c0_count() + COUNTON);
-@@ -131,8 +131,8 @@ void __cpuinit synchronise_count_slave(int cpu)
+@@ -131,8 +131,8 @@ void synchronise_count_slave(int cpu)
  	initcount = atomic_read(&count_reference);
  
  	for (i = 0; i < NR_LOOPS; i++) {
@@ -6762,7 +6740,7 @@ index 1ff43d5..96fec68 100644
  			mb();
  
  		/*
-@@ -141,8 +141,8 @@ void __cpuinit synchronise_count_slave(int cpu)
+@@ -141,8 +141,8 @@ void synchronise_count_slave(int cpu)
  		if (i == NR_LOOPS-1)
  			write_c0_count(initcount);
  
@@ -6774,19 +6752,20 @@ index 1ff43d5..96fec68 100644
  	}
  	/* Arrange for an interrupt in a short while */
 diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
-index a75ae40..0d0f56a 100644
+index 524841f..3eef41e 100644
 --- a/arch/mips/kernel/traps.c
 +++ b/arch/mips/kernel/traps.c
-@@ -675,7 +675,17 @@ asmlinkage void do_ov(struct pt_regs *regs)
- {
+@@ -684,7 +684,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
  	siginfo_t info;
  
+ 	prev_state = exception_enter();
 -	die_if_kernel("Integer overflow", regs);
 +	if (unlikely(!user_mode(regs))) {
 +
 +#ifdef CONFIG_PAX_REFCOUNT
 +		if (fixup_exception(regs)) {
 +			pax_report_refcount_overflow(regs);
++			exception_exit(prev_state);
 +			return;
 +		}
 +#endif
@@ -6797,10 +6776,10 @@ index a75ae40..0d0f56a 100644
  	info.si_code = FPE_INTOVF;
  	info.si_signo = SIGFPE;
 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
-index 0fead53..eeb00a6 100644
+index becc42b..9e43d4b 100644
 --- a/arch/mips/mm/fault.c
 +++ b/arch/mips/mm/fault.c
-@@ -27,6 +27,23 @@
+@@ -28,6 +28,23 @@
  #include <asm/highmem.h>		/* For VMALLOC_END */
  #include <linux/kdebug.h>
  
@@ -6824,7 +6803,7 @@ index 0fead53..eeb00a6 100644
  /*
   * This routine handles page faults.  It determines the address,
   * and the problem, and then passes it off to one of the appropriate
-@@ -196,6 +213,14 @@ bad_area:
+@@ -199,6 +216,14 @@ bad_area:
  bad_area_nosemaphore:
  	/* User mode accesses just cause a SIGSEGV */
  	if (user_mode(regs)) {
@@ -6840,7 +6819,7 @@ index 0fead53..eeb00a6 100644
  		tsk->thread.error_code = write;
  #if 0
 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
-index 7e5fe27..9656513 100644
+index f1baadd..8537544 100644
 --- a/arch/mips/mm/mmap.c
 +++ b/arch/mips/mm/mmap.c
 @@ -59,6 +59,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
@@ -6891,7 +6870,7 @@ index 7e5fe27..9656513 100644
  	if (current->flags & PF_RANDOMIZE) {
  		random_factor = get_random_int();
  		random_factor = random_factor << PAGE_SHIFT;
-@@ -157,42 +167,27 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -157,40 +167,25 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
@@ -6902,7 +6881,6 @@ index 7e5fe27..9656513 100644
 +#endif
 +
  		mm->get_unmapped_area = arch_get_unmapped_area;
- 		mm->unmap_area = arch_unmap_area;
  	} else {
  		mm->mmap_base = mmap_base(random_factor);
 +
@@ -6912,7 +6890,6 @@ index 7e5fe27..9656513 100644
 +#endif
 +
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
- 		mm->unmap_area = arch_unmap_area_topdown;
  	}
  }
  
@@ -7123,7 +7100,7 @@ index fc987a1..6e068ef 100644
  #endif
  
 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
-index 1e40d7f..a3eb445 100644
+index 34899b5..02dd060 100644
 --- a/arch/parisc/include/asm/pgtable.h
 +++ b/arch/parisc/include/asm/pgtable.h
 @@ -223,6 +223,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
@@ -7339,10 +7316,10 @@ index 5dfd248..64914ac 100644
  	return addr;
  }
 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
-index b3f87a3..5d5d03d 100644
+index 1cd1d0c..44ec918 100644
 --- a/arch/parisc/kernel/traps.c
 +++ b/arch/parisc/kernel/traps.c
-@@ -727,9 +727,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
+@@ -722,9 +722,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]);
@@ -7354,7 +7331,7 @@ index b3f87a3..5d5d03d 100644
  				fault_space = regs->iasq[0];
  
 diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
-index f247a34..dc0f219 100644
+index 0293588..3b229aa 100644
 --- a/arch/parisc/mm/fault.c
 +++ b/arch/parisc/mm/fault.c
 @@ -15,6 +15,7 @@
@@ -7491,9 +7468,9 @@ index f247a34..dc0f219 100644
  int fixup_exception(struct pt_regs *regs)
  {
  	const struct exception_table_entry *fix;
-@@ -194,8 +305,33 @@ good_area:
+@@ -204,8 +315,33 @@ retry:
  
- 	acc_type = parisc_acctyp(code,regs->iir);
+ good_area:
  
 -	if ((vma->vm_flags & acc_type) != acc_type)
 +	if ((vma->vm_flags & acc_type) != acc_type) {
@@ -7526,6 +7503,18 @@ index f247a34..dc0f219 100644
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
+diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
+index 38f3b7e..7e485c0 100644
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -378,6 +378,7 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE
+ config KEXEC
+ 	bool "kexec system call"
+ 	depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
++	depends on !GRKERNSEC_KMEM
+ 	help
+ 	  kexec is a system call that implements the ability to shutdown your
+ 	  current kernel, and to start another kernel.  It is like a reboot
 diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
 index e3b1d41..8e81edf 100644
 --- a/arch/powerpc/include/asm/atomic.h
@@ -7695,7 +7684,7 @@ index 88693ce..ac6f9ab 100644
  #include <asm-generic/getorder.h>
  
 diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
-index b66ae72..4a378cd 100644
+index f65e27b..23ffb5b 100644
 --- a/arch/powerpc/include/asm/pgalloc-64.h
 +++ b/arch/powerpc/include/asm/pgalloc-64.h
 @@ -53,6 +53,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
@@ -7727,7 +7716,7 @@ index b66ae72..4a378cd 100644
  static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
  				       pte_t *pte)
 diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
-index 7aeb955..19f748e 100644
+index 7d6eacf..14c0240 100644
 --- a/arch/powerpc/include/asm/pgtable.h
 +++ b/arch/powerpc/include/asm/pgtable.h
 @@ -2,6 +2,7 @@
@@ -7751,7 +7740,7 @@ index 4aad413..85d86bf 100644
  #define _PAGE_NO_CACHE	0x020	/* I: cache inhibit */
  #define _PAGE_WRITETHRU	0x040	/* W: cache write-through */
 diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
-index e1fb161..2290d1d 100644
+index 10d1ef0..8f83abc 100644
 --- a/arch/powerpc/include/asm/reg.h
 +++ b/arch/powerpc/include/asm/reg.h
 @@ -234,6 +234,7 @@
@@ -7763,7 +7752,7 @@ index e1fb161..2290d1d 100644
  #define   DSISR_ISSTORE		0x02000000	/* access was a store */
  #define   DSISR_DABRMATCH	0x00400000	/* hit data breakpoint */
 diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
-index 48cfc85..891382f 100644
+index 98da78e..dc68271 100644
 --- a/arch/powerpc/include/asm/smp.h
 +++ b/arch/powerpc/include/asm/smp.h
 @@ -50,7 +50,7 @@ struct smp_ops_t {
@@ -7810,7 +7799,7 @@ index ba7b197..d292e26 100644
  #define _TIF_USER_WORK_MASK	(_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
  				 _TIF_NOTIFY_RESUME | _TIF_UPROBE)
 diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
-index 4db4959..aba5c41 100644
+index 9485b43..4718d50 100644
 --- a/arch/powerpc/include/asm/uaccess.h
 +++ b/arch/powerpc/include/asm/uaccess.h
 @@ -318,52 +318,6 @@ do {								\
@@ -7982,7 +7971,7 @@ index 4db4959..aba5c41 100644
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
 diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
-index 645170a..6cf0271 100644
+index 2d06704..1616f1b 100644
 --- a/arch/powerpc/kernel/exceptions-64e.S
 +++ b/arch/powerpc/kernel/exceptions-64e.S
 @@ -757,6 +757,7 @@ storage_fault_common:
@@ -8004,10 +7993,10 @@ index 645170a..6cf0271 100644
  	ld	r4,_DAR(r1)
  	bl	.bad_page_fault
 diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
-index 902ca3c..e942155 100644
+index 3a9ed6a..b534681 100644
 --- a/arch/powerpc/kernel/exceptions-64s.S
 +++ b/arch/powerpc/kernel/exceptions-64s.S
-@@ -1357,10 +1357,10 @@ handle_page_fault:
+@@ -1364,10 +1364,10 @@ handle_page_fault:
  11:	ld	r4,_DAR(r1)
  	ld	r5,_DSISR(r1)
  	addi	r3,r1,STACK_FRAME_OVERHEAD
@@ -8053,10 +8042,10 @@ index 2e3200c..72095ce 100644
  	/* Find this entry, or if that fails, the next avail. entry */
  	while (entry->jump[0]) {
 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
-index 7baa27b..f6b394a 100644
+index 96d2fdf..f6d10c8 100644
 --- a/arch/powerpc/kernel/process.c
 +++ b/arch/powerpc/kernel/process.c
-@@ -884,8 +884,8 @@ void show_regs(struct pt_regs * regs)
+@@ -886,8 +886,8 @@ void show_regs(struct pt_regs * regs)
  	 * Lookup NIP late so we have the best change of getting the
  	 * above info out without failing
  	 */
@@ -8067,7 +8056,7 @@ index 7baa27b..f6b394a 100644
  #endif
  #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
  	printk("PACATMSCRATCH [%llx]\n", get_paca()->tm_scratch);
-@@ -1345,10 +1345,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
+@@ -1352,10 +1352,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
  		newsp = stack[0];
  		ip = stack[STACK_FRAME_LR_SAVE];
  		if (!firstframe || ip != lr) {
@@ -8080,7 +8069,7 @@ index 7baa27b..f6b394a 100644
  				       (void *)current->ret_stack[curr_frame].ret);
  				curr_frame--;
  			}
-@@ -1368,7 +1368,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
+@@ -1375,7 +1375,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
  			struct pt_regs *regs = (struct pt_regs *)
  				(sp + STACK_FRAME_OVERHEAD);
  			lr = regs->link;
@@ -8089,7 +8078,7 @@ index 7baa27b..f6b394a 100644
  			       regs->trap, (void *)regs->nip, (void *)lr);
  			firstframe = 1;
  		}
-@@ -1404,58 +1404,3 @@ void notrace __ppc64_runlatch_off(void)
+@@ -1411,58 +1411,3 @@ void notrace __ppc64_runlatch_off(void)
  	mtspr(SPRN_CTRLT, ctrl);
  }
  #endif /* CONFIG_PPC64 */
@@ -8149,10 +8138,10 @@ index 7baa27b..f6b394a 100644
 -	return ret;
 -}
 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
-index 64f7bd5..8dd550f 100644
+index 9a0d24c..e7fbedf 100644
 --- a/arch/powerpc/kernel/ptrace.c
 +++ b/arch/powerpc/kernel/ptrace.c
-@@ -1783,6 +1783,10 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -1761,6 +1761,10 @@ long arch_ptrace(struct task_struct *child, long request,
  	return ret;
  }
  
@@ -8163,7 +8152,7 @@ index 64f7bd5..8dd550f 100644
  /*
   * We must return the syscall number to actually look up in the table.
   * This can be -1L to skip running any syscall at all.
-@@ -1795,6 +1799,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
+@@ -1773,6 +1777,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
  
  	secure_computing_strict(regs->gpr[0]);
  
@@ -8175,7 +8164,7 @@ index 64f7bd5..8dd550f 100644
  	if (test_thread_flag(TIF_SYSCALL_TRACE) &&
  	    tracehook_report_syscall_entry(regs))
  		/*
-@@ -1829,6 +1838,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
+@@ -1807,6 +1816,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
  {
  	int step;
  
@@ -8188,10 +8177,10 @@ index 64f7bd5..8dd550f 100644
  
  	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
 diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
-index 7e9dff8..b63e4b5 100644
+index fea2dba..a779f6b 100644
 --- a/arch/powerpc/kernel/signal_32.c
 +++ b/arch/powerpc/kernel/signal_32.c
-@@ -993,7 +993,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
+@@ -1002,7 +1002,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;
@@ -8201,10 +8190,10 @@ index 7e9dff8..b63e4b5 100644
  		tramp = current->mm->context.vdso_base + vdso32_rt_sigtramp;
  	} else {
 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
-index 35c20a1..e4bf34c 100644
+index 1e7ba88..17afb1b 100644
 --- a/arch/powerpc/kernel/signal_64.c
 +++ b/arch/powerpc/kernel/signal_64.c
-@@ -757,7 +757,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
+@@ -763,7 +763,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
  #endif
  
  	/* Set up to return from userspace. */
@@ -8213,24 +8202,11 @@ index 35c20a1..e4bf34c 100644
  		regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
  	} else {
  		err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
-index a15fd1a..869d32c 100644
---- a/arch/powerpc/kernel/sysfs.c
-+++ b/arch/powerpc/kernel/sysfs.c
-@@ -536,7 +536,7 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
-+static struct notifier_block sysfs_cpu_nb = {
- 	.notifier_call	= sysfs_cpu_notify,
- };
- 
 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
-index 88929b1..bece8f8 100644
+index f783c93..619baf1 100644
 --- a/arch/powerpc/kernel/traps.c
 +++ b/arch/powerpc/kernel/traps.c
-@@ -141,6 +141,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
+@@ -142,6 +142,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
  	return flags;
  }
  
@@ -8239,7 +8215,7 @@ index 88929b1..bece8f8 100644
  static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
  			       int signr)
  {
-@@ -190,6 +192,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
+@@ -191,6 +193,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
  		panic("Fatal exception in interrupt");
  	if (panic_on_oops)
  		panic("Fatal exception");
@@ -8250,7 +8226,7 @@ index 88929b1..bece8f8 100644
  }
  
 diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
-index d4f463a..8fb7431 100644
+index 1d9c926..25f4741 100644
 --- a/arch/powerpc/kernel/vdso.c
 +++ b/arch/powerpc/kernel/vdso.c
 @@ -34,6 +34,7 @@
@@ -8315,7 +8291,7 @@ index 5eea6f3..5d10396 100644
  EXPORT_SYMBOL(copy_in_user);
  
 diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
-index 8726779..a33c512 100644
+index 51ab9e7..7d3c78b 100644
 --- a/arch/powerpc/mm/fault.c
 +++ b/arch/powerpc/mm/fault.c
 @@ -33,6 +33,10 @@
@@ -8372,7 +8348,7 @@ index 8726779..a33c512 100644
  	else
  		is_write = error_code & DSISR_ISSTORE;
  #else
-@@ -371,7 +402,7 @@ good_area:
+@@ -378,7 +409,7 @@ good_area:
           * "undefined".  Of those that can be set, this is the only
           * one which seems bad.
           */
@@ -8381,7 +8357,7 @@ index 8726779..a33c512 100644
                  /* Guarded storage error. */
  		goto bad_area;
  #endif /* CONFIG_8xx */
-@@ -386,7 +417,7 @@ good_area:
+@@ -393,7 +424,7 @@ good_area:
  		 * processors use the same I/D cache coherency mechanism
  		 * as embedded.
  		 */
@@ -8390,7 +8366,7 @@ index 8726779..a33c512 100644
  			goto bad_area;
  #endif /* CONFIG_PPC_STD_MMU */
  
-@@ -471,6 +502,23 @@ bad_area:
+@@ -483,6 +514,23 @@ bad_area:
  bad_area_nosemaphore:
  	/* User mode accesses cause a SIGSEGV */
  	if (user_mode(regs)) {
@@ -8414,10 +8390,10 @@ index 8726779..a33c512 100644
  		_exception(SIGSEGV, regs, code, address);
  		goto bail;
  	}
-diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
-index 67a42ed..cd463e0 100644
---- a/arch/powerpc/mm/mmap_64.c
-+++ b/arch/powerpc/mm/mmap_64.c
+diff --git a/arch/powerpc/mm/mmap.c b/arch/powerpc/mm/mmap.c
+index cb8bdbe..d770680 100644
+--- a/arch/powerpc/mm/mmap.c
++++ b/arch/powerpc/mm/mmap.c
 @@ -57,6 +57,10 @@ static unsigned long mmap_rnd(void)
  {
  	unsigned long rnd = 0;
@@ -8429,7 +8405,7 @@ index 67a42ed..cd463e0 100644
  	if (current->flags & PF_RANDOMIZE) {
  		/* 8MB for 32bit, 1GB for 64bit */
  		if (is_32bit_task())
-@@ -91,10 +95,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -91,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -8440,7 +8416,6 @@ index 67a42ed..cd463e0 100644
 +#endif
 +
  		mm->get_unmapped_area = arch_get_unmapped_area;
- 		mm->unmap_area = arch_unmap_area;
  	} else {
  		mm->mmap_base = mmap_base();
 +
@@ -8450,34 +8425,8 @@ index 67a42ed..cd463e0 100644
 +#endif
 +
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
- 		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c
-index e779642..e5bb889 100644
---- a/arch/powerpc/mm/mmu_context_nohash.c
-+++ b/arch/powerpc/mm/mmu_context_nohash.c
-@@ -363,7 +363,7 @@ static int __cpuinit mmu_context_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata mmu_context_cpu_nb = {
-+static struct notifier_block mmu_context_cpu_nb = {
- 	.notifier_call	= mmu_context_cpu_notify,
- };
- 
-diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
-index cafad40..9cbc0fc 100644
---- a/arch/powerpc/mm/numa.c
-+++ b/arch/powerpc/mm/numa.c
-@@ -920,7 +920,7 @@ static void __init *careful_zallocation(int nid, unsigned long size,
- 	return ret;
  }
- 
--static struct notifier_block __cpuinitdata ppc64_numa_nb = {
-+static struct notifier_block ppc64_numa_nb = {
- 	.notifier_call = cpu_numa_callback,
- 	.priority = 1 /* Must run before sched domains notifier. */
- };
 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
 index 7ce9cf3..a964087 100644
 --- a/arch/powerpc/mm/slice.c
@@ -8532,19 +8481,6 @@ index 9098692..3d54cd1 100644
  {
  	struct spu_context *ctx = vma->vm_file->private_data;
  	unsigned long offset = address - vma->vm_start;
-diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
-index bdb738a..49c9f95 100644
---- a/arch/powerpc/platforms/powermac/smp.c
-+++ b/arch/powerpc/platforms/powermac/smp.c
-@@ -885,7 +885,7 @@ static int smp_core99_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata smp_core99_cpu_nb = {
-+static struct notifier_block smp_core99_cpu_nb = {
- 	.notifier_call	= smp_core99_cpu_notify,
- };
- #endif /* CONFIG_HOTPLUG_CPU */
 diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
 index c797832..ce575c8 100644
 --- a/arch/s390/include/asm/atomic.h
@@ -8743,10 +8679,10 @@ index 7845e15..59c4353 100644
  		if (r_type == R_390_GOTPC)
  			rc = apply_rela_bits(loc, val, 1, 32, 0);
 diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
-index 2bc3edd..ab9d598 100644
+index c5dbb33..b41f4ee 100644
 --- a/arch/s390/kernel/process.c
 +++ b/arch/s390/kernel/process.c
-@@ -236,39 +236,3 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -237,39 +237,3 @@ unsigned long get_wchan(struct task_struct *p)
  	}
  	return 0;
  }
@@ -8787,10 +8723,10 @@ index 2bc3edd..ab9d598 100644
 -	return ret;
 -}
 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
-index 06bafec..2bca531 100644
+index 4002329..99b67cb 100644
 --- a/arch/s390/mm/mmap.c
 +++ b/arch/s390/mm/mmap.c
-@@ -90,10 +90,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -90,9 +90,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -8801,7 +8737,6 @@ index 06bafec..2bca531 100644
 +#endif
 +
  		mm->get_unmapped_area = arch_get_unmapped_area;
- 		mm->unmap_area = arch_unmap_area;
  	} else {
  		mm->mmap_base = mmap_base();
 +
@@ -8811,9 +8746,9 @@ index 06bafec..2bca531 100644
 +#endif
 +
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
- 		mm->unmap_area = arch_unmap_area_topdown;
  	}
-@@ -175,10 +187,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+ }
+@@ -173,9 +185,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -8824,7 +8759,6 @@ index 06bafec..2bca531 100644
 +#endif
 +
  		mm->get_unmapped_area = s390_get_unmapped_area;
- 		mm->unmap_area = arch_unmap_area;
  	} else {
  		mm->mmap_base = mmap_base();
 +
@@ -8834,8 +8768,8 @@ index 06bafec..2bca531 100644
 +#endif
 +
  		mm->get_unmapped_area = s390_get_unmapped_area_topdown;
- 		mm->unmap_area = arch_unmap_area_topdown;
  	}
+ }
 diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
 index ae3d59f..f65f075 100644
 --- a/arch/score/include/asm/cache.h
@@ -8864,7 +8798,7 @@ index f9f3cd5..58ff438 100644
  
  #endif /* _ASM_SCORE_EXEC_H */
 diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
-index f4c6d02..e9355c3 100644
+index a1519ad3..e8ac1ff 100644
 --- a/arch/score/kernel/process.c
 +++ b/arch/score/kernel/process.c
 @@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
@@ -8893,19 +8827,6 @@ index ef9e555..331bd29 100644
  
  #define __read_mostly __attribute__((__section__(".data..read_mostly")))
  
-diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
-index 03f2b55..b0270327 100644
---- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c
-+++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
-@@ -143,7 +143,7 @@ shx3_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata shx3_cpu_notifier = {
-+static struct notifier_block shx3_cpu_notifier = {
- 	.notifier_call		= shx3_cpu_callback,
- };
- 
 diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
 index 6777177..cb5e44f 100644
 --- a/arch/sh/mm/mmap.c
@@ -9257,7 +9178,7 @@ index bcfe063..b333142 100644
  static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
  {
 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
-index 6fc1348..390c50a 100644
+index 502f632..da1917f 100644
 --- a/arch/sparc/include/asm/pgtable_32.h
 +++ b/arch/sparc/include/asm/pgtable_32.h
 @@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
@@ -9571,22 +9492,22 @@ index e562d3c..191f176 100644
  {
 -	unsigned long ret = ___copy_to_user(to, from, size);
 +	unsigned long ret;
-+
+ 
 +	if ((long)size < 0 || size > INT_MAX)
 +		return size;
 +
 +	if (!__builtin_constant_p(size))
 +		check_object_size(from, size, true);
- 
++
 +	ret = ___copy_to_user(to, from, size);
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
 diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
-index d432fb2..6056af1 100644
+index d15cc17..d0ae796 100644
 --- a/arch/sparc/kernel/Makefile
 +++ b/arch/sparc/kernel/Makefile
-@@ -3,7 +3,7 @@
+@@ -4,7 +4,7 @@
  #
  
  asflags-y := -ansi
@@ -9595,27 +9516,6 @@ index d432fb2..6056af1 100644
  
  extra-y     := head_$(BITS).o
  
-diff --git a/arch/sparc/kernel/ds.c b/arch/sparc/kernel/ds.c
-index 252f876..2656fdd 100644
---- a/arch/sparc/kernel/ds.c
-+++ b/arch/sparc/kernel/ds.c
-@@ -783,6 +783,16 @@ void ldom_set_var(const char *var, const char *value)
- 		char  *base, *p;
- 		int msg_len, loops;
- 
-+		if (strlen(var) + strlen(value) + 2 >
-+		    sizeof(pkt) - sizeof(pkt.header)) {
-+			printk(KERN_ERR PFX
-+				"contents length: %zu, which more than max: %lu,"
-+				"so could not set (%s) variable to (%s).\n",
-+				strlen(var) + strlen(value) + 2,
-+				sizeof(pkt) - sizeof(pkt.header), var, value);
-+			return;
-+		}
-+
- 		memset(&pkt, 0, sizeof(pkt));
- 		pkt.header.data.tag.type = DS_DATA;
- 		pkt.header.data.handle = cp->handle;
 diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
 index fdd819d..5af08c8 100644
 --- a/arch/sparc/kernel/process_32.c
@@ -9700,10 +9600,10 @@ index 79cc0d1..ec62734 100644
  	.getproplen = prom_getproplen,
  	.getproperty = prom_getproperty,
 diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
-index 7ff45e4..a58f271 100644
+index 773c1f2..a8bdd87 100644
 --- a/arch/sparc/kernel/ptrace_64.c
 +++ b/arch/sparc/kernel/ptrace_64.c
-@@ -1057,6 +1057,10 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -1059,6 +1059,10 @@ long arch_ptrace(struct task_struct *child, long request,
  	return ret;
  }
  
@@ -9714,7 +9614,7 @@ index 7ff45e4..a58f271 100644
  asmlinkage int syscall_trace_enter(struct pt_regs *regs)
  {
  	int ret = 0;
-@@ -1064,6 +1068,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
+@@ -1066,6 +1070,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
  	/* do the secure computing check first */
  	secure_computing_strict(regs->u_regs[UREG_G1]);
  
@@ -9726,7 +9626,7 @@ index 7ff45e4..a58f271 100644
  	if (test_thread_flag(TIF_SYSCALL_TRACE))
  		ret = tracehook_report_syscall_entry(regs);
  
-@@ -1084,6 +1093,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
+@@ -1086,6 +1095,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
  
  asmlinkage void syscall_trace_leave(struct pt_regs *regs)
  {
@@ -9739,10 +9639,10 @@ index 7ff45e4..a58f271 100644
  
  	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
 diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
-index 77539ed..3ffffe7 100644
+index e142545..fd29654 100644
 --- a/arch/sparc/kernel/smp_64.c
 +++ b/arch/sparc/kernel/smp_64.c
-@@ -868,8 +868,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
+@@ -869,8 +869,8 @@ extern unsigned long xcall_flush_dcache_page_cheetah;
  extern unsigned long xcall_flush_dcache_page_spitfire;
  
  #ifdef CONFIG_DEBUG_DCFLUSH
@@ -9753,7 +9653,7 @@ index 77539ed..3ffffe7 100644
  #endif
  
  static inline void __local_flush_dcache_page(struct page *page)
-@@ -893,7 +893,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
+@@ -894,7 +894,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
  		return;
  
  #ifdef CONFIG_DEBUG_DCFLUSH
@@ -9762,7 +9662,7 @@ index 77539ed..3ffffe7 100644
  #endif
  
  	this_cpu = get_cpu();
-@@ -917,7 +917,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
+@@ -918,7 +918,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
  			xcall_deliver(data0, __pa(pg_addr),
  				      (u64) pg_addr, cpumask_of(cpu));
  #ifdef CONFIG_DEBUG_DCFLUSH
@@ -9771,7 +9671,7 @@ index 77539ed..3ffffe7 100644
  #endif
  		}
  	}
-@@ -936,7 +936,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
+@@ -937,7 +937,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
  	preempt_disable();
  
  #ifdef CONFIG_DEBUG_DCFLUSH
@@ -9780,7 +9680,7 @@ index 77539ed..3ffffe7 100644
  #endif
  	data0 = 0;
  	pg_addr = page_address(page);
-@@ -953,7 +953,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
+@@ -954,7 +954,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
  		xcall_deliver(data0, __pa(pg_addr),
  			      (u64) pg_addr, cpu_online_mask);
  #ifdef CONFIG_DEBUG_DCFLUSH
@@ -9803,7 +9703,7 @@ index 3a8d184..49498a8 100644
  	info.flags = 0;
  	info.length = len;
 diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
-index 2daaaa6..4fb84dc 100644
+index 51561b8..8256764 100644
 --- a/arch/sparc/kernel/sys_sparc_64.c
 +++ b/arch/sparc/kernel/sys_sparc_64.c
 @@ -90,13 +90,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
@@ -9960,9 +9860,9 @@ index 2daaaa6..4fb84dc 100644
 +#endif
 +
  		mm->get_unmapped_area = arch_get_unmapped_area;
- 		mm->unmap_area = arch_unmap_area;
  	} else {
-@@ -301,6 +333,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+ 		/* We know it's 32-bit */
+@@ -300,6 +332,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);
@@ -9973,10 +9873,10 @@ index 2daaaa6..4fb84dc 100644
 +#endif
 +
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
- 		mm->unmap_area = arch_unmap_area_topdown;
  	}
+ }
 diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
-index 73ec8a7..4611979 100644
+index d950197..192f9d8 100644
 --- a/arch/sparc/kernel/syscalls.S
 +++ b/arch/sparc/kernel/syscalls.S
 @@ -52,7 +52,7 @@ sys32_rt_sigreturn:
@@ -10015,19 +9915,6 @@ index 73ec8a7..4611979 100644
  	ldx	[%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
  
  2:
-diff --git a/arch/sparc/kernel/sysfs.c b/arch/sparc/kernel/sysfs.c
-index 654e8aa..45f431b 100644
---- a/arch/sparc/kernel/sysfs.c
-+++ b/arch/sparc/kernel/sysfs.c
-@@ -266,7 +266,7 @@ static int __cpuinit sysfs_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata sysfs_cpu_nb = {
-+static struct notifier_block sysfs_cpu_nb = {
- 	.notifier_call	= sysfs_cpu_notify,
- };
- 
 diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
 index 6629829..036032d 100644
 --- a/arch/sparc/kernel/traps_32.c
@@ -10528,7 +10415,7 @@ index 30c3ecc..736f015 100644
  obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o gup.o
  obj-y                   += fault_$(BITS).o
 diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
-index e98bfda..ea8d221 100644
+index 59dbd46..1dd7f5e 100644
 --- a/arch/sparc/mm/fault_32.c
 +++ b/arch/sparc/mm/fault_32.c
 @@ -21,6 +21,9 @@
@@ -10819,7 +10706,7 @@ index e98bfda..ea8d221 100644
  static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
  				      int text_fault)
  {
-@@ -230,6 +504,24 @@ good_area:
+@@ -229,6 +503,24 @@ good_area:
  		if (!(vma->vm_flags & VM_WRITE))
  			goto bad_area;
  	} else {
@@ -10845,7 +10732,7 @@ index e98bfda..ea8d221 100644
  		if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
 diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
-index 5062ff3..e0b75f3 100644
+index 2ebec26..b212598 100644
 --- a/arch/sparc/mm/fault_64.c
 +++ b/arch/sparc/mm/fault_64.c
 @@ -21,6 +21,9 @@
@@ -11334,7 +11221,7 @@ index 5062ff3..e0b75f3 100644
  asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
  {
  	struct mm_struct *mm = current->mm;
-@@ -341,6 +804,29 @@ retry:
+@@ -342,6 +805,29 @@ retry:
  	if (!vma)
  		goto bad_area;
  
@@ -11365,7 +11252,7 @@ index 5062ff3..e0b75f3 100644
  	 * load/store/atomic was a write or not, it only says that there
  	 * was no match.  So in such a case we (carefully) read the
 diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
-index d2b5944..d878f3c 100644
+index 9639964..806cd0c 100644
 --- a/arch/sparc/mm/hugetlbpage.c
 +++ b/arch/sparc/mm/hugetlbpage.c
 @@ -28,7 +28,8 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
@@ -11469,7 +11356,7 @@ index d2b5944..d878f3c 100644
  
  pte_t *huge_pte_alloc(struct mm_struct *mm,
 diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
-index 04fd55a..4ede686 100644
+index ed82eda..0d80e77 100644
 --- a/arch/sparc/mm/init_64.c
 +++ b/arch/sparc/mm/init_64.c
 @@ -188,9 +188,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
@@ -11506,11 +11393,23 @@ index 04fd55a..4ede686 100644
  #endif /* CONFIG_SMP */
  #endif /* CONFIG_DEBUG_DCFLUSH */
  }
+diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
+index d45a2c4..3c05a78 100644
+--- a/arch/tile/Kconfig
++++ b/arch/tile/Kconfig
+@@ -185,6 +185,7 @@ source "kernel/Kconfig.hz"
+ 
+ config KEXEC
+ 	bool "kexec system call"
++	depends on !GRKERNSEC_KMEM
+ 	---help---
+ 	  kexec is a system call that implements the ability to shutdown your
+ 	  current kernel, and to start another kernel.  It is like a reboot
 diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
-index f4500c6..889656c 100644
+index ad220ee..2f537b3 100644
 --- a/arch/tile/include/asm/atomic_64.h
 +++ b/arch/tile/include/asm/atomic_64.h
-@@ -143,6 +143,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
+@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
  
  #define atomic64_inc_not_zero(v)	atomic64_add_unless((v), 1, 0)
  
@@ -11528,7 +11427,7 @@ index f4500c6..889656c 100644
  #define smp_mb__before_atomic_dec()	smp_mb()
  #define smp_mb__after_atomic_dec()	smp_mb()
 diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
-index a9a5299..0fce79e 100644
+index 6160761..00cac88 100644
 --- a/arch/tile/include/asm/cache.h
 +++ b/arch/tile/include/asm/cache.h
 @@ -15,11 +15,12 @@
@@ -11546,10 +11445,10 @@ index a9a5299..0fce79e 100644
  /* bytes per L2 cache line */
  #define L2_CACHE_SHIFT		CHIP_L2_LOG_LINE_SIZE()
 diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
-index 8a082bc..7a6bf87 100644
+index b6cde32..c0cb736 100644
 --- a/arch/tile/include/asm/uaccess.h
 +++ b/arch/tile/include/asm/uaccess.h
-@@ -408,9 +408,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
+@@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
  					  const void __user *from,
  					  unsigned long n)
  {
@@ -11562,10 +11461,10 @@ index 8a082bc..7a6bf87 100644
  	else
  		copy_from_user_overflow();
 diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
-index 650ccff..45fe2d6 100644
+index 0cb3bba..7338b2d 100644
 --- a/arch/tile/mm/hugetlbpage.c
 +++ b/arch/tile/mm/hugetlbpage.c
-@@ -239,6 +239,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
+@@ -212,6 +212,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
  	info.high_limit = TASK_SIZE;
  	info.align_mask = PAGE_MASK & ~huge_page_mask(h);
  	info.align_offset = 0;
@@ -11573,7 +11472,7 @@ index 650ccff..45fe2d6 100644
  	return vm_unmapped_area(&info);
  }
  
-@@ -256,6 +257,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+@@ -229,6 +230,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
  	info.high_limit = current->mm->mmap_base;
  	info.align_mask = PAGE_MASK & ~huge_page_mask(h);
  	info.align_offset = 0;
@@ -11597,7 +11496,7 @@ index 133f7de..1d6f2f1 100644
  include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
  
 diff --git a/arch/um/defconfig b/arch/um/defconfig
-index 08107a7..ab22afe 100644
+index 2665e6b..3e3822b 100644
 --- a/arch/um/defconfig
 +++ b/arch/um/defconfig
 @@ -51,7 +51,6 @@ CONFIG_X86_CMPXCHG=y
@@ -11711,10 +11610,10 @@ index ad8f795..2c7eec6 100644
  /*
   * Memory returned by kmalloc() may be used for DMA, so we must make
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index fe120da..24177f7 100644
+index f67e839..bfd4748 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -239,7 +239,7 @@ config X86_HT
+@@ -247,7 +247,7 @@ config X86_HT
  
  config X86_32_LAZY_GS
  	def_bool y
@@ -11723,7 +11622,7 @@ index fe120da..24177f7 100644
  
  config ARCH_HWEIGHT_CFLAGS
  	string
-@@ -1073,6 +1073,7 @@ config MICROCODE_EARLY
+@@ -1099,6 +1099,7 @@ config MICROCODE_EARLY
  
  config X86_MSR
  	tristate "/dev/cpu/*/msr - Model-specific register support"
@@ -11731,7 +11630,7 @@ index fe120da..24177f7 100644
  	---help---
  	  This device gives privileged processes access to the x86
  	  Model-Specific Registers (MSRs).  It is a character device with
-@@ -1096,7 +1097,7 @@ choice
+@@ -1122,7 +1123,7 @@ choice
  
  config NOHIGHMEM
  	bool "off"
@@ -11740,7 +11639,7 @@ index fe120da..24177f7 100644
  	---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
-@@ -1133,7 +1134,7 @@ config NOHIGHMEM
+@@ -1159,7 +1160,7 @@ config NOHIGHMEM
  
  config HIGHMEM4G
  	bool "4GB"
@@ -11749,7 +11648,7 @@ index fe120da..24177f7 100644
  	---help---
  	  Select this if you have a 32-bit processor and between 1 and 4
  	  gigabytes of physical RAM.
-@@ -1186,7 +1187,7 @@ config PAGE_OFFSET
+@@ -1212,7 +1213,7 @@ config PAGE_OFFSET
  	hex
  	default 0xB0000000 if VMSPLIT_3G_OPT
  	default 0x80000000 if VMSPLIT_2G
@@ -11758,7 +11657,7 @@ index fe120da..24177f7 100644
  	default 0x40000000 if VMSPLIT_1G
  	default 0xC0000000
  	depends on X86_32
-@@ -1584,6 +1585,7 @@ config SECCOMP
+@@ -1614,6 +1615,7 @@ config SECCOMP
  
  config CC_STACKPROTECTOR
  	bool "Enable -fstack-protector buffer overflow detection"
@@ -11766,16 +11665,24 @@ index fe120da..24177f7 100644
  	---help---
  	  This option turns on the -fstack-protector GCC feature. This
  	  feature puts, at the beginning of functions, a canary value on
-@@ -1703,6 +1705,8 @@ config X86_NEED_RELOCS
+@@ -1632,6 +1634,7 @@ source kernel/Kconfig.hz
+ 
+ config KEXEC
+ 	bool "kexec system call"
++	depends on !GRKERNSEC_KMEM
+ 	---help---
+ 	  kexec is a system call that implements the ability to shutdown your
+ 	  current kernel, and to start another kernel.  It is like a reboot
+@@ -1733,6 +1736,8 @@ config X86_NEED_RELOCS
  config PHYSICAL_ALIGN
- 	hex "Alignment value to which kernel should be aligned" if X86_32
+ 	hex "Alignment value to which kernel should be aligned"
  	default "0x1000000"
 +	range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
 +	range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
- 	range 0x2000 0x1000000
+ 	range 0x2000 0x1000000 if X86_32
+ 	range 0x200000 0x1000000 if X86_64
  	---help---
- 	  This value puts the alignment restrictions on physical address
-@@ -1778,9 +1782,10 @@ config DEBUG_HOTPLUG_CPU0
+@@ -1812,9 +1817,10 @@ config DEBUG_HOTPLUG_CPU0
  	  If unsure, say N.
  
  config COMPAT_VDSO
@@ -11819,10 +11726,10 @@ index c026cca..14657ae 100644
  config X86_MINIMUM_CPU_FAMILY
  	int
 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
-index c198b7e..63eea60 100644
+index 78d91af..8ceb94b 100644
 --- a/arch/x86/Kconfig.debug
 +++ b/arch/x86/Kconfig.debug
-@@ -84,7 +84,7 @@ config X86_PTDUMP
+@@ -74,7 +74,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
  	bool "Write protect kernel read-only data structures"
  	default y
@@ -11831,7 +11738,7 @@ index c198b7e..63eea60 100644
  	---help---
  	  Mark the kernel read-only data as write-protected in the pagetables,
  	  in order to catch accidental (and incorrect) writes to such const
-@@ -102,7 +102,7 @@ config DEBUG_RODATA_TEST
+@@ -92,7 +92,7 @@ config DEBUG_RODATA_TEST
  
  config DEBUG_SET_MODULE_RONX
  	bool "Set loadable kernel module data as NX and text as RO"
@@ -11841,10 +11748,18 @@ index c198b7e..63eea60 100644
  	  This option helps catch unintended modifications to loadable
  	  kernel module's text and read-only data. It also prevents execution
 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
-index 5c47726..8c4fa67 100644
+index 41250fb..863762e 100644
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -54,6 +54,7 @@ else
+@@ -46,14 +46,12 @@ ifeq ($(CONFIG_X86_32),y)
+         # CPU-specific tuning. Anything which can be shared with UML should go here.
+         include $(srctree)/arch/x86/Makefile_32.cpu
+         KBUILD_CFLAGS += $(cflags-y)
+-
+-        # temporary until string.h is fixed
+-        KBUILD_CFLAGS += -ffreestanding
+ else
+         BITS := 64
          UTS_MACHINE := x86_64
          CHECKFLAGS += -D__x86_64__ -m64
  
@@ -11852,9 +11767,19 @@ index 5c47726..8c4fa67 100644
          KBUILD_AFLAGS += -m64
          KBUILD_CFLAGS += -m64
  
-@@ -234,3 +235,12 @@ define archhelp
-   echo  '                  FDARGS="..."  arguments for the booted kernel'
+@@ -83,6 +81,9 @@ else
+         KBUILD_CFLAGS += -maccumulate-outgoing-args
+ endif
+ 
++# temporary until string.h is fixed
++KBUILD_CFLAGS += -ffreestanding
++
+ ifdef CONFIG_CC_STACKPROTECTOR
+ 	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
+         ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y)
+@@ -241,3 +242,12 @@ define archhelp
    echo  '                  FDINITRD=file initrd for the booted kernel'
+   echo  '  kvmconfig	- Enable additional options for guest kernel support'
  endef
 +
 +define OLD_LD
@@ -11902,7 +11827,7 @@ index 878e4b9..20537ab 100644
  
  #endif /* BOOT_BITOPS_H */
 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
-index 5b75319..331a4ca 100644
+index ef72bae..353a184 100644
 --- a/arch/x86/boot/boot.h
 +++ b/arch/x86/boot/boot.h
 @@ -85,7 +85,7 @@ static inline void io_delay(void)
@@ -11924,10 +11849,10 @@ index 5b75319..331a4ca 100644
  	return diff;
  }
 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
-index 5ef205c..342191d 100644
+index dcd90df..c830d7d 100644
 --- a/arch/x86/boot/compressed/Makefile
 +++ b/arch/x86/boot/compressed/Makefile
-@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
+@@ -15,6 +15,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
  KBUILD_CFLAGS += $(cflags-y)
  KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
  KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
@@ -11938,7 +11863,7 @@ index 5ef205c..342191d 100644
  KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
 diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
-index d606463..b887794 100644
+index b7388a4..03844ec 100644
 --- a/arch/x86/boot/compressed/eboot.c
 +++ b/arch/x86/boot/compressed/eboot.c
 @@ -150,7 +150,6 @@ again:
@@ -12000,7 +11925,7 @@ index a53440e..c3dbf1e 100644
  .previous
  
 diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
-index 1e3184f..0d11e2e 100644
+index 5d6f689..9d06730 100644
 --- a/arch/x86/boot/compressed/head_32.S
 +++ b/arch/x86/boot/compressed/head_32.S
 @@ -118,7 +118,7 @@ preferred_addr:
@@ -12012,30 +11937,11 @@ index 1e3184f..0d11e2e 100644
  #endif
  
  	/* Target address to relocate to for decompression */
-@@ -204,7 +204,7 @@ relocated:
-  * and where it was actually loaded.
-  */
- 	movl	%ebp, %ebx
--	subl	$LOAD_PHYSICAL_ADDR, %ebx
-+	subl	$____LOAD_PHYSICAL_ADDR, %ebx
- 	jz	2f	/* Nothing to be done if loaded at compiled addr. */
- /*
-  * Process relocations.
-@@ -212,8 +212,7 @@ relocated:
- 
- 1:	subl	$4, %edi
- 	movl	(%edi), %ecx
--	testl	%ecx, %ecx
--	jz	2f
-+	jecxz	2f
- 	addl	%ebx, -__PAGE_OFFSET(%ebx, %ecx)
- 	jmp	1b
- 2:
 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
-index 16f24e6..47491a3 100644
+index c337422..2c5be72 100644
 --- a/arch/x86/boot/compressed/head_64.S
 +++ b/arch/x86/boot/compressed/head_64.S
-@@ -97,7 +97,7 @@ ENTRY(startup_32)
+@@ -95,7 +95,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl	%eax, %ebx
  #else
@@ -12044,7 +11950,7 @@ index 16f24e6..47491a3 100644
  #endif
  
  	/* Target address to relocate to for decompression */
-@@ -272,7 +272,7 @@ preferred_addr:
+@@ -270,7 +270,7 @@ preferred_addr:
  	notq	%rax
  	andq	%rax, %rbp
  #else
@@ -12053,7 +11959,7 @@ index 16f24e6..47491a3 100644
  #endif
  
  	/* Target address to relocate to for decompression */
-@@ -363,8 +363,8 @@ gdt:
+@@ -362,8 +362,8 @@ gdt:
  	.long	gdt
  	.word	0
  	.quad	0x0000000000000000	/* NULL descriptor */
@@ -12065,10 +11971,19 @@ index 16f24e6..47491a3 100644
  	.quad   0x0000000000000000	/* TS continued */
  gdt_end:
 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
-index 7cb56c6..d382d84 100644
+index 434f077..b6b4b38 100644
 --- a/arch/x86/boot/compressed/misc.c
 +++ b/arch/x86/boot/compressed/misc.c
-@@ -303,7 +303,7 @@ static void parse_elf(void *output)
+@@ -283,7 +283,7 @@ static void handle_relocations(void *output, unsigned long output_len)
+ 	 * Calculate the delta between where vmlinux was linked to load
+ 	 * and where it was actually loaded.
+ 	 */
+-	delta = min_addr - LOAD_PHYSICAL_ADDR;
++	delta = min_addr - ____LOAD_PHYSICAL_ADDR;
+ 	if (!delta) {
+ 		debug_putstr("No relocation needed... ");
+ 		return;
+@@ -380,7 +380,7 @@ static void parse_elf(void *output)
  		case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
  			dest = output;
@@ -12077,7 +11992,7 @@ index 7cb56c6..d382d84 100644
  #else
  			dest = (void *)(phdr->p_paddr);
  #endif
-@@ -354,7 +354,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
+@@ -432,7 +432,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
  		error("Destination address too large");
  #endif
  #ifndef CONFIG_RELOCATABLE
@@ -12445,57 +12360,6 @@ index 477e9d7..3ab339f 100644
  	ret
  ENDPROC(aesni_xts_crypt8)
  
-diff --git a/arch/x86/crypto/blowfish-avx2-asm_64.S b/arch/x86/crypto/blowfish-avx2-asm_64.S
-index 784452e..46982c7 100644
---- a/arch/x86/crypto/blowfish-avx2-asm_64.S
-+++ b/arch/x86/crypto/blowfish-avx2-asm_64.S
-@@ -221,6 +221,7 @@ __blowfish_enc_blk32:
- 
- 	write_block(RXl, RXr);
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(__blowfish_enc_blk32)
- 
-@@ -250,6 +251,7 @@ __blowfish_dec_blk32:
- 
- 	write_block(RXl, RXr);
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(__blowfish_dec_blk32)
- 
-@@ -284,6 +286,7 @@ ENTRY(blowfish_ecb_enc_32way)
- 
- 	vzeroupper;
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(blowfish_ecb_enc_32way)
- 
-@@ -318,6 +321,7 @@ ENTRY(blowfish_ecb_dec_32way)
- 
- 	vzeroupper;
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(blowfish_ecb_dec_32way)
- 
-@@ -365,6 +369,7 @@ ENTRY(blowfish_cbc_dec_32way)
- 
- 	vzeroupper;
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(blowfish_cbc_dec_32way)
- 
-@@ -445,5 +450,6 @@ ENTRY(blowfish_ctr_32way)
- 
- 	vzeroupper;
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(blowfish_ctr_32way)
 diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
 index 246c670..4d1ed00 100644
 --- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
@@ -12636,7 +12500,7 @@ index ce71f92..2dd5b1e 100644
  ENDPROC(camellia_xts_crypt_16way)
  
 diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
-index 91a1878..bcf340a 100644
+index 0e0b886..8fc756a 100644
 --- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
 +++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
 @@ -11,6 +11,7 @@
@@ -12647,7 +12511,7 @@ index 91a1878..bcf340a 100644
  
  #define CAMELLIA_TABLE_BYTE_LEN 272
  
-@@ -212,6 +213,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
+@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
  	roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
  		  %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
  		  %rcx, (%r9));
@@ -12655,7 +12519,7 @@ index 91a1878..bcf340a 100644
  	ret;
  ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
  
-@@ -220,6 +222,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
+@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
  	roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
  		  %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
  		  %rax, (%r9));
@@ -12663,7 +12527,7 @@ index 91a1878..bcf340a 100644
  	ret;
  ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
  
-@@ -802,6 +805,7 @@ __camellia_enc_blk32:
+@@ -820,6 +823,7 @@ __camellia_enc_blk32:
  		    %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
  		    %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
  
@@ -12671,7 +12535,7 @@ index 91a1878..bcf340a 100644
  	ret;
  
  .align 8
-@@ -887,6 +891,7 @@ __camellia_dec_blk32:
+@@ -905,6 +909,7 @@ __camellia_dec_blk32:
  		    %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
  		    %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
  
@@ -12679,7 +12543,7 @@ index 91a1878..bcf340a 100644
  	ret;
  
  .align 8
-@@ -930,6 +935,7 @@ ENTRY(camellia_ecb_enc_32way)
+@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
  
  	vzeroupper;
  
@@ -12687,7 +12551,7 @@ index 91a1878..bcf340a 100644
  	ret;
  ENDPROC(camellia_ecb_enc_32way)
  
-@@ -962,6 +968,7 @@ ENTRY(camellia_ecb_dec_32way)
+@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
  
  	vzeroupper;
  
@@ -12695,7 +12559,7 @@ index 91a1878..bcf340a 100644
  	ret;
  ENDPROC(camellia_ecb_dec_32way)
  
-@@ -1028,6 +1035,7 @@ ENTRY(camellia_cbc_dec_32way)
+@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
  
  	vzeroupper;
  
@@ -12703,7 +12567,7 @@ index 91a1878..bcf340a 100644
  	ret;
  ENDPROC(camellia_cbc_dec_32way)
  
-@@ -1166,6 +1174,7 @@ ENTRY(camellia_ctr_32way)
+@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
  
  	vzeroupper;
  
@@ -12711,7 +12575,7 @@ index 91a1878..bcf340a 100644
  	ret;
  ENDPROC(camellia_ctr_32way)
  
-@@ -1331,6 +1340,7 @@ camellia_xts_crypt_32way:
+@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
  
  	vzeroupper;
  
@@ -13406,74 +13270,6 @@ index 0505813..63b1d00 100644
 +	pax_force_retaddr 0, 1
  	ret;
  ENDPROC(twofish_xts_dec_8way)
-diff --git a/arch/x86/crypto/twofish-avx2-asm_64.S b/arch/x86/crypto/twofish-avx2-asm_64.S
-index e1a83b9..33006b9 100644
---- a/arch/x86/crypto/twofish-avx2-asm_64.S
-+++ b/arch/x86/crypto/twofish-avx2-asm_64.S
-@@ -11,6 +11,7 @@
-  */
- 
- #include <linux/linkage.h>
-+#include <asm/alternative-asm.h>
- #include "glue_helper-asm-avx2.S"
- 
- .file "twofish-avx2-asm_64.S"
-@@ -422,6 +423,7 @@ __twofish_enc_blk16:
- 	outunpack_enc16(RA, RB, RC, RD);
- 	write_blocks16(RA, RB, RC, RD);
- 
-+	pax_force_retaddr_bts
- 	ret;
- ENDPROC(__twofish_enc_blk16)
- 
-@@ -454,6 +456,7 @@ __twofish_dec_blk16:
- 	outunpack_dec16(RA, RB, RC, RD);
- 	write_blocks16(RA, RB, RC, RD);
- 
-+	pax_force_retaddr_bts
- 	ret;
- ENDPROC(__twofish_dec_blk16)
- 
-@@ -476,6 +479,7 @@ ENTRY(twofish_ecb_enc_16way)
- 	popq %r12;
- 	vzeroupper;
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(twofish_ecb_enc_16way)
- 
-@@ -498,6 +502,7 @@ ENTRY(twofish_ecb_dec_16way)
- 	popq %r12;
- 	vzeroupper;
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(twofish_ecb_dec_16way)
- 
-@@ -521,6 +526,7 @@ ENTRY(twofish_cbc_dec_16way)
- 	popq %r12;
- 	vzeroupper;
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(twofish_cbc_dec_16way)
- 
-@@ -546,6 +552,7 @@ ENTRY(twofish_ctr_16way)
- 	popq %r12;
- 	vzeroupper;
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(twofish_ctr_16way)
- 
-@@ -574,6 +581,7 @@ twofish_xts_crypt_16way:
- 	popq %r12;
- 	vzeroupper;
- 
-+	pax_force_retaddr 0, 1
- 	ret;
- ENDPROC(twofish_xts_crypt_16way)
- 
 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
 index 1c3b7ce..b365c5e 100644
 --- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
@@ -13537,7 +13333,7 @@ index a039d21..29e7615 100644
  	ret
  ENDPROC(twofish_dec_blk)
 diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
-index 52ff81c..98af645 100644
+index bae3aba..c1788c1 100644
 --- a/arch/x86/ia32/ia32_aout.c
 +++ b/arch/x86/ia32/ia32_aout.c
 @@ -159,6 +159,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
@@ -13550,10 +13346,10 @@ index 52ff81c..98af645 100644
  	set_fs(KERNEL_DS);
  	has_dumped = 1;
 diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
-index 10adb41..95ea4c2 100644
+index 665a730..8e7a67a 100644
 --- a/arch/x86/ia32/ia32_signal.c
 +++ b/arch/x86/ia32/ia32_signal.c
-@@ -340,7 +340,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
+@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, 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. */
@@ -13562,7 +13358,7 @@ index 10adb41..95ea4c2 100644
  	return (void __user *) sp;
  }
  
-@@ -398,7 +398,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
+@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
  		 * These are actually not used anymore, but left because some
  		 * gdb versions depend on them as a marker.
  		 */
@@ -13571,7 +13367,7 @@ index 10adb41..95ea4c2 100644
  	} put_user_catch(err);
  
  	if (err)
-@@ -440,7 +440,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
+@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
  		0xb8,
  		__NR_ia32_rt_sigreturn,
  		0x80cd,
@@ -13580,7 +13376,7 @@ index 10adb41..95ea4c2 100644
  	};
  
  	frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
-@@ -463,16 +463,18 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
+@@ -461,16 +461,18 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
  
  		if (ksig->ka.sa.sa_flags & SA_RESTORER)
  			restorer = ksig->ka.sa.sa_restorer;
@@ -13603,7 +13399,7 @@ index 10adb41..95ea4c2 100644
  
  	err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
 diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
-index 474dc1b..9297c58 100644
+index 4299eb0..904b82a 100644
 --- a/arch/x86/ia32/ia32entry.S
 +++ b/arch/x86/ia32/ia32entry.S
 @@ -15,8 +15,10 @@
@@ -14001,10 +13797,10 @@ index 372231c..a5aa1a1 100644
  	.long \orig - .
  	.long \alt - .
 diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
-index 58ed6d9..f1cbe58 100644
+index 0a3f9c9..c9d081d 100644
 --- a/arch/x86/include/asm/alternative.h
 +++ b/arch/x86/include/asm/alternative.h
-@@ -105,7 +105,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
+@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
  	".pushsection .discard,\"aw\",@progbits\n"			\
  	DISCARD_ENTRY(1)						\
  	".popsection\n"							\
@@ -14013,7 +13809,7 @@ index 58ed6d9..f1cbe58 100644
  	ALTINSTR_REPLACEMENT(newinstr, feature, 1)			\
  	".popsection"
  
-@@ -119,7 +119,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
+@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
  	DISCARD_ENTRY(1)						\
  	DISCARD_ENTRY(2)						\
  	".popsection\n"							\
@@ -14023,10 +13819,10 @@ index 58ed6d9..f1cbe58 100644
  	ALTINSTR_REPLACEMENT(newinstr2, feature2, 2)			\
  	".popsection"
 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
-index 3388034..050f0b9 100644
+index 1d2091a..f5074c1 100644
 --- a/arch/x86/include/asm/apic.h
 +++ b/arch/x86/include/asm/apic.h
-@@ -44,7 +44,7 @@ static inline void generic_apic_probe(void)
+@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
  
  #ifdef CONFIG_X86_LOCAL_APIC
  
@@ -14449,11 +14245,6 @@ index 722aa3b..3a0bb27 100644
 -#define atomic_clear_mask(mask, addr)				\
 -	asm volatile(LOCK_PREFIX "andl %0,%1"			\
 -		     : : "r" (~(mask)), "m" (*(addr)) : "memory")
--
--#define atomic_set_mask(mask, addr)				\
--	asm volatile(LOCK_PREFIX "orl %0,%1"			\
--		     : : "r" ((unsigned)(mask)), "m" (*(addr))	\
--		     : "memory")
 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
 +{
 +	asm volatile(LOCK_PREFIX "andl %1,%0"
@@ -14461,7 +14252,11 @@ index 722aa3b..3a0bb27 100644
 +		     : "r" (~(mask))
 +		     : "memory");
 +}
-+
+ 
+-#define atomic_set_mask(mask, addr)				\
+-	asm volatile(LOCK_PREFIX "orl %0,%1"			\
+-		     : : "r" ((unsigned)(mask)), "m" (*(addr))	\
+-		     : "memory")
 +static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
 +{
 +	asm volatile(LOCK_PREFIX "andl %1,%0"
@@ -14975,10 +14770,10 @@ index 0e1cbfc..5623683 100644
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
 diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
-index 6dfd019..28e188d 100644
+index 41639ce..ebce552 100644
 --- a/arch/x86/include/asm/bitops.h
 +++ b/arch/x86/include/asm/bitops.h
-@@ -40,7 +40,7 @@
+@@ -48,7 +48,7 @@
   * a mask operation on a byte.
   */
  #define IS_IMMEDIATE(nr)		(__builtin_constant_p(nr))
@@ -14987,7 +14782,43 @@ index 6dfd019..28e188d 100644
  #define CONST_MASK(nr)			(1 << ((nr) & 7))
  
  /**
-@@ -486,7 +486,7 @@ static inline int fls(int x)
+@@ -361,7 +361,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
+  *
+  * Undefined if no bit exists, so code should check against 0 first.
+  */
+-static inline unsigned long __ffs(unsigned long word)
++static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
+ {
+ 	asm("rep; bsf %1,%0"
+ 		: "=r" (word)
+@@ -375,7 +375,7 @@ static inline unsigned long __ffs(unsigned long word)
+  *
+  * Undefined if no zero exists, so code should check against ~0UL first.
+  */
+-static inline unsigned long ffz(unsigned long word)
++static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
+ {
+ 	asm("rep; bsf %1,%0"
+ 		: "=r" (word)
+@@ -389,7 +389,7 @@ static inline unsigned long ffz(unsigned long word)
+  *
+  * Undefined if no set bit exists, so code should check against 0 first.
+  */
+-static inline unsigned long __fls(unsigned long word)
++static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
+ {
+ 	asm("bsr %1,%0"
+ 	    : "=r" (word)
+@@ -452,7 +452,7 @@ static inline int ffs(int x)
+  * set bit if value is nonzero. The last (most significant) bit is
+  * at position 32.
+  */
+-static inline int fls(int x)
++static inline int __intentional_overflow(-1) fls(int x)
+ {
+ 	int r;
+ 
+@@ -494,7 +494,7 @@ static inline int fls(int x)
   * at position 64.
   */
  #ifdef CONFIG_X86_64
@@ -15163,7 +14994,7 @@ index 59c6c40..5e0b22c 100644
  struct compat_timespec {
  	compat_time_t	tv_sec;
 diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
-index 4af181d..eb8011f 100644
+index 89270b4..f0abf8e 100644
 --- a/arch/x86/include/asm/cpufeature.h
 +++ b/arch/x86/include/asm/cpufeature.h
 @@ -203,7 +203,7 @@
@@ -15192,7 +15023,17 @@ index 4af181d..eb8011f 100644
  #endif /* CONFIG_X86_64 */
  
  #if __GNUC__ >= 4
-@@ -394,7 +395,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
+@@ -405,7 +406,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
+ 
+ #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
+ 	t_warn:
+-		warn_pre_alternatives();
++		if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
++			warn_pre_alternatives();
+ 		return false;
+ #endif
+ 
+@@ -425,7 +427,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
  			     ".section .discard,\"aw\",@progbits\n"
  			     " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
  			     ".previous\n"
@@ -15201,8 +15042,35 @@ index 4af181d..eb8011f 100644
  			     "3: movb $1,%0\n"
  			     "4:\n"
  			     ".previous\n"
+@@ -462,7 +464,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
+ 			 " .byte 2b - 1b\n"		/* src len */
+ 			 " .byte 4f - 3f\n"		/* repl len */
+ 			 ".previous\n"
+-			 ".section .altinstr_replacement,\"ax\"\n"
++			 ".section .altinstr_replacement,\"a\"\n"
+ 			 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
+ 			 "4:\n"
+ 			 ".previous\n"
+@@ -495,7 +497,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
+ 			     ".section .discard,\"aw\",@progbits\n"
+ 			     " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
+ 			     ".previous\n"
+-			     ".section .altinstr_replacement,\"ax\"\n"
++			     ".section .altinstr_replacement,\"a\"\n"
+ 			     "3: movb $0,%0\n"
+ 			     "4:\n"
+ 			     ".previous\n"
+@@ -509,7 +511,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
+ 			     ".section .discard,\"aw\",@progbits\n"
+ 			     " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
+ 			     ".previous\n"
+-			     ".section .altinstr_replacement,\"ax\"\n"
++			     ".section .altinstr_replacement,\"a\"\n"
+ 			     "5: movb $1,%0\n"
+ 			     "6:\n"
+ 			     ".previous\n"
 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index 8bf1c06..b6ae785 100644
+index b90e5df..b462c91 100644
 --- a/arch/x86/include/asm/desc.h
 +++ b/arch/x86/include/asm/desc.h
 @@ -4,6 +4,7 @@
@@ -15226,16 +15094,17 @@ index 8bf1c06..b6ae785 100644
  
  extern struct desc_ptr idt_descr;
 -extern gate_desc idt_table[];
- extern struct desc_ptr nmi_idt_descr;
--extern gate_desc nmi_idt_table[];
+-extern struct desc_ptr debug_idt_descr;
+-extern gate_desc debug_idt_table[];
 -
 -struct gdt_page {
 -	struct desc_struct gdt[GDT_ENTRIES];
 -} __attribute__((aligned(PAGE_SIZE)));
 -
 -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
-+extern gate_desc idt_table[256];
-+extern gate_desc nmi_idt_table[256];
++extern gate_desc idt_table[IDT_ENTRIES];
++extern const struct desc_ptr debug_idt_descr;
++extern gate_desc debug_idt_table[IDT_ENTRIES];
  
 +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
  static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
@@ -15328,7 +15197,18 @@ index 8bf1c06..b6ae785 100644
  {
  	gate_desc s;
  
-@@ -320,7 +333,7 @@ static inline void set_nmi_gate(int gate, void *addr)
+@@ -321,8 +334,8 @@ static inline void set_nmi_gate(int gate, void *addr)
+ #endif
+ 
+ #ifdef CONFIG_TRACING
+-extern struct desc_ptr trace_idt_descr;
+-extern gate_desc trace_idt_table[];
++extern const struct desc_ptr trace_idt_descr;
++extern gate_desc trace_idt_table[IDT_ENTRIES];
+ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
+ {
+ 	write_idt_entry(trace_idt_table, entry, gate);
+@@ -333,7 +346,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
  }
  #endif
  
@@ -15337,7 +15217,7 @@ index 8bf1c06..b6ae785 100644
  			     unsigned dpl, unsigned ist, unsigned seg)
  {
  	gate_desc s;
-@@ -339,7 +352,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
+@@ -353,7 +366,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.
   */
@@ -15346,7 +15226,7 @@ index 8bf1c06..b6ae785 100644
  {
  	BUG_ON((unsigned)n > 0xFF);
  	_set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
-@@ -369,19 +382,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
+@@ -410,19 +423,19 @@ static inline void __alloc_intr_gate(unsigned int n, void *addr)
  /*
   * This routine sets up an interrupt gate at directory privilege level 3.
   */
@@ -15369,7 +15249,7 @@ index 8bf1c06..b6ae785 100644
  {
  	BUG_ON((unsigned)n > 0xFF);
  	_set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
-@@ -390,19 +403,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
+@@ -431,16 +444,16 @@ 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);
@@ -15389,8 +15269,11 @@ index 8bf1c06..b6ae785 100644
  {
  	BUG_ON((unsigned)n > 0xFF);
  	_set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
+@@ -512,4 +525,17 @@ static inline void load_current_idt(void)
+ 	else
+ 		load_idt((const struct desc_ptr *)&idt_descr);
  }
- 
++
 +#ifdef CONFIG_X86_32
 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
 +{
@@ -15503,22 +15386,22 @@ index 9c999c1..3860cb8 100644
   * True on X86_32 or when emulating IA32 on X86_64
   */
 diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
-index 75ce3f4..882e801 100644
+index 77a99ac..39ff7f5 100644
 --- a/arch/x86/include/asm/emergency-restart.h
 +++ b/arch/x86/include/asm/emergency-restart.h
-@@ -13,6 +13,6 @@ enum reboot_type {
- 
- extern enum reboot_type reboot_type;
+@@ -1,6 +1,6 @@
+ #ifndef _ASM_X86_EMERGENCY_RESTART_H
+ #define _ASM_X86_EMERGENCY_RESTART_H
  
 -extern void machine_emergency_restart(void);
 +extern void machine_emergency_restart(void) __noreturn;
  
  #endif /* _ASM_X86_EMERGENCY_RESTART_H */
 diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
-index e25cc33..7d3ec01 100644
+index 4d0bda7..221da4d 100644
 --- a/arch/x86/include/asm/fpu-internal.h
 +++ b/arch/x86/include/asm/fpu-internal.h
-@@ -126,8 +126,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
+@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
  #define user_insn(insn, output, input...)				\
  ({									\
  	int err;							\
@@ -15531,7 +15414,7 @@ index e25cc33..7d3ec01 100644
  		     "2: " ASM_CLAC "\n"				\
  		     ".section .fixup,\"ax\"\n"				\
  		     "3:  movl $-1,%[err]\n"				\
-@@ -136,6 +139,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
+@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
  		     _ASM_EXTABLE(1b, 3b)				\
  		     : [err] "=r" (err), output				\
  		     : "0"(0), input);					\
@@ -15539,7 +15422,7 @@ index e25cc33..7d3ec01 100644
  	err;								\
  })
  
-@@ -300,7 +304,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
+@@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
  		"emms\n\t"		/* clear stack tags */
  		"fildl %P[addr]",	/* set F?P to defined value */
  		X86_FEATURE_FXSAVE_LEAK,
@@ -15636,10 +15519,10 @@ index be27ba1..04a8801 100644
  	*uval = oldval;
  	return ret;
 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
-index 1da97ef..9c2ebff 100644
+index 92b3bae..3866449 100644
 --- a/arch/x86/include/asm/hw_irq.h
 +++ b/arch/x86/include/asm/hw_irq.h
-@@ -148,8 +148,8 @@ extern void setup_ioapic_dest(void);
+@@ -165,8 +165,8 @@ extern void setup_ioapic_dest(void);
  extern void enable_IO_APIC(void);
  
  /* Statistics */
@@ -15664,7 +15547,7 @@ index a203659..9889f1c 100644
  extern struct legacy_pic *legacy_pic;
  extern struct legacy_pic null_legacy_pic;
 diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
-index d8e8eef..1765f78 100644
+index 34f69cb..6d95446 100644
 --- a/arch/x86/include/asm/io.h
 +++ b/arch/x86/include/asm/io.h
 @@ -51,12 +51,12 @@ static inline void name(type val, volatile void __iomem *addr) \
@@ -15728,7 +15611,7 @@ index bba3cf8..06bc8da 100644
  #define INTERRUPT_RETURN		iret
  #define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit
 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
-index 5a6d287..f815789 100644
+index 9454c16..e4100e3 100644
 --- a/arch/x86/include/asm/kprobes.h
 +++ b/arch/x86/include/asm/kprobes.h
 @@ -38,13 +38,8 @@ typedef u8 kprobe_opcode_t;
@@ -16021,7 +15904,7 @@ index 5f55e69..e20bfb1 100644
  
  #ifdef CONFIG_SMP
 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
-index be12c53..7430027 100644
+index be12c53..4d24039 100644
 --- a/arch/x86/include/asm/mmu_context.h
 +++ b/arch/x86/include/asm/mmu_context.h
 @@ -24,6 +24,20 @@ void destroy_context(struct mm_struct *mm);
@@ -16045,7 +15928,7 @@ index be12c53..7430027 100644
  #ifdef CONFIG_SMP
  	if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
  		this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
-@@ -34,16 +48,55 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -34,16 +48,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
  			     struct task_struct *tsk)
  {
  	unsigned cpu = smp_processor_id();
@@ -16081,9 +15964,13 @@ index be12c53..7430027 100644
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +		if (static_cpu_has(X86_FEATURE_PCID)) {
 +			if (static_cpu_has(X86_FEATURE_INVPCID)) {
-+				unsigned long descriptor[2];
++				u64 descriptor[2];
 +				descriptor[0] = PCID_USER;
 +				asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
++				if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
++					descriptor[0] = PCID_KERNEL;
++					asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
++				}
 +			} else {
 +				write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
 +				if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
@@ -16101,7 +15988,7 @@ index be12c53..7430027 100644
  
  		/* Stop flush ipis for the previous mm */
  		cpumask_clear_cpu(cpu, mm_cpumask(prev));
-@@ -51,9 +104,63 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -51,9 +108,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
  		/* Load the LDT, if the LDT is different: */
  		if (unlikely(prev->context.ldt != next->context.ldt))
  			load_LDT_nolock(&next->context);
@@ -16145,9 +16032,13 @@ index be12c53..7430027 100644
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +		if (static_cpu_has(X86_FEATURE_PCID)) {
 +			if (static_cpu_has(X86_FEATURE_INVPCID)) {
-+				unsigned long descriptor[2];
++				u64 descriptor[2];
 +				descriptor[0] = PCID_USER;
 +				asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
++				if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
++					descriptor[0] = PCID_KERNEL;
++					asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
++				}
 +			} else {
 +				write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
 +				if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
@@ -16166,7 +16057,7 @@ index be12c53..7430027 100644
  		this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
  		BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
  
-@@ -70,11 +177,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -70,11 +185,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.
  			 */
@@ -16190,9 +16081,9 @@ index be12c53..7430027 100644
 +#endif
 +
  		}
--	}
- #endif
-+	}
++#endif
+ 	}
+-#endif
  }
  
  #define activate_mm(prev, next)			\
@@ -16287,7 +16178,7 @@ index 0f1ddee..e2fc3d1 100644
  	unsigned long y = x - __START_KERNEL_map;
  
 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index cfdc9ee..3f7b5d6 100644
+index 401f350..dee5d13 100644
 --- a/arch/x86/include/asm/paravirt.h
 +++ b/arch/x86/include/asm/paravirt.h
 @@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
@@ -16339,8 +16230,8 @@ index cfdc9ee..3f7b5d6 100644
 +
  #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
  
- static inline int arch_spin_is_locked(struct arch_spinlock *lock)
-@@ -926,7 +953,7 @@ extern void default_banner(void);
+ static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
+@@ -906,7 +933,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)
@@ -16349,7 +16240,7 @@ index cfdc9ee..3f7b5d6 100644
  #endif
  
  #define INTERRUPT_RETURN						\
-@@ -1001,6 +1028,21 @@ extern void default_banner(void);
+@@ -981,6 +1008,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))
@@ -16372,7 +16263,7 @@ index cfdc9ee..3f7b5d6 100644
  
  #endif /* __ASSEMBLY__ */
 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
-index 0db1fca..52310cc 100644
+index aab8f67..2531748 100644
 --- a/arch/x86/include/asm/paravirt_types.h
 +++ b/arch/x86/include/asm/paravirt_types.h
 @@ -84,7 +84,7 @@ struct pv_init_ops {
@@ -16432,15 +16323,6 @@ index 0db1fca..52310cc 100644
  };
  
  struct arch_spinlock;
-@@ -334,7 +341,7 @@ struct pv_lock_ops {
- 	void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
- 	int (*spin_trylock)(struct arch_spinlock *lock);
- 	void (*spin_unlock)(struct arch_spinlock *lock);
--};
-+} __no_const;
- 
- /* This contains all the paravirt structures: we get a convenient
-  * number for each function using the offset which we use to indicate
 diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
 index b4389a4..7024269 100644
 --- a/arch/x86/include/asm/pgalloc.h
@@ -16496,7 +16378,7 @@ index b4389a4..7024269 100644
  {
  	return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
 diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
-index f2b489c..4f7e2e5 100644
+index 3bf2dd0..23d2a9f 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)
@@ -16510,7 +16392,7 @@ index f2b489c..4f7e2e5 100644
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
 diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
-index 4cc9f2b..5fd9226 100644
+index 81bb91b..9392125 100644
 --- a/arch/x86/include/asm/pgtable-3level.h
 +++ b/arch/x86/include/asm/pgtable-3level.h
 @@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
@@ -16531,10 +16413,10 @@ index 4cc9f2b..5fd9226 100644
  
  /*
 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index 1e67223..92a9585 100644
+index 3d19994..732a48c 100644
 --- a/arch/x86/include/asm/pgtable.h
 +++ b/arch/x86/include/asm/pgtable.h
-@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
+@@ -45,6 +45,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
  
  #ifndef __PAGETABLE_PUD_FOLDED
  #define set_pgd(pgdp, pgd)		native_set_pgd(pgdp, pgd)
@@ -16542,7 +16424,7 @@ index 1e67223..92a9585 100644
  #define pgd_clear(pgd)			native_pgd_clear(pgd)
  #endif
  
-@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
+@@ -82,12 +83,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
  
  #define arch_end_context_switch(prev)	do {} while(0)
  
@@ -16594,7 +16476,7 @@ index 1e67223..92a9585 100644
  static inline int pte_dirty(pte_t pte)
  {
  	return pte_flags(pte) & _PAGE_DIRTY;
-@@ -147,6 +187,11 @@ static inline unsigned long pud_pfn(pud_t pud)
+@@ -148,6 +188,11 @@ static inline unsigned long pud_pfn(pud_t pud)
  	return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
  }
  
@@ -16606,7 +16488,7 @@ index 1e67223..92a9585 100644
  #define pte_page(pte)	pfn_to_page(pte_pfn(pte))
  
  static inline int pmd_large(pmd_t pte)
-@@ -200,9 +245,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
+@@ -201,9 +246,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
  	return pte_clear_flags(pte, _PAGE_RW);
  }
  
@@ -16637,7 +16519,7 @@ index 1e67223..92a9585 100644
  }
  
  static inline pte_t pte_mkdirty(pte_t pte)
-@@ -394,6 +459,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
+@@ -430,6 +495,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
  #endif
  
  #ifndef __ASSEMBLY__
@@ -16652,9 +16534,9 @@ index 1e67223..92a9585 100644
 +#endif
 +
  #include <linux/mm_types.h>
+ #include <linux/mmdebug.h>
  #include <linux/log2.h>
- 
-@@ -529,7 +604,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
+@@ -563,7 +638,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
   * Currently stuck as a macro due to indirect forward reference to
   * linux/mmzone.h's __section_mem_map_addr() definition:
   */
@@ -16663,7 +16545,7 @@ index 1e67223..92a9585 100644
  
  /* Find an entry in the second-level page table.. */
  static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
-@@ -569,7 +644,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
+@@ -603,7 +678,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
   * Currently stuck as a macro due to indirect forward reference to
   * linux/mmzone.h's __section_mem_map_addr() definition:
   */
@@ -16672,7 +16554,7 @@ index 1e67223..92a9585 100644
  
  /* to find an entry in a page-table-directory. */
  static inline unsigned long pud_index(unsigned long address)
-@@ -584,7 +659,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
+@@ -618,7 +693,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
  
  static inline int pgd_bad(pgd_t pgd)
  {
@@ -16681,7 +16563,7 @@ index 1e67223..92a9585 100644
  }
  
  static inline int pgd_none(pgd_t pgd)
-@@ -607,7 +682,12 @@ static inline int pgd_none(pgd_t pgd)
+@@ -641,7 +716,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;
   */
@@ -16695,7 +16577,7 @@ index 1e67223..92a9585 100644
  /*
   * a shortcut which implies the use of the kernel's pgd, instead
   * of a process's
-@@ -618,6 +698,23 @@ static inline int pgd_none(pgd_t pgd)
+@@ -652,6 +732,23 @@ 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)
  
@@ -16719,7 +16601,7 @@ index 1e67223..92a9585 100644
  #ifndef __ASSEMBLY__
  
  extern int direct_gbpages;
-@@ -784,11 +881,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
+@@ -818,11 +915,24 @@ static inline void pmdp_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.
   */
@@ -16896,7 +16778,7 @@ index 2d88344..4679fc3 100644
  #define EARLY_DYNAMIC_PAGE_TABLES	64
  
 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
-index e642300..0ef8f31 100644
+index 0ecac25..306c276 100644
 --- a/arch/x86/include/asm/pgtable_types.h
 +++ b/arch/x86/include/asm/pgtable_types.h
 @@ -16,13 +16,12 @@
@@ -16924,7 +16806,7 @@ index e642300..0ef8f31 100644
  #define _PAGE_IOMAP	(_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
  #define _PAGE_PAT	(_AT(pteval_t, 1) << _PAGE_BIT_PAT)
  #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
-@@ -57,8 +55,10 @@
+@@ -87,8 +85,10 @@
  
  #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
  #define _PAGE_NX	(_AT(pteval_t, 1) << _PAGE_BIT_NX)
@@ -16936,7 +16818,7 @@ index e642300..0ef8f31 100644
  #endif
  
  #define _PAGE_FILE	(_AT(pteval_t, 1) << _PAGE_BIT_FILE)
-@@ -116,6 +116,9 @@
+@@ -146,6 +146,9 @@
  #define PAGE_READONLY_EXEC	__pgprot(_PAGE_PRESENT | _PAGE_USER |	\
  					 _PAGE_ACCESSED)
  
@@ -16946,7 +16828,7 @@ index e642300..0ef8f31 100644
  #define __PAGE_KERNEL_EXEC						\
  	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
  #define __PAGE_KERNEL		(__PAGE_KERNEL_EXEC | _PAGE_NX)
-@@ -126,7 +129,7 @@
+@@ -156,7 +159,7 @@
  #define __PAGE_KERNEL_WC		(__PAGE_KERNEL | _PAGE_CACHE_WC)
  #define __PAGE_KERNEL_NOCACHE		(__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
  #define __PAGE_KERNEL_UC_MINUS		(__PAGE_KERNEL | _PAGE_PCD)
@@ -16955,7 +16837,7 @@ index e642300..0ef8f31 100644
  #define __PAGE_KERNEL_VVAR		(__PAGE_KERNEL_RO | _PAGE_USER)
  #define __PAGE_KERNEL_VVAR_NOCACHE	(__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
  #define __PAGE_KERNEL_LARGE		(__PAGE_KERNEL | _PAGE_PSE)
-@@ -188,8 +191,8 @@
+@@ -218,8 +221,8 @@
   * bits are combined, this will alow user to access the high address mapped
   * VDSO in the presence of CONFIG_COMPAT_VDSO
   */
@@ -16966,7 +16848,7 @@ index e642300..0ef8f31 100644
  #define PGD_IDENT_ATTR	 0x001		/* PRESENT (no other attributes) */
  #endif
  
-@@ -227,7 +230,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
+@@ -257,7 +260,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
  {
  	return native_pgd_val(pgd) & PTE_FLAGS_MASK;
  }
@@ -16984,7 +16866,7 @@ index e642300..0ef8f31 100644
  #if PAGETABLE_LEVELS > 3
  typedef struct { pudval_t pud; } pud_t;
  
-@@ -241,8 +254,6 @@ static inline pudval_t native_pud_val(pud_t pud)
+@@ -271,8 +284,6 @@ static inline pudval_t native_pud_val(pud_t pud)
  	return pud.pud;
  }
  #else
@@ -16993,7 +16875,7 @@ index e642300..0ef8f31 100644
  static inline pudval_t native_pud_val(pud_t pud)
  {
  	return native_pgd_val(pud.pgd);
-@@ -262,8 +273,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
+@@ -292,8 +303,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
  	return pmd.pmd;
  }
  #else
@@ -17002,7 +16884,7 @@ index e642300..0ef8f31 100644
  static inline pmdval_t native_pmd_val(pmd_t pmd)
  {
  	return native_pgd_val(pmd.pud.pgd);
-@@ -303,7 +312,6 @@ typedef struct page *pgtable_t;
+@@ -333,7 +342,6 @@ typedef struct page *pgtable_t;
  
  extern pteval_t __supported_pte_mask;
  extern void set_nx(void);
@@ -17011,10 +16893,10 @@ index e642300..0ef8f31 100644
  #define pgprot_writecombine	pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index 22224b3..b3a2f90 100644
+index 987c75e..2723054 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
-@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
+@@ -199,9 +199,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
  	    : "memory");
  }
  
@@ -17037,7 +16919,7 @@ index 22224b3..b3a2f90 100644
  }
  
  #ifdef CONFIG_X86_32
-@@ -282,7 +294,7 @@ struct tss_struct {
+@@ -283,7 +295,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
  
@@ -17046,7 +16928,7 @@ index 22224b3..b3a2f90 100644
  
  /*
   * Save the original ist values for checking stack pointers during debugging
-@@ -452,6 +464,7 @@ struct thread_struct {
+@@ -453,6 +465,7 @@ struct thread_struct {
  	unsigned short		ds;
  	unsigned short		fsindex;
  	unsigned short		gsindex;
@@ -17054,7 +16936,7 @@ index 22224b3..b3a2f90 100644
  #endif
  #ifdef CONFIG_X86_32
  	unsigned long		ip;
-@@ -552,29 +565,8 @@ static inline void load_sp0(struct tss_struct *tss,
+@@ -553,29 +566,8 @@ static inline void load_sp0(struct tss_struct *tss,
  extern unsigned long mmu_cr4_features;
  extern u32 *trampoline_cr4_features;
  
@@ -17086,7 +16968,7 @@ index 22224b3..b3a2f90 100644
  
  typedef struct {
  	unsigned long		seg;
-@@ -823,11 +815,18 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -824,11 +816,18 @@ static inline void spin_lock_prefetch(const void *x)
   */
  #define TASK_SIZE		PAGE_OFFSET
  #define TASK_SIZE_MAX		TASK_SIZE
@@ -17107,7 +16989,7 @@ index 22224b3..b3a2f90 100644
  	.vm86_info		= NULL,					  \
  	.sysenter_cs		= __KERNEL_CS,				  \
  	.io_bitmap_ptr		= NULL,					  \
-@@ -841,7 +840,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -842,7 +841,7 @@ static inline void spin_lock_prefetch(const void *x)
   */
  #define INIT_TSS  {							  \
  	.x86_tss = {							  \
@@ -17116,7 +16998,7 @@ index 22224b3..b3a2f90 100644
  		.ss0		= __KERNEL_DS,				  \
  		.ss1		= __KERNEL_CS,				  \
  		.io_bitmap_base	= INVALID_IO_BITMAP_OFFSET,		  \
-@@ -852,11 +851,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -853,11 +852,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))
@@ -17129,7 +17011,7 @@ index 22224b3..b3a2f90 100644
  
  /*
   * The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -871,7 +866,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -872,7 +867,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
  #define task_pt_regs(task)                                             \
  ({                                                                     \
         struct pt_regs *__regs__;                                       \
@@ -17138,7 +17020,7 @@ index 22224b3..b3a2f90 100644
         __regs__ - 1;                                                   \
  })
  
-@@ -881,13 +876,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -882,13 +877,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
  /*
   * User space process size. 47bits minus one guard page.
   */
@@ -17154,7 +17036,7 @@ index 22224b3..b3a2f90 100644
  
  #define TASK_SIZE		(test_thread_flag(TIF_ADDR32) ? \
  					IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -898,11 +893,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -899,11 +894,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
  #define STACK_TOP_MAX		TASK_SIZE_MAX
  
  #define INIT_THREAD  { \
@@ -17168,7 +17050,7 @@ index 22224b3..b3a2f90 100644
  }
  
  /*
-@@ -930,6 +925,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
+@@ -931,6 +926,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
   */
  #define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
  
@@ -17179,18 +17061,8 @@ index 22224b3..b3a2f90 100644
  #define KSTK_EIP(task)		(task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-@@ -942,7 +941,8 @@ extern int set_tsc_mode(unsigned int val);
- extern u16 amd_get_nb_id(int cpu);
- 
- struct aperfmperf {
--	u64 aperf, mperf;
-+	u64 aperf __intentional_overflow(0);
-+	u64 mperf __intentional_overflow(0);
- };
- 
- static inline void get_aperfmperf(struct aperfmperf *am)
-@@ -970,7 +970,7 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old,
- 	return ratio;
+@@ -957,7 +956,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
+ 	return 0;
  }
  
 -extern unsigned long arch_align_stack(unsigned long sp);
@@ -17198,13 +17070,13 @@ index 22224b3..b3a2f90 100644
  extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
  
  void default_idle(void);
-@@ -980,6 +980,6 @@ bool xen_set_default_idle(void);
+@@ -967,6 +966,6 @@ bool xen_set_default_idle(void);
  #define xen_set_default_idle 0
  #endif
  
 -void stop_this_cpu(void *dummy);
 +void stop_this_cpu(void *dummy) __noreturn;
- 
+ void df_debug(struct pt_regs *regs, long error_code);
  #endif /* _ASM_X86_PROCESSOR_H */
 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
 index 942a086..6c26446 100644
@@ -17635,7 +17507,7 @@ index 8d3120f..352b440 100644
  
  static __always_inline void clac(void)
 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
-index b073aae..39f9bdd 100644
+index 4137890..03fa172 100644
 --- a/arch/x86/include/asm/smp.h
 +++ b/arch/x86/include/asm/smp.h
 @@ -36,7 +36,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
@@ -17656,7 +17528,7 @@ index b073aae..39f9bdd 100644
  
  /* Globals due to paravirt */
  extern void set_cpu_sibling_map(int cpu);
-@@ -191,14 +191,8 @@ extern unsigned disabled_cpus __cpuinitdata;
+@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
  extern int safe_smp_processor_id(void);
  
  #elif defined(CONFIG_X86_64_SMP)
@@ -17674,10 +17546,10 @@ index b073aae..39f9bdd 100644
  
  #endif
 diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
-index 33692ea..350a534 100644
+index bf156de..1a782ab 100644
 --- a/arch/x86/include/asm/spinlock.h
 +++ b/arch/x86/include/asm/spinlock.h
-@@ -172,6 +172,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
+@@ -223,6 +223,14 @@ 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 READ_LOCK_SIZE(dec) " (%0)\n\t"
@@ -17692,7 +17564,7 @@ index 33692ea..350a534 100644
  		     "jns 1f\n"
  		     "call __read_lock_failed\n\t"
  		     "1:\n"
-@@ -181,6 +189,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
+@@ -232,6 +240,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
  static inline void arch_write_lock(arch_rwlock_t *rw)
  {
  	asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
@@ -17707,7 +17579,7 @@ index 33692ea..350a534 100644
  		     "jz 1f\n"
  		     "call __write_lock_failed\n\t"
  		     "1:\n"
-@@ -210,13 +226,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
+@@ -261,13 +277,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
  
  static inline void arch_read_unlock(arch_rwlock_t *rw)
  {
@@ -17780,7 +17652,15 @@ index 70bbe39..4ae2bd4 100644
 -				      void *data,
 -				      unsigned long *end,
 -				      int *graph);
--
++typedef unsigned long walk_stack_t(struct task_struct *task,
++				   void *stack_start,
++				   unsigned long *stack,
++				   unsigned long bp,
++				   const struct stacktrace_ops *ops,
++				   void *data,
++				   unsigned long *end,
++				   int *graph);
+ 
 -extern unsigned long
 -print_context_stack(struct thread_info *tinfo,
 -		    unsigned long *stack, unsigned long bp,
@@ -17792,15 +17672,6 @@ index 70bbe39..4ae2bd4 100644
 -		       unsigned long *stack, unsigned long bp,
 -		       const struct stacktrace_ops *ops, void *data,
 -		       unsigned long *end, int *graph);
-+typedef unsigned long walk_stack_t(struct task_struct *task,
-+				   void *stack_start,
-+				   unsigned long *stack,
-+				   unsigned long bp,
-+				   const struct stacktrace_ops *ops,
-+				   void *data,
-+				   unsigned long *end,
-+				   int *graph);
-+
 +extern walk_stack_t print_context_stack;
 +extern walk_stack_t print_context_stack_bp;
  
@@ -17816,7 +17687,7 @@ index 70bbe39..4ae2bd4 100644
  
  void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
 diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
-index 4ec45b3..a4f0a8a 100644
+index d7f3b3b..3cc39f1 100644
 --- a/arch/x86/include/asm/switch_to.h
 +++ b/arch/x86/include/asm/switch_to.h
 @@ -108,7 +108,7 @@ do {									\
@@ -17838,7 +17709,7 @@ index 4ec45b3..a4f0a8a 100644
  	       __switch_canary_iparam					  \
  	     : "memory", "cc" __EXTRA_CLOBBER)
 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
-index a1df6e8..e002940 100644
+index 2781119..618b59b 100644
 --- a/arch/x86/include/asm/thread_info.h
 +++ b/arch/x86/include/asm/thread_info.h
 @@ -10,6 +10,7 @@
@@ -17888,7 +17759,7 @@ index a1df6e8..e002940 100644
  #define init_stack		(init_thread_union.stack)
  
  #else /* !__ASSEMBLY__ */
-@@ -97,6 +91,7 @@ struct thread_info {
+@@ -96,6 +90,7 @@ struct thread_info {
  #define TIF_SYSCALL_TRACEPOINT	28	/* syscall tracepoint instrumentation */
  #define TIF_ADDR32		29	/* 32-bit address space on 64 bits */
  #define TIF_X32			30	/* 32-bit native x86-64 binary */
@@ -17896,7 +17767,7 @@ index a1df6e8..e002940 100644
  
  #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
  #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
-@@ -121,17 +116,18 @@ struct thread_info {
+@@ -119,17 +114,18 @@ struct thread_info {
  #define _TIF_SYSCALL_TRACEPOINT	(1 << TIF_SYSCALL_TRACEPOINT)
  #define _TIF_ADDR32		(1 << TIF_ADDR32)
  #define _TIF_X32		(1 << TIF_X32)
@@ -17917,7 +17788,7 @@ index a1df6e8..e002940 100644
  
  /* work to do on interrupt/exception return */
  #define _TIF_WORK_MASK							\
-@@ -142,7 +138,7 @@ struct thread_info {
+@@ -140,7 +136,7 @@ struct thread_info {
  /* work to do on any return to user space */
  #define _TIF_ALLWORK_MASK						\
  	((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT |	\
@@ -17926,38 +17797,24 @@ index a1df6e8..e002940 100644
  
  /* Only used for 64 bit */
  #define _TIF_DO_NOTIFY_MASK						\
-@@ -158,6 +154,23 @@ struct thread_info {
+@@ -156,45 +152,40 @@ struct thread_info {
  
  #define PREEMPT_ACTIVE		0x10000000
  
-+#ifdef __ASSEMBLY__
-+/* how to get the thread information struct from ASM */
-+#define GET_THREAD_INFO(reg)	 \
-+	mov PER_CPU_VAR(current_tinfo), reg
-+
-+/* use this one if reg already contains %esp */
-+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
-+#else
-+/* how to get the thread information struct from C */
-+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
-+
-+static __always_inline struct thread_info *current_thread_info(void)
-+{
-+	return this_cpu_read_stable(current_tinfo);
-+}
-+#endif
-+
- #ifdef CONFIG_X86_32
- 
- #define STACK_WARN	(THREAD_SIZE/8)
-@@ -168,35 +181,13 @@ struct thread_info {
-  */
- #ifndef __ASSEMBLY__
- 
+-#ifdef CONFIG_X86_32
+-
+-#define STACK_WARN	(THREAD_SIZE/8)
+-/*
+- * macros/functions for gaining access to the thread information structure
+- *
+- * preempt_count needs to be 1 initially, until the scheduler is functional.
+- */
+-#ifndef __ASSEMBLY__
+-
+-
+-/* how to get the current stack pointer from C */
+-register unsigned long current_stack_pointer asm("esp") __used;
 -
- /* how to get the current stack pointer from C */
- register unsigned long current_stack_pointer asm("esp") __used;
- 
 -/* how to get the thread information struct from C */
 -static inline struct thread_info *current_thread_info(void)
 -{
@@ -17967,15 +17824,40 @@ index a1df6e8..e002940 100644
 -
 -#else /* !__ASSEMBLY__ */
 -
--/* how to get the thread information struct from ASM */
--#define GET_THREAD_INFO(reg)	 \
++#ifdef __ASSEMBLY__
+ /* how to get the thread information struct from ASM */
+ #define GET_THREAD_INFO(reg)	 \
 -	movl $-THREAD_SIZE, reg; \
 -	andl %esp, reg
--
--/* use this one if reg already contains %esp */
++	mov PER_CPU_VAR(current_tinfo), reg
+ 
+ /* use this one if reg already contains %esp */
 -#define GET_THREAD_INFO_WITH_ESP(reg) \
 -	andl $-THREAD_SIZE, reg
--
++#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
++#else
++/* how to get the thread information struct from C */
++DECLARE_PER_CPU(struct thread_info *, current_tinfo);
++
++static __always_inline struct thread_info *current_thread_info(void)
++{
++	return this_cpu_read_stable(current_tinfo);
++}
++#endif
++
++#ifdef CONFIG_X86_32
++
++#define STACK_WARN	(THREAD_SIZE/8)
++/*
++ * macros/functions for gaining access to the thread information structure
++ *
++ * preempt_count needs to be 1 initially, until the scheduler is functional.
++ */
++#ifndef __ASSEMBLY__
++
++/* how to get the current stack pointer from C */
++register unsigned long current_stack_pointer asm("esp") __used;
+ 
  #endif
  
  #else /* X86_32 */
@@ -17986,7 +17868,7 @@ index a1df6e8..e002940 100644
  /*
   * macros/functions for gaining access to the thread information structure
   * preempt_count needs to be 1 initially, until the scheduler is functional.
-@@ -204,27 +195,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -202,27 +193,8 @@ static inline struct thread_info *current_thread_info(void)
  #ifndef __ASSEMBLY__
  DECLARE_PER_CPU(unsigned long, kernel_stack);
  
@@ -18016,7 +17898,7 @@ index a1df6e8..e002940 100644
  #endif
  
  #endif /* !X86_32 */
-@@ -283,5 +255,12 @@ static inline bool is_ia32_task(void)
+@@ -281,5 +253,12 @@ static inline bool is_ia32_task(void)
  extern void arch_task_cache_init(void);
  extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
  extern void arch_release_task_struct(struct task_struct *tsk);
@@ -18030,7 +17912,7 @@ index a1df6e8..e002940 100644
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
 diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
-index 50a7fc0..45844c0 100644
+index e6d90ba..0897f44 100644
 --- a/arch/x86/include/asm/tlbflush.h
 +++ b/arch/x86/include/asm/tlbflush.h
 @@ -17,18 +17,44 @@
@@ -18038,7 +17920,7 @@ index 50a7fc0..45844c0 100644
  static inline void __native_flush_tlb(void)
  {
 +	if (static_cpu_has(X86_FEATURE_INVPCID)) {
-+		unsigned long descriptor[2];
++		u64 descriptor[2];
 +
 +		descriptor[0] = PCID_KERNEL;
 +		asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory");
@@ -18062,15 +17944,14 @@ index 50a7fc0..45844c0 100644
  static inline void __native_flush_tlb_global_irq_disabled(void)
  {
 -	unsigned long cr4;
--
++	if (static_cpu_has(X86_FEATURE_INVPCID)) {
++		u64 descriptor[2];
+ 
 -	cr4 = native_read_cr4();
 -	/* clear PGE */
 -	native_write_cr4(cr4 & ~X86_CR4_PGE);
 -	/* write old PGE again and flush TLBs */
 -	native_write_cr4(cr4);
-+	if (static_cpu_has(X86_FEATURE_INVPCID)) {
-+		unsigned long descriptor[2];
-+
 +		descriptor[0] = PCID_KERNEL;
 +		asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
 +	} else {
@@ -18091,7 +17972,7 @@ index 50a7fc0..45844c0 100644
  {
 +
 +	if (static_cpu_has(X86_FEATURE_INVPCID)) {
-+		unsigned long descriptor[2];
++		u64 descriptor[2];
 +
 +		descriptor[0] = PCID_KERNEL;
 +		descriptor[1] = addr;
@@ -18129,7 +18010,7 @@ index 50a7fc0..45844c0 100644
  }
  
 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
-index 5ee2687..74590b9 100644
+index 5838fa9..f7ae572 100644
 --- a/arch/x86/include/asm/uaccess.h
 +++ b/arch/x86/include/asm/uaccess.h
 @@ -7,6 +7,7 @@
@@ -18189,8 +18070,8 @@ index 5ee2687..74590b9 100644
  
  /*
   * The exception table consists of pairs of addresses relative to the
-@@ -165,10 +196,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
- 	register __inttype(*(ptr)) __val_gu asm("%edx");		\
+@@ -168,10 +199,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
+ 	register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX);		\
  	__chk_user_ptr(ptr);						\
  	might_fault();							\
 +	pax_open_userland();						\
@@ -18202,7 +18083,7 @@ index 5ee2687..74590b9 100644
  	__ret_gu;							\
  })
  
-@@ -176,13 +209,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
+@@ -179,13 +212,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
  	asm volatile("call __put_user_" #size : "=a" (__ret_pu)	\
  		     : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
  
@@ -18227,7 +18108,7 @@ index 5ee2687..74590b9 100644
  		     "3: " ASM_CLAC "\n"				\
  		     ".section .fixup,\"ax\"\n"				\
  		     "4:	movl %3,%0\n"				\
-@@ -195,8 +236,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
+@@ -198,8 +239,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
  
  #define __put_user_asm_ex_u64(x, addr)					\
  	asm volatile(ASM_STAC "\n"					\
@@ -18238,7 +18119,7 @@ index 5ee2687..74590b9 100644
  		     "3: " ASM_CLAC "\n"				\
  		     _ASM_EXTABLE_EX(1b, 2b)				\
  		     _ASM_EXTABLE_EX(2b, 3b)				\
-@@ -246,7 +287,8 @@ extern void __put_user_8(void);
+@@ -249,7 +290,8 @@ extern void __put_user_8(void);
  	__typeof__(*(ptr)) __pu_val;				\
  	__chk_user_ptr(ptr);					\
  	might_fault();						\
@@ -18248,7 +18129,7 @@ index 5ee2687..74590b9 100644
  	switch (sizeof(*(ptr))) {				\
  	case 1:							\
  		__put_user_x(1, __pu_val, ptr, __ret_pu);	\
-@@ -264,6 +306,7 @@ extern void __put_user_8(void);
+@@ -267,6 +309,7 @@ extern void __put_user_8(void);
  		__put_user_x(X, __pu_val, ptr, __ret_pu);	\
  		break;						\
  	}							\
@@ -18256,7 +18137,7 @@ index 5ee2687..74590b9 100644
  	__ret_pu;						\
  })
  
-@@ -344,8 +387,10 @@ do {									\
+@@ -347,8 +390,10 @@ do {									\
  } while (0)
  
  #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret)	\
@@ -18268,7 +18149,7 @@ index 5ee2687..74590b9 100644
  		     "2: " ASM_CLAC "\n"				\
  		     ".section .fixup,\"ax\"\n"				\
  		     "3:	mov %3,%0\n"				\
-@@ -353,8 +398,10 @@ do {									\
+@@ -356,8 +401,10 @@ do {									\
  		     "	jmp 2b\n"					\
  		     ".previous\n"					\
  		     _ASM_EXTABLE(1b, 3b)				\
@@ -18281,7 +18162,7 @@ index 5ee2687..74590b9 100644
  
  #define __get_user_size_ex(x, ptr, size)				\
  do {									\
-@@ -378,7 +425,7 @@ do {									\
+@@ -381,7 +428,7 @@ do {									\
  } while (0)
  
  #define __get_user_asm_ex(x, addr, itype, rtype, ltype)			\
@@ -18290,7 +18171,7 @@ index 5ee2687..74590b9 100644
  		     "2:\n"						\
  		     _ASM_EXTABLE_EX(1b, 2b)				\
  		     : ltype(x) : "m" (__m(addr)))
-@@ -395,13 +442,24 @@ do {									\
+@@ -398,13 +445,24 @@ do {									\
  	int __gu_err;							\
  	unsigned long __gu_val;						\
  	__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);	\
@@ -18317,7 +18198,7 @@ index 5ee2687..74590b9 100644
  
  /*
   * Tell gcc we read from memory instead of writing: this is because
-@@ -409,8 +467,10 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -412,8 +470,10 @@ struct __large_struct { unsigned long buf[100]; };
   * aliasing issues.
   */
  #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret)	\
@@ -18329,7 +18210,7 @@ index 5ee2687..74590b9 100644
  		     "2: " ASM_CLAC "\n"				\
  		     ".section .fixup,\"ax\"\n"				\
  		     "3:	mov %3,%0\n"				\
-@@ -418,10 +478,12 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -421,10 +481,12 @@ struct __large_struct { unsigned long buf[100]; };
  		     ".previous\n"					\
  		     _ASM_EXTABLE(1b, 3b)				\
  		     : "=r"(err)					\
@@ -18344,7 +18225,7 @@ index 5ee2687..74590b9 100644
  		     "2:\n"						\
  		     _ASM_EXTABLE_EX(1b, 2b)				\
  		     : : ltype(x), "m" (__m(addr)))
-@@ -431,11 +493,13 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -434,11 +496,13 @@ struct __large_struct { unsigned long buf[100]; };
   */
  #define uaccess_try	do {						\
  	current_thread_info()->uaccess_err = 0;				\
@@ -18358,7 +18239,7 @@ index 5ee2687..74590b9 100644
  	(err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0);	\
  } while (0)
  
-@@ -460,8 +524,12 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -463,8 +527,12 @@ struct __large_struct { unsigned long buf[100]; };
   * On error, the variable @x is set to zero.
   */
  
@@ -18371,7 +18252,7 @@ index 5ee2687..74590b9 100644
  
  /**
   * __put_user: - Write a simple value into user space, with less checking.
-@@ -483,8 +551,12 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -486,8 +554,12 @@ struct __large_struct { unsigned long buf[100]; };
   * Returns zero on success, or -EFAULT on error.
   */
  
@@ -18384,7 +18265,7 @@ index 5ee2687..74590b9 100644
  
  #define __get_user_unaligned __get_user
  #define __put_user_unaligned __put_user
-@@ -502,7 +574,7 @@ struct __large_struct { unsigned long buf[100]; };
+@@ -505,7 +577,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))));	\
@@ -18393,42 +18274,10 @@ index 5ee2687..74590b9 100644
  } while (0)
  
  #define put_user_try		uaccess_try
-@@ -519,8 +591,8 @@ strncpy_from_user(char *dst, const char __user *src, long count);
- extern __must_check long strlen_user(const char __user *str);
- extern __must_check long strnlen_user(const char __user *str, long n);
- 
--unsigned long __must_check clear_user(void __user *mem, unsigned long len);
--unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
-+unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
-+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
- 
- /*
-  * movsl can be slow when source and dest are not both 8-byte aligned
 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
-index 7f760a9..04b1c65 100644
+index 7f760a9..b596b9a 100644
 --- a/arch/x86/include/asm/uaccess_32.h
 +++ b/arch/x86/include/asm/uaccess_32.h
-@@ -11,15 +11,15 @@
- #include <asm/page.h>
- 
- unsigned long __must_check __copy_to_user_ll
--		(void __user *to, const void *from, unsigned long n);
-+		(void __user *to, const void *from, unsigned long n) __size_overflow(3);
- unsigned long __must_check __copy_from_user_ll
--		(void *to, const void __user *from, unsigned long n);
-+		(void *to, const void __user *from, unsigned long n) __size_overflow(3);
- unsigned long __must_check __copy_from_user_ll_nozero
--		(void *to, const void __user *from, unsigned long n);
-+		(void *to, const void __user *from, unsigned long n) __size_overflow(3);
- unsigned long __must_check __copy_from_user_ll_nocache
--		(void *to, const void __user *from, unsigned long n);
-+		(void *to, const void __user *from, unsigned long n) __size_overflow(3);
- unsigned long __must_check __copy_from_user_ll_nocache_nozero
--		(void *to, const void __user *from, unsigned long n);
-+		(void *to, const void __user *from, unsigned long n) __size_overflow(3);
- 
- /**
-  * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
 @@ -43,6 +43,11 @@ 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)
@@ -18487,18 +18336,18 @@ index 7f760a9..04b1c65 100644
  				  unsigned long n)
  {
 -       return __copy_from_user_ll_nocache_nozero(to, from, n);
--}
 +	if ((long)n < 0)
 +		return n;
++
++	return __copy_from_user_ll_nocache_nozero(to, from, n);
+ }
  
 -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")
@@ -18538,14 +18387,13 @@ index 7f760a9..04b1c65 100644
 -	if (likely(sz == -1 || sz >= n))
 -		n = _copy_from_user(to, from, n);
 -	else
--		copy_from_user_overflow();
 +	if (unlikely(sz != (size_t)-1 && sz < n))
 +		copy_to_user_overflow();
 +	else if (access_ok(VERIFY_WRITE, to, n))
 +		n = __copy_to_user(to, from, n);
 +	return n;
 +}
- 
++
 +/**
 + * copy_from_user: - Copy a block of data from user space.
 + * @to:   Destination address, in kernel space.
@@ -18570,7 +18418,8 @@ index 7f760a9..04b1c65 100644
 +	check_object_size(to, n, false);
 +
 +	if (unlikely(sz != (size_t)-1 && sz < n))
-+		copy_from_user_overflow();
+ 		copy_from_user_overflow();
+-
 +	else if (access_ok(VERIFY_READ, from, n))
 +		n = __copy_from_user(to, from, n);
 +	else if ((long)n > 0)
@@ -18579,7 +18428,7 @@ index 7f760a9..04b1c65 100644
  }
  
 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
-index 142810c..9d398f4 100644
+index 4f7923d..201b58d 100644
 --- a/arch/x86/include/asm/uaccess_64.h
 +++ b/arch/x86/include/asm/uaccess_64.h
 @@ -10,6 +10,9 @@
@@ -18592,7 +18441,7 @@ index 142810c..9d398f4 100644
  
  /*
   * Copy To/From Userspace
-@@ -17,13 +20,13 @@
+@@ -17,14 +20,14 @@
  
  /* Handles exceptions in both to and from, but doesn't do access_ok */
  __must_check unsigned long
@@ -18606,10 +18455,12 @@ index 142810c..9d398f4 100644
 +copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
  
 -static __always_inline __must_check unsigned long
-+static __always_inline __must_check  __size_overflow(3) unsigned long
- copy_user_generic(void *to, const void *from, unsigned len)
+-copy_user_generic(void *to, const void *from, unsigned len)
++static __always_inline __must_check  unsigned long
++copy_user_generic(void *to, const void *from, unsigned long len)
  {
  	unsigned ret;
+ 
 @@ -45,138 +48,200 @@ copy_user_generic(void *to, const void *from, unsigned len)
  	return ret;
  }
@@ -18882,7 +18733,7 @@ index 142810c..9d398f4 100644
  			       ret, "q", "", "=r", 8);
  		if (likely(!ret))
  			__put_user_asm(tmp, (u64 __user *)dst,
-@@ -212,41 +277,72 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -212,41 +277,74 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
  		return ret;
  	}
  	default:
@@ -18930,13 +18781,14 @@ index 142810c..9d398f4 100644
 -extern long __copy_user_nocache(void *dst, const void __user *src,
 -				unsigned size, int zerorest);
 +extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
-+				unsigned long size, int zerorest) __size_overflow(3);
++				unsigned long size, int zerorest);
  
 -static inline int
 -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
-+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
++static inline unsigned long
++__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
  {
- 	might_sleep();
+ 	might_fault();
 +
 +	if (size > INT_MAX)
 +		return size;
@@ -18950,9 +18802,9 @@ index 142810c..9d398f4 100644
  }
  
 -static inline int
--__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
++static inline unsigned long
+ __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
 -				  unsigned size)
-+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
 +				  unsigned long size)
  {
 +	if (size > INT_MAX)
@@ -18966,9 +18818,8 @@ index 142810c..9d398f4 100644
  	return __copy_user_nocache(dst, src, size, 0);
  }
  
--unsigned long
+ unsigned long
 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
-+extern unsigned long
 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
  
  #endif /* _ASM_X86_UACCESS_64_H */
@@ -18986,7 +18837,7 @@ index 5b238981..77fdd78 100644
  
  #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
-index d8d9922..bf6cecb 100644
+index 828a156..650e625 100644
 --- a/arch/x86/include/asm/x86_init.h
 +++ b/arch/x86/include/asm/x86_init.h
 @@ -129,7 +129,7 @@ struct x86_init_ops {
@@ -19005,9 +18856,9 @@ index d8d9922..bf6cecb 100644
 -};
 +} __no_const;
  
- /**
-  * struct x86_platform_ops - platform specific runtime functions
-@@ -166,7 +166,7 @@ struct x86_platform_ops {
+ struct timespec;
+ 
+@@ -168,7 +168,7 @@ struct x86_platform_ops {
  	void (*save_sched_clock_state)(void);
  	void (*restore_sched_clock_state)(void);
  	void (*apic_post_init)(void);
@@ -19016,7 +18867,7 @@ index d8d9922..bf6cecb 100644
  
  struct pci_dev;
  struct msi_msg;
-@@ -180,7 +180,7 @@ struct x86_msi_ops {
+@@ -182,7 +182,7 @@ struct x86_msi_ops {
  	void (*teardown_msi_irqs)(struct pci_dev *dev);
  	void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
  	int  (*setup_hpet_msi)(unsigned int irq, unsigned int id);
@@ -19025,7 +18876,7 @@ index d8d9922..bf6cecb 100644
  
  struct IO_APIC_route_entry;
  struct io_apic_irq_attr;
-@@ -201,7 +201,7 @@ struct x86_io_apic_ops {
+@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
  				       unsigned int destination, int vector,
  				       struct io_apic_irq_attr *attr);
  	void		(*eoi_ioapic_pin)(int apic, int pin, int vector);
@@ -19034,6 +18885,19 @@ index d8d9922..bf6cecb 100644
  
  extern struct x86_init_ops x86_init;
  extern struct x86_cpuinit_ops x86_cpuinit;
+diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
+index b913915..4f5a581 100644
+--- a/arch/x86/include/asm/xen/page.h
++++ b/arch/x86/include/asm/xen/page.h
+@@ -56,7 +56,7 @@ extern int m2p_remove_override(struct page *page,
+ extern struct page *m2p_find_override(unsigned long mfn);
+ extern unsigned long m2p_find_override_pfn(unsigned long mfn, unsigned long pfn);
+ 
+-static inline unsigned long pfn_to_mfn(unsigned long pfn)
++static inline unsigned long __intentional_overflow(-1) pfn_to_mfn(unsigned long pfn)
+ {
+ 	unsigned long mfn;
+ 
 diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
 index 0415cda..3b22adc 100644
 --- a/arch/x86/include/asm/xsave.h
@@ -19098,10 +18962,10 @@ index bbae024..e1528f9 100644
  
  #define BIOS_ROM_BASE		0xffe00000
 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
-index 7bd3bd3..5dac791 100644
+index a5408b9..5133813 100644
 --- a/arch/x86/kernel/Makefile
 +++ b/arch/x86/kernel/Makefile
-@@ -22,7 +22,7 @@ obj-y			+= time.o ioport.o ldt.o dumpstack.o nmi.o
+@@ -24,7 +24,7 @@ obj-y			+= time.o ioport.o ldt.o dumpstack.o nmi.o
  obj-y			+= setup.o x86_init.o i8259.o irqinit.o jump_label.o
  obj-$(CONFIG_IRQ_WORK)  += irq_work.o
  obj-y			+= probe_roms.o
@@ -19111,10 +18975,10 @@ index 7bd3bd3..5dac791 100644
  obj-y			+= syscall_$(BITS).o
  obj-$(CONFIG_X86_64)	+= vsyscall_64.o
 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
-index 230c8ea..f915130 100644
+index 40c7660..f709f4b 100644
 --- a/arch/x86/kernel/acpi/boot.c
 +++ b/arch/x86/kernel/acpi/boot.c
-@@ -1361,7 +1361,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
+@@ -1365,7 +1365,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
   * If your system is blacklisted here, but you find that acpi=force
   * works for you, please contact linux-acpi@vger.kernel.org
   */
@@ -19123,7 +18987,7 @@ index 230c8ea..f915130 100644
  	/*
  	 * Boxes that need ACPI disabled
  	 */
-@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
+@@ -1440,7 +1440,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
  };
  
  /* second table for DMI checks that should run after early-quirks */
@@ -19133,10 +18997,10 @@ index 230c8ea..f915130 100644
  	 * HP laptops which use a DSDT reporting as HP/SB400/10000,
  	 * which includes some code which overrides all temperature
 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
-index ec94e11..7fbbec0 100644
+index 3312010..a65ca7b 100644
 --- a/arch/x86/kernel/acpi/sleep.c
 +++ b/arch/x86/kernel/acpi/sleep.c
-@@ -88,8 +88,12 @@ int acpi_suspend_lowlevel(void)
+@@ -88,8 +88,12 @@ int x86_acpi_suspend_lowlevel(void)
  #else /* CONFIG_64BIT */
  #ifdef CONFIG_SMP
  	stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
@@ -19170,10 +19034,10 @@ index d1daa66..59fecba 100644
  bogus_magic:
  	jmp	bogus_magic
 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
-index c15cf9a..0e63558 100644
+index 15e8563..323cbe1 100644
 --- a/arch/x86/kernel/alternative.c
 +++ b/arch/x86/kernel/alternative.c
-@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
+@@ -269,6 +269,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
  	 */
  	for (a = start; a < end; a++) {
  		instr = (u8 *)&a->instr_offset + a->instr_offset;
@@ -19187,7 +19051,7 @@ index c15cf9a..0e63558 100644
  		replacement = (u8 *)&a->repl_offset + a->repl_offset;
  		BUG_ON(a->replacementlen > a->instrlen);
  		BUG_ON(a->instrlen > sizeof(insnbuf));
-@@ -299,10 +306,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
+@@ -300,10 +307,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
  	for (poff = start; poff < end; poff++) {
  		u8 *ptr = (u8 *)poff + *poff;
  
@@ -19205,7 +19069,7 @@ index c15cf9a..0e63558 100644
  			text_poke(ptr, ((unsigned char []){0xf0}), 1);
  	}
  	mutex_unlock(&text_mutex);
-@@ -317,10 +330,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
+@@ -318,10 +331,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
  	for (poff = start; poff < end; poff++) {
  		u8 *ptr = (u8 *)poff + *poff;
  
@@ -19223,7 +19087,7 @@ index c15cf9a..0e63558 100644
  			text_poke(ptr, ((unsigned char []){0x3E}), 1);
  	}
  	mutex_unlock(&text_mutex);
-@@ -468,7 +487,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
+@@ -469,7 +488,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 */
@@ -19232,7 +19096,7 @@ index c15cf9a..0e63558 100644
  		used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
  					 (unsigned long)p->instr, p->len);
  
-@@ -515,7 +534,7 @@ void __init alternative_instructions(void)
+@@ -516,7 +535,7 @@ void __init alternative_instructions(void)
  	if (!uniproc_patched || num_possible_cpus() == 1)
  		free_init_pages("SMP alternatives",
  				(unsigned long)__smp_locks,
@@ -19241,7 +19105,7 @@ index c15cf9a..0e63558 100644
  #endif
  
  	apply_paravirt(__parainstructions, __parainstructions_end);
-@@ -535,13 +554,17 @@ void __init alternative_instructions(void)
+@@ -536,13 +555,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.
   */
@@ -19261,7 +19125,7 @@ index c15cf9a..0e63558 100644
  	local_irq_restore(flags);
  	/* Could also do a CLFLUSH here to speed up CPU recovery; but
  	   that causes hangs on some VIA CPUs. */
-@@ -563,36 +586,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
+@@ -564,36 +587,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
   */
  void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
  {
@@ -19306,11 +19170,29 @@ index c15cf9a..0e63558 100644
  	return addr;
  }
  
+@@ -613,7 +622,7 @@ int poke_int3_handler(struct pt_regs *regs)
+ 	if (likely(!bp_patching_in_progress))
+ 		return 0;
+ 
+-	if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
++	if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
+ 		return 0;
+ 
+ 	/* set up the specified breakpoint handler */
+@@ -647,7 +656,7 @@ int poke_int3_handler(struct pt_regs *regs)
+  */
+ void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
+ {
+-	unsigned char int3 = 0xcc;
++	const unsigned char int3 = 0xcc;
+ 
+ 	bp_int3_handler = handler;
+ 	bp_int3_addr = (u8 *)addr + sizeof(int3);
 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
-index 904611b..004dde6 100644
+index a7eb82d..f6e52d4 100644
 --- a/arch/x86/kernel/apic/apic.c
 +++ b/arch/x86/kernel/apic/apic.c
-@@ -189,7 +189,7 @@ int first_system_vector = 0xfe;
+@@ -190,7 +190,7 @@ int first_system_vector = 0xfe;
  /*
   * Debug level, exported for io_apic.c
   */
@@ -19319,7 +19201,7 @@ index 904611b..004dde6 100644
  
  int pic_mode;
  
-@@ -1955,7 +1955,7 @@ void smp_error_interrupt(struct pt_regs *regs)
+@@ -1985,7 +1985,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
  	apic_write(APIC_ESR, 0);
  	v1 = apic_read(APIC_ESR);
  	ack_APIC_irq();
@@ -19377,7 +19259,7 @@ index d50e364..543bee3 100644
  	.name				= "bigsmp",
  	.probe				= probe_bigsmp,
 diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
-index 0874799..a7a7892 100644
+index c552247..587a316 100644
 --- a/arch/x86/kernel/apic/es7000_32.c
 +++ b/arch/x86/kernel/apic/es7000_32.c
 @@ -608,8 +608,7 @@ static int es7000_mps_oem_check_cluster(struct mpc_table *mpc, char *oem,
@@ -19400,7 +19282,7 @@ index 0874799..a7a7892 100644
  	.name				= "es7000",
  	.probe				= probe_es7000,
 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 9ed796c..e930fe4 100644
+index e63a5bd..c0babf8 100644
 --- a/arch/x86/kernel/apic/io_apic.c
 +++ b/arch/x86/kernel/apic/io_apic.c
 @@ -1060,7 +1060,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
@@ -19421,7 +19303,7 @@ index 9ed796c..e930fe4 100644
  {
  	raw_spin_unlock(&vector_lock);
  }
-@@ -2362,7 +2362,7 @@ static void ack_apic_edge(struct irq_data *data)
+@@ -2367,7 +2367,7 @@ static void ack_apic_edge(struct irq_data *data)
  	ack_APIC_irq();
  }
  
@@ -19430,7 +19312,7 @@ index 9ed796c..e930fe4 100644
  
  #ifdef CONFIG_GENERIC_PENDING_IRQ
  static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
-@@ -2503,7 +2503,7 @@ static void ack_apic_level(struct irq_data *data)
+@@ -2508,7 +2508,7 @@ static void ack_apic_level(struct irq_data *data)
  	 * at the cpu.
  	 */
  	if (!(v & (1 << (i & 0x1f)))) {
@@ -19440,7 +19322,7 @@ index 9ed796c..e930fe4 100644
  		eoi_ioapic_irq(irq, cfg);
  	}
 diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
-index d661ee9..791fd33 100644
+index 1e42e8f..daacf44 100644
 --- a/arch/x86/kernel/apic/numaq_32.c
 +++ b/arch/x86/kernel/apic/numaq_32.c
 @@ -455,8 +455,7 @@ static void numaq_setup_portio_remap(void)
@@ -19480,7 +19362,7 @@ index 77c95c0..434f8a4 100644
  	.name				= "summit",
  	.probe				= probe_summit,
 diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
-index c88baa4..757aee1 100644
+index 140e29d..d88bc95 100644
 --- a/arch/x86/kernel/apic/x2apic_cluster.c
 +++ b/arch/x86/kernel/apic/x2apic_cluster.c
 @@ -183,7 +183,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
@@ -19515,10 +19397,10 @@ index 562a76d..a003c0f 100644
  	.name				= "physical x2apic",
  	.probe				= x2apic_phys_probe,
 diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
-index b32dbb4..6d66648 100644
+index a419814..1dd34a0 100644
 --- a/arch/x86/kernel/apic/x2apic_uv_x.c
 +++ b/arch/x86/kernel/apic/x2apic_uv_x.c
-@@ -342,7 +342,7 @@ static int uv_probe(void)
+@@ -357,7 +357,7 @@ static int uv_probe(void)
  	return apic == &apic_x2apic_uv_x;
  }
  
@@ -19528,7 +19410,7 @@ index b32dbb4..6d66648 100644
  	.name				= "UV large system",
  	.probe				= uv_probe,
 diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
-index 53a4e27..038760a 100644
+index 3ab0343..814c4787 100644
 --- a/arch/x86/kernel/apm_32.c
 +++ b/arch/x86/kernel/apm_32.c
 @@ -433,7 +433,7 @@ static DEFINE_MUTEX(apm_mutex);
@@ -19622,16 +19504,16 @@ index 2861082..6d4718e 100644
 +
 +#ifdef CONFIG_PAX_KERNEXEC
 +	OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
-+#endif
-+
+ #endif
+ 
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
 +	OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
 +#ifdef CONFIG_X86_64
 +	OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
 +#endif
- #endif
- 
++#endif
++
 +#endif
 +
 +	BLANK();
@@ -19655,7 +19537,7 @@ index e7c798b..2b2019b 100644
  	BLANK();
  
 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
-index b0684e4..22ccfd7 100644
+index 47b56a7..efc2bc6 100644
 --- a/arch/x86/kernel/cpu/Makefile
 +++ b/arch/x86/kernel/cpu/Makefile
 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
@@ -19670,11 +19552,11 @@ index b0684e4..22ccfd7 100644
  obj-y			+= proc.o capflags.o powerflags.o common.o
  obj-y			+= rdrand.o
 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index 5013a48..0782c53 100644
+index 903a264..fc955f3 100644
 --- a/arch/x86/kernel/cpu/amd.c
 +++ b/arch/x86/kernel/cpu/amd.c
-@@ -744,7 +744,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
- 							unsigned int size)
+@@ -743,7 +743,7 @@ static void init_amd(struct cpuinfo_x86 *c)
+ static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
  {
  	/* AMD errata T13 (order #21922) */
 -	if ((c->x86 == 6)) {
@@ -19683,12 +19565,12 @@ index 5013a48..0782c53 100644
  		if (c->x86_model == 3 && c->x86_mask == 0)
  			size = 64;
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 22018f7..df77e23 100644
+index 2793d1f..b4f313a 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -88,60 +88,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
+@@ -88,60 +88,6 @@ static const struct cpu_dev default_cpu = {
  
- static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
+ static const struct cpu_dev *this_cpu = &default_cpu;
  
 -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
 -#ifdef CONFIG_X86_64
@@ -19747,7 +19629,7 @@ index 22018f7..df77e23 100644
  static int __init x86_xsave_setup(char *s)
  {
  	setup_clear_cpu_cap(X86_FEATURE_XSAVE);
-@@ -288,6 +234,57 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
+@@ -288,6 +234,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
  		set_in_cr4(X86_CR4_SMAP);
  }
  
@@ -19755,6 +19637,7 @@ index 22018f7..df77e23 100644
 +static __init int setup_disable_pcid(char *arg)
 +{
 +	setup_clear_cpu_cap(X86_FEATURE_PCID);
++	setup_clear_cpu_cap(X86_FEATURE_INVPCID);
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	if (clone_pgd_mask != ~(pgdval_t)0UL)
@@ -19768,6 +19651,7 @@ index 22018f7..df77e23 100644
 +static void setup_pcid(struct cpuinfo_x86 *c)
 +{
 +	if (!cpu_has(c, X86_FEATURE_PCID)) {
++		clear_cpu_cap(c, X86_FEATURE_INVPCID);
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +		if (clone_pgd_mask != ~(pgdval_t)0UL) {
@@ -19805,7 +19689,7 @@ index 22018f7..df77e23 100644
  /*
   * Some CPU features depend on higher CPUID levels, which may not always
   * be available due to CPUID level capping or broken virtualization
-@@ -386,7 +383,7 @@ void switch_to_new_gdt(int cpu)
+@@ -386,7 +385,7 @@ void switch_to_new_gdt(int cpu)
  {
  	struct desc_ptr gdt_descr;
  
@@ -19814,7 +19698,7 @@ index 22018f7..df77e23 100644
  	gdt_descr.size = GDT_SIZE - 1;
  	load_gdt(&gdt_descr);
  	/* Reload the per-cpu base */
-@@ -874,6 +871,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -875,6 +874,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
  	setup_smep(c);
  	setup_smap(c);
  
@@ -19825,7 +19709,7 @@ index 22018f7..df77e23 100644
  	/*
  	 * The vendor-specific functions might have changed features.
  	 * Now we do "generic changes."
-@@ -882,6 +883,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -883,6 +886,10 @@ static void identify_cpu(struct cpuinfo_x86 *c)
  	/* Filter out anything that depends on CPUID levels we don't have */
  	filter_cpuid_features(c, true);
  
@@ -19836,7 +19720,7 @@ index 22018f7..df77e23 100644
  	/* If the model name is still unset, do table lookup. */
  	if (!c->x86_model_id[0]) {
  		const char *p;
-@@ -1069,10 +1074,12 @@ static __init int setup_disablecpuid(char *arg)
+@@ -1070,10 +1077,12 @@ static __init int setup_disablecpuid(char *arg)
  }
  __setup("clearcpuid=", setup_disablecpuid);
  
@@ -19844,14 +19728,15 @@ index 22018f7..df77e23 100644
 +EXPORT_PER_CPU_SYMBOL(current_tinfo);
 +
  #ifdef CONFIG_X86_64
- struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
--struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1,
--				    (unsigned long) nmi_idt_table };
-+struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) nmi_idt_table };
+-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
+-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
+-				    (unsigned long) debug_idt_table };
++struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
++const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
  
  DEFINE_PER_CPU_FIRST(union irq_stack_union,
- 		     irq_stack_union) __aligned(PAGE_SIZE);
-@@ -1086,7 +1093,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
+ 		     irq_stack_union) __aligned(PAGE_SIZE) __visible;
+@@ -1087,7 +1096,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
  EXPORT_PER_CPU_SYMBOL(current_task);
  
  DEFINE_PER_CPU(unsigned long, kernel_stack) =
@@ -19860,7 +19745,7 @@ index 22018f7..df77e23 100644
  EXPORT_PER_CPU_SYMBOL(kernel_stack);
  
  DEFINE_PER_CPU(char *, irq_stack_ptr) =
-@@ -1231,7 +1238,7 @@ void __cpuinit cpu_init(void)
+@@ -1232,7 +1241,7 @@ void cpu_init(void)
  	load_ucode_ap();
  
  	cpu = stack_smp_processor_id();
@@ -19869,16 +19754,7 @@ index 22018f7..df77e23 100644
  	oist = &per_cpu(orig_ist, cpu);
  
  #ifdef CONFIG_NUMA
-@@ -1257,7 +1264,7 @@ void __cpuinit cpu_init(void)
- 	switch_to_new_gdt(cpu);
- 	loadsegment(fs, 0);
- 
--	load_idt((const struct desc_ptr *)&idt_descr);
-+	load_idt(&idt_descr);
- 
- 	memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
- 	syscall_init();
-@@ -1266,7 +1273,6 @@ void __cpuinit cpu_init(void)
+@@ -1267,7 +1276,6 @@ void cpu_init(void)
  	wrmsrl(MSR_KERNEL_GS_BASE, 0);
  	barrier();
  
@@ -19886,7 +19762,7 @@ index 22018f7..df77e23 100644
  	enable_x2apic();
  
  	/*
-@@ -1318,7 +1324,7 @@ void __cpuinit cpu_init(void)
+@@ -1319,7 +1327,7 @@ void cpu_init(void)
  {
  	int cpu = smp_processor_id();
  	struct task_struct *curr = current;
@@ -19896,10 +19772,10 @@ index 22018f7..df77e23 100644
  
  	show_ucode_info_early();
 diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
-index 7c6f7d5..8cac382 100644
+index 1414c90..1159406 100644
 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
 +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
-@@ -1017,6 +1017,22 @@ static struct attribute *default_attrs[] = {
+@@ -1014,6 +1014,22 @@ static struct attribute *default_attrs[] = {
  };
  
  #ifdef CONFIG_AMD_NB
@@ -19919,10 +19795,10 @@ index 7c6f7d5..8cac382 100644
 +	NULL
 +};
 +
- static struct attribute ** __cpuinit amd_l3_attrs(void)
+ static struct attribute **amd_l3_attrs(void)
  {
  	static struct attribute **attrs;
-@@ -1027,18 +1043,7 @@ static struct attribute ** __cpuinit amd_l3_attrs(void)
+@@ -1024,18 +1040,7 @@ static struct attribute **amd_l3_attrs(void)
  
  	n = ARRAY_SIZE(default_attrs);
  
@@ -19942,7 +19818,7 @@ index 7c6f7d5..8cac382 100644
  
  	if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
  		attrs[n++] = &cache_disable_0.attr;
-@@ -1089,6 +1094,13 @@ static struct kobj_type ktype_cache = {
+@@ -1086,6 +1091,13 @@ static struct kobj_type ktype_cache = {
  	.default_attrs	= default_attrs,
  };
  
@@ -19956,7 +19832,7 @@ index 7c6f7d5..8cac382 100644
  static struct kobj_type ktype_percpu_entry = {
  	.sysfs_ops	= &sysfs_ops,
  };
-@@ -1154,20 +1166,26 @@ static int __cpuinit cache_add_dev(struct device *dev)
+@@ -1151,20 +1163,26 @@ static int cache_add_dev(struct device *dev)
  		return retval;
  	}
  
@@ -19986,17 +19862,8 @@ index 7c6f7d5..8cac382 100644
  					      per_cpu(ici_cache_kobject, cpu),
  					      "index%1lu", i);
  		if (unlikely(retval)) {
-@@ -1222,7 +1240,7 @@ static int __cpuinit cacheinfo_cpu_callback(struct notifier_block *nfb,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata cacheinfo_cpu_notifier = {
-+static struct notifier_block cacheinfo_cpu_notifier = {
- 	.notifier_call = cacheinfo_cpu_callback,
- };
- 
 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index 9239504..b2471ce 100644
+index b3218cd..99a75de 100644
 --- a/arch/x86/kernel/cpu/mcheck/mce.c
 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
 @@ -45,6 +45,7 @@
@@ -20007,7 +19874,7 @@ index 9239504..b2471ce 100644
  
  #include "mce-internal.h"
  
-@@ -246,7 +247,7 @@ static void print_mce(struct mce *m)
+@@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
  			!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
  				m->cs, m->ip);
  
@@ -20016,7 +19883,7 @@ index 9239504..b2471ce 100644
  			print_symbol("{%s}", m->ip);
  		pr_cont("\n");
  	}
-@@ -279,10 +280,10 @@ static void print_mce(struct mce *m)
+@@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
  
  #define PANIC_TIMEOUT 5 /* 5 seconds */
  
@@ -20029,7 +19896,7 @@ index 9239504..b2471ce 100644
  
  /* Panic in progress. Enable interrupts and wait for final IPI */
  static void wait_for_panic(void)
-@@ -306,7 +307,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -318,7 +319,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
  		/*
  		 * Make sure only one CPU runs in machine check panic
  		 */
@@ -20038,7 +19905,7 @@ index 9239504..b2471ce 100644
  			wait_for_panic();
  		barrier();
  
-@@ -314,7 +315,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -326,7 +327,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
  		console_verbose();
  	} else {
  		/* Don't log too much for fake panic */
@@ -20047,7 +19914,7 @@ index 9239504..b2471ce 100644
  			return;
  	}
  	/* First print corrected ones that are still unlogged */
-@@ -353,7 +354,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -365,7 +366,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
  	if (!fake_panic) {
  		if (panic_timeout == 0)
  			panic_timeout = mca_cfg.panic_timeout;
@@ -20056,7 +19923,7 @@ index 9239504..b2471ce 100644
  	} else
  		pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
  }
-@@ -683,7 +684,7 @@ static int mce_timed_out(u64 *t)
+@@ -695,7 +696,7 @@ static int mce_timed_out(u64 *t)
  	 * might have been modified by someone else.
  	 */
  	rmb();
@@ -20065,7 +19932,7 @@ index 9239504..b2471ce 100644
  		wait_for_panic();
  	if (!mca_cfg.monarch_timeout)
  		goto out;
-@@ -1654,7 +1655,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
+@@ -1666,7 +1667,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
  }
  
  /* Call the installed machine check handler for this CPU setup. */
@@ -20074,7 +19941,7 @@ index 9239504..b2471ce 100644
  						unexpected_machine_check;
  
  /*
-@@ -1677,7 +1678,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1689,7 +1690,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
  		return;
  	}
  
@@ -20084,7 +19951,7 @@ index 9239504..b2471ce 100644
  
  	__mcheck_cpu_init_generic();
  	__mcheck_cpu_init_vendor(c);
-@@ -1691,7 +1694,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1703,7 +1706,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
   */
  
  static DEFINE_SPINLOCK(mce_chrdev_state_lock);
@@ -20093,7 +19960,7 @@ index 9239504..b2471ce 100644
  static int mce_chrdev_open_exclu;	/* already open exclusive? */
  
  static int mce_chrdev_open(struct inode *inode, struct file *file)
-@@ -1699,7 +1702,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1711,7 +1714,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
  	spin_lock(&mce_chrdev_state_lock);
  
  	if (mce_chrdev_open_exclu ||
@@ -20102,7 +19969,7 @@ index 9239504..b2471ce 100644
  		spin_unlock(&mce_chrdev_state_lock);
  
  		return -EBUSY;
-@@ -1707,7 +1710,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1719,7 +1722,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
  
  	if (file->f_flags & O_EXCL)
  		mce_chrdev_open_exclu = 1;
@@ -20111,7 +19978,7 @@ index 9239504..b2471ce 100644
  
  	spin_unlock(&mce_chrdev_state_lock);
  
-@@ -1718,7 +1721,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
+@@ -1730,7 +1733,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
  {
  	spin_lock(&mce_chrdev_state_lock);
  
@@ -20120,16 +19987,7 @@ index 9239504..b2471ce 100644
  	mce_chrdev_open_exclu = 0;
  
  	spin_unlock(&mce_chrdev_state_lock);
-@@ -2364,7 +2367,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block mce_cpu_notifier __cpuinitdata = {
-+static struct notifier_block mce_cpu_notifier = {
- 	.notifier_call = mce_cpu_callback,
- };
- 
-@@ -2374,7 +2377,7 @@ static __init void mce_init_banks(void)
+@@ -2404,7 +2407,7 @@ static __init void mce_init_banks(void)
  
  	for (i = 0; i < mca_cfg.banks; i++) {
  		struct mce_bank *b = &mce_banks[i];
@@ -20138,7 +19996,7 @@ index 9239504..b2471ce 100644
  
  		sysfs_attr_init(&a->attr);
  		a->attr.name	= b->attrname;
-@@ -2442,7 +2445,7 @@ struct dentry *mce_get_debugfs_dir(void)
+@@ -2472,7 +2475,7 @@ struct dentry *mce_get_debugfs_dir(void)
  static void mce_reset(void)
  {
  	cpu_missing = 0;
@@ -20169,19 +20027,6 @@ index 1c044b1..37a2a43 100644
  	/* Make sure the vector pointer is visible before we enable MCEs: */
  	wmb();
  
-diff --git a/arch/x86/kernel/cpu/mcheck/therm_throt.c b/arch/x86/kernel/cpu/mcheck/therm_throt.c
-index 47a1870..8c019a7 100644
---- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
-+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
-@@ -288,7 +288,7 @@ thermal_throttle_cpu_callback(struct notifier_block *nfb,
- 	return notifier_from_errno(err);
- }
- 
--static struct notifier_block thermal_throttle_cpu_notifier __cpuinitdata =
-+static struct notifier_block thermal_throttle_cpu_notifier =
- {
- 	.notifier_call = thermal_throttle_cpu_callback,
- };
 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
 index e9a701a..35317d6 100644
 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
@@ -20205,10 +20050,10 @@ index e9a701a..35317d6 100644
  	wmb();
  
 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
-index ca22b73..9987afe 100644
+index f961de9..8a9d332 100644
 --- a/arch/x86/kernel/cpu/mtrr/main.c
 +++ b/arch/x86/kernel/cpu/mtrr/main.c
-@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
+@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
  
@@ -20231,10 +20076,10 @@ index df5e41f..816c719 100644
  extern int generic_get_free_region(unsigned long base, unsigned long size,
  				   int replace_reg);
 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
-index 1025f3c..824f677 100644
+index 8a87a32..682a22a 100644
 --- a/arch/x86/kernel/cpu/perf_event.c
 +++ b/arch/x86/kernel/cpu/perf_event.c
-@@ -1311,7 +1311,7 @@ static void __init pmu_check_apic(void)
+@@ -1348,7 +1348,7 @@ static void __init pmu_check_apic(void)
  	pr_info("no hardware sampling interrupt available.\n");
  }
  
@@ -20243,7 +20088,7 @@ index 1025f3c..824f677 100644
  	.name = "format",
  	.attrs = NULL,
  };
-@@ -1410,7 +1410,7 @@ static struct attribute *events_attr[] = {
+@@ -1447,7 +1447,7 @@ static struct attribute *events_attr[] = {
  	NULL,
  };
  
@@ -20252,7 +20097,7 @@ index 1025f3c..824f677 100644
  	.name = "events",
  	.attrs = events_attr,
  };
-@@ -1920,7 +1920,7 @@ static unsigned long get_segment_base(unsigned int segment)
+@@ -1958,7 +1958,7 @@ static unsigned long get_segment_base(unsigned int segment)
  		if (idx > GDT_ENTRIES)
  			return 0;
  
@@ -20261,7 +20106,7 @@ index 1025f3c..824f677 100644
  	}
  
  	return get_desc_base(desc + idx);
-@@ -2010,7 +2010,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
+@@ -2048,7 +2048,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
  			break;
  
  		perf_callchain_store(entry, frame.return_address);
@@ -20270,11 +20115,24 @@ index 1025f3c..824f677 100644
  	}
  }
  
+diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
+index 639d128..e92d7e5 100644
+--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
++++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
+@@ -405,7 +405,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
+ static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
+ {
+ 	struct attribute **attrs;
+-	struct attribute_group *attr_group;
++	attribute_group_no_const *attr_group;
+ 	int i = 0, j;
+ 
+ 	while (amd_iommu_v2_event_descs[i].attr.attr.name)
 diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
-index a9e2207..d70c83a 100644
+index f31a165..7b46cd8 100644
 --- a/arch/x86/kernel/cpu/perf_event_intel.c
 +++ b/arch/x86/kernel/cpu/perf_event_intel.c
-@@ -2022,10 +2022,10 @@ __init int intel_pmu_init(void)
+@@ -2247,10 +2247,10 @@ __init int intel_pmu_init(void)
  	 * v2 and above have a perf capabilities MSR
  	 */
  	if (version > 1) {
@@ -20289,10 +20147,10 @@ index a9e2207..d70c83a 100644
  
  	intel_ds_init();
 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
-index 8aac56b..588fb13 100644
+index 4118f9f..f91d0ab 100644
 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
-@@ -3093,7 +3093,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
+@@ -3204,7 +3204,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
  static int __init uncore_type_init(struct intel_uncore_type *type)
  {
  	struct intel_uncore_pmu *pmus;
@@ -20301,20 +20159,11 @@ index 8aac56b..588fb13 100644
  	struct attribute **attrs;
  	int i, j;
  
-@@ -3518,7 +3518,7 @@ static int
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block uncore_cpu_nb __cpuinitdata = {
-+static struct notifier_block uncore_cpu_nb = {
- 	.notifier_call	= uncore_cpu_notifier,
- 	/*
- 	 * to migrate uncore events, our notifier should be executed
 diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
-index f952891..4722ad4 100644
+index a80ab71..4089da5 100644
 --- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
 +++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
-@@ -488,7 +488,7 @@ struct intel_uncore_box {
+@@ -498,7 +498,7 @@ struct intel_uncore_box {
  struct uncore_event_desc {
  	struct kobj_attribute attr;
  	const char *config;
@@ -20324,10 +20173,10 @@ index f952891..4722ad4 100644
  #define INTEL_UNCORE_EVENT_DESC(_name, _config)			\
  {								\
 diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
-index 1e4dbcf..b9a34c2 100644
+index 7d9481c..99c7e4b 100644
 --- a/arch/x86/kernel/cpuid.c
 +++ b/arch/x86/kernel/cpuid.c
-@@ -171,7 +171,7 @@ static int __cpuinit cpuid_class_cpu_callback(struct notifier_block *nfb,
+@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
  	return notifier_from_errno(err);
  }
  
@@ -20337,7 +20186,7 @@ index 1e4dbcf..b9a34c2 100644
  	.notifier_call = cpuid_class_cpu_callback,
  };
 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
-index 74467fe..18793d5 100644
+index 18677a9..f67c45b 100644
 --- a/arch/x86/kernel/crash.c
 +++ b/arch/x86/kernel/crash.c
 @@ -58,10 +58,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
@@ -20365,11 +20214,11 @@ index afa64ad..dce67dd 100644
  			iounmap(vaddr);
  			return -EFAULT;
  		}
-diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
-index 155a13f..1672b9b 100644
---- a/arch/x86/kernel/doublefault_32.c
-+++ b/arch/x86/kernel/doublefault_32.c
-@@ -11,7 +11,7 @@
+diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
+index 5d3fe8d..02e1429 100644
+--- a/arch/x86/kernel/doublefault.c
++++ b/arch/x86/kernel/doublefault.c
+@@ -13,7 +13,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
  static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
@@ -20378,7 +20227,7 @@ index 155a13f..1672b9b 100644
  
  #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
  
-@@ -21,7 +21,7 @@ static void doublefault_fn(void)
+@@ -23,7 +23,7 @@ static void doublefault_fn(void)
  	unsigned long gdt, tss;
  
  	native_store_gdt(&gdt_desc);
@@ -20387,7 +20236,7 @@ index 155a13f..1672b9b 100644
  
  	printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
  
-@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
+@@ -60,10 +60,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
  		/* 0x2 bit is always set */
  		.flags		= X86_EFLAGS_SF | 0x2,
  		.sp		= STACK_START,
@@ -20788,7 +20637,7 @@ index d15f575..d692043 100644
  #include <asm/processor.h>
  #include <asm/fcntl.h>
 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
-index 8f3e2de..6b71e39 100644
+index f0dcb0c..9f39b80 100644
 --- a/arch/x86/kernel/entry_32.S
 +++ b/arch/x86/kernel/entry_32.S
 @@ -177,13 +177,153 @@
@@ -21289,7 +21138,7 @@ index 8f3e2de..6b71e39 100644
  
  .previous
  END(interrupt)
-@@ -813,7 +1052,7 @@ ENTRY(coprocessor_error)
+@@ -823,7 +1062,7 @@ ENTRY(coprocessor_error)
  	pushl_cfi $do_coprocessor_error
  	jmp error_code
  	CFI_ENDPROC
@@ -21298,7 +21147,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(simd_coprocessor_error)
  	RING0_INT_FRAME
-@@ -826,7 +1065,7 @@ ENTRY(simd_coprocessor_error)
+@@ -836,7 +1075,7 @@ ENTRY(simd_coprocessor_error)
  .section .altinstructions,"a"
  	altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
  .previous
@@ -21307,7 +21156,7 @@ index 8f3e2de..6b71e39 100644
  663:	pushl $do_simd_coprocessor_error
  664:
  .previous
-@@ -835,7 +1074,7 @@ ENTRY(simd_coprocessor_error)
+@@ -845,7 +1084,7 @@ ENTRY(simd_coprocessor_error)
  #endif
  	jmp error_code
  	CFI_ENDPROC
@@ -21316,7 +21165,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(device_not_available)
  	RING0_INT_FRAME
-@@ -844,18 +1083,18 @@ ENTRY(device_not_available)
+@@ -854,18 +1093,18 @@ ENTRY(device_not_available)
  	pushl_cfi $do_device_not_available
  	jmp error_code
  	CFI_ENDPROC
@@ -21338,7 +21187,7 @@ index 8f3e2de..6b71e39 100644
  #endif
  
  ENTRY(overflow)
-@@ -865,7 +1104,7 @@ ENTRY(overflow)
+@@ -875,7 +1114,7 @@ ENTRY(overflow)
  	pushl_cfi $do_overflow
  	jmp error_code
  	CFI_ENDPROC
@@ -21347,7 +21196,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(bounds)
  	RING0_INT_FRAME
-@@ -874,7 +1113,7 @@ ENTRY(bounds)
+@@ -884,7 +1123,7 @@ ENTRY(bounds)
  	pushl_cfi $do_bounds
  	jmp error_code
  	CFI_ENDPROC
@@ -21356,7 +21205,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(invalid_op)
  	RING0_INT_FRAME
-@@ -883,7 +1122,7 @@ ENTRY(invalid_op)
+@@ -893,7 +1132,7 @@ ENTRY(invalid_op)
  	pushl_cfi $do_invalid_op
  	jmp error_code
  	CFI_ENDPROC
@@ -21365,7 +21214,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(coprocessor_segment_overrun)
  	RING0_INT_FRAME
-@@ -892,7 +1131,7 @@ ENTRY(coprocessor_segment_overrun)
+@@ -902,7 +1141,7 @@ ENTRY(coprocessor_segment_overrun)
  	pushl_cfi $do_coprocessor_segment_overrun
  	jmp error_code
  	CFI_ENDPROC
@@ -21374,7 +21223,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(invalid_TSS)
  	RING0_EC_FRAME
-@@ -900,7 +1139,7 @@ ENTRY(invalid_TSS)
+@@ -910,7 +1149,7 @@ ENTRY(invalid_TSS)
  	pushl_cfi $do_invalid_TSS
  	jmp error_code
  	CFI_ENDPROC
@@ -21383,7 +21232,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(segment_not_present)
  	RING0_EC_FRAME
-@@ -908,7 +1147,7 @@ ENTRY(segment_not_present)
+@@ -918,7 +1157,7 @@ ENTRY(segment_not_present)
  	pushl_cfi $do_segment_not_present
  	jmp error_code
  	CFI_ENDPROC
@@ -21392,7 +21241,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(stack_segment)
  	RING0_EC_FRAME
-@@ -916,7 +1155,7 @@ ENTRY(stack_segment)
+@@ -926,7 +1165,7 @@ ENTRY(stack_segment)
  	pushl_cfi $do_stack_segment
  	jmp error_code
  	CFI_ENDPROC
@@ -21401,7 +21250,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(alignment_check)
  	RING0_EC_FRAME
-@@ -924,7 +1163,7 @@ ENTRY(alignment_check)
+@@ -934,7 +1173,7 @@ ENTRY(alignment_check)
  	pushl_cfi $do_alignment_check
  	jmp error_code
  	CFI_ENDPROC
@@ -21410,7 +21259,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(divide_error)
  	RING0_INT_FRAME
-@@ -933,7 +1172,7 @@ ENTRY(divide_error)
+@@ -943,7 +1182,7 @@ ENTRY(divide_error)
  	pushl_cfi $do_divide_error
  	jmp error_code
  	CFI_ENDPROC
@@ -21419,7 +21268,7 @@ index 8f3e2de..6b71e39 100644
  
  #ifdef CONFIG_X86_MCE
  ENTRY(machine_check)
-@@ -943,7 +1182,7 @@ ENTRY(machine_check)
+@@ -953,7 +1192,7 @@ ENTRY(machine_check)
  	pushl_cfi machine_check_vector
  	jmp error_code
  	CFI_ENDPROC
@@ -21428,7 +21277,7 @@ index 8f3e2de..6b71e39 100644
  #endif
  
  ENTRY(spurious_interrupt_bug)
-@@ -953,7 +1192,7 @@ ENTRY(spurious_interrupt_bug)
+@@ -963,7 +1202,7 @@ ENTRY(spurious_interrupt_bug)
  	pushl_cfi $do_spurious_interrupt_bug
  	jmp error_code
  	CFI_ENDPROC
@@ -21437,7 +21286,7 @@ index 8f3e2de..6b71e39 100644
  /*
   * End of kprobes section
   */
-@@ -1063,7 +1302,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
+@@ -1073,7 +1312,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
  
  ENTRY(mcount)
  	ret
@@ -21446,7 +21295,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(ftrace_caller)
  	cmpl $0, function_trace_stop
-@@ -1096,7 +1335,7 @@ ftrace_graph_call:
+@@ -1106,7 +1345,7 @@ ftrace_graph_call:
  .globl ftrace_stub
  ftrace_stub:
  	ret
@@ -21455,7 +21304,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(ftrace_regs_caller)
  	pushf	/* push flags before compare (in cs location) */
-@@ -1197,7 +1436,7 @@ trace:
+@@ -1210,7 +1449,7 @@ trace:
  	popl %ecx
  	popl %eax
  	jmp ftrace_stub
@@ -21464,7 +21313,7 @@ index 8f3e2de..6b71e39 100644
  #endif /* CONFIG_DYNAMIC_FTRACE */
  #endif /* CONFIG_FUNCTION_TRACER */
  
-@@ -1215,7 +1454,7 @@ ENTRY(ftrace_graph_caller)
+@@ -1228,7 +1467,7 @@ ENTRY(ftrace_graph_caller)
  	popl %ecx
  	popl %eax
  	ret
@@ -21473,7 +21322,7 @@ index 8f3e2de..6b71e39 100644
  
  .globl return_to_handler
  return_to_handler:
-@@ -1271,15 +1510,18 @@ error_code:
+@@ -1284,15 +1523,18 @@ error_code:
  	movl $-1, PT_ORIG_EAX(%esp)	# no syscall to restart
  	REG_TO_PTGS %ecx
  	SET_KERNEL_GS %ecx
@@ -21494,7 +21343,7 @@ index 8f3e2de..6b71e39 100644
  
  /*
   * Debug traps and NMI can happen at the one SYSENTER instruction
-@@ -1322,7 +1564,7 @@ debug_stack_correct:
+@@ -1335,7 +1577,7 @@ debug_stack_correct:
  	call do_debug
  	jmp ret_from_exception
  	CFI_ENDPROC
@@ -21503,7 +21352,7 @@ index 8f3e2de..6b71e39 100644
  
  /*
   * NMI is doubly nasty. It can happen _while_ we're handling
-@@ -1360,6 +1602,9 @@ nmi_stack_correct:
+@@ -1373,6 +1615,9 @@ nmi_stack_correct:
  	xorl %edx,%edx		# zero error code
  	movl %esp,%eax		# pt_regs pointer
  	call do_nmi
@@ -21513,7 +21362,7 @@ index 8f3e2de..6b71e39 100644
  	jmp restore_all_notrace
  	CFI_ENDPROC
  
-@@ -1396,12 +1641,15 @@ nmi_espfix_stack:
+@@ -1409,12 +1654,15 @@ nmi_espfix_stack:
  	FIXUP_ESPFIX_STACK		# %eax == %esp
  	xorl %edx,%edx			# zero error code
  	call do_nmi
@@ -21530,7 +21379,7 @@ index 8f3e2de..6b71e39 100644
  
  ENTRY(int3)
  	RING0_INT_FRAME
-@@ -1414,14 +1662,14 @@ ENTRY(int3)
+@@ -1427,14 +1675,14 @@ ENTRY(int3)
  	call do_int3
  	jmp ret_from_exception
  	CFI_ENDPROC
@@ -21547,7 +21396,7 @@ index 8f3e2de..6b71e39 100644
  
  #ifdef CONFIG_KVM_GUEST
  ENTRY(async_page_fault)
-@@ -1430,7 +1678,7 @@ ENTRY(async_page_fault)
+@@ -1443,7 +1691,7 @@ ENTRY(async_page_fault)
  	pushl_cfi $do_async_page_fault
  	jmp error_code
  	CFI_ENDPROC
@@ -21557,7 +21406,7 @@ index 8f3e2de..6b71e39 100644
  
  /*
 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
-index 7272089..0b74104 100644
+index b077f4c..feb26c1 100644
 --- a/arch/x86/kernel/entry_64.S
 +++ b/arch/x86/kernel/entry_64.S
 @@ -59,6 +59,8 @@
@@ -22095,19 +21944,7 @@ index 7272089..0b74104 100644
  	je 1f
  	SWAPGS
  	/*
-@@ -498,9 +931,10 @@ ENTRY(save_rest)
- 	movq_cfi r15, R15+16
- 	movq %r11, 8(%rsp)	/* return address */
- 	FIXUP_TOP_OF_STACK %r11, 16
-+	pax_force_retaddr
- 	ret
- 	CFI_ENDPROC
--END(save_rest)
-+ENDPROC(save_rest)
- 
- /* save complete stack frame */
- 	.pushsection .kprobes.text, "ax"
-@@ -529,9 +963,10 @@ ENTRY(save_paranoid)
+@@ -514,9 +947,10 @@ ENTRY(save_paranoid)
  	js 1f	/* negative -> in kernel */
  	SWAPGS
  	xorl %ebx,%ebx
@@ -22120,7 +21957,7 @@ index 7272089..0b74104 100644
  	.popsection
  
  /*
-@@ -553,7 +988,7 @@ ENTRY(ret_from_fork)
+@@ -538,7 +972,7 @@ ENTRY(ret_from_fork)
  
  	RESTORE_REST
  
@@ -22129,7 +21966,7 @@ index 7272089..0b74104 100644
  	jz   1f
  
  	testl $_TIF_IA32, TI_flags(%rcx)	# 32-bit compat task needs IRET
-@@ -571,7 +1006,7 @@ ENTRY(ret_from_fork)
+@@ -556,7 +990,7 @@ ENTRY(ret_from_fork)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -22138,7 +21975,7 @@ index 7272089..0b74104 100644
  
  /*
   * System call entry. Up to 6 arguments in registers are supported.
-@@ -608,7 +1043,7 @@ END(ret_from_fork)
+@@ -593,7 +1027,7 @@ END(ret_from_fork)
  ENTRY(system_call)
  	CFI_STARTPROC	simple
  	CFI_SIGNAL_FRAME
@@ -22147,7 +21984,7 @@ index 7272089..0b74104 100644
  	CFI_REGISTER	rip,rcx
  	/*CFI_REGISTER	rflags,r11*/
  	SWAPGS_UNSAFE_STACK
-@@ -621,16 +1056,23 @@ GLOBAL(system_call_after_swapgs)
+@@ -606,16 +1040,23 @@ GLOBAL(system_call_after_swapgs)
  
  	movq	%rsp,PER_CPU_VAR(old_rsp)
  	movq	PER_CPU_VAR(kernel_stack),%rsp
@@ -22173,7 +22010,7 @@ index 7272089..0b74104 100644
  	jnz tracesys
  system_call_fastpath:
  #if __SYSCALL_MASK == ~0
-@@ -640,7 +1082,7 @@ system_call_fastpath:
+@@ -625,7 +1066,7 @@ system_call_fastpath:
  	cmpl $__NR_syscall_max,%eax
  #endif
  	ja badsys
@@ -22182,7 +22019,7 @@ index 7272089..0b74104 100644
  	call *sys_call_table(,%rax,8)  # XXX:	 rip relative
  	movq %rax,RAX-ARGOFFSET(%rsp)
  /*
-@@ -654,10 +1096,13 @@ sysret_check:
+@@ -639,10 +1080,13 @@ sysret_check:
  	LOCKDEP_SYS_EXIT
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	TRACE_IRQS_OFF
@@ -22197,7 +22034,7 @@ index 7272089..0b74104 100644
  	/*
  	 * sysretq will re-enable interrupts:
  	 */
-@@ -709,14 +1154,18 @@ badsys:
+@@ -694,14 +1138,18 @@ badsys:
  	 * jump back to the normal fast path.
  	 */
  auditsys:
@@ -22217,7 +22054,7 @@ index 7272089..0b74104 100644
  	jmp system_call_fastpath
  
  	/*
-@@ -737,7 +1186,7 @@ sysret_audit:
+@@ -722,7 +1170,7 @@ sysret_audit:
  	/* Do syscall tracing */
  tracesys:
  #ifdef CONFIG_AUDITSYSCALL
@@ -22226,7 +22063,7 @@ index 7272089..0b74104 100644
  	jz auditsys
  #endif
  	SAVE_REST
-@@ -745,12 +1194,16 @@ tracesys:
+@@ -730,12 +1178,16 @@ tracesys:
  	FIXUP_TOP_OF_STACK %rdi
  	movq %rsp,%rdi
  	call syscall_trace_enter
@@ -22243,7 +22080,7 @@ index 7272089..0b74104 100644
  	RESTORE_REST
  #if __SYSCALL_MASK == ~0
  	cmpq $__NR_syscall_max,%rax
-@@ -759,7 +1212,7 @@ tracesys:
+@@ -744,7 +1196,7 @@ tracesys:
  	cmpl $__NR_syscall_max,%eax
  #endif
  	ja   int_ret_from_sys_call	/* RAX(%rsp) set to -ENOSYS above */
@@ -22252,7 +22089,7 @@ index 7272089..0b74104 100644
  	call *sys_call_table(,%rax,8)
  	movq %rax,RAX-ARGOFFSET(%rsp)
  	/* Use IRET because user could have changed frame */
-@@ -780,7 +1233,9 @@ GLOBAL(int_with_check)
+@@ -765,7 +1217,9 @@ GLOBAL(int_with_check)
  	andl %edi,%edx
  	jnz   int_careful
  	andl    $~TS_COMPAT,TI_status(%rcx)
@@ -22263,7 +22100,7 @@ index 7272089..0b74104 100644
  
  	/* Either reschedule or signal or syscall exit tracking needed. */
  	/* First do a reschedule test. */
-@@ -826,7 +1281,7 @@ int_restore_rest:
+@@ -811,7 +1265,7 @@ int_restore_rest:
  	TRACE_IRQS_OFF
  	jmp int_with_check
  	CFI_ENDPROC
@@ -22272,7 +22109,7 @@ index 7272089..0b74104 100644
  
  	.macro FORK_LIKE func
  ENTRY(stub_\func)
-@@ -839,9 +1294,10 @@ ENTRY(stub_\func)
+@@ -824,9 +1278,10 @@ ENTRY(stub_\func)
  	DEFAULT_FRAME 0 8		/* offset 8: return address */
  	call sys_\func
  	RESTORE_TOP_OF_STACK %r11, 8
@@ -22284,7 +22121,7 @@ index 7272089..0b74104 100644
  	.endm
  
  	.macro FIXED_FRAME label,func
-@@ -851,9 +1307,10 @@ ENTRY(\label)
+@@ -836,9 +1291,10 @@ ENTRY(\label)
  	FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
  	call \func
  	RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
@@ -22296,7 +22133,7 @@ index 7272089..0b74104 100644
  	.endm
  
  	FORK_LIKE  clone
-@@ -870,9 +1327,10 @@ ENTRY(ptregscall_common)
+@@ -855,9 +1311,10 @@ ENTRY(ptregscall_common)
  	movq_cfi_restore R12+8, r12
  	movq_cfi_restore RBP+8, rbp
  	movq_cfi_restore RBX+8, rbx
@@ -22308,7 +22145,7 @@ index 7272089..0b74104 100644
  
  ENTRY(stub_execve)
  	CFI_STARTPROC
-@@ -885,7 +1343,7 @@ ENTRY(stub_execve)
+@@ -870,7 +1327,7 @@ ENTRY(stub_execve)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -22317,7 +22154,7 @@ index 7272089..0b74104 100644
  
  /*
   * sigreturn is special because it needs to restore all registers on return.
-@@ -902,7 +1360,7 @@ ENTRY(stub_rt_sigreturn)
+@@ -887,7 +1344,7 @@ ENTRY(stub_rt_sigreturn)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -22326,7 +22163,7 @@ index 7272089..0b74104 100644
  
  #ifdef CONFIG_X86_X32_ABI
  ENTRY(stub_x32_rt_sigreturn)
-@@ -916,7 +1374,7 @@ ENTRY(stub_x32_rt_sigreturn)
+@@ -901,7 +1358,7 @@ ENTRY(stub_x32_rt_sigreturn)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -22335,7 +22172,7 @@ index 7272089..0b74104 100644
  
  ENTRY(stub_x32_execve)
  	CFI_STARTPROC
-@@ -930,7 +1388,7 @@ ENTRY(stub_x32_execve)
+@@ -915,7 +1372,7 @@ ENTRY(stub_x32_execve)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -22344,7 +22181,7 @@ index 7272089..0b74104 100644
  
  #endif
  
-@@ -967,7 +1425,7 @@ vector=vector+1
+@@ -952,7 +1409,7 @@ vector=vector+1
  2:	jmp common_interrupt
  .endr
  	CFI_ENDPROC
@@ -22353,7 +22190,7 @@ index 7272089..0b74104 100644
  
  .previous
  END(interrupt)
-@@ -987,6 +1445,16 @@ END(interrupt)
+@@ -972,6 +1429,16 @@ END(interrupt)
  	subq $ORIG_RAX-RBP, %rsp
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
  	SAVE_ARGS_IRQ
@@ -22370,7 +22207,7 @@ index 7272089..0b74104 100644
  	call \func
  	.endm
  
-@@ -1019,7 +1487,7 @@ ret_from_intr:
+@@ -1004,7 +1471,7 @@ ret_from_intr:
  
  exit_intr:
  	GET_THREAD_INFO(%rcx)
@@ -22379,7 +22216,7 @@ index 7272089..0b74104 100644
  	je retint_kernel
  
  	/* Interrupt came from user space */
-@@ -1041,12 +1509,16 @@ retint_swapgs:		/* return to user-space */
+@@ -1026,12 +1493,16 @@ retint_swapgs:		/* return to user-space */
  	 * The iretq could re-enable interrupts:
  	 */
  	DISABLE_INTERRUPTS(CLBR_ANY)
@@ -22396,7 +22233,7 @@ index 7272089..0b74104 100644
  	/*
  	 * The iretq could re-enable interrupts:
  	 */
-@@ -1129,7 +1601,7 @@ ENTRY(retint_kernel)
+@@ -1114,7 +1585,7 @@ ENTRY(retint_kernel)
  #endif
  
  	CFI_ENDPROC
@@ -22405,7 +22242,7 @@ index 7272089..0b74104 100644
  /*
   * End of kprobes section
   */
-@@ -1147,7 +1619,7 @@ ENTRY(\sym)
+@@ -1132,7 +1603,7 @@ ENTRY(\sym)
  	interrupt \do_sym
  	jmp ret_from_intr
  	CFI_ENDPROC
@@ -22413,8 +22250,8 @@ index 7272089..0b74104 100644
 +ENDPROC(\sym)
  .endm
  
- #ifdef CONFIG_SMP
-@@ -1208,12 +1680,22 @@ ENTRY(\sym)
+ #ifdef CONFIG_TRACING
+@@ -1215,12 +1686,22 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call error_entry
  	DEFAULT_FRAME 0
@@ -22438,7 +22275,7 @@ index 7272089..0b74104 100644
  .endm
  
  .macro paranoidzeroentry sym do_sym
-@@ -1226,15 +1708,25 @@ ENTRY(\sym)
+@@ -1233,15 +1714,25 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -22466,7 +22303,7 @@ index 7272089..0b74104 100644
  .macro paranoidzeroentry_ist sym do_sym ist
  ENTRY(\sym)
  	INTR_FRAME
-@@ -1245,14 +1737,30 @@ ENTRY(\sym)
+@@ -1252,14 +1743,30 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	TRACE_IRQS_OFF_DEBUG
@@ -22498,7 +22335,7 @@ index 7272089..0b74104 100644
  .endm
  
  .macro errorentry sym do_sym
-@@ -1264,13 +1772,23 @@ ENTRY(\sym)
+@@ -1271,13 +1778,23 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call error_entry
  	DEFAULT_FRAME 0
@@ -22523,7 +22360,7 @@ index 7272089..0b74104 100644
  .endm
  
  	/* error code is on the stack already */
-@@ -1284,13 +1802,23 @@ ENTRY(\sym)
+@@ -1291,13 +1808,23 @@ ENTRY(\sym)
  	call save_paranoid
  	DEFAULT_FRAME 0
  	TRACE_IRQS_OFF
@@ -22548,7 +22385,7 @@ index 7272089..0b74104 100644
  .endm
  
  zeroentry divide_error do_divide_error
-@@ -1320,9 +1848,10 @@ gs_change:
+@@ -1327,9 +1854,10 @@ gs_change:
  2:	mfence		/* workaround */
  	SWAPGS
  	popfq_cfi
@@ -22560,7 +22397,7 @@ index 7272089..0b74104 100644
  
  	_ASM_EXTABLE(gs_change,bad_gs)
  	.section .fixup,"ax"
-@@ -1350,9 +1879,10 @@ ENTRY(call_softirq)
+@@ -1357,9 +1885,10 @@ ENTRY(call_softirq)
  	CFI_DEF_CFA_REGISTER	rsp
  	CFI_ADJUST_CFA_OFFSET   -8
  	decl PER_CPU_VAR(irq_count)
@@ -22572,7 +22409,7 @@ index 7272089..0b74104 100644
  
  #ifdef CONFIG_XEN
  zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
-@@ -1390,7 +1920,7 @@ ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
+@@ -1397,7 +1926,7 @@ ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
  	decl PER_CPU_VAR(irq_count)
  	jmp  error_exit
  	CFI_ENDPROC
@@ -22581,16 +22418,16 @@ index 7272089..0b74104 100644
  
  /*
   * Hypervisor uses this for application faults while it executes.
-@@ -1449,7 +1979,7 @@ ENTRY(xen_failsafe_callback)
+@@ -1456,7 +1985,7 @@ ENTRY(xen_failsafe_callback)
  	SAVE_ALL
  	jmp error_exit
  	CFI_ENDPROC
 -END(xen_failsafe_callback)
 +ENDPROC(xen_failsafe_callback)
  
- apicinterrupt HYPERVISOR_CALLBACK_VECTOR \
+ apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
  	xen_hvm_callback_vector xen_evtchn_do_upcall
-@@ -1501,18 +2031,33 @@ ENTRY(paranoid_exit)
+@@ -1508,18 +2037,33 @@ ENTRY(paranoid_exit)
  	DEFAULT_FRAME
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	TRACE_IRQS_OFF_DEBUG
@@ -22626,7 +22463,7 @@ index 7272089..0b74104 100644
  	jmp irq_return
  paranoid_userspace:
  	GET_THREAD_INFO(%rcx)
-@@ -1541,7 +2086,7 @@ paranoid_schedule:
+@@ -1548,7 +2092,7 @@ paranoid_schedule:
  	TRACE_IRQS_OFF
  	jmp paranoid_userspace
  	CFI_ENDPROC
@@ -22635,7 +22472,7 @@ index 7272089..0b74104 100644
  
  /*
   * Exception entry point. This expects an error code/orig_rax on the stack.
-@@ -1568,12 +2113,13 @@ ENTRY(error_entry)
+@@ -1575,12 +2119,13 @@ ENTRY(error_entry)
  	movq_cfi r14, R14+8
  	movq_cfi r15, R15+8
  	xorl %ebx,%ebx
@@ -22650,7 +22487,7 @@ index 7272089..0b74104 100644
  	ret
  
  /*
-@@ -1600,7 +2146,7 @@ bstep_iret:
+@@ -1607,7 +2152,7 @@ bstep_iret:
  	movq %rcx,RIP+8(%rsp)
  	jmp error_swapgs
  	CFI_ENDPROC
@@ -22659,7 +22496,7 @@ index 7272089..0b74104 100644
  
  
  /* ebx:	no swapgs flag (1: don't need swapgs, 0: need it) */
-@@ -1611,7 +2157,7 @@ ENTRY(error_exit)
+@@ -1618,7 +2163,7 @@ ENTRY(error_exit)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	TRACE_IRQS_OFF
  	GET_THREAD_INFO(%rcx)
@@ -22668,7 +22505,7 @@ index 7272089..0b74104 100644
  	jne retint_kernel
  	LOCKDEP_SYS_EXIT_IRQ
  	movl TI_flags(%rcx),%edx
-@@ -1620,7 +2166,7 @@ ENTRY(error_exit)
+@@ -1627,7 +2172,7 @@ ENTRY(error_exit)
  	jnz retint_careful
  	jmp retint_swapgs
  	CFI_ENDPROC
@@ -22677,7 +22514,7 @@ index 7272089..0b74104 100644
  
  /*
   * Test if a given stack is an NMI stack or not.
-@@ -1678,9 +2224,11 @@ ENTRY(nmi)
+@@ -1685,9 +2230,11 @@ ENTRY(nmi)
  	 * If %cs was not the kernel segment, then the NMI triggered in user
  	 * space, which means it is definitely not nested.
  	 */
@@ -22690,7 +22527,7 @@ index 7272089..0b74104 100644
  	/*
  	 * Check the special variable on the stack to see if NMIs are
  	 * executing.
-@@ -1714,8 +2262,7 @@ nested_nmi:
+@@ -1721,8 +2268,7 @@ nested_nmi:
  
  1:
  	/* Set up the interrupted NMIs stack to jump to repeat_nmi */
@@ -22700,7 +22537,7 @@ index 7272089..0b74104 100644
  	CFI_ADJUST_CFA_OFFSET 1*8
  	leaq -10*8(%rsp), %rdx
  	pushq_cfi $__KERNEL_DS
-@@ -1733,6 +2280,7 @@ nested_nmi_out:
+@@ -1740,6 +2286,7 @@ nested_nmi_out:
  	CFI_RESTORE rdx
  
  	/* No need to check faults here */
@@ -22708,7 +22545,7 @@ index 7272089..0b74104 100644
  	INTERRUPT_RETURN
  
  	CFI_RESTORE_STATE
-@@ -1849,6 +2397,8 @@ end_repeat_nmi:
+@@ -1856,6 +2403,8 @@ end_repeat_nmi:
  	 */
  	movq %cr2, %r12
  
@@ -22717,7 +22554,7 @@ index 7272089..0b74104 100644
  	/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
  	movq %rsp,%rdi
  	movq $-1,%rsi
-@@ -1861,26 +2411,31 @@ end_repeat_nmi:
+@@ -1868,26 +2417,31 @@ end_repeat_nmi:
  	movq %r12, %cr2
  1:
  	
@@ -22820,7 +22657,7 @@ index d4bdd25..912664c 100644
  		return -EFAULT;
  
 diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
-index 55b6761..a6456fc 100644
+index 1be8e43..d9b9ef6 100644
 --- a/arch/x86/kernel/head64.c
 +++ b/arch/x86/kernel/head64.c
 @@ -67,12 +67,12 @@ again:
@@ -22864,7 +22701,7 @@ index 55b6761..a6456fc 100644
  	}
  	pmd = (physaddr & PMD_MASK) + early_pmd_flags;
  	pmd_p[pmd_index(address)] = pmd;
-@@ -175,7 +175,6 @@ void __init x86_64_start_kernel(char * real_mode_data)
+@@ -175,7 +175,6 @@ asmlinkage void __init x86_64_start_kernel(char * real_mode_data)
  	if (console_loglevel == 10)
  		early_printk("Kernel alive\n");
  
@@ -22873,7 +22710,7 @@ index 55b6761..a6456fc 100644
  	init_level4_pgt[511] = early_level4_pgt[511];
  
 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
-index 73afd11..0ef46f2 100644
+index 81ba276..30c5411 100644
 --- a/arch/x86/kernel/head_32.S
 +++ b/arch/x86/kernel/head_32.S
 @@ -26,6 +26,12 @@
@@ -23043,7 +22880,7 @@ index 73afd11..0ef46f2 100644
  num_subarch_entries = (. - subarch_entries) / 4
  .previous
  #else
-@@ -355,6 +427,7 @@ default_entry:
+@@ -354,6 +426,7 @@ default_entry:
  	movl pa(mmu_cr4_features),%eax
  	movl %eax,%cr4
  
@@ -23051,7 +22888,7 @@ index 73afd11..0ef46f2 100644
  	testb $X86_CR4_PAE, %al		# check if PAE is enabled
  	jz enable_paging
  
-@@ -383,6 +456,9 @@ default_entry:
+@@ -382,6 +455,9 @@ default_entry:
  	/* Make changes effective */
  	wrmsr
  
@@ -23061,7 +22898,7 @@ index 73afd11..0ef46f2 100644
  enable_paging:
  
  /*
-@@ -451,14 +527,20 @@ is486:
+@@ -449,14 +525,20 @@ is486:
  1:	movl $(__KERNEL_DS),%eax	# reload all the segment registers
  	movl %eax,%ss			# after changing gdt.
  
@@ -23083,7 +22920,7 @@ index 73afd11..0ef46f2 100644
  	movl %eax,%gs
  
  	xorl %eax,%eax			# Clear LDT
-@@ -534,8 +616,11 @@ setup_once:
+@@ -512,8 +594,11 @@ setup_once:
  	 * relocation.  Manually set base address in stack canary
  	 * segment descriptor.
  	 */
@@ -23096,7 +22933,7 @@ index 73afd11..0ef46f2 100644
  	movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
  	shrl $16, %ecx
  	movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
-@@ -566,7 +651,7 @@ ENDPROC(early_idt_handlers)
+@@ -544,7 +629,7 @@ ENDPROC(early_idt_handlers)
  	/* This is global to keep gas from relaxing the jumps */
  ENTRY(early_idt_handler)
  	cld
@@ -23105,7 +22942,7 @@ index 73afd11..0ef46f2 100644
  	je hlt_loop
  	incl %ss:early_recursion_flag
  
-@@ -604,8 +689,8 @@ ENTRY(early_idt_handler)
+@@ -582,8 +667,8 @@ ENTRY(early_idt_handler)
  	pushl (20+6*4)(%esp)	/* trapno */
  	pushl $fault_msg
  	call printk
@@ -23115,7 +22952,7 @@ index 73afd11..0ef46f2 100644
  hlt_loop:
  	hlt
  	jmp hlt_loop
-@@ -624,8 +709,11 @@ ENDPROC(early_idt_handler)
+@@ -602,8 +687,11 @@ ENDPROC(early_idt_handler)
  /* This is the default interrupt "handler" :-) */
  	ALIGN
  ignore_int:
@@ -23128,7 +22965,7 @@ index 73afd11..0ef46f2 100644
  	pushl %eax
  	pushl %ecx
  	pushl %edx
-@@ -634,9 +722,6 @@ ignore_int:
+@@ -612,9 +700,6 @@ ignore_int:
  	movl $(__KERNEL_DS),%eax
  	movl %eax,%ds
  	movl %eax,%es
@@ -23138,7 +22975,7 @@ index 73afd11..0ef46f2 100644
  	pushl 16(%esp)
  	pushl 24(%esp)
  	pushl 32(%esp)
-@@ -670,29 +755,43 @@ ENTRY(setup_once_ref)
+@@ -648,29 +733,34 @@ ENTRY(setup_once_ref)
  /*
   * BSS section
   */
@@ -23166,15 +23003,6 @@ index 73afd11..0ef46f2 100644
 +#else
  	.fill 1024,4,0
 +#endif
-+
-+/*
-+ * The IDT has to be page-aligned to simplify the Pentium
-+ * F0 0F bug workaround.. We have a special link segment
-+ * for this.
-+ */
-+.section .idt,"a",@progbits
-+ENTRY(idt_table)
-+	.fill 256,8,0
  
  /*
   * This starts the data section.
@@ -23187,7 +23015,7 @@ index 73afd11..0ef46f2 100644
  ENTRY(initial_page_table)
  	.long	pa(initial_pg_pmd+PGD_IDENT_ATTR),0	/* low identity map */
  # if KPMDS == 3
-@@ -711,12 +810,20 @@ ENTRY(initial_page_table)
+@@ -689,12 +779,20 @@ ENTRY(initial_page_table)
  #  error "Kernel PMDs should be 1, 2 or 3"
  # endif
  	.align PAGE_SIZE		/* needs to be page-sized too */
@@ -23209,7 +23037,7 @@ index 73afd11..0ef46f2 100644
  
  __INITRODATA
  int_msg:
-@@ -744,7 +851,7 @@ fault_msg:
+@@ -722,7 +820,7 @@ fault_msg:
   * segment size, and 32-bit linear address value:
   */
  
@@ -23218,7 +23046,7 @@ index 73afd11..0ef46f2 100644
  .globl boot_gdt_descr
  .globl idt_descr
  
-@@ -753,7 +860,7 @@ fault_msg:
+@@ -731,7 +829,7 @@ fault_msg:
  	.word 0				# 32 bit align gdt_desc.address
  boot_gdt_descr:
  	.word __BOOT_DS+7
@@ -23227,7 +23055,7 @@ index 73afd11..0ef46f2 100644
  
  	.word 0				# 32-bit align idt_desc.address
  idt_descr:
-@@ -764,7 +871,7 @@ idt_descr:
+@@ -742,7 +840,7 @@ idt_descr:
  	.word 0				# 32 bit align gdt_desc.address
  ENTRY(early_gdt_descr)
  	.word GDT_ENTRIES*8-1
@@ -23236,7 +23064,7 @@ index 73afd11..0ef46f2 100644
  
  /*
   * The boot_gdt must mirror the equivalent in setup.S and is
-@@ -773,5 +880,65 @@ ENTRY(early_gdt_descr)
+@@ -751,5 +849,65 @@ ENTRY(early_gdt_descr)
  	.align L1_CACHE_BYTES
  ENTRY(boot_gdt)
  	.fill GDT_ENTRY_BOOT_CS,8,0
@@ -23305,7 +23133,7 @@ index 73afd11..0ef46f2 100644
 +	.fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +	.endr
 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
-index a836860..1b5c665 100644
+index e1aabdb..fee4fee 100644
 --- a/arch/x86/kernel/head_64.S
 +++ b/arch/x86/kernel/head_64.S
 @@ -20,6 +20,8 @@
@@ -23330,7 +23158,7 @@ index a836860..1b5c665 100644
  
  	.text
  	__HEAD
-@@ -89,11 +97,23 @@ startup_64:
+@@ -89,11 +97,24 @@ startup_64:
  	 * Fixup the physical addresses in the page table
  	 */
  	addq	%rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
@@ -23348,16 +23176,16 @@ index a836860..1b5c665 100644
 +#endif
 +
 +	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+1)*8)(%rip)
-+
+ 
+ 	addq	%rbp, level2_fixmap_pgt + (506*8)(%rip)
 +	addq	%rbp, level2_fixmap_pgt + (507*8)(%rip)
  
  	/*
  	 * Set up the identity mapping for the switchover.  These
-@@ -177,8 +197,8 @@ ENTRY(secondary_startup_64)
+@@ -177,8 +198,8 @@ ENTRY(secondary_startup_64)
  	movq	$(init_level4_pgt - __START_KERNEL_map), %rax
  1:
  
@@ -23368,7 +23196,7 @@ index a836860..1b5c665 100644
  	movq	%rcx, %cr4
  
  	/* Setup early boot stage 4 level pagetables. */
-@@ -199,10 +219,18 @@ ENTRY(secondary_startup_64)
+@@ -199,10 +220,19 @@ ENTRY(secondary_startup_64)
  	movl	$MSR_EFER, %ecx
  	rdmsr
  	btsl	$_EFER_SCE, %eax	/* Enable System Call */
@@ -23377,18 +23205,19 @@ index a836860..1b5c665 100644
  	jnc     1f
  	btsl	$_EFER_NX, %eax
  	btsq	$_PAGE_BIT_NX,early_pmd_flags(%rip)
-+	leaq	init_level4_pgt(%rip), %rdi
 +#ifndef CONFIG_EFI
-+	btsq	$_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
++	btsq	$_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
 +#endif
-+	btsq	$_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
-+	btsq	$_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
-+	btsq	$_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
++	btsq	$_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
++	btsq	$_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
++	btsq	$_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
++	btsq	$_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
++	btsq	$_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
 +	btsq	$_PAGE_BIT_NX, __supported_pte_mask(%rip)
  1:	wrmsr				/* Make changes effective */
  
  	/* Setup cr0 */
-@@ -282,6 +310,7 @@ ENTRY(secondary_startup_64)
+@@ -282,6 +312,7 @@ ENTRY(secondary_startup_64)
  	 *	REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
  	 *		address given in m16:64.
  	 */
@@ -23396,7 +23225,7 @@ index a836860..1b5c665 100644
  	movq	initial_code(%rip),%rax
  	pushq	$0		# fake return address to stop unwinder
  	pushq	$__KERNEL_CS	# set correct cs
-@@ -388,7 +417,7 @@ ENTRY(early_idt_handler)
+@@ -388,7 +419,7 @@ ENTRY(early_idt_handler)
  	call dump_stack
  #ifdef CONFIG_KALLSYMS	
  	leaq early_idt_ripmsg(%rip),%rdi
@@ -23405,7 +23234,7 @@ index a836860..1b5c665 100644
  	call __print_symbol
  #endif
  #endif /* EARLY_PRINTK */
-@@ -416,6 +445,7 @@ ENDPROC(early_idt_handler)
+@@ -416,6 +447,7 @@ ENDPROC(early_idt_handler)
  early_recursion_flag:
  	.long 0
  
@@ -23413,7 +23242,7 @@ index a836860..1b5c665 100644
  #ifdef CONFIG_EARLY_PRINTK
  early_idt_msg:
  	.asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
-@@ -443,29 +473,52 @@ NEXT_PAGE(early_level4_pgt)
+@@ -443,29 +475,52 @@ NEXT_PAGE(early_level4_pgt)
  NEXT_PAGE(early_dynamic_pgts)
  	.fill	512*EARLY_DYNAMIC_PAGE_TABLES,8,0
  
@@ -23475,7 +23304,7 @@ index a836860..1b5c665 100644
  
  NEXT_PAGE(level3_kernel_pgt)
  	.fill	L3_START_KERNEL,8,0
-@@ -473,6 +526,9 @@ NEXT_PAGE(level3_kernel_pgt)
+@@ -473,6 +528,9 @@ NEXT_PAGE(level3_kernel_pgt)
  	.quad	level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
  	.quad	level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
  
@@ -23485,23 +23314,22 @@ index a836860..1b5c665 100644
  NEXT_PAGE(level2_kernel_pgt)
  	/*
  	 * 512 MB kernel mapping. We spend a full page on this pagetable
-@@ -488,39 +544,70 @@ NEXT_PAGE(level2_kernel_pgt)
- 		KERNEL_IMAGE_SIZE/PMD_SIZE)
- 
+@@ -490,28 +548,64 @@ NEXT_PAGE(level2_kernel_pgt)
  NEXT_PAGE(level2_fixmap_pgt)
--	.fill	506,8,0
--	.quad	level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
+ 	.fill	506,8,0
+ 	.quad	level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
 -	/* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
 -	.fill	5,8,0
-+	.fill	507,8,0
 +	.quad	level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
 +	/* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
 +	.fill	4,8,0
  
--NEXT_PAGE(level1_fixmap_pgt)
-+NEXT_PAGE(level1_vsyscall_pgt)
+ NEXT_PAGE(level1_fixmap_pgt)
  	.fill	512,8,0
  
++NEXT_PAGE(level1_vsyscall_pgt)
++	.fill	512,8,0
++
  #undef PMDS
  
 -	.data
@@ -23552,25 +23380,11 @@ index a836860..1b5c665 100644
  
  #include "../../x86/xen/xen-head.S"
 -	
--	.section .bss, "aw", @nobits
+-	__PAGE_ALIGNED_BSS
 +
 +	.section .rodata,"a",@progbits
-+NEXT_PAGE(empty_zero_page)
-+	.skip PAGE_SIZE
-+
- 	.align PAGE_SIZE
- ENTRY(idt_table)
--	.skip IDT_ENTRIES * 16
-+	.fill 512,8,0
- 
- 	.align L1_CACHE_BYTES
- ENTRY(nmi_idt_table)
--	.skip IDT_ENTRIES * 16
--
--	__PAGE_ALIGNED_BSS
--NEXT_PAGE(empty_zero_page)
--	.skip PAGE_SIZE
-+	.fill 512,8,0
+ NEXT_PAGE(empty_zero_page)
+ 	.skip PAGE_SIZE
 diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
 index 0fa6912..b37438b 100644
 --- a/arch/x86/kernel/i386_ksyms_32.c
@@ -23601,7 +23415,7 @@ index 0fa6912..b37438b 100644
 +EXPORT_SYMBOL(cpu_pgd);
 +#endif
 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
-index f7ea30d..6318acc 100644
+index 5d576ab..1403a03 100644
 --- a/arch/x86/kernel/i387.c
 +++ b/arch/x86/kernel/i387.c
 @@ -51,7 +51,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
@@ -23668,7 +23482,7 @@ index a979b5b..1d6db75 100644
  		.callback	= dmi_io_delay_0xed_port,
  		.ident		= "Compaq Presario V6000",
 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
-index 4ddaf66..6292f4e 100644
+index 4ddaf66..49d5c18 100644
 --- a/arch/x86/kernel/ioport.c
 +++ b/arch/x86/kernel/ioport.c
 @@ -6,6 +6,7 @@
@@ -23679,19 +23493,19 @@ index 4ddaf66..6292f4e 100644
  #include <linux/errno.h>
  #include <linux/types.h>
  #include <linux/ioport.h>
-@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
- 
- 	if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
+@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
  		return -EINVAL;
+ 	if (turn_on && !capable(CAP_SYS_RAWIO))
+ 		return -EPERM;
 +#ifdef CONFIG_GRKERNSEC_IO
 +	if (turn_on && grsec_disable_privio) {
 +		gr_handle_ioperm();
-+		return -EPERM;
++		return -ENODEV;
 +	}
 +#endif
- 	if (turn_on && !capable(CAP_SYS_RAWIO))
- 		return -EPERM;
  
+ 	/*
+ 	 * If it's the first ioperm() call in this thread's lifetime, set the
 @@ -54,7 +61,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:
@@ -23701,33 +23515,33 @@ index 4ddaf66..6292f4e 100644
  
  	if (turn_on)
  		bitmap_clear(t->io_bitmap_ptr, from, num);
-@@ -103,6 +110,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
- 		return -EINVAL;
- 	/* Trying to gain more privileges? */
+@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
  	if (level > old) {
+ 		if (!capable(CAP_SYS_RAWIO))
+ 			return -EPERM;
 +#ifdef CONFIG_GRKERNSEC_IO
 +		if (grsec_disable_privio) {
 +			gr_handle_iopl();
-+			return -EPERM;
++			return -ENODEV;
 +		}
 +#endif
- 		if (!capable(CAP_SYS_RAWIO))
- 			return -EPERM;
  	}
+ 	regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
+ 	t->iopl = level << 12;
 diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
-index ac0631d..ff7cb62 100644
+index 22d0687..e07b2a5 100644
 --- a/arch/x86/kernel/irq.c
 +++ b/arch/x86/kernel/irq.c
-@@ -18,7 +18,7 @@
- #include <asm/mce.h>
- #include <asm/hw_irq.h>
+@@ -21,7 +21,7 @@
+ #define CREATE_TRACE_POINTS
+ #include <asm/trace/irq_vectors.h>
  
 -atomic_t irq_err_count;
 +atomic_unchecked_t irq_err_count;
  
  /* Function pointer for generic interrupt vector handling */
  void (*x86_platform_ipi_callback)(void) = NULL;
-@@ -122,9 +122,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
+@@ -125,9 +125,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
  		seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
  	seq_printf(p, "  Machine check polls\n");
  #endif
@@ -23739,7 +23553,7 @@ index ac0631d..ff7cb62 100644
  #endif
  	return 0;
  }
-@@ -164,7 +164,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
+@@ -167,7 +167,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
  
  u64 arch_irq_stat(void)
  {
@@ -23749,7 +23563,7 @@ index ac0631d..ff7cb62 100644
  }
  
 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
-index 344faf8..355f60d 100644
+index 4186755..784efa0 100644
 --- a/arch/x86/kernel/irq_32.c
 +++ b/arch/x86/kernel/irq_32.c
 @@ -39,7 +39,7 @@ static int check_stack_overflow(void)
@@ -23821,7 +23635,7 @@ index 344faf8..355f60d 100644
  
 @@ -121,29 +125,14 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
   */
- void __cpuinit irq_ctx_init(int cpu)
+ void irq_ctx_init(int cpu)
  {
 -	union irq_ctx *irqctx;
 -
@@ -23835,7 +23649,9 @@ index 344faf8..355f60d 100644
 -	irqctx->tinfo.cpu		= cpu;
 -	irqctx->tinfo.preempt_count	= HARDIRQ_OFFSET;
 -	irqctx->tinfo.addr_limit	= MAKE_MM_SEG(0);
--
++	per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
++	per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
+ 
 -	per_cpu(hardirq_ctx, cpu) = irqctx;
 -
 -	irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
@@ -23846,15 +23662,12 @@ index 344faf8..355f60d 100644
 -	irqctx->tinfo.addr_limit	= MAKE_MM_SEG(0);
 -
 -	per_cpu(softirq_ctx, cpu) = irqctx;
-+	per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
-+	per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
-+ 
-+ 	printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
-+ 	       cpu, per_cpu(hardirq_ctx, cpu),  per_cpu(softirq_ctx, cpu));
++	printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
++	       cpu, per_cpu(hardirq_ctx, cpu),  per_cpu(softirq_ctx, cpu));
  
  	printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
  	       cpu, per_cpu(hardirq_ctx, cpu),  per_cpu(softirq_ctx, cpu));
-@@ -152,7 +141,6 @@ void __cpuinit irq_ctx_init(int cpu)
+@@ -152,7 +141,6 @@ void irq_ctx_init(int cpu)
  asmlinkage void do_softirq(void)
  {
  	unsigned long flags;
@@ -23911,19 +23724,35 @@ index d04d3ec..ea4b374 100644
  		return;
  
  	if (regs->sp >= curbase + sizeof(struct thread_info) +
-diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c
-index dc1404b..bbc43e7 100644
---- a/arch/x86/kernel/kdebugfs.c
-+++ b/arch/x86/kernel/kdebugfs.c
-@@ -27,7 +27,7 @@ struct setup_data_node {
- 	u32 len;
- };
+diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
+index ee11b7d..4df4d0c 100644
+--- a/arch/x86/kernel/jump_label.c
++++ b/arch/x86/kernel/jump_label.c
+@@ -49,7 +49,7 @@ static void __jump_label_transform(struct jump_entry *entry,
+ 		 * We are enabling this jump label. If it is not a nop
+ 		 * then something must have gone wrong.
+ 		 */
+-		if (unlikely(memcmp((void *)entry->code, ideal_nop, 5) != 0))
++		if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5) != 0))
+ 			bug_at((void *)entry->code, __LINE__);
  
--static ssize_t setup_data_read(struct file *file, char __user *user_buf,
-+static ssize_t __size_overflow(3) setup_data_read(struct file *file, char __user *user_buf,
- 			       size_t count, loff_t *ppos)
- {
- 	struct setup_data_node *node = file->private_data;
+ 		code.jump = 0xe9;
+@@ -64,13 +64,13 @@ static void __jump_label_transform(struct jump_entry *entry,
+ 		 */
+ 		if (init) {
+ 			const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP };
+-			if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
++			if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
+ 				bug_at((void *)entry->code, __LINE__);
+ 		} else {
+ 			code.jump = 0xe9;
+ 			code.offset = entry->target -
+ 				(entry->code + JUMP_LABEL_NOP_SIZE);
+-			if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
++			if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
+ 				bug_at((void *)entry->code, __LINE__);
+ 		}
+ 		memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
 diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
 index 836f832..a8bda67 100644
 --- a/arch/x86/kernel/kgdb.c
@@ -24018,7 +23847,7 @@ index 836f832..a8bda67 100644
  }
  
 diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
-index 211bce4..6e2580a 100644
+index 79a3f96..6ba030a 100644
 --- a/arch/x86/kernel/kprobes/core.c
 +++ b/arch/x86/kernel/kprobes/core.c
 @@ -119,9 +119,12 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
@@ -24135,7 +23964,7 @@ index 211bce4..6e2580a 100644
  
  	switch (val) {
 diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
-index 76dc6f0..66bdfc3 100644
+index 898160b..758cde8 100644
 --- a/arch/x86/kernel/kprobes/opt.c
 +++ b/arch/x86/kernel/kprobes/opt.c
 @@ -79,6 +79,7 @@ found:
@@ -24153,8 +23982,8 @@ index 76dc6f0..66bdfc3 100644
 +	pax_close_kernel();
  }
  
- static void __used __kprobes kprobes_optinsn_template_holder(void)
-@@ -338,7 +340,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+ asm (
+@@ -335,7 +337,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
  	 * Verify if the address gap is in 2GB range, because this uses
  	 * a relative jump.
  	 */
@@ -24163,7 +23992,7 @@ index 76dc6f0..66bdfc3 100644
  	if (abs(rel) > 0x7fffffff)
  		return -ERANGE;
  
-@@ -353,16 +355,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+@@ -350,16 +352,18 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
  	op->optinsn.size = ret;
  
  	/* Copy arch-dep-instance from template */
@@ -24185,16 +24014,16 @@ index 76dc6f0..66bdfc3 100644
  			   (u8 *)op->kp.addr + op->optinsn.size);
  
  	flush_icache_range((unsigned long) buf,
-@@ -385,7 +389,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
- 			((long)op->kp.addr + RELATIVEJUMP_SIZE));
+@@ -384,7 +388,7 @@ void __kprobes arch_optimize_kprobes(struct list_head *oplist)
+ 		WARN_ON(kprobe_disabled(&op->kp));
  
- 	/* Backup instructions which will be replaced by jump address */
--	memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
-+	memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
- 	       RELATIVE_ADDR_SIZE);
+ 		/* Backup instructions which will be replaced by jump address */
+-		memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
++		memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
+ 		       RELATIVE_ADDR_SIZE);
  
- 	insn_buf[0] = RELATIVEJUMP_OPCODE;
-@@ -483,7 +487,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
+ 		insn_buf[0] = RELATIVEJUMP_OPCODE;
+@@ -433,7 +437,7 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
  		/* This kprobe is really able to run optimized path. */
  		op = container_of(p, struct optimized_kprobe, kp);
  		/* Detour through copied instructions */
@@ -24203,19 +24032,6 @@ index 76dc6f0..66bdfc3 100644
  		if (!reenter)
  			reset_current_kprobe();
  		preempt_enable_no_resched();
-diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
-index cd6d9a5..16245a4 100644
---- a/arch/x86/kernel/kvm.c
-+++ b/arch/x86/kernel/kvm.c
-@@ -455,7 +455,7 @@ static int __cpuinit kvm_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata kvm_cpu_notifier = {
-+static struct notifier_block kvm_cpu_notifier = {
-         .notifier_call  = kvm_cpu_notify,
- };
- #endif
 diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
 index ebc9873..1b9724b 100644
 --- a/arch/x86/kernel/ldt.c
@@ -24316,7 +24132,7 @@ index 5b19e4d..6476a76 100644
  	relocate_kernel_ptr = control_page;
  	page_list[PA_CONTROL_PAGE] = __pa(control_page);
 diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
-index 22db92b..d546bec 100644
+index 15c9876..0a43909 100644
 --- a/arch/x86/kernel/microcode_core.c
 +++ b/arch/x86/kernel/microcode_core.c
 @@ -513,7 +513,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
@@ -24486,10 +24302,10 @@ index 216a4d7..228255a 100644
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
 diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
-index ce13049..e2e9c3c 100644
+index 88458fa..349f7a4 100644
 --- a/arch/x86/kernel/msr.c
 +++ b/arch/x86/kernel/msr.c
-@@ -233,7 +233,7 @@ static int __cpuinit msr_class_cpu_callback(struct notifier_block *nfb,
+@@ -233,7 +233,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
  	return notifier_from_errno(err);
  }
  
@@ -24499,10 +24315,10 @@ index ce13049..e2e9c3c 100644
  };
  
 diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
-index 6030805..2d33f21 100644
+index 6fcb49c..5b3f4ff 100644
 --- a/arch/x86/kernel/nmi.c
 +++ b/arch/x86/kernel/nmi.c
-@@ -105,7 +105,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
+@@ -138,7 +138,7 @@ static int __kprobes nmi_handle(unsigned int type, struct pt_regs *regs, bool b2
  	return handled;
  }
  
@@ -24511,7 +24327,7 @@ index 6030805..2d33f21 100644
  {
  	struct nmi_desc *desc = nmi_to_desc(type);
  	unsigned long flags;
-@@ -129,9 +129,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
+@@ -162,9 +162,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
  	 * event confuses some handlers (kdump uses this flag)
  	 */
  	if (action->flags & NMI_FLAG_FIRST)
@@ -24523,7 +24339,7 @@ index 6030805..2d33f21 100644
  	
  	spin_unlock_irqrestore(&desc->lock, flags);
  	return 0;
-@@ -154,7 +154,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
+@@ -187,7 +187,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
  		if (!strcmp(n->name, name)) {
  			WARN(in_nmi(),
  				"Trying to free NMI (%s) from NMI context!\n", n->name);
@@ -24532,7 +24348,7 @@ index 6030805..2d33f21 100644
  			break;
  		}
  	}
-@@ -479,6 +479,17 @@ static inline void nmi_nesting_postprocess(void)
+@@ -512,6 +512,17 @@ static inline void nmi_nesting_postprocess(void)
  dotraplinkage notrace __kprobes void
  do_nmi(struct pt_regs *regs, long error_code)
  {
@@ -24573,20 +24389,20 @@ index 6d9582e..f746287 100644
  		return;
  	}
 diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
-index 676b8c7..870ba04 100644
+index bbb6c73..24a58ef 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);
- }
+@@ -8,7 +8,7 @@
+ 
+ #include <asm/paravirt.h>
  
 -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,
+ 	.lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
+ 	.unlock_kick = paravirt_nop,
 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
-index cd6de64..27c6af0 100644
+index 1b10af8..0b58cbc 100644
 --- a/arch/x86/kernel/paravirt.c
 +++ b/arch/x86/kernel/paravirt.c
 @@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
@@ -24599,7 +24415,7 @@ index cd6de64..27c6af0 100644
  
  void __init default_banner(void)
  {
-@@ -147,15 +150,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
+@@ -142,15 +145,19 @@ 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));
@@ -24614,15 +24430,15 @@ index cd6de64..27c6af0 100644
  		ret = paravirt_patch_ident_32(insnbuf, len);
 -	else if (opfunc == _paravirt_ident_64)
 +	else if (opfunc == (void *)_paravirt_ident_64)
-+		ret = paravirt_patch_ident_64(insnbuf, len);
+ 		ret = paravirt_patch_ident_64(insnbuf, len);
 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
 +	else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
- 		ret = paravirt_patch_ident_64(insnbuf, len);
++		ret = paravirt_patch_ident_64(insnbuf, len);
 +#endif
  
  	else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
  		 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
-@@ -180,7 +187,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
+@@ -175,7 +182,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
  	if (insn_len > len || start == NULL)
  		insn_len = len;
  	else
@@ -24631,7 +24447,7 @@ index cd6de64..27c6af0 100644
  
  	return insn_len;
  }
-@@ -304,7 +311,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
+@@ -299,7 +306,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
  	return this_cpu_read(paravirt_lazy_mode);
  }
  
@@ -24640,7 +24456,7 @@ index cd6de64..27c6af0 100644
  	.name = "bare hardware",
  	.paravirt_enabled = 0,
  	.kernel_rpl = 0,
-@@ -315,16 +322,16 @@ struct pv_info pv_info = {
+@@ -310,16 +317,16 @@ struct pv_info pv_info = {
  #endif
  };
  
@@ -24655,21 +24471,21 @@ index cd6de64..27c6af0 100644
  	.steal_clock = native_steal_clock,
  };
  
--struct pv_irq_ops pv_irq_ops = {
-+struct pv_irq_ops pv_irq_ops __read_only = {
+-__visible struct pv_irq_ops pv_irq_ops = {
++__visible struct pv_irq_ops pv_irq_ops __read_only = {
  	.save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
  	.restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
  	.irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
-@@ -336,7 +343,7 @@ struct pv_irq_ops pv_irq_ops = {
+@@ -331,7 +338,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
  #endif
  };
  
--struct pv_cpu_ops pv_cpu_ops = {
-+struct pv_cpu_ops pv_cpu_ops __read_only = {
+-__visible struct pv_cpu_ops pv_cpu_ops = {
++__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
  	.cpuid = native_cpuid,
  	.get_debugreg = native_get_debugreg,
  	.set_debugreg = native_set_debugreg,
-@@ -394,21 +401,26 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -389,21 +396,26 @@ __visible struct pv_cpu_ops pv_cpu_ops = {
  	.end_context_switch = paravirt_nop,
  };
  
@@ -24699,7 +24515,7 @@ index cd6de64..27c6af0 100644
  
  	.read_cr2 = native_read_cr2,
  	.write_cr2 = native_write_cr2,
-@@ -458,6 +470,7 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -453,6 +465,7 @@ struct pv_mmu_ops pv_mmu_ops = {
  	.make_pud = PTE_IDENT,
  
  	.set_pgd = native_set_pgd,
@@ -24707,7 +24523,7 @@ index cd6de64..27c6af0 100644
  #endif
  #endif /* PAGETABLE_LEVELS >= 3 */
  
-@@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -473,6 +486,12 @@ struct pv_mmu_ops pv_mmu_ops = {
  	},
  
  	.set_fixmap = native_set_fixmap,
@@ -24760,15 +24576,15 @@ index 6c483ba..d10ce2f 100644
  
  static struct dma_map_ops swiotlb_dma_ops = {
 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index 59b9037..047a1ef 100644
+index 3fb8d95..254dc51 100644
 --- a/arch/x86/kernel/process.c
 +++ b/arch/x86/kernel/process.c
 @@ -36,7 +36,8 @@
   * section. Since TSS's are completely CPU-local, we want them
   * on exact cacheline boundaries, to eliminate cacheline ping-pong.
   */
--DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
-+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
+-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
++struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
  
  #ifdef CONFIG_X86_64
@@ -24868,7 +24684,7 @@ index 59b9037..047a1ef 100644
 +}
 +#endif
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 7305f7d..22f73d6 100644
+index 884f98f..ec23e04 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
 @@ -65,6 +65,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
@@ -24902,7 +24718,7 @@ index 7305f7d..22f73d6 100644
  	print_symbol("EIP is at %s\n", regs->ip);
  
  	printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
-@@ -128,20 +128,21 @@ void release_thread(struct task_struct *dead_task)
+@@ -133,20 +133,21 @@ void release_thread(struct task_struct *dead_task)
  int copy_thread(unsigned long clone_flags, unsigned long sp,
  	unsigned long arg, struct task_struct *p)
  {
@@ -24928,7 +24744,7 @@ index 7305f7d..22f73d6 100644
  		childregs->fs = __KERNEL_PERCPU;
  		childregs->bx = sp;	/* function */
  		childregs->bp = arg;
-@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -253,7 +254,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();
@@ -24937,7 +24753,7 @@ index 7305f7d..22f73d6 100644
  	fpu_switch_t fpu;
  
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -277,6 +278,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	 */
  	lazy_save_gs(prev->gs);
  
@@ -24948,7 +24764,7 @@ index 7305f7d..22f73d6 100644
  	/*
  	 * Load the per-thread Thread-Local Storage descriptor.
  	 */
-@@ -302,6 +307,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -307,6 +312,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	 */
  	arch_end_context_switch(next_p);
  
@@ -24958,7 +24774,7 @@ index 7305f7d..22f73d6 100644
  	/*
  	 * Restore %gs if needed (which is common)
  	 */
-@@ -310,8 +318,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -315,8 +323,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  
  	switch_fpu_finish(next_p, fpu);
  
@@ -24967,16 +24783,16 @@ index 7305f7d..22f73d6 100644
  	return prev_p;
  }
  
-@@ -341,4 +347,3 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -346,4 +352,3 @@ unsigned long get_wchan(struct task_struct *p)
  	} while (count++ < 16);
  	return 0;
  }
 -
 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
-index 355ae06..560fbbe 100644
+index bb1dc51..08dda7f 100644
 --- a/arch/x86/kernel/process_64.c
 +++ b/arch/x86/kernel/process_64.c
-@@ -151,10 +151,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
  	struct pt_regs *childregs;
  	struct task_struct *me = current;
  
@@ -24989,7 +24805,7 @@ index 355ae06..560fbbe 100644
  	set_tsk_thread_flag(p, TIF_FORK);
  	p->fpu_counter = 0;
  	p->thread.io_bitmap_ptr = NULL;
-@@ -165,6 +166,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -172,6 +173,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
  	p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
  	savesegment(es, p->thread.es);
  	savesegment(ds, p->thread.ds);
@@ -24998,7 +24814,7 @@ index 355ae06..560fbbe 100644
  	memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
  
  	if (unlikely(p->flags & PF_KTHREAD)) {
-@@ -273,7 +276,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -280,7 +283,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();
@@ -25007,7 +24823,7 @@ index 355ae06..560fbbe 100644
  	unsigned fsindex, gsindex;
  	fpu_switch_t fpu;
  
-@@ -296,6 +299,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -303,6 +306,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	if (unlikely(next->ds | prev->ds))
  		loadsegment(ds, next->ds);
  
@@ -25017,7 +24833,7 @@ index 355ae06..560fbbe 100644
  
  	/* We must save %fs and %gs before load_TLS() because
  	 * %fs and %gs may be cleared by load_TLS().
-@@ -355,10 +361,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -362,10 +368,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
  	prev->usersp = this_cpu_read(old_rsp);
  	this_cpu_write(old_rsp, next->usersp);
  	this_cpu_write(current_task, next_p);
@@ -25030,7 +24846,7 @@ index 355ae06..560fbbe 100644
  
  	/*
  	 * Now maybe reload the debug registers and handle I/O bitmaps
-@@ -427,12 +432,11 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -434,12 +439,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);
@@ -25046,7 +24862,7 @@ index 355ae06..560fbbe 100644
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
-index 29a8120..a50b5ee 100644
+index 7461f50..1334029 100644
 --- a/arch/x86/kernel/ptrace.c
 +++ b/arch/x86/kernel/ptrace.c
 @@ -184,14 +184,13 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
@@ -25077,7 +24893,7 @@ index 29a8120..a50b5ee 100644
  	struct arch_hw_breakpoint *info;
  
  	for (i = 0; i < HBP_NUM; i++) {
-@@ -856,7 +855,7 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -822,7 +821,7 @@ long arch_ptrace(struct task_struct *child, long request,
  		 unsigned long addr, unsigned long data)
  {
  	int ret;
@@ -25086,7 +24902,7 @@ index 29a8120..a50b5ee 100644
  
  	switch (request) {
  	/* read the word at location addr in the USER area. */
-@@ -941,14 +940,14 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -907,14 +906,14 @@ long arch_ptrace(struct task_struct *child, long request,
  		if ((int) addr < 0)
  			return -EIO;
  		ret = do_get_thread_area(child, addr,
@@ -25103,7 +24919,7 @@ index 29a8120..a50b5ee 100644
  		break;
  #endif
  
-@@ -1326,7 +1325,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
+@@ -1292,7 +1291,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
  
  #ifdef CONFIG_X86_64
  
@@ -25112,7 +24928,7 @@ index 29a8120..a50b5ee 100644
  	[REGSET_GENERAL] = {
  		.core_note_type = NT_PRSTATUS,
  		.n = sizeof(struct user_regs_struct) / sizeof(long),
-@@ -1367,7 +1366,7 @@ static const struct user_regset_view user_x86_64_view = {
+@@ -1333,7 +1332,7 @@ static const struct user_regset_view user_x86_64_view = {
  #endif	/* CONFIG_X86_64 */
  
  #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
@@ -25121,7 +24937,7 @@ index 29a8120..a50b5ee 100644
  	[REGSET_GENERAL] = {
  		.core_note_type = NT_PRSTATUS,
  		.n = sizeof(struct user_regs_struct32) / sizeof(u32),
-@@ -1420,7 +1419,7 @@ static const struct user_regset_view user_x86_32_view = {
+@@ -1386,7 +1385,7 @@ static const struct user_regset_view user_x86_32_view = {
   */
  u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
  
@@ -25130,7 +24946,7 @@ index 29a8120..a50b5ee 100644
  {
  #ifdef CONFIG_X86_64
  	x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
-@@ -1455,7 +1454,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
+@@ -1421,7 +1420,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
  	memset(info, 0, sizeof(*info));
  	info->si_signo = SIGTRAP;
  	info->si_code = si_code;
@@ -25139,7 +24955,7 @@ index 29a8120..a50b5ee 100644
  }
  
  void user_single_step_siginfo(struct task_struct *tsk,
-@@ -1484,6 +1483,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
+@@ -1450,6 +1449,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
  # define IS_IA32	0
  #endif
  
@@ -25150,7 +24966,7 @@ index 29a8120..a50b5ee 100644
  /*
   * We must return the syscall number to actually look up in the table.
   * This can be -1L to skip running any syscall at all.
-@@ -1494,6 +1497,11 @@ long syscall_trace_enter(struct pt_regs *regs)
+@@ -1460,6 +1463,11 @@ long syscall_trace_enter(struct pt_regs *regs)
  
  	user_exit();
  
@@ -25162,7 +24978,7 @@ index 29a8120..a50b5ee 100644
  	/*
  	 * If we stepped into a sysenter/syscall insn, it trapped in
  	 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
-@@ -1549,6 +1557,11 @@ void syscall_trace_leave(struct pt_regs *regs)
+@@ -1515,6 +1523,11 @@ void syscall_trace_leave(struct pt_regs *regs)
  	 */
  	user_exit();
  
@@ -25175,7 +24991,7 @@ index 29a8120..a50b5ee 100644
  
  	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
 diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
-index 2cb9470..ff1fd80 100644
+index a16bae3..1f65f25 100644
 --- a/arch/x86/kernel/pvclock.c
 +++ b/arch/x86/kernel/pvclock.c
 @@ -43,11 +43,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
@@ -25207,19 +25023,10 @@ index 2cb9470..ff1fd80 100644
  
  	return ret;
 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index 90fd119..61aa5d2 100644
+index 618ce26..ec7e21c 100644
 --- a/arch/x86/kernel/reboot.c
 +++ b/arch/x86/kernel/reboot.c
-@@ -36,7 +36,7 @@ void (*pm_power_off)(void);
- EXPORT_SYMBOL(pm_power_off);
- 
- static const struct desc_ptr no_idt = {};
--static int reboot_mode;
-+static unsigned short reboot_mode;
- enum reboot_type reboot_type = BOOT_ACPI;
- int reboot_force;
- 
-@@ -157,6 +157,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
+@@ -68,6 +68,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
  
  void __noreturn machine_real_restart(unsigned int type)
  {
@@ -25231,7 +25038,7 @@ index 90fd119..61aa5d2 100644
  	local_irq_disable();
  
  	/*
-@@ -184,7 +189,29 @@ void __noreturn machine_real_restart(unsigned int type)
+@@ -95,7 +100,29 @@ void __noreturn machine_real_restart(unsigned int type)
  
  	/* Jump to the identity-mapped low memory code */
  #ifdef CONFIG_X86_32
@@ -25262,7 +25069,7 @@ index 90fd119..61aa5d2 100644
  		     "rm" (real_mode_header->machine_real_restart_asm),
  		     "a" (type));
  #else
-@@ -547,7 +574,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
+@@ -466,7 +493,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
   * try to force a triple fault and then cycle between hitting the keyboard
   * controller and doing that
   */
@@ -25271,7 +25078,7 @@ index 90fd119..61aa5d2 100644
  {
  	int i;
  	int attempt = 0;
-@@ -670,13 +697,13 @@ void native_machine_shutdown(void)
+@@ -575,13 +602,13 @@ void native_machine_shutdown(void)
  #endif
  }
  
@@ -25287,7 +25094,7 @@ index 90fd119..61aa5d2 100644
  {
  	pr_notice("machine restart\n");
  
-@@ -685,7 +712,7 @@ static void native_machine_restart(char *__unused)
+@@ -590,7 +617,7 @@ static void native_machine_restart(char *__unused)
  	__machine_emergency_restart(0);
  }
  
@@ -25296,7 +25103,7 @@ index 90fd119..61aa5d2 100644
  {
  	/* Stop other cpus and apics */
  	machine_shutdown();
-@@ -695,7 +722,7 @@ static void native_machine_halt(void)
+@@ -600,7 +627,7 @@ static void native_machine_halt(void)
  	stop_this_cpu(NULL);
  }
  
@@ -25305,7 +25112,7 @@ index 90fd119..61aa5d2 100644
  {
  	if (pm_power_off) {
  		if (!reboot_force)
-@@ -704,9 +731,10 @@ static void native_machine_power_off(void)
+@@ -609,9 +636,10 @@ static void native_machine_power_off(void)
  	}
  	/* A fallback in case there is no PM info available */
  	tboot_shutdown(TB_SHUTDOWN_HALT);
@@ -25331,7 +25138,7 @@ index c8e41e9..64049ef 100644
  /*
   * PCI ids solely used for fixups_table go here
 diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
-index f2bb9c9..bed145d7 100644
+index 3fd2c69..16ef367 100644
 --- a/arch/x86/kernel/relocate_kernel_64.S
 +++ b/arch/x86/kernel/relocate_kernel_64.S
 @@ -11,6 +11,7 @@
@@ -25342,16 +25149,26 @@ index f2bb9c9..bed145d7 100644
  
  /*
   * Must be relocatable PIC code callable as a C function
-@@ -167,6 +168,7 @@ identity_mapped:
- 	xorq	%r14, %r14
- 	xorq	%r15, %r15
+@@ -96,8 +97,7 @@ relocate_kernel:
+ 
+ 	/* jump to identity mapped page */
+ 	addq	$(identity_mapped - relocate_kernel), %r8
+-	pushq	%r8
+-	ret
++	jmp	*%r8
+ 
+ identity_mapped:
+ 	/* set return address to 0 if not preserving context */
+@@ -167,6 +167,7 @@ identity_mapped:
+ 	xorl	%r14d, %r14d
+ 	xorl	%r15d, %r15d
  
 +	pax_force_retaddr 0, 1
  	ret
  
  1:
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 91964c6..bbab1da 100644
+index f0de629..a4978a8f 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -110,6 +110,7 @@
@@ -25367,14 +25184,14 @@ index 91964c6..bbab1da 100644
  
  
 -#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
--unsigned long mmu_cr4_features;
+-__visible unsigned long mmu_cr4_features;
 +#ifdef CONFIG_X86_64
-+unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
++__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
 +#elif defined(CONFIG_X86_PAE)
-+unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
++__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
  #else
--unsigned long mmu_cr4_features = X86_CR4_PAE;
-+unsigned long mmu_cr4_features __read_only;
+-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
++__visible unsigned long mmu_cr4_features __read_only;
  #endif
  
 +void set_in_cr4(unsigned long mask)
@@ -25416,15 +25233,6 @@ index 91964c6..bbab1da 100644
  /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
  int bootloader_type, bootloader_version;
  
-@@ -442,7 +481,7 @@ static void __init parse_setup_data(void)
- 
- 		switch (data_type) {
- 		case SETUP_E820_EXT:
--			parse_e820_ext(pa_data, data_len);
-+			parse_e820_ext((struct setup_data __force_kernel *)pa_data, data_len);
- 			break;
- 		case SETUP_DTB:
- 			add_dtb(pa_data);
 @@ -768,7 +807,7 @@ static void __init trim_bios_range(void)
  	 * area (640->1Mb) as ram even though it is not.
  	 * take them out.
@@ -25553,10 +25361,10 @@ index 5cdff03..80fa283 100644
  		 * Up to this point, the boot CPU has been using .init.data
  		 * area.  Reload any changed state for the boot CPU.
 diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
-index 087ab2a..f798055 100644
+index 9e5de68..16c53cb 100644
 --- a/arch/x86/kernel/signal.c
 +++ b/arch/x86/kernel/signal.c
-@@ -196,7 +196,7 @@ static unsigned long align_sigframe(unsigned long sp)
+@@ -190,7 +190,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.
  	 */
@@ -25565,7 +25373,7 @@ index 087ab2a..f798055 100644
  #else /* !CONFIG_X86_32 */
  	sp = round_down(sp, 16) - 8;
  #endif
-@@ -304,9 +304,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
+@@ -298,9 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
  	}
  
  	if (current->mm->context.vdso)
@@ -25577,7 +25385,7 @@ index 087ab2a..f798055 100644
  	if (ksig->ka.sa.sa_flags & SA_RESTORER)
  		restorer = ksig->ka.sa.sa_restorer;
  
-@@ -320,7 +320,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
+@@ -314,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
  	 * reasons and because gdb uses it as a signature to notice
  	 * signal handler stack frames.
  	 */
@@ -25586,7 +25394,7 @@ index 087ab2a..f798055 100644
  
  	if (err)
  		return -EFAULT;
-@@ -367,7 +367,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
+@@ -361,7 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
  		save_altstack_ex(&frame->uc.uc_stack, regs->sp);
  
  		/* Set up to return from userspace.  */
@@ -25598,7 +25406,7 @@ index 087ab2a..f798055 100644
  		if (ksig->ka.sa.sa_flags & SA_RESTORER)
  			restorer = ksig->ka.sa.sa_restorer;
  		put_user_ex(restorer, &frame->pretcode);
-@@ -379,7 +382,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
+@@ -373,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
  		 * reasons and because gdb uses it as a signature to notice
  		 * signal handler stack frames.
  		 */
@@ -25607,7 +25415,7 @@ index 087ab2a..f798055 100644
  	} put_user_catch(err);
  	
  	err |= copy_siginfo_to_user(&frame->info, &ksig->info);
-@@ -615,7 +618,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
+@@ -609,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
  {
  	int usig = signr_convert(ksig->sig);
  	sigset_t *set = sigmask_to_save();
@@ -25621,7 +25429,7 @@ index 087ab2a..f798055 100644
  
  	/* Set up the stack frame */
  	if (is_ia32_frame()) {
-@@ -626,7 +634,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
+@@ -620,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
  	} else if (is_x32_frame()) {
  		return x32_setup_rt_frame(ksig, cset, regs);
  	} else {
@@ -25631,10 +25439,10 @@ index 087ab2a..f798055 100644
  }
  
 diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
-index 48d2b7d..90d328a 100644
+index 7c3a5a6..f0a8961 100644
 --- a/arch/x86/kernel/smp.c
 +++ b/arch/x86/kernel/smp.c
-@@ -285,7 +285,7 @@ static int __init nonmi_ipi_setup(char *str)
+@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
  
  __setup("nonmi_ipi", nonmi_ipi_setup);
  
@@ -25644,32 +25452,35 @@ index 48d2b7d..90d328a 100644
  	.smp_prepare_cpus	= native_smp_prepare_cpus,
  	.smp_cpus_done		= native_smp_cpus_done,
 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
-index bfd348e..914f323 100644
+index 6cacab6..750636a 100644
 --- a/arch/x86/kernel/smpboot.c
 +++ b/arch/x86/kernel/smpboot.c
-@@ -251,14 +251,18 @@ notrace static void __cpuinit start_secondary(void *unused)
+@@ -251,14 +251,18 @@ static void notrace start_secondary(void *unused)
  
  	enable_start_cpu0 = 0;
  
 -#ifdef CONFIG_X86_32
-+	/* otherwise gcc will move up smp_processor_id before the cpu_init */
-+	barrier();
+-	/* switch away from the initial page table */
+-	load_cr3(swapper_pg_dir);
+-	__flush_tlb_all();
+-#endif
+-
+ 	/* otherwise gcc will move up smp_processor_id before the cpu_init */
+ 	barrier();
 +
- 	/* switch away from the initial page table */
++	/* switch away from the initial page table */
 +#ifdef CONFIG_PAX_PER_CPU_PGD
 +	load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
 +	__flush_tlb_all();
 +#elif defined(CONFIG_X86_32)
- 	load_cr3(swapper_pg_dir);
- 	__flush_tlb_all();
- #endif
- 
--	/* otherwise gcc will move up smp_processor_id before the cpu_init */
--	barrier();
++	load_cr3(swapper_pg_dir);
++	__flush_tlb_all();
++#endif
++
  	/*
  	 * Check TSC synchronization with the BP:
  	 */
-@@ -748,6 +752,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
+@@ -749,6 +753,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
  	idle->thread.sp = (unsigned long) (((struct pt_regs *)
  			  (THREAD_SIZE +  task_stack_page(idle))) - 1);
  	per_cpu(current_task, cpu) = idle;
@@ -25677,7 +25488,7 @@ index bfd348e..914f323 100644
  
  #ifdef CONFIG_X86_32
  	/* Stack for startup_32 can be just as for start_secondary onwards */
-@@ -755,11 +760,13 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
+@@ -756,11 +761,13 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
  #else
  	clear_tsk_thread_flag(idle, TIF_FORK);
  	initial_gs = per_cpu_offset(cpu);
@@ -25694,7 +25505,7 @@ index bfd348e..914f323 100644
  	initial_code = (unsigned long)start_secondary;
  	stack_start  = idle->thread.sp;
  
-@@ -908,6 +915,15 @@ int __cpuinit native_cpu_up(unsigned int cpu, struct task_struct *tidle)
+@@ -909,6 +916,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
  	/* the FPU context is blank, nobody can own it */
  	__cpu_disable_lazy_restore(cpu);
  
@@ -26037,10 +25848,10 @@ index 30277e2..5664a29 100644
  	if (!(addr & ~PAGE_MASK))
  		return addr;
 diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
-index f84fe00..f41d9f1 100644
+index 91a4496..1730bff 100644
 --- a/arch/x86/kernel/tboot.c
 +++ b/arch/x86/kernel/tboot.c
-@@ -220,7 +220,7 @@ static int tboot_setup_sleep(void)
+@@ -221,7 +221,7 @@ static int tboot_setup_sleep(void)
  
  void tboot_shutdown(u32 shutdown_type)
  {
@@ -26049,7 +25860,7 @@ index f84fe00..f41d9f1 100644
  
  	if (!tboot_enabled())
  		return;
-@@ -242,7 +242,7 @@ void tboot_shutdown(u32 shutdown_type)
+@@ -243,7 +243,7 @@ void tboot_shutdown(u32 shutdown_type)
  
  	switch_to_tboot_pt();
  
@@ -26058,8 +25869,8 @@ index f84fe00..f41d9f1 100644
  	shutdown();
  
  	/* should not reach here */
-@@ -300,7 +300,7 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
- 	return 0;
+@@ -310,7 +310,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
+ 	return -ENODEV;
  }
  
 -static atomic_t ap_wfs_count;
@@ -26067,7 +25878,7 @@ index f84fe00..f41d9f1 100644
  
  static int tboot_wait_for_aps(int num_aps)
  {
-@@ -324,16 +324,16 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
+@@ -334,9 +334,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
  {
  	switch (action) {
  	case CPU_DYING:
@@ -26079,15 +25890,7 @@ index f84fe00..f41d9f1 100644
  				return NOTIFY_BAD;
  		break;
  	}
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block tboot_cpu_notifier __cpuinitdata =
-+static struct notifier_block tboot_cpu_notifier =
- {
- 	.notifier_call = tboot_cpu_callback,
- };
-@@ -345,7 +345,7 @@ static __init int tboot_late_init(void)
+@@ -422,7 +422,7 @@ static __init int tboot_late_init(void)
  
  	tboot_create_trampoline();
  
@@ -26095,7 +25898,7 @@ index f84fe00..f41d9f1 100644
 +	atomic_set_unchecked(&ap_wfs_count, 0);
  	register_hotcpu_notifier(&tboot_cpu_notifier);
  
- 	acpi_os_set_prepare_sleep(&tboot_sleep);
+ #ifdef CONFIG_DEBUG_FS
 diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
 index 24d3c91..d06b473 100644
 --- a/arch/x86/kernel/time.c
@@ -26155,24 +25958,47 @@ index f7fec09..9991981 100644
  		return -EFAULT;
  	else
  		info = infobuf;
+diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
+index 1c113db..287b42e 100644
+--- a/arch/x86/kernel/tracepoint.c
++++ b/arch/x86/kernel/tracepoint.c
+@@ -9,11 +9,11 @@
+ #include <linux/atomic.h>
+ 
+ atomic_t trace_idt_ctr = ATOMIC_INIT(0);
+-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
++const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
+ 				(unsigned long) trace_idt_table };
+ 
+ /* No need to be aligned, but done to keep all IDTs defined the same way. */
+-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
++gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
+ 
+ static int trace_irq_vector_refcount;
+ static DEFINE_MUTEX(irq_vector_mutex);
 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index 772e2a8..bad5bf6 100644
+index 8c8093b..c93f581 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
-@@ -68,12 +68,6 @@
- #include <asm/setup.h>
+@@ -66,7 +66,7 @@
+ #include <asm/proto.h>
  
- asmlinkage int system_call(void);
--
--/*
-- * The IDT has to be page-aligned to simplify the Pentium
-- * F0 0F bug workaround.
-- */
--gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
+ /* No need to be aligned, but done to keep all IDTs defined the same way. */
+-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
++gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
+ #else
+ #include <asm/processor-flags.h>
+ #include <asm/setup.h>
+@@ -75,7 +75,7 @@ asmlinkage int system_call(void);
  #endif
  
+ /* Must be page-aligned because the real IDT is used in a fixmap. */
+-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
++gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
+ 
  DECLARE_BITMAP(used_vectors, NR_VECTORS);
-@@ -106,11 +100,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
+ EXPORT_SYMBOL_GPL(used_vectors);
+@@ -107,11 +107,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
  }
  
  static int __kprobes
@@ -26186,7 +26012,7 @@ index 772e2a8..bad5bf6 100644
  		/*
  		 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
  		 * On nmi (interrupt 2), do_trap should not be called.
-@@ -123,12 +117,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
+@@ -124,12 +124,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
  		return -1;
  	}
  #endif
@@ -26212,7 +26038,7 @@ index 772e2a8..bad5bf6 100644
  		return 0;
  	}
  
-@@ -136,7 +142,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
+@@ -137,7 +149,7 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
  }
  
  static void __kprobes
@@ -26221,7 +26047,7 @@ index 772e2a8..bad5bf6 100644
  	long error_code, siginfo_t *info)
  {
  	struct task_struct *tsk = current;
-@@ -160,7 +166,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
+@@ -161,7 +173,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
  	if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
  	    printk_ratelimit()) {
  		pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
@@ -26230,7 +26056,7 @@ index 772e2a8..bad5bf6 100644
  			regs->ip, regs->sp, error_code);
  		print_vma_addr(" in ", regs->ip);
  		pr_cont("\n");
-@@ -273,7 +279,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -277,7 +289,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	conditional_sti(regs);
  
  #ifdef CONFIG_X86_32
@@ -26239,7 +26065,7 @@ index 772e2a8..bad5bf6 100644
  		local_irq_enable();
  		handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
  		goto exit;
-@@ -281,18 +287,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -285,18 +297,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
  #endif
  
  	tsk = current;
@@ -26284,7 +26110,7 @@ index 772e2a8..bad5bf6 100644
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_nr = X86_TRAP_GP;
  
-@@ -450,7 +480,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -457,7 +493,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);
  
@@ -26293,7 +26119,7 @@ index 772e2a8..bad5bf6 100644
  		handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
  					X86_TRAP_DB);
  		preempt_conditional_cli(regs);
-@@ -465,7 +495,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -472,7 +508,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.
  	 */
@@ -26302,7 +26128,7 @@ index 772e2a8..bad5bf6 100644
  		tsk->thread.debugreg6 &= ~DR_STEP;
  		set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
  		regs->flags &= ~X86_EFLAGS_TF;
-@@ -497,7 +527,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
+@@ -504,7 +540,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
  		return;
  	conditional_sti(regs);
  
@@ -26414,7 +26240,7 @@ index e8edcf5..27f9344 100644
  		goto cannot_handle;
  	if ((segoffs >> 16) == BIOSSEG)
 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
-index 10c4f30..57377c2 100644
+index 10c4f30..65408b9 100644
 --- a/arch/x86/kernel/vmlinux.lds.S
 +++ b/arch/x86/kernel/vmlinux.lds.S
 @@ -26,6 +26,13 @@
@@ -26483,7 +26309,7 @@ index 10c4f30..57377c2 100644
  		HEAD_TEXT
  		. = ALIGN(8);
  		_stext = .;
-@@ -104,13 +124,48 @@ SECTIONS
+@@ -104,13 +124,47 @@ SECTIONS
  		IRQENTRY_TEXT
  		*(.fixup)
  		*(.gnu.warning)
@@ -26519,7 +26345,6 @@ index 10c4f30..57377c2 100644
 +#ifdef CONFIG_X86_32
 +	. = ALIGN(PAGE_SIZE);
 +	.rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
-+		*(.idt)
 +		. = ALIGN(PAGE_SIZE);
 +		*(.empty_zero_page)
 +		*(.initial_pg_fixmap)
@@ -26536,7 +26361,7 @@ index 10c4f30..57377c2 100644
  
  #if defined(CONFIG_DEBUG_RODATA)
  	/* .text should occupy whole number of pages */
-@@ -122,16 +177,20 @@ SECTIONS
+@@ -122,16 +176,20 @@ SECTIONS
  
  	/* Data */
  	.data : AT(ADDR(.data) - LOAD_OFFSET) {
@@ -26560,7 +26385,7 @@ index 10c4f30..57377c2 100644
  
  		PAGE_ALIGNED_DATA(PAGE_SIZE)
  
-@@ -172,12 +231,19 @@ SECTIONS
+@@ -172,12 +230,19 @@ SECTIONS
  #endif /* CONFIG_X86_64 */
  
  	/* Init code and data - will be freed after init */
@@ -26583,7 +26408,7 @@ index 10c4f30..57377c2 100644
  	/*
  	 * percpu offsets are zero-based on SMP.  PERCPU_VADDR() changes the
  	 * output PHDR, so the next output section - .init.text - should
-@@ -186,12 +252,27 @@ SECTIONS
+@@ -186,12 +251,27 @@ SECTIONS
  	PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
  #endif
  
@@ -26616,7 +26441,7 @@ index 10c4f30..57377c2 100644
  
  	.x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
  		__x86_cpu_dev_start = .;
-@@ -253,19 +334,12 @@ SECTIONS
+@@ -253,19 +333,12 @@ SECTIONS
  	}
  
  	. = ALIGN(8);
@@ -26637,7 +26462,7 @@ index 10c4f30..57377c2 100644
  	PERCPU_SECTION(INTERNODE_CACHE_BYTES)
  #endif
  
-@@ -284,16 +358,10 @@ SECTIONS
+@@ -284,16 +357,10 @@ SECTIONS
  	.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
  		__smp_locks = .;
  		*(.smp_locks)
@@ -26655,7 +26480,7 @@ index 10c4f30..57377c2 100644
  	/* BSS */
  	. = ALIGN(PAGE_SIZE);
  	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -309,6 +377,7 @@ SECTIONS
+@@ -309,6 +376,7 @@ SECTIONS
  		__brk_base = .;
  		. += 64 * 1024;		/* 64k alignment slop space */
  		*(.brk_reservation)	/* areas brk users have reserved */
@@ -26663,7 +26488,7 @@ index 10c4f30..57377c2 100644
  		__brk_limit = .;
  	}
  
-@@ -335,13 +404,12 @@ SECTIONS
+@@ -335,13 +403,12 @@ SECTIONS
   * for the boot processor.
   */
  #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
@@ -26679,7 +26504,7 @@ index 10c4f30..57377c2 100644
  
  #ifdef CONFIG_SMP
 diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
-index 9a907a6..f83f921 100644
+index 1f96f93..d5c8f7a 100644
 --- a/arch/x86/kernel/vsyscall_64.c
 +++ b/arch/x86/kernel/vsyscall_64.c
 @@ -56,15 +56,13 @@
@@ -26743,19 +26568,10 @@ index b014d94..e775258 100644
 +EXPORT_SYMBOL(cpu_pgd);
 +#endif
 diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
-index 45a14db..075bb9b 100644
+index 8ce0072..431a0e7 100644
 --- a/arch/x86/kernel/x86_init.c
 +++ b/arch/x86/kernel/x86_init.c
-@@ -85,7 +85,7 @@ struct x86_init_ops x86_init __initdata = {
- 	},
- };
- 
--struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
-+struct x86_cpuinit_ops x86_cpuinit __cpuinitconst = {
- 	.early_percpu_clock_init	= x86_init_noop,
- 	.setup_percpu_clockev		= setup_secondary_APIC_clock,
- };
-@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit __cpuinitdata = {
+@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
  static void default_nmi_init(void) { };
  static int default_i8042_detect(void) { return 1; };
  
@@ -26764,18 +26580,18 @@ index 45a14db..075bb9b 100644
  	.calibrate_tsc			= native_calibrate_tsc,
  	.get_wallclock			= mach_get_cmos_time,
  	.set_wallclock			= mach_set_rtc_mmss,
-@@ -107,7 +107,7 @@ struct x86_platform_ops x86_platform = {
- };
- 
+@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
  EXPORT_SYMBOL_GPL(x86_platform);
+ 
+ #if defined(CONFIG_PCI_MSI)
 -struct x86_msi_ops x86_msi = {
 +struct x86_msi_ops x86_msi __read_only = {
  	.setup_msi_irqs		= native_setup_msi_irqs,
  	.compose_msi_msg	= native_compose_msi_msg,
  	.teardown_msi_irq	= native_teardown_msi_irq,
-@@ -116,7 +116,7 @@ struct x86_msi_ops x86_msi = {
- 	.setup_hpet_msi		= default_setup_hpet_msi,
- };
+@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev, int irq)
+ }
+ #endif
  
 -struct x86_io_apic_ops x86_io_apic_ops = {
 +struct x86_io_apic_ops x86_io_apic_ops __read_only = {
@@ -26783,7 +26599,7 @@ index 45a14db..075bb9b 100644
  	.read			= native_io_apic_read,
  	.write			= native_io_apic_write,
 diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
-index ada87a3..afea76d 100644
+index 422fd82..c3687ca 100644
 --- a/arch/x86/kernel/xsave.c
 +++ b/arch/x86/kernel/xsave.c
 @@ -199,6 +199,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
@@ -26803,7 +26619,7 @@ index ada87a3..afea76d 100644
  		if ((unsigned long)buf % 64 || fx_only) {
  			u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
 diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
-index a20ecb5..d0e2194 100644
+index b110fe6..d9c19f2 100644
 --- a/arch/x86/kvm/cpuid.c
 +++ b/arch/x86/kvm/cpuid.c
 @@ -124,15 +124,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
@@ -26853,37 +26669,8 @@ index a20ecb5..d0e2194 100644
  	return 0;
  
  out:
-diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
-index 5484d54..d5f90d0 100644
---- a/arch/x86/kvm/emulate.c
-+++ b/arch/x86/kvm/emulate.c
-@@ -329,6 +329,7 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt)
- 
- #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype)	\
- 	do {								\
-+		unsigned long _tmp;					\
- 		__asm__ __volatile__ (					\
- 			_PRE_EFLAGS("0", "4", "2")			\
- 			_op _suffix " %"_x"3,%1; "			\
-@@ -343,8 +344,6 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt)
- /* Raw emulation: instruction has two explicit operands. */
- #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy)		\
- 	do {								\
--		unsigned long _tmp;					\
--									\
- 		switch ((ctxt)->dst.bytes) {				\
- 		case 2:							\
- 			____emulate_2op(ctxt,_op,_wx,_wy,"w",u16);	\
-@@ -360,7 +359,6 @@ static void invalidate_registers(struct x86_emulate_ctxt *ctxt)
- 
- #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy)		     \
- 	do {								     \
--		unsigned long _tmp;					     \
- 		switch ((ctxt)->dst.bytes) {				     \
- 		case 1:							     \
- 			____emulate_2op(ctxt,_op,_bx,_by,"b",u8);	     \
 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
-index 0eee2c8..94a32c3 100644
+index 5439117..d08f3d4 100644
 --- a/arch/x86/kvm/lapic.c
 +++ b/arch/x86/kvm/lapic.c
 @@ -55,7 +55,7 @@
@@ -26896,10 +26683,10 @@ index 0eee2c8..94a32c3 100644
  #define APIC_LVT_NUM			6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
-index da20860..d19fdf5 100644
+index ad75d77..a679d32 100644
 --- a/arch/x86/kvm/paging_tmpl.h
 +++ b/arch/x86/kvm/paging_tmpl.h
-@@ -208,7 +208,7 @@ retry_walk:
+@@ -331,7 +331,7 @@ retry_walk:
  		if (unlikely(kvm_is_error_hva(host_addr)))
  			goto error;
  
@@ -26909,10 +26696,10 @@ index da20860..d19fdf5 100644
  			goto error;
  		walker->ptep_user[walker->level - 1] = ptep_user;
 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
-index a14a6ea..dc86cf0 100644
+index c0bc803..6837a50 100644
 --- a/arch/x86/kvm/svm.c
 +++ b/arch/x86/kvm/svm.c
-@@ -3493,7 +3493,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
+@@ -3501,7 +3501,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
  	int cpu = raw_smp_processor_id();
  
  	struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
@@ -26924,7 +26711,7 @@ index a14a6ea..dc86cf0 100644
  	load_TR_desc();
  }
  
-@@ -3894,6 +3898,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -3902,6 +3906,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
  #endif
  #endif
  
@@ -26936,10 +26723,10 @@ index a14a6ea..dc86cf0 100644
  
  	local_irq_disable();
 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index 5402c94..c3bdeee 100644
+index 2b2fce1..da76be4 100644
 --- a/arch/x86/kvm/vmx.c
 +++ b/arch/x86/kvm/vmx.c
-@@ -1311,12 +1311,12 @@ static void vmcs_write64(unsigned long field, u64 value)
+@@ -1316,12 +1316,12 @@ static void vmcs_write64(unsigned long field, u64 value)
  #endif
  }
  
@@ -26954,7 +26741,7 @@ index 5402c94..c3bdeee 100644
  {
  	vmcs_writel(field, vmcs_readl(field) | mask);
  }
-@@ -1517,7 +1517,11 @@ static void reload_tss(void)
+@@ -1522,7 +1522,11 @@ static void reload_tss(void)
  	struct desc_struct *descs;
  
  	descs = (void *)gdt->address;
@@ -26966,7 +26753,7 @@ index 5402c94..c3bdeee 100644
  	load_TR_desc();
  }
  
-@@ -1741,6 +1745,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
+@@ -1746,6 +1750,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
  		vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
  		vmcs_writel(HOST_GDTR_BASE, gdt->address);   /* 22.2.4 */
  
@@ -26977,7 +26764,16 @@ index 5402c94..c3bdeee 100644
  		rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
  		vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
  		vmx->loaded_vmcs->cpu = cpu;
-@@ -2935,8 +2943,11 @@ static __init int hardware_setup(void)
+@@ -2037,7 +2045,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
+  * reads and returns guest's timestamp counter "register"
+  * guest_tsc = host_tsc + tsc_offset    -- 21.3
+  */
+-static u64 guest_read_tsc(void)
++static u64 __intentional_overflow(-1) guest_read_tsc(void)
+ {
+ 	u64 host_tsc, tsc_offset;
+ 
+@@ -2982,8 +2990,11 @@ static __init int hardware_setup(void)
  	if (!cpu_has_vmx_flexpriority())
  		flexpriority_enabled = 0;
  
@@ -26991,7 +26787,7 @@ index 5402c94..c3bdeee 100644
  
  	if (enable_ept && !cpu_has_vmx_ept_2m_page())
  		kvm_disable_largepages();
-@@ -2947,13 +2958,15 @@ static __init int hardware_setup(void)
+@@ -2994,13 +3005,15 @@ static __init int hardware_setup(void)
  	if (!cpu_has_vmx_apicv())
  		enable_apicv = 0;
  
@@ -27011,7 +26807,7 @@ index 5402c94..c3bdeee 100644
  
  	if (nested)
  		nested_vmx_setup_ctls_msrs();
-@@ -4076,7 +4089,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
+@@ -4127,7 +4140,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
  
  	vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS);  /* 22.2.3 */
  	vmcs_writel(HOST_CR4, read_cr4());  /* 22.2.3, 22.2.5 */
@@ -27022,7 +26818,7 @@ index 5402c94..c3bdeee 100644
  
  	vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS);  /* 22.2.4 */
  #ifdef CONFIG_X86_64
-@@ -4098,7 +4114,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
+@@ -4149,7 +4165,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
  	vmcs_writel(HOST_IDTR_BASE, dt.address);   /* 22.2.4 */
  	vmx->host_idt_base = dt.address;
  
@@ -27031,7 +26827,7 @@ index 5402c94..c3bdeee 100644
  
  	rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
  	vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
-@@ -7030,6 +7046,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -7191,6 +7207,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
  		"jmp 2f \n\t"
  		"1: " __ex(ASM_VMX_VMRESUME) "\n\t"
  		"2: "
@@ -27044,7 +26840,7 @@ index 5402c94..c3bdeee 100644
  		/* Save guest registers, load host registers, keep flags */
  		"mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
  		"pop %0 \n\t"
-@@ -7082,6 +7104,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -7243,6 +7265,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
  #endif
  		[cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
  		[wordsize]"i"(sizeof(ulong))
@@ -27056,7 +26852,7 @@ index 5402c94..c3bdeee 100644
  	      : "cc", "memory"
  #ifdef CONFIG_X86_64
  		, "rax", "rbx", "rdi", "rsi"
-@@ -7095,7 +7122,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -7256,7 +7283,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
  	if (debugctlmsr)
  		update_debugctlmsr(debugctlmsr);
  
@@ -27065,7 +26861,7 @@ index 5402c94..c3bdeee 100644
  	/*
  	 * The sysexit path does not restore ds/es, so we must set them to
  	 * a reasonable value ourselves.
-@@ -7104,8 +7131,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -7265,8 +7292,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
  	 * may be executed in interrupt context, which saves and restore segments
  	 * around it, nullifying its effect.
  	 */
@@ -27087,10 +26883,10 @@ index 5402c94..c3bdeee 100644
  
  	vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index e8ba99c..ee9d7d9 100644
+index e5ca72a..83d5177 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -1725,8 +1725,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
+@@ -1779,8 +1779,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
  {
  	struct kvm *kvm = vcpu->kvm;
  	int lm = is_long_mode(vcpu);
@@ -27101,7 +26897,7 @@ index e8ba99c..ee9d7d9 100644
  	u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
  		: kvm->arch.xen_hvm_config.blob_size_32;
  	u32 page_num = data & ~PAGE_MASK;
-@@ -2609,6 +2609,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
+@@ -2663,6 +2663,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
  		if (n < msr_list.nmsrs)
  			goto out;
  		r = -EFAULT;
@@ -27110,7 +26906,7 @@ index e8ba99c..ee9d7d9 100644
  		if (copy_to_user(user_msr_list->indices, &msrs_to_save,
  				 num_msrs_to_save * sizeof(u32)))
  			goto out;
-@@ -5297,7 +5299,7 @@ static struct notifier_block pvclock_gtod_notifier = {
+@@ -5462,7 +5464,7 @@ static struct notifier_block pvclock_gtod_notifier = {
  };
  #endif
  
@@ -27118,12 +26914,12 @@ index e8ba99c..ee9d7d9 100644
 +int kvm_arch_init(const void *opaque)
  {
  	int r;
- 	struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
+ 	struct kvm_x86_ops *ops = opaque;
 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
-index 7114c63..a1018fc 100644
+index bdf8532..f63c587 100644
 --- a/arch/x86/lguest/boot.c
 +++ b/arch/x86/lguest/boot.c
-@@ -1201,9 +1201,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
+@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
   * Rebooting also tells the Host we're finished, but the RESTART flag tells the
   * Launcher to reboot us.
   */
@@ -28267,7 +28063,7 @@ index 2419d5f..953ee51 100644
  	CFI_RESTORE_STATE
  
 diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
-index 7609e0e..5464390 100644
+index 7609e0e..b449b98 100644
 --- a/arch/x86/lib/csum-wrappers_64.c
 +++ b/arch/x86/lib/csum-wrappers_64.c
 @@ -53,10 +53,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
@@ -28291,9 +28087,8 @@ index 7609e0e..5464390 100644
 +	pax_open_userland();
  	stac();
 -	ret = csum_partial_copy_generic(src, (void __force *)dst,
--					len, isum, NULL, errp);
 +	ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
-+					 len, isum, NULL, errp);
+ 					len, isum, NULL, errp);
  	clac();
 +	pax_close_userland();
  	return ret;
@@ -29445,7 +29240,7 @@ index a63efd6..ccecad8 100644
  	ret
  	CFI_ENDPROC
 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
-index 3eb18ac..6890bc3 100644
+index 3eb18ac..4b22130 100644
 --- a/arch/x86/lib/usercopy_32.c
 +++ b/arch/x86/lib/usercopy_32.c
 @@ -42,11 +42,13 @@ do {									\
@@ -29524,7 +29319,7 @@ index 3eb18ac..6890bc3 100644
  		       "       addl $-64, %0\n"
  		       "       addl $64, %4\n"
  		       "       addl $64, %3\n"
-@@ -149,10 +151,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
+@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
  		       "       shrl  $2, %0\n"
  		       "       andl  $3, %%eax\n"
  		       "       cld\n"
@@ -29534,13 +29329,55 @@ index 3eb18ac..6890bc3 100644
  		       "37:    rep; movsb\n"
  		       "100:\n"
 +		       __COPYUSER_RESTORE_ES
- 		       ".section .fixup,\"ax\"\n"
- 		       "101:   lea 0(%%eax,%0,4),%0\n"
- 		       "       jmp 100b\n"
-@@ -202,46 +206,150 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
- }
- 
- static unsigned long
++		       ".section .fixup,\"ax\"\n"
++		       "101:   lea 0(%%eax,%0,4),%0\n"
++		       "       jmp 100b\n"
++		       ".previous\n"
++		       _ASM_EXTABLE(1b,100b)
++		       _ASM_EXTABLE(2b,100b)
++		       _ASM_EXTABLE(3b,100b)
++		       _ASM_EXTABLE(4b,100b)
++		       _ASM_EXTABLE(5b,100b)
++		       _ASM_EXTABLE(6b,100b)
++		       _ASM_EXTABLE(7b,100b)
++		       _ASM_EXTABLE(8b,100b)
++		       _ASM_EXTABLE(9b,100b)
++		       _ASM_EXTABLE(10b,100b)
++		       _ASM_EXTABLE(11b,100b)
++		       _ASM_EXTABLE(12b,100b)
++		       _ASM_EXTABLE(13b,100b)
++		       _ASM_EXTABLE(14b,100b)
++		       _ASM_EXTABLE(15b,100b)
++		       _ASM_EXTABLE(16b,100b)
++		       _ASM_EXTABLE(17b,100b)
++		       _ASM_EXTABLE(18b,100b)
++		       _ASM_EXTABLE(19b,100b)
++		       _ASM_EXTABLE(20b,100b)
++		       _ASM_EXTABLE(21b,100b)
++		       _ASM_EXTABLE(22b,100b)
++		       _ASM_EXTABLE(23b,100b)
++		       _ASM_EXTABLE(24b,100b)
++		       _ASM_EXTABLE(25b,100b)
++		       _ASM_EXTABLE(26b,100b)
++		       _ASM_EXTABLE(27b,100b)
++		       _ASM_EXTABLE(28b,100b)
++		       _ASM_EXTABLE(29b,100b)
++		       _ASM_EXTABLE(30b,100b)
++		       _ASM_EXTABLE(31b,100b)
++		       _ASM_EXTABLE(32b,100b)
++		       _ASM_EXTABLE(33b,100b)
++		       _ASM_EXTABLE(34b,100b)
++		       _ASM_EXTABLE(35b,100b)
++		       _ASM_EXTABLE(36b,100b)
++		       _ASM_EXTABLE(37b,100b)
++		       _ASM_EXTABLE(99b,101b)
++		       : "=&c"(size), "=&D" (d0), "=&S" (d1)
++		       :  "1"(to), "2"(from), "0"(size)
++		       : "eax", "edx", "memory");
++	return size;
++}
++
++static unsigned long
 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
 +{
 +	int d0, d1;
@@ -29596,57 +29433,10 @@ index 3eb18ac..6890bc3 100644
 +		       "36:    movl %%eax, %0\n"
 +		       "37:    rep; "__copyuser_seg" movsb\n"
 +		       "100:\n"
-+		       ".section .fixup,\"ax\"\n"
-+		       "101:   lea 0(%%eax,%0,4),%0\n"
-+		       "       jmp 100b\n"
-+		       ".previous\n"
-+		       _ASM_EXTABLE(1b,100b)
-+		       _ASM_EXTABLE(2b,100b)
-+		       _ASM_EXTABLE(3b,100b)
-+		       _ASM_EXTABLE(4b,100b)
-+		       _ASM_EXTABLE(5b,100b)
-+		       _ASM_EXTABLE(6b,100b)
-+		       _ASM_EXTABLE(7b,100b)
-+		       _ASM_EXTABLE(8b,100b)
-+		       _ASM_EXTABLE(9b,100b)
-+		       _ASM_EXTABLE(10b,100b)
-+		       _ASM_EXTABLE(11b,100b)
-+		       _ASM_EXTABLE(12b,100b)
-+		       _ASM_EXTABLE(13b,100b)
-+		       _ASM_EXTABLE(14b,100b)
-+		       _ASM_EXTABLE(15b,100b)
-+		       _ASM_EXTABLE(16b,100b)
-+		       _ASM_EXTABLE(17b,100b)
-+		       _ASM_EXTABLE(18b,100b)
-+		       _ASM_EXTABLE(19b,100b)
-+		       _ASM_EXTABLE(20b,100b)
-+		       _ASM_EXTABLE(21b,100b)
-+		       _ASM_EXTABLE(22b,100b)
-+		       _ASM_EXTABLE(23b,100b)
-+		       _ASM_EXTABLE(24b,100b)
-+		       _ASM_EXTABLE(25b,100b)
-+		       _ASM_EXTABLE(26b,100b)
-+		       _ASM_EXTABLE(27b,100b)
-+		       _ASM_EXTABLE(28b,100b)
-+		       _ASM_EXTABLE(29b,100b)
-+		       _ASM_EXTABLE(30b,100b)
-+		       _ASM_EXTABLE(31b,100b)
-+		       _ASM_EXTABLE(32b,100b)
-+		       _ASM_EXTABLE(33b,100b)
-+		       _ASM_EXTABLE(34b,100b)
-+		       _ASM_EXTABLE(35b,100b)
-+		       _ASM_EXTABLE(36b,100b)
-+		       _ASM_EXTABLE(37b,100b)
-+		       _ASM_EXTABLE(99b,101b)
-+		       : "=&c"(size), "=&D" (d0), "=&S" (d1)
-+		       :  "1"(to), "2"(from), "0"(size)
-+		       : "eax", "edx", "memory");
-+	return size;
-+}
-+
-+static unsigned long __size_overflow(3)
- __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
- {
+ 		       ".section .fixup,\"ax\"\n"
+ 		       "101:   lea 0(%%eax,%0,4),%0\n"
+ 		       "       jmp 100b\n"
+@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
  	int d0, d1;
  	__asm__ __volatile__(
  		       "        .align 2,0x90\n"
@@ -29718,15 +29508,7 @@ index 3eb18ac..6890bc3 100644
  		       "8:\n"
  		       ".section .fixup,\"ax\"\n"
  		       "9:      lea 0(%%eax,%0,4),%0\n"
-@@ -298,48 +406,48 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
-  * hyoshiok@miraclelinux.com
-  */
- 
--static unsigned long __copy_user_zeroing_intel_nocache(void *to,
-+static unsigned long __size_overflow(3) __copy_user_zeroing_intel_nocache(void *to,
- 				const void __user *from, unsigned long size)
- {
- 	int d0, d1;
+@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
  
  	__asm__ __volatile__(
  	       "        .align 2,0x90\n"
@@ -29798,15 +29580,7 @@ index 3eb18ac..6890bc3 100644
  	       "8:\n"
  	       ".section .fixup,\"ax\"\n"
  	       "9:      lea 0(%%eax,%0,4),%0\n"
-@@ -392,48 +500,48 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
- 	return size;
- }
- 
--static unsigned long __copy_user_intel_nocache(void *to,
-+static unsigned long __size_overflow(3) __copy_user_intel_nocache(void *to,
- 				const void __user *from, unsigned long size)
- {
- 	int d0, d1;
+@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
  
  	__asm__ __volatile__(
  	       "        .align 2,0x90\n"
@@ -30048,7 +29822,7 @@ index 3eb18ac..6890bc3 100644
 +EXPORT_SYMBOL(set_fs);
 +#endif
 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
-index 906fea3..0194a18 100644
+index c905e89..01ab928 100644
 --- a/arch/x86/lib/usercopy_64.c
 +++ b/arch/x86/lib/usercopy_64.c
 @@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
@@ -30091,7 +29865,7 @@ index 906fea3..0194a18 100644
 @@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
   * it is not necessary to optimize tail handling.
   */
- unsigned long
+ __visible unsigned long
 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
  {
@@ -30177,7 +29951,7 @@ index 903ec1e..c4166b2 100644
  }
  
 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index 654be4a..a4a3da1 100644
+index 3aaeffc..42ea9fb 100644
 --- a/arch/x86/mm/fault.c
 +++ b/arch/x86/mm/fault.c
 @@ -14,11 +14,18 @@
@@ -30369,7 +30143,7 @@ index 654be4a..a4a3da1 100644
  
  static void
  show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -579,14 +663,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
+@@ -579,15 +663,27 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
  	if (!oops_may_print())
  		return;
  
@@ -30382,8 +30156,8 @@ index 654be4a..a4a3da1 100644
  		if (pte && pte_present(*pte) && !pte_exec(*pte))
 -			printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
 +			printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
-+	}
-+
+ 	}
+ 
 +#ifdef CONFIG_PAX_KERNEXEC
 +	if (init_mm.start_code <= address && address < init_mm.end_code) {
 +		if (current->signal->curr_ip)
@@ -30393,11 +30167,12 @@ index 654be4a..a4a3da1 100644
 +		else
 +			printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
 +					from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
- 	}
++	}
 +#endif
- 
++
  	printk(KERN_ALERT "BUG: unable to handle kernel ");
  	if (address < PAGE_SIZE)
+ 		printk(KERN_CONT "NULL pointer dereference");
 @@ -750,6 +846,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
  				return;
  		}
@@ -30430,7 +30205,7 @@ index 654be4a..a4a3da1 100644
  		code = BUS_MCEERR_AR;
  	}
  #endif
-@@ -898,6 +1010,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
+@@ -889,6 +1001,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
  	return 1;
  }
  
@@ -30530,7 +30305,7 @@ index 654be4a..a4a3da1 100644
  /*
   * Handle a spurious fault caused by a stale TLB entry.
   *
-@@ -964,6 +1169,9 @@ int show_unhandled_signals = 1;
+@@ -955,6 +1160,9 @@ int show_unhandled_signals = 1;
  static inline int
  access_error(unsigned long error_code, struct vm_area_struct *vma)
  {
@@ -30540,7 +30315,7 @@ index 654be4a..a4a3da1 100644
  	if (error_code & PF_WRITE) {
  		/* write, present and write, not present: */
  		if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -992,7 +1200,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
+@@ -983,7 +1191,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
  	if (error_code & PF_USER)
  		return false;
  
@@ -30549,20 +30324,10 @@ index 654be4a..a4a3da1 100644
  		return false;
  
  	return true;
-@@ -1008,19 +1216,34 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
- {
- 	struct vm_area_struct *vma;
- 	struct task_struct *tsk;
--	unsigned long address;
- 	struct mm_struct *mm;
- 	int fault;
- 	int write = error_code & PF_WRITE;
- 	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
- 					(write ? FAULT_FLAG_WRITE : 0);
+@@ -1010,6 +1218,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
+ 	/* Get the faulting address: */
+ 	address = read_cr2();
  
-+	/* Get the faulting address: */
-+	unsigned long address = read_cr2();
-+
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +	if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
 +		if (!search_exception_tables(regs->ip)) {
@@ -30579,16 +30344,10 @@ index 654be4a..a4a3da1 100644
 +	}
 +#endif
 +
- 	tsk = current;
- 	mm = tsk->mm;
- 
--	/* Get the faulting address: */
--	address = read_cr2();
--
  	/*
  	 * Detect and handle instructions that would cause a page fault for
  	 * both a tracked kernel page and a userspace page.
-@@ -1080,7 +1303,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
+@@ -1069,7 +1293,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:
  	 */
@@ -30596,8 +30355,8 @@ index 654be4a..a4a3da1 100644
 +	if (user_mode(regs)) {
  		local_irq_enable();
  		error_code |= PF_USER;
- 	} else {
-@@ -1142,6 +1365,11 @@ retry:
+ 		flags |= FAULT_FLAG_USER;
+@@ -1135,6 +1359,11 @@ retry:
  		might_sleep();
  	}
  
@@ -30609,7 +30368,7 @@ index 654be4a..a4a3da1 100644
  	vma = find_vma(mm, address);
  	if (unlikely(!vma)) {
  		bad_area(regs, error_code, address);
-@@ -1153,18 +1381,24 @@ retry:
+@@ -1146,18 +1375,24 @@ retry:
  		bad_area(regs, error_code, address);
  		return;
  	}
@@ -30645,7 +30404,7 @@ index 654be4a..a4a3da1 100644
  	if (unlikely(expand_stack(vma, address))) {
  		bad_area(regs, error_code, address);
  		return;
-@@ -1230,3 +1464,292 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
+@@ -1231,3 +1466,292 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
  	__do_page_fault(regs, error_code);
  	exception_exit(prev_state);
  }
@@ -30952,10 +30711,10 @@ index dd74e46..7d26398 100644
  		return 0;
  
 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
-index 252b8f5..4dcfdc1 100644
+index 4500142..53a363c 100644
 --- a/arch/x86/mm/highmem_32.c
 +++ b/arch/x86/mm/highmem_32.c
-@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
+@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, 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)));
@@ -30968,10 +30727,10 @@ index 252b8f5..4dcfdc1 100644
  
  	return (void *)vaddr;
 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
-index ae1aa71..d9bea75 100644
+index 9d980d8..6bbfacb 100644
 --- a/arch/x86/mm/hugetlbpage.c
 +++ b/arch/x86/mm/hugetlbpage.c
-@@ -271,23 +271,30 @@ follow_huge_pud(struct mm_struct *mm, unsigned long address,
+@@ -92,23 +92,30 @@ int pmd_huge_support(void)
  #ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA
  static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
  		unsigned long addr, unsigned long len,
@@ -31005,7 +30764,7 @@ index ae1aa71..d9bea75 100644
  {
  	struct hstate *h = hstate_file(file);
  	struct vm_unmapped_area_info info;
-@@ -299,6 +306,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+@@ -120,6 +127,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
  	info.high_limit = current->mm->mmap_base;
  	info.align_mask = PAGE_MASK & ~huge_page_mask(h);
  	info.align_offset = 0;
@@ -31013,7 +30772,7 @@ index ae1aa71..d9bea75 100644
  	addr = vm_unmapped_area(&info);
  
  	/*
-@@ -311,6 +319,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+@@ -132,6 +140,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
  		VM_BUG_ON(addr != -ENOMEM);
  		info.flags = 0;
  		info.low_limit = TASK_UNMAPPED_BASE;
@@ -31026,7 +30785,7 @@ index ae1aa71..d9bea75 100644
  		info.high_limit = TASK_SIZE;
  		addr = vm_unmapped_area(&info);
  	}
-@@ -325,10 +339,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -146,10 +160,20 @@ 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;
@@ -31048,7 +30807,7 @@ index ae1aa71..d9bea75 100644
  		return -ENOMEM;
  
  	if (flags & MAP_FIXED) {
-@@ -337,19 +361,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -158,19 +182,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
  		return addr;
  	}
  
@@ -31076,7 +30835,7 @@ index ae1aa71..d9bea75 100644
  
  #endif /*HAVE_ARCH_HUGETLB_UNMAPPED_AREA*/
 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index 7a5bf1b..c96ab0d 100644
+index 04664cd..dae6e5d 100644
 --- a/arch/x86/mm/init.c
 +++ b/arch/x86/mm/init.c
 @@ -4,6 +4,7 @@
@@ -31131,10 +30890,10 @@ index 7a5bf1b..c96ab0d 100644
 +#ifdef CONFIG_GRKERNSEC_KMEM
 +	/* allow BDA */
 +	if (!pagenr)
-+		return 1;
+ 		return 1;
 +	/* allow EBDA */
 +	if (pagenr >= ebda_start && pagenr < ebda_end)
- 		return 1;
++		return 1;
 +	/* if tboot is in use, allow access to its hardcoded serial log range */
 +	if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
 +		return 1;
@@ -31157,7 +30916,7 @@ index 7a5bf1b..c96ab0d 100644
  	if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
  		return 0;
  	if (!page_is_ram(pagenr))
-@@ -538,8 +582,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
+@@ -530,8 +574,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
  #endif
  }
  
@@ -31233,7 +30992,7 @@ index 7a5bf1b..c96ab0d 100644
 +		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)));
++	set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
 +	}
 +*/
 +#endif
@@ -31259,7 +31018,7 @@ index 7a5bf1b..c96ab0d 100644
 +	addr = (unsigned long)__va(__pa(__START_KERNEL_map));
 +	end = addr + KERNEL_IMAGE_SIZE;
 +	for (; addr < end; addr += PMD_SIZE) {
-+		pgd = pgd_offset_k(addr);
++	pgd = pgd_offset_k(addr);
 +		pud = pud_offset(pgd, addr);
 +		pmd = pmd_offset(pud, addr);
 +		if (!pmd_present(*pmd))
@@ -31272,11 +31031,11 @@ index 7a5bf1b..c96ab0d 100644
 +	flush_tlb_all();
 +#endif
 +
- 	free_init_pages("unused kernel memory",
+ 	free_init_pages("unused kernel",
  			(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 3ac7e31..89611b7 100644
+index 4287f1f..3b99c71 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
 @@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
@@ -31490,16 +31249,7 @@ index 3ac7e31..89611b7 100644
  EXPORT_SYMBOL_GPL(__supported_pte_mask);
  
  /* user-defined highmem size */
-@@ -772,7 +774,7 @@ void __init mem_init(void)
- 	after_bootmem = 1;
- 
- 	codesize =  (unsigned long) &_etext - (unsigned long) &_text;
--	datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
-+	datasize =  (unsigned long) &_edata - (unsigned long) &_sdata;
- 	initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
- 
- 	printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
-@@ -813,10 +815,10 @@ void __init mem_init(void)
+@@ -787,10 +789,10 @@ void __init mem_init(void)
  		((unsigned long)&__init_end -
  		 (unsigned long)&__init_begin) >> 10,
  
@@ -31513,7 +31263,7 @@ index 3ac7e31..89611b7 100644
  		((unsigned long)&_etext - (unsigned long)&_text) >> 10);
  
  	/*
-@@ -906,6 +908,7 @@ void set_kernel_text_rw(void)
+@@ -880,6 +882,7 @@ void set_kernel_text_rw(void)
  	if (!kernel_set_to_readonly)
  		return;
  
@@ -31521,7 +31271,7 @@ index 3ac7e31..89611b7 100644
  	pr_debug("Set kernel text: %lx - %lx for read write\n",
  		 start, start+size);
  
-@@ -920,6 +923,7 @@ void set_kernel_text_ro(void)
+@@ -894,6 +897,7 @@ void set_kernel_text_ro(void)
  	if (!kernel_set_to_readonly)
  		return;
  
@@ -31529,7 +31279,7 @@ index 3ac7e31..89611b7 100644
  	pr_debug("Set kernel text: %lx - %lx for read only\n",
  		 start, start+size);
  
-@@ -948,6 +952,7 @@ void mark_rodata_ro(void)
+@@ -922,6 +926,7 @@ void mark_rodata_ro(void)
  	unsigned long start = PFN_ALIGN(_text);
  	unsigned long size = PFN_ALIGN(_etext) - start;
  
@@ -31538,7 +31288,7 @@ index 3ac7e31..89611b7 100644
  	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
  		size >> 10);
 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
-index bb00c46..bf91a67 100644
+index 104d56a..62ba13f1 100644
 --- a/arch/x86/mm/init_64.c
 +++ b/arch/x86/mm/init_64.c
 @@ -151,7 +151,7 @@ early_param("gbpages", parse_direct_gbpages_on);
@@ -31662,7 +31412,7 @@ index bb00c46..bf91a67 100644
  		spin_unlock(&init_mm.page_table_lock);
  		pgd_changed = true;
  	}
-@@ -1221,8 +1242,8 @@ int kern_addr_valid(unsigned long addr)
+@@ -1188,8 +1209,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),
@@ -31673,7 +31423,7 @@ index bb00c46..bf91a67 100644
  };
  
  struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-@@ -1256,7 +1277,7 @@ int in_gate_area_no_mm(unsigned long addr)
+@@ -1223,7 +1244,7 @@ int in_gate_area_no_mm(unsigned long addr)
  
  const char *arch_vma_name(struct vm_area_struct *vma)
  {
@@ -31683,7 +31433,7 @@ index bb00c46..bf91a67 100644
  	if (vma == &gate_vma)
  		return "[vsyscall]";
 diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
-index 7b179b4..6bd1777 100644
+index 7b179b4..6bd17777 100644
 --- a/arch/x86/mm/iomap_32.c
 +++ b/arch/x86/mm/iomap_32.c
 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
@@ -31699,7 +31449,7 @@ index 7b179b4..6bd1777 100644
  
  	return (void *)vaddr;
 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index 9a1e658..da003f3 100644
+index 799580c..72f9fe0 100644
 --- a/arch/x86/mm/ioremap.c
 +++ b/arch/x86/mm/ioremap.c
 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
@@ -31776,7 +31526,7 @@ index d87dd6d..bf3fa66 100644
  
  	pte = kmemcheck_pte_lookup(address);
 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
-index 5c1ae28..45f4ac9 100644
+index 25e7e13..1964579 100644
 --- a/arch/x86/mm/mmap.c
 +++ b/arch/x86/mm/mmap.c
 @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
@@ -31853,7 +31603,7 @@ index 5c1ae28..45f4ac9 100644
  	if (mmap_is_legacy()) {
  		mm->mmap_base = mm->mmap_legacy_base;
 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
-index dc0b727..f612039 100644
+index 0057a7a..95c7edd 100644
 --- a/arch/x86/mm/mmio-mod.c
 +++ b/arch/x86/mm/mmio-mod.c
 @@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
@@ -31902,7 +31652,7 @@ index dc0b727..f612039 100644
  	might_sleep();
  	if (is_enabled()) /* recheck and proper locking in *_core() */
 diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
-index a71c4e2..301ae44 100644
+index 8bf93ba..dbcd670 100644
 --- a/arch/x86/mm/numa.c
 +++ b/arch/x86/mm/numa.c
 @@ -474,7 +474,7 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
@@ -32129,7 +31879,7 @@ index 9f0614d..92ae64a 100644
  	p += get_opcode(p, &opcode);
  	for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
-index 17fda6a..f7d54a0 100644
+index dfa537a..fd45c64 100644
 --- a/arch/x86/mm/pgtable.c
 +++ b/arch/x86/mm/pgtable.c
 @@ -91,10 +91,67 @@ static inline void pgd_list_del(pgd_t *pgd)
@@ -32144,7 +31894,7 @@ index 17fda6a..f7d54a0 100644
 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
 +{
 +	unsigned int count = USER_PGD_PTRS;
-+
+ 
 +	if (!pax_user_shadow_base)
 +		return;
 +
@@ -32170,7 +31920,7 @@ index 17fda6a..f7d54a0 100644
 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
 +		pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
 +#endif
- 
++
 +		*dst++ = pgd;
 +	}
 +
@@ -32278,7 +32028,7 @@ index 17fda6a..f7d54a0 100644
  		return -ENOMEM;
  	}
  
-@@ -219,51 +279,55 @@ static int preallocate_pmds(pmd_t *pmds[])
+@@ -219,49 +279,52 @@ static int preallocate_pmds(pmd_t *pmds[])
   * preallocate which never got a corresponding vma will need to be
   * freed manually.
   */
@@ -32311,7 +32061,6 @@ index 17fda6a..f7d54a0 100644
  {
 -	pud_t *pud;
 +	pyd_t *pyd;
- 	unsigned long addr;
  	int i;
  
 -	if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
@@ -32319,19 +32068,17 @@ index 17fda6a..f7d54a0 100644
  		return;
  
 -	pud = pud_offset(pgd, 0);
+-
+-	for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
+-		pmd_t *pmd = pmds[i];
 +#ifdef CONFIG_X86_64
 +	pyd = pyd_offset(mm, 0L);
 +#else
 +	pyd = pyd_offset(pgd, 0L);
 +#endif
  
-- 	for (addr = i = 0; i < PREALLOCATED_PMDS;
--	     i++, pud++, addr += PUD_SIZE) {
--		pmd_t *pmd = pmds[i];
-+ 	for (addr = i = 0; i < PREALLOCATED_PXDS;
-+	     i++, pyd++, addr += PYD_SIZE) {
++	for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
 +		pxd_t *pxd = pxds[i];
- 
  		if (i >= KERNEL_PGD_BOUNDARY)
 -			memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
 -			       sizeof(pmd_t) * PTRS_PER_PMD);
@@ -32351,7 +32098,7 @@ index 17fda6a..f7d54a0 100644
  
  	pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
  
-@@ -272,11 +336,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -270,11 +333,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  
  	mm->pgd = pgd;
  
@@ -32365,7 +32112,7 @@ index 17fda6a..f7d54a0 100644
  
  	/*
  	 * Make sure that pre-populating the pmds is atomic with
-@@ -286,14 +350,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -284,14 +347,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  	spin_lock(&pgd_lock);
  
  	pgd_ctor(mm, pgd);
@@ -32383,7 +32130,7 @@ index 17fda6a..f7d54a0 100644
  out_free_pgd:
  	free_page((unsigned long)pgd);
  out:
-@@ -302,7 +366,7 @@ out:
+@@ -300,7 +363,7 @@ out:
  
  void pgd_free(struct mm_struct *mm, pgd_t *pgd)
  {
@@ -32433,7 +32180,7 @@ index e666cbb..61788c45 100644
  	unsigned long phys_addr = x - PAGE_OFFSET;
  	/* VMALLOC_* aren't constants  */
 diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
-index 410531d..0f16030 100644
+index 90555bf..f5f1828 100644
 --- a/arch/x86/mm/setup_nx.c
 +++ b/arch/x86/mm/setup_nx.c
 @@ -5,8 +5,10 @@
@@ -32441,7 +32188,7 @@ index 410531d..0f16030 100644
  #include <asm/proto.h>
  
 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
- static int disable_nx __cpuinitdata;
+ static int disable_nx;
  
 +#ifndef CONFIG_PAX_PAGEEXEC
  /*
@@ -32455,7 +32202,7 @@ index 410531d..0f16030 100644
 +
 +#endif
  
- void __cpuinit x86_configure_nx(void)
+ void x86_configure_nx(void)
  {
 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
  	if (cpu_has_nx && !disable_nx)
@@ -32466,7 +32213,7 @@ index 410531d..0f16030 100644
  }
  
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index 282375f..e03a98f 100644
+index ae699b3..f1b2ad2 100644
 --- a/arch/x86/mm/tlb.c
 +++ b/arch/x86/mm/tlb.c
 @@ -48,7 +48,11 @@ void leave_mm(int cpu)
@@ -32638,18 +32385,10 @@ index 877b9a1..a8ecf42 100644
 +	pax_force_retaddr
  	ret
 diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
-index f66b540..3e88dfb 100644
+index 26328e8..5f96c25 100644
 --- a/arch/x86/net/bpf_jit_comp.c
 +++ b/arch/x86/net/bpf_jit_comp.c
-@@ -12,6 +12,7 @@
- #include <linux/netdevice.h>
- #include <linux/filter.h>
- #include <linux/if_vlan.h>
-+#include <linux/random.h>
- 
- /*
-  * Conventions :
-@@ -49,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
+@@ -50,13 +50,90 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
  	return ptr + len;
  }
  
@@ -32740,7 +32479,7 @@ index f66b540..3e88dfb 100644
  
  #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
  #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
-@@ -90,6 +168,24 @@ do {									\
+@@ -91,6 +168,24 @@ do {									\
  #define X86_JBE 0x76
  #define X86_JA  0x77
  
@@ -32765,7 +32504,7 @@ index f66b540..3e88dfb 100644
  #define EMIT_COND_JMP(op, offset)				\
  do {								\
  	if (is_near(offset))					\
-@@ -97,6 +193,7 @@ do {								\
+@@ -98,6 +193,7 @@ do {								\
  	else {							\
  		EMIT2(0x0f, op + 0x10);				\
  		EMIT(offset, 4); /* jxx .+off32 */		\
@@ -32773,19 +32512,53 @@ index f66b540..3e88dfb 100644
  	}							\
  } while (0)
  
-@@ -121,6 +218,11 @@ static inline void bpf_flush_icache(void *start, void *end)
- 	set_fs(old_fs);
+@@ -145,55 +241,54 @@ static int pkt_type_offset(void)
+ 	return -1;
  }
  
-+struct bpf_jit_work {
-+	struct work_struct work;
-+	void *image;
-+};
-+
- #define CHOOSE_LOAD_FUNC(K, func) \
- 	((int)K < 0 ? ((int)K >= SKF_LL_OFF ? func##_negative_offset : func) : func##_positive_offset)
+-struct bpf_binary_header {
+-	unsigned int	pages;
+-	/* Note : for security reasons, bpf code will follow a randomly
+-	 * sized amount of int3 instructions
+-	 */
+-	u8		image[];
+-};
+-
+-static struct bpf_binary_header *bpf_alloc_binary(unsigned int proglen,
++/* Note : for security reasons, bpf code will follow a randomly
++ * sized amount of int3 instructions
++ */
++static u8 *bpf_alloc_binary(unsigned int proglen,
+ 						  u8 **image_ptr)
+ {
+ 	unsigned int sz, hole;
+-	struct bpf_binary_header *header;
++	u8 *header;
  
-@@ -146,7 +248,7 @@ static int pkt_type_offset(void)
+ 	/* Most of BPF filters are really small,
+ 	 * but if some of them fill a page, allow at least
+ 	 * 128 extra bytes to insert a random section of int3
+ 	 */
+-	sz = round_up(proglen + sizeof(*header) + 128, PAGE_SIZE);
+-	header = module_alloc(sz);
++	sz = round_up(proglen + 128, PAGE_SIZE);
++	header = module_alloc_exec(sz);
+ 	if (!header)
+ 		return NULL;
+ 
++	pax_open_kernel();
+ 	memset(header, 0xcc, sz); /* fill whole space with int3 instructions */
++	pax_close_kernel();
+ 
+-	header->pages = sz / PAGE_SIZE;
+-	hole = sz - (proglen + sizeof(*header));
++	hole = PAGE_SIZE - (proglen & ~PAGE_MASK);
+ 
+ 	/* insert a random number of int3 instructions before BPF code */
+-	*image_ptr = &header->image[prandom_u32() % hole];
++	*image_ptr = &header[prandom_u32() % hole];
+ 	return header;
+ }
  
  void bpf_jit_compile(struct sk_filter *fp)
  {
@@ -32794,7 +32567,14 @@ index f66b540..3e88dfb 100644
  	u8 *prog;
  	unsigned int proglen, oldproglen = 0;
  	int ilen, i;
-@@ -159,6 +261,9 @@ void bpf_jit_compile(struct sk_filter *fp)
+ 	int t_offset, f_offset;
+ 	u8 t_op, f_op, seen = 0, pass;
+ 	u8 *image = NULL;
+-	struct bpf_binary_header *header = NULL;
++	u8 *header = NULL;
+ 	u8 *func;
+ 	int pc_ret0 = -1; /* bpf index of first RET #0 instruction (if any) */
+ 	unsigned int cleanup_addr; /* epilogue code offset */
  	unsigned int *addrs;
  	const struct sock_filter *filter = fp->insns;
  	int flen = fp->len;
@@ -32804,14 +32584,10 @@ index f66b540..3e88dfb 100644
  
  	if (!bpf_jit_enable)
  		return;
-@@ -167,11 +272,19 @@ void bpf_jit_compile(struct sk_filter *fp)
+@@ -202,11 +297,15 @@ void bpf_jit_compile(struct sk_filter *fp)
  	if (addrs == NULL)
  		return;
  
-+	fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
-+	if (!fp->work)
-+		goto out;
-+
 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
 +	randkey = get_random_int();
 +#endif
@@ -32826,7 +32602,7 @@ index f66b540..3e88dfb 100644
  		addrs[i] = proglen;
  	}
  	cleanup_addr = proglen; /* epilogue address */
-@@ -282,10 +395,8 @@ void bpf_jit_compile(struct sk_filter *fp)
+@@ -317,10 +416,8 @@ void bpf_jit_compile(struct sk_filter *fp)
  			case BPF_S_ALU_MUL_K: /* A *= K */
  				if (is_imm8(K))
  					EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
@@ -32839,7 +32615,7 @@ index f66b540..3e88dfb 100644
  				break;
  			case BPF_S_ALU_DIV_X: /* A /= X; */
  				seen |= SEEN_XREG;
-@@ -325,13 +436,23 @@ void bpf_jit_compile(struct sk_filter *fp)
+@@ -360,13 +457,23 @@ void bpf_jit_compile(struct sk_filter *fp)
  				break;
  			case BPF_S_ALU_MOD_K: /* A %= K; */
  				EMIT2(0x31, 0xd2);	/* xor %edx,%edx */
@@ -32863,7 +32639,7 @@ index f66b540..3e88dfb 100644
  				EMIT4(0x48, 0xc1, 0xe8, 0x20); /* shr $0x20,%rax */
  				break;
  			case BPF_S_ALU_AND_X:
-@@ -602,8 +723,7 @@ common_load_ind:		seen |= SEEN_DATAREF | SEEN_XREG;
+@@ -637,8 +744,7 @@ common_load_ind:		seen |= SEEN_DATAREF | SEEN_XREG;
  					if (is_imm8(K)) {
  						EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */
  					} else {
@@ -32873,22 +32649,13 @@ index f66b540..3e88dfb 100644
  					}
  				} else {
  					EMIT2(0x89,0xde); /* mov %ebx,%esi */
-@@ -686,17 +806,18 @@ cond_branch:			f_offset = addrs[i + filter[i].jf] - addrs[i];
- 				break;
- 			default:
- 				/* hmm, too complex filter, give up with jit compiler */
--				goto out;
-+				goto error;
- 			}
- 			ilen = prog - temp;
- 			if (image) {
+@@ -728,10 +834,12 @@ cond_branch:			f_offset = addrs[i + filter[i].jf] - addrs[i];
  				if (unlikely(proglen + ilen > oldproglen)) {
  					pr_err("bpb_jit_compile fatal error\n");
--					kfree(addrs);
--					module_free(NULL, image);
--					return;
+ 					kfree(addrs);
+-					module_free(NULL, header);
 +					module_free_exec(NULL, image);
-+					goto error;
+ 					return;
  				}
 +				pax_open_kernel();
  				memcpy(image + proglen, temp, ilen);
@@ -32896,56 +32663,27 @@ index f66b540..3e88dfb 100644
  			}
  			proglen += ilen;
  			addrs[i] = proglen;
-@@ -717,11 +838,9 @@ cond_branch:			f_offset = addrs[i + filter[i].jf] - addrs[i];
- 			break;
- 		}
- 		if (proglen == oldproglen) {
--			image = module_alloc(max_t(unsigned int,
--						   proglen,
--						   sizeof(struct work_struct)));
-+			image = module_alloc_exec(proglen);
- 			if (!image)
--				goto out;
-+				goto error;
- 		}
- 		oldproglen = proglen;
- 	}
-@@ -732,7 +851,10 @@ cond_branch:			f_offset = addrs[i + filter[i].jf] - addrs[i];
+@@ -764,7 +872,6 @@ cond_branch:			f_offset = addrs[i + filter[i].jf] - addrs[i];
+ 
  	if (image) {
- 		bpf_flush_icache(image, image + proglen);
+ 		bpf_flush_icache(header, image + proglen);
+-		set_memory_ro((unsigned long)header, header->pages);
  		fp->bpf_func = (void *)image;
--	}
-+	} else
-+error:
-+		kfree(fp->work);
-+
+ 	}
  out:
- 	kfree(addrs);
- 	return;
-@@ -740,18 +862,20 @@ out:
- 
- static void jit_free_defer(struct work_struct *arg)
- {
--	module_free(NULL, arg);
-+	module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
-+	kfree(arg);
- }
- 
- /* run from softirq, we must use a work_struct to call
-- * module_free() from process context
-+ * module_free_exec() from process context
-  */
- void bpf_jit_free(struct sk_filter *fp)
+@@ -776,10 +883,9 @@ static void bpf_jit_free_deferred(struct work_struct *work)
  {
- 	if (fp->bpf_func != sk_run_filter) {
--		struct work_struct *work = (struct work_struct *)fp->bpf_func;
-+		struct work_struct *work = &fp->work->work;
+ 	struct sk_filter *fp = container_of(work, struct sk_filter, work);
+ 	unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
+-	struct bpf_binary_header *header = (void *)addr;
  
- 		INIT_WORK(work, jit_free_defer);
-+		fp->work->image = fp->bpf_func;
- 		schedule_work(work);
- 	}
+-	set_memory_rw(addr, header->pages);
+-	module_free(NULL, header);
++	set_memory_rw(addr, 1);
++	module_free_exec(NULL, (void *)addr);
+ 	kfree(fp);
  }
+ 
 diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
 index d6aa6e8..266395a 100644
 --- a/arch/x86/oprofile/backtrace.c
@@ -32983,7 +32721,7 @@ index d6aa6e8..266395a 100644
  		if (depth)
  			dump_trace(NULL, regs, (unsigned long *)stack, 0,
 diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
-index 48768df..ba9143c 100644
+index 6890d84..1dad1f1 100644
 --- a/arch/x86/oprofile/nmi_int.c
 +++ b/arch/x86/oprofile/nmi_int.c
 @@ -23,6 +23,7 @@
@@ -33009,7 +32747,7 @@ index 48768df..ba9143c 100644
  	mux_init(ops);
  
 diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
-index b2b9443..be58856 100644
+index 50d86c0..7985318 100644
 --- a/arch/x86/oprofile/op_model_amd.c
 +++ b/arch/x86/oprofile/op_model_amd.c
 @@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
@@ -33065,19 +32803,6 @@ index 71e8a67..6a313bb 100644
  
  struct op_counter_config;
  
-diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
-index e9e6ed5..e47ae67 100644
---- a/arch/x86/pci/amd_bus.c
-+++ b/arch/x86/pci/amd_bus.c
-@@ -337,7 +337,7 @@ static int __cpuinit amd_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata amd_cpu_notifier = {
-+static struct notifier_block amd_cpu_notifier = {
- 	.notifier_call	= amd_cpu_notify,
- };
- 
 diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
 index 372e9b8..e775a6c 100644
 --- a/arch/x86/pci/irq.c
@@ -33119,11 +32844,11 @@ index 372e9b8..e775a6c 100644
  		.callback = fix_broken_hp_bios_irq9,
  		.ident = "HP Pavilion N5400 Series Laptop",
 diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
-index 6eb18c4..20d83de 100644
+index 903fded..94b0d88 100644
 --- a/arch/x86/pci/mrst.c
 +++ b/arch/x86/pci/mrst.c
-@@ -238,7 +238,9 @@ int __init pci_mrst_init(void)
- 	printk(KERN_INFO "Intel MID platform detected, using MID PCI ops\n");
+@@ -241,7 +241,9 @@ int __init pci_mrst_init(void)
+ 	pr_info("Intel MID platform detected, using MID PCI ops\n");
  	pci_mmcfg_late_init();
  	pcibios_enable_irq = mrst_pci_irq_enable;
 -	pci_root_ops = pci_mrst_ops;
@@ -33488,7 +33213,7 @@ index 40e4469..d915bf9 100644
  
  	local_irq_restore(efi_rt_eflags);
 diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
-index 39a0e7f..872396e 100644
+index 39a0e7f1..872396e 100644
 --- a/arch/x86/platform/efi/efi_64.c
 +++ b/arch/x86/platform/efi/efi_64.c
 @@ -76,6 +76,11 @@ void __init efi_call_phys_prelog(void)
@@ -33712,7 +33437,7 @@ index 4c07cca..2c8427d 100644
  	ret
  ENDPROC(efi_call6)
 diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
-index a0a0a43..a48e233 100644
+index 3ca5957..7909c18 100644
 --- a/arch/x86/platform/mrst/mrst.c
 +++ b/arch/x86/platform/mrst/mrst.c
 @@ -78,13 +78,15 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
@@ -33747,7 +33472,7 @@ index d6ee929..3637cb5 100644
  	.getproplen = olpc_dt_getproplen,
  	.getproperty = olpc_dt_getproperty,
 diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
-index 1cf5b30..fd45732 100644
+index 424f4c9..f2a2988 100644
 --- a/arch/x86/power/cpu.c
 +++ b/arch/x86/power/cpu.c
 @@ -137,11 +137,8 @@ static void do_fpu_end(void)
@@ -34151,7 +33876,7 @@ index fd14be1..e3c79c0 100644
  
  #
 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 0faad64..39ef157 100644
+index d6bfb87..876ee18 100644
 --- a/arch/x86/vdso/vdso32-setup.c
 +++ b/arch/x86/vdso/vdso32-setup.c
 @@ -25,6 +25,7 @@
@@ -34310,7 +34035,7 @@ index 431e875..cbb23f3 100644
 -}
 -__setup("vdso=", vdso_setup);
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index a492be2..08678da 100644
+index fa6ade7..73da73a5 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
 @@ -123,8 +123,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
@@ -34322,7 +34047,7 @@ index a492be2..08678da 100644
  RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
  __read_mostly int xen_have_vector_callback;
  EXPORT_SYMBOL_GPL(xen_have_vector_callback);
-@@ -542,8 +540,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
+@@ -541,8 +539,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
  {
  	unsigned long va = dtr->address;
  	unsigned int size = dtr->size + 1;
@@ -34332,7 +34057,7 @@ index a492be2..08678da 100644
  	int f;
  
  	/*
-@@ -591,8 +588,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
+@@ -590,8 +587,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
  {
  	unsigned long va = dtr->address;
  	unsigned int size = dtr->size + 1;
@@ -34342,7 +34067,7 @@ index a492be2..08678da 100644
  	int f;
  
  	/*
-@@ -600,7 +596,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
+@@ -599,7 +595,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
  	 * 8-byte entries, or 16 4k pages..
  	 */
  
@@ -34351,7 +34076,7 @@ index a492be2..08678da 100644
  	BUG_ON(va & ~PAGE_MASK);
  
  	for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
-@@ -985,7 +981,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
+@@ -988,7 +984,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
          return 0;
  }
  
@@ -34360,7 +34085,7 @@ index a492be2..08678da 100644
  {
  	apic->read = xen_apic_read;
  	apic->write = xen_apic_write;
-@@ -1290,30 +1286,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
+@@ -1293,30 +1289,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
  #endif
  };
  
@@ -34398,7 +34123,7 @@ index a492be2..08678da 100644
  {
  	if (pm_power_off)
  		pm_power_off();
-@@ -1464,7 +1460,17 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1467,7 +1463,17 @@ asmlinkage void __init xen_start_kernel(void)
  	__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
  
  	/* Work out if we support NX */
@@ -34417,7 +34142,7 @@ index a492be2..08678da 100644
  
  	xen_setup_features();
  
-@@ -1495,13 +1501,6 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1498,13 +1504,6 @@ asmlinkage void __init xen_start_kernel(void)
  
  	machine_ops = xen_machine_ops;
  
@@ -34431,19 +34156,19 @@ index a492be2..08678da 100644
  	xen_smp_init();
  
  #ifdef CONFIG_ACPI_NUMA
-@@ -1700,7 +1699,7 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block xen_hvm_cpu_notifier __cpuinitdata = {
-+static struct notifier_block xen_hvm_cpu_notifier = {
- 	.notifier_call	= xen_hvm_cpu_notify,
- };
- 
 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index fdc3ba2..3daee39 100644
+index fdc3ba2..23cae00 100644
 --- a/arch/x86/xen/mmu.c
 +++ b/arch/x86/xen/mmu.c
+@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
+ 	return val;
+ }
+ 
+-static pteval_t pte_pfn_to_mfn(pteval_t val)
++static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
+ {
+ 	if (val & _PAGE_PRESENT) {
+ 		unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
 @@ -1894,6 +1894,9 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
  	/* L3_k[510] -> level2_kernel_pgt
  	 * L3_i[511] -> level2_fixmap_pgt */
@@ -34484,22 +34209,30 @@ index fdc3ba2..3daee39 100644
  	.alloc_pud = xen_alloc_pmd_init,
  	.release_pud = xen_release_pmd_init,
 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
-index a1e58e1..9392ad8 100644
+index 31d0475..51af671 100644
 --- a/arch/x86/xen/smp.c
 +++ b/arch/x86/xen/smp.c
-@@ -240,11 +240,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
- {
- 	BUG_ON(smp_processor_id() != 0);
+@@ -274,17 +274,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
  	native_smp_prepare_boot_cpu();
+ 
+ 	if (xen_pv_domain()) {
+-		/* We've switched to the "real" per-cpu gdt, so make sure the
+-		   old memory can be recycled */
+-		make_lowmem_page_readwrite(xen_initial_gdt);
 -
--	/* We've switched to the "real" per-cpu gdt, so make sure the
--	   old memory can be recycled */
--	make_lowmem_page_readwrite(xen_initial_gdt);
--
- 	xen_filter_cpu_maps();
- 	xen_setup_vcpu_info_placement();
- }
-@@ -314,7 +309,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
+ #ifdef CONFIG_X86_32
+ 		/*
+ 		 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
+ 		 * expects __USER_DS
+ 		 */
+-		loadsegment(ds, __USER_DS);
+-		loadsegment(es, __USER_DS);
++		loadsegment(ds, __KERNEL_DS);
++		loadsegment(es, __KERNEL_DS);
+ #endif
+ 
+ 		xen_filter_cpu_maps();
+@@ -364,7 +360,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
  	ctxt->user_regs.ss = __KERNEL_DS;
  #ifdef CONFIG_X86_32
  	ctxt->user_regs.fs = __KERNEL_PERCPU;
@@ -34508,7 +34241,7 @@ index a1e58e1..9392ad8 100644
  #else
  	ctxt->gs_base_kernel = per_cpu_offset(cpu);
  #endif
-@@ -324,8 +319,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
+@@ -374,8 +370,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
  
  	{
  		ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
@@ -34519,7 +34252,7 @@ index a1e58e1..9392ad8 100644
  
  		xen_copy_trap_info(ctxt->trap_ctxt);
  
-@@ -370,13 +365,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu, struct task_struct *idle)
+@@ -420,13 +416,12 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
  	int rc;
  
  	per_cpu(current_task, cpu) = idle;
@@ -34535,15 +34268,15 @@ index a1e58e1..9392ad8 100644
  #endif
  	xen_setup_runstate_info(cpu);
  	xen_setup_timer(cpu);
-@@ -651,7 +645,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
+@@ -702,7 +697,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
  
  void __init xen_smp_init(void)
  {
 -	smp_ops = xen_smp_ops;
 +	memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
  	xen_fill_possible_map();
- 	xen_init_spinlocks();
  }
+ 
 diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
 index 33ca6e4..0ded929 100644
 --- a/arch/x86/xen/xen-asm_32.S
@@ -34592,7 +34325,7 @@ index 7faed58..ba4427c 100644
  	mov %rsi,xen_start_info
  	mov $init_thread_union+THREAD_SIZE,%rsp
 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
-index a95b417..b6dbd0b 100644
+index 95f8c61..611d6e8 100644
 --- a/arch/x86/xen/xen-ops.h
 +++ b/arch/x86/xen/xen-ops.h
 @@ -10,8 +10,6 @@
@@ -34666,19 +34399,19 @@ index af00795..2bb8105 100644
  #define XCHAL_ICACHE_SIZE		32768	/* I-cache size in bytes or 0 */
  #define XCHAL_DCACHE_SIZE		32768	/* D-cache size in bytes or 0 */
 diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
-index e8918ff..b3ffc51 100644
+index 4e491d9..c8e18e4 100644
 --- a/block/blk-cgroup.c
 +++ b/block/blk-cgroup.c
-@@ -825,7 +825,7 @@ static void blkcg_css_free(struct cgroup *cgroup)
- 
- static struct cgroup_subsys_state *blkcg_css_alloc(struct cgroup *cgroup)
+@@ -812,7 +812,7 @@ static void blkcg_css_free(struct cgroup_subsys_state *css)
+ static struct cgroup_subsys_state *
+ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
  {
 -	static atomic64_t id_seq = ATOMIC64_INIT(0);
 +	static atomic64_unchecked_t id_seq = ATOMIC64_INIT(0);
  	struct blkcg *blkcg;
- 	struct cgroup *parent = cgroup->parent;
  
-@@ -840,7 +840,7 @@ static struct cgroup_subsys_state *blkcg_css_alloc(struct cgroup *cgroup)
+ 	if (!parent_css) {
+@@ -826,7 +826,7 @@ blkcg_css_alloc(struct cgroup_subsys_state *parent_css)
  
  	blkcg->cfq_weight = CFQ_WEIGHT_DEFAULT;
  	blkcg->cfq_leaf_weight = CFQ_WEIGHT_DEFAULT;
@@ -34688,7 +34421,7 @@ index e8918ff..b3ffc51 100644
  	spin_lock_init(&blkcg->lock);
  	INIT_RADIX_TREE(&blkcg->blkg_tree, GFP_ATOMIC);
 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
-index 58916af..eb9dbcf 100644
+index 4b8d9b54..a7178c0 100644
 --- a/block/blk-iopoll.c
 +++ b/block/blk-iopoll.c
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
@@ -34696,19 +34429,10 @@ index 58916af..eb9dbcf 100644
  EXPORT_SYMBOL(blk_iopoll_complete);
  
 -static void blk_iopoll_softirq(struct softirq_action *h)
-+static void blk_iopoll_softirq(void)
++static __latent_entropy void blk_iopoll_softirq(void)
  {
  	struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
  	int rearm = 0, budget = blk_iopoll_budget;
-@@ -209,7 +209,7 @@ static int __cpuinit blk_iopoll_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata blk_iopoll_cpu_notifier = {
-+static struct notifier_block blk_iopoll_cpu_notifier = {
- 	.notifier_call	= blk_iopoll_cpu_notify,
- };
- 
 diff --git a/block/blk-map.c b/block/blk-map.c
 index 623e1cd..ca1e109 100644
 --- a/block/blk-map.c
@@ -34723,7 +34447,7 @@ index 623e1cd..ca1e109 100644
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
-index 467c8de..f3628c5 100644
+index ec9e606..3f38839 100644
 --- a/block/blk-softirq.c
 +++ b/block/blk-softirq.c
 @@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
@@ -34731,19 +34455,10 @@ index 467c8de..f3628c5 100644
   * while passing them to the queue registered handler.
   */
 -static void blk_done_softirq(struct softirq_action *h)
-+static void blk_done_softirq(void)
++static __latent_entropy void blk_done_softirq(void)
  {
  	struct list_head *cpu_list, local_list;
  
-@@ -98,7 +98,7 @@ static int __cpuinit blk_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata blk_cpu_notifier = {
-+static struct notifier_block blk_cpu_notifier = {
- 	.notifier_call	= blk_cpu_notify,
- };
- 
 diff --git a/block/bsg.c b/block/bsg.c
 index 420a5a9..23834aa 100644
 --- a/block/bsg.c
@@ -34776,10 +34491,10 @@ index 420a5a9..23834aa 100644
  		if (blk_verify_command(rq->cmd, has_write_perm))
  			return -EPERM;
 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
-index 7c668c8..db3521c 100644
+index fbd5a67..5d631b5 100644
 --- a/block/compat_ioctl.c
 +++ b/block/compat_ioctl.c
-@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
+@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
  		err |= __get_user(f->spec1, &uf->spec1);
  		err |= __get_user(f->fmt_gap, &uf->fmt_gap);
  		err |= __get_user(name, &uf->name);
@@ -34789,7 +34504,7 @@ index 7c668c8..db3521c 100644
  			err = -EFAULT;
  			goto out;
 diff --git a/block/genhd.c b/block/genhd.c
-index cdeb527..10aa34d 100644
+index 791f419..89f21c4 100644
 --- a/block/genhd.c
 +++ b/block/genhd.c
 @@ -467,21 +467,24 @@ static char *bdevt_str(dev_t devt, char *buf)
@@ -34821,32 +34536,43 @@ index cdeb527..10aa34d 100644
  
  EXPORT_SYMBOL(blk_unregister_region);
 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
-index c85fc89..51e690b 100644
+index a8287b4..241a48e 100644
 --- a/block/partitions/efi.c
 +++ b/block/partitions/efi.c
-@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
+@@ -292,14 +292,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
  	if (!gpt)
  		return NULL;
  
--	count = le32_to_cpu(gpt->num_partition_entries) *
--                le32_to_cpu(gpt->sizeof_partition_entry);
--	if (!count)
 +	if (!le32_to_cpu(gpt->num_partition_entries))
- 		return NULL;
--	pte = kmalloc(count, GFP_KERNEL);
++		return NULL;
 +	pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
- 	if (!pte)
- 		return NULL;
- 
-+	count = le32_to_cpu(gpt->num_partition_entries) *
-+                le32_to_cpu(gpt->sizeof_partition_entry);
++	if (!pte)
++		return NULL;
++
+ 	count = le32_to_cpu(gpt->num_partition_entries) *
+                 le32_to_cpu(gpt->sizeof_partition_entry);
+-	if (!count)
+-		return NULL;
+-	pte = kmalloc(count, GFP_KERNEL);
+-	if (!pte)
+-		return NULL;
+-
  	if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
-                      (u8 *) pte,
- 		     count) < count) {
+ 			(u8 *) pte, count) < count) {
+ 		kfree(pte);
 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
-index a5ffcc9..3cedc9c 100644
+index a5ffcc9..e057498 100644
 --- a/block/scsi_ioctl.c
 +++ b/block/scsi_ioctl.c
+@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
+ 	return put_user(0, p);
+ }
+ 
+-static int sg_get_timeout(struct request_queue *q)
++static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
+ {
+ 	return jiffies_to_clock_t(q->sg_timeout);
+ }
 @@ -224,8 +224,20 @@ EXPORT_SYMBOL(blk_verify_command);
  static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
  			     struct sg_io_hdr *hdr, fmode_t mode)
@@ -34921,7 +34647,7 @@ index 7bdd61b..afec999 100644
  static void cryptd_queue_worker(struct work_struct *work);
  
 diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
-index b2c99dc..476c9fb 100644
+index f8c920c..ab2cb5a 100644
 --- a/crypto/pcrypt.c
 +++ b/crypto/pcrypt.c
 @@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
@@ -34933,17 +34659,6 @@ index b2c99dc..476c9fb 100644
  	if (!ret)
  		kobject_uevent(&pinst->kobj, KOBJ_ADD);
  
-@@ -455,8 +455,8 @@ static int pcrypt_init_padata(struct padata_pcrypt *pcrypt,
- 
- 	get_online_cpus();
- 
--	pcrypt->wq = alloc_workqueue(name,
--				     WQ_MEM_RECLAIM | WQ_CPU_INTENSIVE, 1);
-+	pcrypt->wq = alloc_workqueue("%s",
-+				     WQ_MEM_RECLAIM | WQ_CPU_INTENSIVE, 1, name);
- 	if (!pcrypt->wq)
- 		goto err;
- 
 diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
 index f220d64..d359ad6 100644
 --- a/drivers/acpi/apei/apei-internal.h
@@ -34979,10 +34694,10 @@ index 33dc6a0..4b24b47 100644
  EXPORT_SYMBOL_GPL(cper_next_record_id);
  
 diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
-index fcd7d91..6b2f1a3 100644
+index 8ec37bb..b0716e5 100644
 --- a/drivers/acpi/apei/ghes.c
 +++ b/drivers/acpi/apei/ghes.c
-@@ -468,7 +468,7 @@ static void __ghes_print_estatus(const char *pfx,
+@@ -498,7 +498,7 @@ static void __ghes_print_estatus(const char *pfx,
  				 const struct acpi_hest_generic *generic,
  				 const struct acpi_hest_generic_status *estatus)
  {
@@ -34991,7 +34706,7 @@ index fcd7d91..6b2f1a3 100644
  	unsigned int curr_seqno;
  	char pfx_seq[64];
  
-@@ -479,7 +479,7 @@ static void __ghes_print_estatus(const char *pfx,
+@@ -509,7 +509,7 @@ static void __ghes_print_estatus(const char *pfx,
  		else
  			pfx = KERN_ERR;
  	}
@@ -35001,24 +34716,24 @@ index fcd7d91..6b2f1a3 100644
  	printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
  	       pfx_seq, generic->header.source_id);
 diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
-index be60399..778b33e8 100644
+index a83e3c6..c3d617f 100644
 --- a/drivers/acpi/bgrt.c
 +++ b/drivers/acpi/bgrt.c
-@@ -87,8 +87,10 @@ static int __init bgrt_init(void)
+@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
+ 	if (!bgrt_image)
  		return -ENODEV;
  
- 	sysfs_bin_attr_init(&image_attr);
--	image_attr.private = bgrt_image;
--	image_attr.size = bgrt_image_size;
+-	bin_attr_image.private = bgrt_image;
+-	bin_attr_image.size = bgrt_image_size;
 +	pax_open_kernel();
-+	*(void **)&image_attr.private = bgrt_image;
-+	*(size_t *)&image_attr.size = bgrt_image_size;
++	*(void **)&bin_attr_image.private = bgrt_image;
++	*(size_t *)&bin_attr_image.size = bgrt_image_size;
 +	pax_close_kernel();
  
  	bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
  	if (!bgrt_kobj)
 diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
-index cb96296..b81293b 100644
+index 9515f18..4b149c9 100644
 --- a/drivers/acpi/blacklist.c
 +++ b/drivers/acpi/blacklist.c
 @@ -52,7 +52,7 @@ struct acpi_blacklist_item {
@@ -35030,7 +34745,7 @@ index cb96296..b81293b 100644
  
  /*
   * POLICY: If *anything* doesn't work, put it on the blacklist.
-@@ -193,7 +193,7 @@ static int __init dmi_disable_osi_win7(const struct dmi_system_id *d)
+@@ -199,7 +199,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
  	return 0;
  }
  
@@ -35039,64 +34754,11 @@ index cb96296..b81293b 100644
  	{
  	.callback = dmi_disable_osi_vista,
  	.ident = "Fujitsu Siemens",
-diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
-index 7586544..636a2f0 100644
---- a/drivers/acpi/ec_sys.c
-+++ b/drivers/acpi/ec_sys.c
-@@ -12,6 +12,7 @@
- #include <linux/acpi.h>
- #include <linux/debugfs.h>
- #include <linux/module.h>
-+#include <linux/uaccess.h>
- #include "internal.h"
- 
- MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
-@@ -34,7 +35,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
- 	 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
- 	 */
- 	unsigned int size = EC_SPACE_SIZE;
--	u8 *data = (u8 *) buf;
-+	u8 data;
- 	loff_t init_off = *off;
- 	int err = 0;
- 
-@@ -47,9 +48,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
- 		size = count;
- 
- 	while (size) {
--		err = ec_read(*off, &data[*off - init_off]);
-+		err = ec_read(*off, &data);
- 		if (err)
- 			return err;
-+		if (put_user(data, &buf[*off - init_off]))
-+			return -EFAULT;
- 		*off += 1;
- 		size--;
- 	}
-@@ -65,7 +68,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
- 
- 	unsigned int size = count;
- 	loff_t init_off = *off;
--	u8 *data = (u8 *) buf;
- 	int err = 0;
- 
- 	if (*off >= EC_SPACE_SIZE)
-@@ -76,7 +78,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
- 	}
- 
- 	while (size) {
--		u8 byte_write = data[*off - init_off];
-+		u8 byte_write;
-+		if (get_user(byte_write, &buf[*off - init_off]))
-+			return -EFAULT;
- 		err = ec_write(*off, byte_write);
- 		if (err)
- 			return err;
 diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
-index 4056d31..ef54bc1 100644
+index c7414a5..d5afd71 100644
 --- a/drivers/acpi/processor_idle.c
 +++ b/drivers/acpi/processor_idle.c
-@@ -968,7 +968,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
+@@ -966,7 +966,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
  {
  	int i, count = CPUIDLE_DRIVER_STATE_START;
  	struct acpi_processor_cx *cx;
@@ -35106,7 +34768,7 @@ index 4056d31..ef54bc1 100644
  
  	if (!pr->flags.power_setup_done)
 diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
-index fcae5fa..e9f71ea 100644
+index 05306a5..733d1f0 100644
 --- a/drivers/acpi/sysfs.c
 +++ b/drivers/acpi/sysfs.c
 @@ -423,11 +423,11 @@ static u32 num_counters;
@@ -35124,10 +34786,10 @@ index fcae5fa..e9f71ea 100644
  static void delete_gpe_attr_array(void)
  {
 diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
-index 8905e03..d1b0719 100644
+index cfb7447..98f2149 100644
 --- a/drivers/ata/libahci.c
 +++ b/drivers/ata/libahci.c
-@@ -1230,7 +1230,7 @@ int ahci_kick_engine(struct ata_port *ap)
+@@ -1239,7 +1239,7 @@ int ahci_kick_engine(struct ata_port *ap)
  }
  EXPORT_SYMBOL_GPL(ahci_kick_engine);
  
@@ -35137,7 +34799,7 @@ index 8905e03..d1b0719 100644
  				unsigned long timeout_msec)
  {
 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index cd6aa28..6f5e966 100644
+index 81a94a3..b711c74 100644
 --- a/drivers/ata/libata-core.c
 +++ b/drivers/ata/libata-core.c
 @@ -98,7 +98,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
@@ -35149,7 +34811,7 @@ index cd6aa28..6f5e966 100644
  
  struct ata_force_param {
  	const char	*name;
-@@ -4793,7 +4793,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
+@@ -4809,7 +4809,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
  	struct ata_port *ap;
  	unsigned int tag;
  
@@ -35158,7 +34820,7 @@ index cd6aa28..6f5e966 100644
  	ap = qc->ap;
  
  	qc->flags = 0;
-@@ -4809,7 +4809,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
+@@ -4825,7 +4825,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
  	struct ata_port *ap;
  	struct ata_link *link;
  
@@ -35167,7 +34829,7 @@ index cd6aa28..6f5e966 100644
  	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
  	ap = qc->ap;
  	link = qc->dev->link;
-@@ -5927,6 +5927,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5944,6 +5944,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
  		return;
  
  	spin_lock(&lock);
@@ -35175,7 +34837,7 @@ index cd6aa28..6f5e966 100644
  
  	for (cur = ops->inherits; cur; cur = cur->inherits) {
  		void **inherit = (void **)cur;
-@@ -5940,8 +5941,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5957,8 +5958,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
  		if (IS_ERR(*pp))
  			*pp = NULL;
  
@@ -35186,20 +34848,20 @@ index cd6aa28..6f5e966 100644
  	spin_unlock(&lock);
  }
  
-@@ -6134,7 +6136,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
+@@ -6151,7 +6153,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
  
  	/* give ports names and add SCSI hosts */
- 	for (i = 0; i < host->n_ports; i++)
+ 	for (i = 0; i < host->n_ports; i++) {
 -		host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
 +		host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
+ 		host->ports[i]->local_port_no = i + 1;
+ 	}
  
- 
- 	/* Create associated sysfs transport objects  */
 diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
-index 0101af5..c70c325 100644
+index db6dfcf..770d1f0 100644
 --- a/drivers/ata/libata-scsi.c
 +++ b/drivers/ata/libata-scsi.c
-@@ -4105,7 +4105,7 @@ int ata_sas_port_init(struct ata_port *ap)
+@@ -4113,7 +4113,7 @@ int ata_sas_port_init(struct ata_port *ap)
  
  	if (rc)
  		return rc;
@@ -35209,7 +34871,7 @@ index 0101af5..c70c325 100644
  }
  EXPORT_SYMBOL_GPL(ata_sas_port_init);
 diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
-index 577d902b..cb4781e 100644
+index 45b5ab3..98446b8 100644
 --- a/drivers/ata/libata.h
 +++ b/drivers/ata/libata.h
 @@ -53,7 +53,7 @@ enum {
@@ -35222,7 +34884,7 @@ index 577d902b..cb4781e 100644
  extern int libata_fua;
  extern int libata_noacpi;
 diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
-index 7638121..357a965 100644
+index 853f610..97d24da 100644
 --- a/drivers/ata/pata_arasan_cf.c
 +++ b/drivers/ata/pata_arasan_cf.c
 @@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
@@ -35250,7 +34912,7 @@ index f9b983a..887b9d8 100644
  	return 0;
  }
 diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
-index 77a7480d..05cde58 100644
+index 62a7607..cc4be104 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) {
@@ -35489,10 +35151,10 @@ index 204814e..cede831 100644
  	    fore200e->tx_sat++;
  	    DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
 diff --git a/drivers/atm/he.c b/drivers/atm/he.c
-index 507362a..a845e57 100644
+index 8557adc..3fb5d55 100644
 --- a/drivers/atm/he.c
 +++ b/drivers/atm/he.c
-@@ -1698,7 +1698,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1691,7 +1691,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);
@@ -35501,7 +35163,7 @@ index 507362a..a845e57 100644
  			goto return_host_buffers;
  		}
  
-@@ -1725,7 +1725,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1718,7 +1718,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
  				RBRQ_LEN_ERR(he_dev->rbrq_head)
  							? "LEN_ERR" : "",
  							vcc->vpi, vcc->vci);
@@ -35510,7 +35172,7 @@ index 507362a..a845e57 100644
  			goto return_host_buffers;
  		}
  
-@@ -1777,7 +1777,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1770,7 +1770,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
  		vcc->push(vcc, skb);
  		spin_lock(&he_dev->global_lock);
  
@@ -35519,7 +35181,7 @@ index 507362a..a845e57 100644
  
  return_host_buffers:
  		++pdus_assembled;
-@@ -2103,7 +2103,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
+@@ -2096,7 +2096,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);
@@ -35528,7 +35190,7 @@ index 507362a..a845e57 100644
  			}
  			pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
  			return;
-@@ -2515,7 +2515,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2508,7 +2508,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -35537,7 +35199,7 @@ index 507362a..a845e57 100644
  		return -EINVAL;
  	}
  
-@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2519,7 +2519,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -35546,7 +35208,7 @@ index 507362a..a845e57 100644
  		return -EINVAL;
  	}
  #endif
-@@ -2538,7 +2538,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2531,7 +2531,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -35555,7 +35217,7 @@ index 507362a..a845e57 100644
  		spin_unlock_irqrestore(&he_dev->global_lock, flags);
  		return -ENOMEM;
  	}
-@@ -2580,7 +2580,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2573,7 +2573,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  					vcc->pop(vcc, skb);
  				else
  					dev_kfree_skb_any(skb);
@@ -35564,7 +35226,7 @@ index 507362a..a845e57 100644
  				spin_unlock_irqrestore(&he_dev->global_lock, flags);
  				return -ENOMEM;
  			}
-@@ -2611,7 +2611,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2604,7 +2604,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);
  
@@ -35912,10 +35574,10 @@ index fa7d701..1e404c7 100644
  	lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
  	cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
 diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
-index 6587dc2..149833d 100644
+index 5aca5f4..ce3a6b0 100644
 --- a/drivers/atm/nicstar.c
 +++ b/drivers/atm/nicstar.c
-@@ -1641,7 +1641,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1640,7 +1640,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);
@@ -35924,7 +35586,7 @@ index 6587dc2..149833d 100644
  		dev_kfree_skb_any(skb);
  		return -EINVAL;
  	}
-@@ -1649,7 +1649,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1648,7 +1648,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);
@@ -35933,7 +35595,7 @@ index 6587dc2..149833d 100644
  		dev_kfree_skb_any(skb);
  		return -EINVAL;
  	}
-@@ -1657,14 +1657,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1656,14 +1656,14 @@ 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);
@@ -35950,7 +35612,7 @@ index 6587dc2..149833d 100644
  		dev_kfree_skb_any(skb);
  		return -EINVAL;
  	}
-@@ -1712,11 +1712,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
  	}
  
  	if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
@@ -35964,7 +35626,7 @@ index 6587dc2..149833d 100644
  
  	return 0;
  }
-@@ -2033,14 +2033,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  				printk
  				    ("nicstar%d: Can't allocate buffers for aal0.\n",
  				     card->index);
@@ -35981,7 +35643,7 @@ index 6587dc2..149833d 100644
  				dev_kfree_skb_any(sb);
  				break;
  			}
-@@ -2055,7 +2055,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  			ATM_SKB(sb)->vcc = vcc;
  			__net_timestamp(sb);
  			vcc->push(vcc, sb);
@@ -35990,7 +35652,7 @@ index 6587dc2..149833d 100644
  			cell += ATM_CELL_PAYLOAD;
  		}
  
-@@ -2072,7 +2072,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  			if (iovb == NULL) {
  				printk("nicstar%d: Out of iovec buffers.\n",
  				       card->index);
@@ -35999,7 +35661,7 @@ index 6587dc2..149833d 100644
  				recycle_rx_buf(card, skb);
  				return;
  			}
-@@ -2096,7 +2096,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  		   small or large buffer itself. */
  	} else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
  		printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
@@ -36008,7 +35670,7 @@ index 6587dc2..149833d 100644
  		recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
  				      NS_MAX_IOVECS);
  		NS_PRV_IOVCNT(iovb) = 0;
-@@ -2116,7 +2116,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  			    ("nicstar%d: Expected a small buffer, and this is not one.\n",
  			     card->index);
  			which_list(card, skb);
@@ -36017,7 +35679,7 @@ index 6587dc2..149833d 100644
  			recycle_rx_buf(card, skb);
  			vc->rx_iov = NULL;
  			recycle_iov_buf(card, iovb);
-@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  			    ("nicstar%d: Expected a large buffer, and this is not one.\n",
  			     card->index);
  			which_list(card, skb);
@@ -36026,7 +35688,7 @@ index 6587dc2..149833d 100644
  			recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
  					      NS_PRV_IOVCNT(iovb));
  			vc->rx_iov = NULL;
-@@ -2152,7 +2152,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  				printk(" - PDU size mismatch.\n");
  			else
  				printk(".\n");
@@ -36035,7 +35697,7 @@ index 6587dc2..149833d 100644
  			recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
  					      NS_PRV_IOVCNT(iovb));
  			vc->rx_iov = NULL;
-@@ -2166,7 +2166,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  			/* skb points to a small buffer */
  			if (!atm_charge(vcc, skb->truesize)) {
  				push_rxbufs(card, skb);
@@ -36044,7 +35706,7 @@ index 6587dc2..149833d 100644
  			} else {
  				skb_put(skb, len);
  				dequeue_sm_buf(card, skb);
-@@ -2176,7 +2176,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  				ATM_SKB(skb)->vcc = vcc;
  				__net_timestamp(skb);
  				vcc->push(vcc, skb);
@@ -36053,7 +35715,7 @@ index 6587dc2..149833d 100644
  			}
  		} else if (NS_PRV_IOVCNT(iovb) == 2) {	/* One small plus one large buffer */
  			struct sk_buff *sb;
-@@ -2187,7 +2187,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  			if (len <= NS_SMBUFSIZE) {
  				if (!atm_charge(vcc, sb->truesize)) {
  					push_rxbufs(card, sb);
@@ -36062,7 +35724,7 @@ index 6587dc2..149833d 100644
  				} else {
  					skb_put(sb, len);
  					dequeue_sm_buf(card, sb);
-@@ -2197,7 +2197,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  					ATM_SKB(sb)->vcc = vcc;
  					__net_timestamp(sb);
  					vcc->push(vcc, sb);
@@ -36071,7 +35733,7 @@ index 6587dc2..149833d 100644
  				}
  
  				push_rxbufs(card, skb);
-@@ -2206,7 +2206,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  
  				if (!atm_charge(vcc, skb->truesize)) {
  					push_rxbufs(card, skb);
@@ -36080,7 +35742,7 @@ index 6587dc2..149833d 100644
  				} else {
  					dequeue_lg_buf(card, skb);
  #ifdef NS_USE_DESTRUCTORS
-@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  					ATM_SKB(skb)->vcc = vcc;
  					__net_timestamp(skb);
  					vcc->push(vcc, skb);
@@ -36089,7 +35751,7 @@ index 6587dc2..149833d 100644
  				}
  
  				push_rxbufs(card, sb);
-@@ -2240,7 +2240,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  					printk
  					    ("nicstar%d: Out of huge buffers.\n",
  					     card->index);
@@ -36098,7 +35760,7 @@ index 6587dc2..149833d 100644
  					recycle_iovec_rx_bufs(card,
  							      (struct iovec *)
  							      iovb->data,
-@@ -2291,7 +2291,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  					card->hbpool.count++;
  				} else
  					dev_kfree_skb_any(hb);
@@ -36107,7 +35769,7 @@ index 6587dc2..149833d 100644
  			} else {
  				/* Copy the small buffer to the huge buffer */
  				sb = (struct sk_buff *)iov->iov_base;
-@@ -2328,7 +2328,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
  #endif /* NS_USE_DESTRUCTORS */
  				__net_timestamp(hb);
  				vcc->push(vcc, hb);
@@ -36232,24 +35894,11 @@ index 969c3c2..9b72956 100644
  	wake_up(&zatm_vcc->tx_wait);
  }
  
-diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
-index d78b204..ecc1929 100644
---- a/drivers/base/attribute_container.c
-+++ b/drivers/base/attribute_container.c
-@@ -167,7 +167,7 @@ attribute_container_add_device(struct device *dev,
- 		ic->classdev.parent = get_device(dev);
- 		ic->classdev.class = cont->class;
- 		cont->class->dev_release = attribute_container_release;
--		dev_set_name(&ic->classdev, dev_name(dev));
-+		dev_set_name(&ic->classdev, "%s", dev_name(dev));
- 		if (fn)
- 			fn(cont, dev, &ic->classdev);
- 		else
 diff --git a/drivers/base/bus.c b/drivers/base/bus.c
-index d414331..b4dd4ba 100644
+index 4c289ab..de1c333 100644
 --- a/drivers/base/bus.c
 +++ b/drivers/base/bus.c
-@@ -1163,7 +1163,7 @@ int subsys_interface_register(struct subsys_interface *sif)
+@@ -1193,7 +1193,7 @@ int subsys_interface_register(struct subsys_interface *sif)
  		return -EINVAL;
  
  	mutex_lock(&subsys->p->mutex);
@@ -36258,7 +35907,7 @@ index d414331..b4dd4ba 100644
  	if (sif->add_dev) {
  		subsys_dev_iter_init(&iter, subsys, NULL, NULL);
  		while ((dev = subsys_dev_iter_next(&iter)))
-@@ -1188,7 +1188,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
+@@ -1218,7 +1218,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
  	subsys = sif->subsys;
  
  	mutex_lock(&subsys->p->mutex);
@@ -36296,10 +35945,10 @@ index 7413d06..79155fa 100644
  	while (1) {
  		spin_lock(&req_lock);
 diff --git a/drivers/base/node.c b/drivers/base/node.c
-index 7616a77c..8f57f51 100644
+index bc9f43b..29703b8 100644
 --- a/drivers/base/node.c
 +++ b/drivers/base/node.c
-@@ -626,7 +626,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
+@@ -620,7 +620,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
  struct node_attr {
  	struct device_attribute attr;
  	enum node_states state;
@@ -36309,7 +35958,7 @@ index 7616a77c..8f57f51 100644
  static ssize_t show_node_state(struct device *dev,
  			       struct device_attribute *attr, char *buf)
 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
-index 7072404..76dcebd 100644
+index bfb8955..42c9b9a 100644
 --- a/drivers/base/power/domain.c
 +++ b/drivers/base/power/domain.c
 @@ -1850,7 +1850,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
@@ -36331,7 +35980,7 @@ index 7072404..76dcebd 100644
  
  	if (IS_ERR_OR_NULL(genpd))
 diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
-index a53ebd2..8f73eeb 100644
+index 03e089a..0e9560c 100644
 --- a/drivers/base/power/sysfs.c
 +++ b/drivers/base/power/sysfs.c
 @@ -185,7 +185,7 @@ static ssize_t rtpm_status_show(struct device *dev,
@@ -36344,7 +35993,7 @@ index a53ebd2..8f73eeb 100644
  
  static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
 diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
-index 79715e7..df06b3b 100644
+index 2d56f41..8830f19 100644
 --- a/drivers/base/power/wakeup.c
 +++ b/drivers/base/power/wakeup.c
 @@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
@@ -36405,7 +36054,7 @@ index e8d11b6..7b1b36f 100644
  }
  EXPORT_SYMBOL_GPL(unregister_syscore_ops);
 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
-index 90a4e6b..002d10f 100644
+index edfa251..1734d4d 100644
 --- a/drivers/block/cciss.c
 +++ b/drivers/block/cciss.c
 @@ -3011,7 +3011,7 @@ static void start_io(ctlr_info_t *h)
@@ -36465,7 +36114,7 @@ index 90a4e6b..002d10f 100644
  	h->transMethod = CFGTBL_Trans_Performant;
  
  	return;
-@@ -4320,7 +4320,7 @@ static int cciss_pci_init(ctlr_info_t *h)
+@@ -4327,7 +4327,7 @@ static int cciss_pci_init(ctlr_info_t *h)
  	if (prod_index < 0)
  		return -ENODEV;
  	h->product_name = products[prod_index].product_name;
@@ -36474,7 +36123,7 @@ index 90a4e6b..002d10f 100644
  
  	if (cciss_board_disabled(h)) {
  		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
-@@ -5052,7 +5052,7 @@ reinit_after_soft_reset:
+@@ -5059,7 +5059,7 @@ reinit_after_soft_reset:
  	}
  
  	/* make sure the board interrupts are off */
@@ -36483,7 +36132,7 @@ index 90a4e6b..002d10f 100644
  	rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
  	if (rc)
  		goto clean2;
-@@ -5102,7 +5102,7 @@ reinit_after_soft_reset:
+@@ -5109,7 +5109,7 @@ reinit_after_soft_reset:
  		 * fake ones to scoop up any residual completions.
  		 */
  		spin_lock_irqsave(&h->lock, flags);
@@ -36492,7 +36141,7 @@ index 90a4e6b..002d10f 100644
  		spin_unlock_irqrestore(&h->lock, flags);
  		free_irq(h->intr[h->intr_mode], h);
  		rc = cciss_request_irq(h, cciss_msix_discard_completions,
-@@ -5122,9 +5122,9 @@ reinit_after_soft_reset:
+@@ -5129,9 +5129,9 @@ reinit_after_soft_reset:
  		dev_info(&h->pdev->dev, "Board READY.\n");
  		dev_info(&h->pdev->dev,
  			"Waiting for stale completions to drain.\n");
@@ -36504,7 +36153,7 @@ index 90a4e6b..002d10f 100644
  
  		rc = controller_reset_failed(h->cfgtable);
  		if (rc)
-@@ -5147,7 +5147,7 @@ reinit_after_soft_reset:
+@@ -5154,7 +5154,7 @@ reinit_after_soft_reset:
  	cciss_scsi_setup(h);
  
  	/* Turn the interrupts on so we can service requests */
@@ -36513,7 +36162,7 @@ index 90a4e6b..002d10f 100644
  
  	/* Get the firmware version */
  	inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
-@@ -5219,7 +5219,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
+@@ -5226,7 +5226,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
  	kfree(flush_buf);
  	if (return_code != IO_OK)
  		dev_warn(&h->pdev->dev, "Error flushing cache\n");
@@ -36669,7 +36318,7 @@ index be73e9d..7fbf140 100644
  	cmdlist_t *reqQ;
  	cmdlist_t *cmpQ;
 diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
-index f943aac..99bfd19 100644
+index 2d7f608..11245fe 100644
 --- a/drivers/block/drbd/drbd_int.h
 +++ b/drivers/block/drbd/drbd_int.h
 @@ -582,7 +582,7 @@ struct drbd_epoch {
@@ -36681,7 +36330,7 @@ index f943aac..99bfd19 100644
  	atomic_t active;     /* increased on every req. added, and dec on every finished. */
  	unsigned long flags;
  };
-@@ -1021,7 +1021,7 @@ struct drbd_conf {
+@@ -1022,7 +1022,7 @@ struct drbd_conf {
  	unsigned int al_tr_number;
  	int al_tr_cycle;
  	wait_queue_head_t seq_wait;
@@ -36690,7 +36339,7 @@ index f943aac..99bfd19 100644
  	unsigned int peer_seq;
  	spinlock_t peer_seq_lock;
  	unsigned int minor;
-@@ -1562,7 +1562,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
+@@ -1572,7 +1572,7 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
  	char __user *uoptval;
  	int err;
  
@@ -36700,7 +36349,7 @@ index f943aac..99bfd19 100644
  	set_fs(KERNEL_DS);
  	if (level == SOL_SOCKET)
 diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
-index a5dca6a..bb27967 100644
+index 55635ed..40e837c 100644
 --- a/drivers/block/drbd/drbd_main.c
 +++ b/drivers/block/drbd/drbd_main.c
 @@ -1317,7 +1317,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packet cmd,
@@ -36733,10 +36382,10 @@ index a5dca6a..bb27967 100644
  
  	idr_destroy(&tconn->volumes);
 diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
-index 9e3f441..4044d47 100644
+index 8cc1e64..ba7ffa9 100644
 --- a/drivers/block/drbd/drbd_nl.c
 +++ b/drivers/block/drbd/drbd_nl.c
-@@ -3339,7 +3339,7 @@ out:
+@@ -3440,7 +3440,7 @@ out:
  
  void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
  {
@@ -36745,7 +36394,7 @@ index 9e3f441..4044d47 100644
  	struct sk_buff *msg;
  	struct drbd_genlmsghdr *d_out;
  	unsigned seq;
-@@ -3352,7 +3352,7 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
+@@ -3453,7 +3453,7 @@ void drbd_bcast_event(struct drbd_conf *mdev, const struct sib_info *sib)
  			return;
  	}
  
@@ -36755,7 +36404,7 @@ index 9e3f441..4044d47 100644
  	if (!msg)
  		goto failed;
 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
-index 4222aff..1f79506 100644
+index cc29cd3..d4b058b 100644
 --- a/drivers/block/drbd/drbd_receiver.c
 +++ b/drivers/block/drbd/drbd_receiver.c
 @@ -834,7 +834,7 @@ int drbd_connected(struct drbd_conf *mdev)
@@ -36854,7 +36503,7 @@ index 4222aff..1f79506 100644
  static struct asender_cmd asender_tbl[] = {
  	[P_PING]	    = { 0, got_Ping },
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 4a81165..53dc2c7 100644
+index c8dac73..1800093 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 @@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
@@ -36867,18 +36516,53 @@ index 4a81165..53dc2c7 100644
  	file_end_write(file);
  	if (likely(bw == len))
 diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
-index f5d0ea1..c62380a 100644
+index 5618847..5a46f3b 100644
 --- a/drivers/block/pktcdvd.c
 +++ b/drivers/block/pktcdvd.c
-@@ -84,7 +84,7 @@
- #define MAX_SPEED 0xffff
+@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
  
- #define ZONE(sector, pd) (((sector) + (pd)->offset) & \
--			~(sector_t)((pd)->settings.size - 1))
-+			~(sector_t)((pd)->settings.size - 1UL))
+ static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
+ {
+-	return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
++	return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
+ }
+ 
+ /*
+@@ -1897,7 +1897,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
+ 		return -EROFS;
+ 	}
+ 	pd->settings.fp = ti.fp;
+-	pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
++	pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
+ 
+ 	if (ti.nwa_v) {
+ 		pd->nwa = be32_to_cpu(ti.next_writable);
+diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
+index 60abf59..80789e1 100644
+--- a/drivers/bluetooth/btwilink.c
++++ b/drivers/bluetooth/btwilink.c
+@@ -293,7 +293,7 @@ static int ti_st_send_frame(struct sk_buff *skb)
+ 
+ static int bt_ti_probe(struct platform_device *pdev)
+ {
+-	static struct ti_st *hst;
++	struct ti_st *hst;
+ 	struct hci_dev *hdev;
+ 	int err;
+ 
+diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
+index 2009266..7be9ca2 100644
+--- a/drivers/bus/arm-cci.c
++++ b/drivers/bus/arm-cci.c
+@@ -405,7 +405,7 @@ static int __init cci_probe(void)
+ 
+ 	nb_cci_ports = cci_config->nb_ace + cci_config->nb_ace_lite;
+ 
+-	ports = kcalloc(sizeof(*ports), nb_cci_ports, GFP_KERNEL);
++	ports = kcalloc(nb_cci_ports, sizeof(*ports), GFP_KERNEL);
+ 	if (!ports)
+ 		return -ENOMEM;
  
- static DEFINE_MUTEX(pktcdvd_mutex);
- static struct pktcdvd_device *pkt_devs[MAX_WRITERS];
 diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
 index 8a3aff7..d7538c2 100644
 --- a/drivers/cdrom/cdrom.c
@@ -36932,7 +36616,7 @@ index 8a3aff7..d7538c2 100644
  		return 1;
  
 diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
-index 4afcb65..a68a32d 100644
+index 5980cb9..6d7bd7e 100644
 --- a/drivers/cdrom/gdrom.c
 +++ b/drivers/cdrom/gdrom.c
 @@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
@@ -36944,7 +36628,7 @@ index 4afcb65..a68a32d 100644
  
  static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 3bb6fa3..34013fb 100644
+index 1421997..33f5d6d 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
@@ -36957,7 +36641,7 @@ index 3bb6fa3..34013fb 100644
  	help
  	  Say Y here if you want to support the /dev/kmem device. The
  	  /dev/kmem device is rarely used, but can be used for certain
-@@ -582,6 +583,7 @@ config DEVPORT
+@@ -570,6 +571,7 @@ config DEVPORT
  	bool
  	depends on !M68K
  	depends on ISA || PCI
@@ -36979,10 +36663,10 @@ index a48e05b..6bac831 100644
  			kfree(usegment);
  			kfree(ksegment);
 diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
-index 2e04433..771f2cc 100644
+index 1b19239..b87b143 100644
 --- a/drivers/char/agp/frontend.c
 +++ b/drivers/char/agp/frontend.c
-@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
+@@ -819,7 +819,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;
  
@@ -36991,7 +36675,7 @@ index 2e04433..771f2cc 100644
  		return -EFAULT;
  
  	client = agp_find_client_by_pid(reserve.pid);
-@@ -847,7 +847,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
+@@ -849,7 +849,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
  		if (segment == NULL)
  			return -ENOMEM;
  
@@ -37013,7 +36697,7 @@ index 4f94375..413694e 100644
  	 	    return -EINVAL;
  	    else
 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
-index d784650..e8bfd69 100644
+index 448ce5e..3a76625 100644
 --- a/drivers/char/hpet.c
 +++ b/drivers/char/hpet.c
 @@ -559,7 +559,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
@@ -37039,7 +36723,7 @@ index 86fe45c..c0ea948 100644
  	}
  
 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index 4445fa1..7c6de37 100644
+index ec4e10f..f2a763b 100644
 --- a/drivers/char/ipmi/ipmi_msghandler.c
 +++ b/drivers/char/ipmi/ipmi_msghandler.c
 @@ -420,7 +420,7 @@ struct ipmi_smi {
@@ -37073,10 +36757,10 @@ index 4445fa1..7c6de37 100644
  	intf->proc_dir = NULL;
  
 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
-index af4b23f..79806fc 100644
+index 15e4a60..b046093 100644
 --- a/drivers/char/ipmi/ipmi_si_intf.c
 +++ b/drivers/char/ipmi/ipmi_si_intf.c
-@@ -275,7 +275,7 @@ struct smi_info {
+@@ -280,7 +280,7 @@ struct smi_info {
  	unsigned char slave_addr;
  
  	/* Counters and things for the proc filesystem. */
@@ -37085,7 +36769,7 @@ index af4b23f..79806fc 100644
  
  	struct task_struct *thread;
  
-@@ -284,9 +284,9 @@ struct smi_info {
+@@ -289,9 +289,9 @@ struct smi_info {
  };
  
  #define smi_inc_stat(smi, stat) \
@@ -37097,7 +36781,7 @@ index af4b23f..79806fc 100644
  
  #define SI_MAX_PARMS 4
  
-@@ -3258,7 +3258,7 @@ static int try_smi_init(struct smi_info *new_smi)
+@@ -3324,7 +3324,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++)
@@ -37107,7 +36791,7 @@ index af4b23f..79806fc 100644
  	new_smi->interrupt_disabled = 1;
  	atomic_set(&new_smi->stop_operation, 0);
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 1ccbe94..6ad651a 100644
+index f895a8c..2bc9147 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -18,6 +18,7 @@
@@ -37118,7 +36802,7 @@ index 1ccbe94..6ad651a 100644
  #include <linux/ptrace.h>
  #include <linux/device.h>
  #include <linux/highmem.h>
-@@ -38,6 +39,10 @@
+@@ -37,6 +38,10 @@
  
  #define DEVPORT_MINOR	4
  
@@ -37129,7 +36813,7 @@ index 1ccbe94..6ad651a 100644
  static inline unsigned long size_inside_page(unsigned long start,
  					     unsigned long size)
  {
-@@ -69,9 +74,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
+@@ -68,9 +73,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
  
  	while (cursor < to) {
  		if (!devmem_is_allowed(pfn)) {
@@ -37143,7 +36827,7 @@ index 1ccbe94..6ad651a 100644
  			return 0;
  		}
  		cursor += PAGE_SIZE;
-@@ -79,6 +88,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
+@@ -78,6 +87,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
  	}
  	return 1;
  }
@@ -37155,7 +36839,7 @@ index 1ccbe94..6ad651a 100644
  #else
  static inline int range_is_allowed(unsigned long pfn, unsigned long size)
  {
-@@ -121,6 +135,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
+@@ -120,6 +134,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
  
  	while (count > 0) {
  		unsigned long remaining;
@@ -37163,7 +36847,7 @@ index 1ccbe94..6ad651a 100644
  
  		sz = size_inside_page(p, count);
  
-@@ -136,7 +151,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
+@@ -135,7 +150,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
  		if (!ptr)
  			return -EFAULT;
  
@@ -37188,16 +36872,7 @@ index 1ccbe94..6ad651a 100644
  		unxlate_dev_mem_ptr(p, ptr);
  		if (remaining)
  			return -EFAULT;
-@@ -379,7 +410,7 @@ static ssize_t read_oldmem(struct file *file, char __user *buf,
- 		else
- 			csize = count;
- 
--		rc = copy_oldmem_page(pfn, buf, csize, offset, 1);
-+		rc = copy_oldmem_page(pfn, (char __force_kernel *)buf, csize, offset, 1);
- 		if (rc < 0)
- 			return rc;
- 		buf += csize;
-@@ -399,9 +430,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -364,9 +395,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
  			 size_t count, loff_t *ppos)
  {
  	unsigned long p = *ppos;
@@ -37208,7 +36883,7 @@ index 1ccbe94..6ad651a 100644
  
  	read = 0;
  	if (p < (unsigned long) high_memory) {
-@@ -423,6 +453,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -388,6 +418,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
  		}
  #endif
  		while (low_count > 0) {
@@ -37217,7 +36892,7 @@ index 1ccbe94..6ad651a 100644
  			sz = size_inside_page(p, low_count);
  
  			/*
-@@ -432,7 +464,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -397,7 +429,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
  			 */
  			kbuf = xlate_dev_kmem_ptr((char *)p);
  
@@ -37241,9 +36916,9 @@ index 1ccbe94..6ad651a 100644
  				return -EFAULT;
  			buf += sz;
  			p += sz;
-@@ -869,6 +916,9 @@ static const struct memdev {
- #ifdef CONFIG_CRASH_DUMP
- 	[12] = { "oldmem", 0, &oldmem_fops, NULL },
+@@ -822,6 +869,9 @@ static const struct memdev {
+ #ifdef CONFIG_PRINTK
+ 	[11] = { "kmsg", 0644, &kmsg_fops, NULL },
  #endif
 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
 +	[13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
@@ -37251,7 +36926,7 @@ index 1ccbe94..6ad651a 100644
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-@@ -940,7 +990,7 @@ static int __init chr_dev_init(void)
+@@ -893,7 +943,7 @@ static int __init chr_dev_init(void)
  			continue;
  
  		device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
@@ -37260,18 +36935,6 @@ index 1ccbe94..6ad651a 100644
  	}
  
  	return tty_init();
-diff --git a/drivers/char/mwave/tp3780i.c b/drivers/char/mwave/tp3780i.c
-index c689697..04e6d6a 100644
---- a/drivers/char/mwave/tp3780i.c
-+++ b/drivers/char/mwave/tp3780i.c
-@@ -479,6 +479,7 @@ int tp3780I_QueryAbilities(THINKPAD_BD_DATA * pBDData, MW_ABILITIES * pAbilities
- 	PRINTK_2(TRACE_TP3780I,
- 		"tp3780i::tp3780I_QueryAbilities entry pBDData %p\n", pBDData);
- 
-+	memset(pAbilities, 0, sizeof(*pAbilities));
- 	/* fill out standard constant fields */
- 	pAbilities->instr_per_sec = pBDData->rDspSettings.uIps;
- 	pAbilities->data_size = pBDData->rDspSettings.uDStoreSize;
 diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
 index 9df78e2..01ba9ae 100644
 --- a/drivers/char/nvram.c
@@ -37286,7 +36949,7 @@ index 9df78e2..01ba9ae 100644
  
  	*ppos = i;
 diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
-index 5c5cc00..ac9edb7 100644
+index d39cca6..8c1e269 100644
 --- a/drivers/char/pcmcia/synclink_cs.c
 +++ b/drivers/char/pcmcia/synclink_cs.c
 @@ -2345,9 +2345,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
@@ -37361,10 +37024,10 @@ index 5c5cc00..ac9edb7 100644
  
  	if (cmd != SIOCWANDEV)
 diff --git a/drivers/char/random.c b/drivers/char/random.c
-index 81eefa1..219a156 100644
+index 7a744d3..35a177ee 100644
 --- a/drivers/char/random.c
 +++ b/drivers/char/random.c
-@@ -272,8 +272,13 @@
+@@ -269,8 +269,13 @@
  /*
   * Configuration information
   */
@@ -37378,7 +37041,7 @@ index 81eefa1..219a156 100644
  #define SEC_XFER_SIZE 512
  #define EXTRACT_SIZE 10
  
-@@ -313,10 +318,17 @@ static struct poolinfo {
+@@ -310,10 +315,17 @@ static struct poolinfo {
  	int poolwords;
  	int tap1, tap2, tap3, tap4, tap5;
  } poolinfo_table[] = {
@@ -37396,7 +37059,7 @@ index 81eefa1..219a156 100644
  #if 0
  	/* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1  -- 115 */
  	{ 2048,	1638,	1231,	819,	411,	1 },
-@@ -524,8 +536,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
+@@ -521,8 +533,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
  		input_rotate += i ? 7 : 14;
  	}
  
@@ -37407,7 +37070,7 @@ index 81eefa1..219a156 100644
  	smp_wmb();
  
  	if (out)
-@@ -1032,7 +1044,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
+@@ -1029,7 +1041,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);
@@ -37416,7 +37079,7 @@ index 81eefa1..219a156 100644
  			ret = -EFAULT;
  			break;
  		}
-@@ -1368,7 +1380,7 @@ EXPORT_SYMBOL(generate_random_uuid);
+@@ -1365,7 +1377,7 @@ EXPORT_SYMBOL(generate_random_uuid);
  #include <linux/sysctl.h>
  
  static int min_read_thresh = 8, min_write_thresh;
@@ -37425,17 +37088,17 @@ index 81eefa1..219a156 100644
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-@@ -1384,7 +1396,7 @@ static char sysctl_bootid[16];
- static int proc_do_uuid(ctl_table *table, int write,
+@@ -1381,7 +1393,7 @@ static char sysctl_bootid[16];
+ static int proc_do_uuid(struct ctl_table *table, int write,
  			void __user *buffer, size_t *lenp, loff_t *ppos)
  {
--	ctl_table fake_table;
+-	struct ctl_table fake_table;
 +	ctl_table_no_const fake_table;
  	unsigned char buf[64], tmp_uuid[16], *uuid;
  
  	uuid = table->data;
 diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
-index bf2349db..5456d53 100644
+index 7cc1fe22..b602d6b 100644
 --- a/drivers/char/sonypi.c
 +++ b/drivers/char/sonypi.c
 @@ -54,6 +54,7 @@
@@ -37455,7 +37118,7 @@ index bf2349db..5456d53 100644
  	int model;
  	struct input_dev *input_jog_dev;
  	struct input_dev *input_key_dev;
-@@ -897,7 +898,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
+@@ -892,7 +893,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);
@@ -37464,7 +37127,7 @@ index bf2349db..5456d53 100644
  	mutex_unlock(&sonypi_device.lock);
  	return 0;
  }
-@@ -906,9 +907,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
+@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
  {
  	mutex_lock(&sonypi_device.lock);
  	/* Flush input queue on first open */
@@ -37527,7 +37190,7 @@ index 84ddc55..1d32f1e 100644
  	return 0;
  }
 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
-index fc45567..fa2a590 100644
+index b79cf3e..de172d64f 100644
 --- a/drivers/char/virtio_console.c
 +++ b/drivers/char/virtio_console.c
 @@ -682,7 +682,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
@@ -37562,7 +37225,7 @@ index a33f46f..a720eed 100644
  	composite = kzalloc(sizeof(*composite), GFP_KERNEL);
  	if (!composite) {
 diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
-index bd11315..7f87098 100644
+index 81dd31a..ef5c542 100644
 --- a/drivers/clk/socfpga/clk.c
 +++ b/drivers/clk/socfpga/clk.c
 @@ -22,6 +22,7 @@
@@ -37572,10 +37235,10 @@ index bd11315..7f87098 100644
 +#include <asm/pgtable.h>
  
  /* Clock Manager offsets */
- #define CLKMGR_CTRL    0x0
-@@ -135,8 +136,10 @@ static __init struct clk *socfpga_clk_init(struct device_node *node,
- 	if (strcmp(clk_name, "main_pll") || strcmp(clk_name, "periph_pll") ||
- 			strcmp(clk_name, "sdram_pll")) {
+ #define CLKMGR_CTRL	0x0
+@@ -152,8 +153,10 @@ static __init struct clk *socfpga_clk_init(struct device_node *node,
+ 		streq(clk_name, "periph_pll") ||
+ 		streq(clk_name, "sdram_pll")) {
  		socfpga_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
 -		clk_pll_ops.enable = clk_gate_ops.enable;
 -		clk_pll_ops.disable = clk_gate_ops.disable;
@@ -37586,47 +37249,17 @@ index bd11315..7f87098 100644
  	}
  
  	clk = clk_register(NULL, &socfpga_clk->hw.hw);
-diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
-index a2b2541..bc1e7ff 100644
---- a/drivers/clocksource/arm_arch_timer.c
-+++ b/drivers/clocksource/arm_arch_timer.c
-@@ -264,7 +264,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
+@@ -244,7 +247,7 @@ static unsigned long socfpga_clk_recalc_rate(struct clk_hw *hwclk,
+ 	return parent_rate / div;
  }
  
--static struct notifier_block arch_timer_cpu_nb __cpuinitdata = {
-+static struct notifier_block arch_timer_cpu_nb = {
- 	.notifier_call = arch_timer_cpu_notify,
- };
- 
-diff --git a/drivers/clocksource/bcm_kona_timer.c b/drivers/clocksource/bcm_kona_timer.c
-index 350f493..489479e 100644
---- a/drivers/clocksource/bcm_kona_timer.c
-+++ b/drivers/clocksource/bcm_kona_timer.c
-@@ -199,7 +199,7 @@ static struct irqaction kona_timer_irq = {
- 	.handler = kona_timer_interrupt,
- };
- 
--static void __init kona_timer_init(void)
-+static void __init kona_timer_init(struct device_node *np)
- {
- 	kona_timers_init();
- 	kona_timer_clockevents_init();
-diff --git a/drivers/clocksource/metag_generic.c b/drivers/clocksource/metag_generic.c
-index ade7513..069445f 100644
---- a/drivers/clocksource/metag_generic.c
-+++ b/drivers/clocksource/metag_generic.c
-@@ -169,7 +169,7 @@ static int __cpuinit arch_timer_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata arch_timer_cpu_nb = {
-+static struct notifier_block arch_timer_cpu_nb = {
- 	.notifier_call = arch_timer_cpu_notify,
- };
- 
+-static struct clk_ops gateclk_ops = {
++static clk_ops_no_const gateclk_ops __read_only = {
+ 	.recalc_rate = socfpga_clk_recalc_rate,
+ 	.get_parent = socfpga_clk_get_parent,
+ 	.set_parent = socfpga_clk_set_parent,
 diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
-index edc089e..bc7c0bc 100644
+index 506fd23..01a593f 100644
 --- a/drivers/cpufreq/acpi-cpufreq.c
 +++ b/drivers/cpufreq/acpi-cpufreq.c
 @@ -172,7 +172,7 @@ static ssize_t show_global_boost(struct kobject *kobj,
@@ -37638,7 +37271,7 @@ index edc089e..bc7c0bc 100644
  						show_global_boost,
  						store_global_boost);
  
-@@ -705,8 +705,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
+@@ -721,8 +721,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
  	data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
  	per_cpu(acfreq_data, cpu) = data;
  
@@ -37652,7 +37285,7 @@ index edc089e..bc7c0bc 100644
  
  	result = acpi_processor_register_performance(data->acpi_data, cpu);
  	if (result)
-@@ -832,7 +835,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
+@@ -850,7 +853,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
  		policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
  		break;
  	case ACPI_ADR_SPACE_FIXED_HARDWARE:
@@ -37663,34 +37296,20 @@ index edc089e..bc7c0bc 100644
  		policy->cur = get_cur_freq_on_cpu(cpu);
  		break;
  	default:
-@@ -843,8 +848,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
- 	acpi_processor_notify_smm(THIS_MODULE);
- 
- 	/* Check for APERF/MPERF support in hardware */
--	if (boot_cpu_has(X86_FEATURE_APERFMPERF))
--		acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf;
-+	if (boot_cpu_has(X86_FEATURE_APERFMPERF)) {
-+		pax_open_kernel();
-+		*(void **)&acpi_cpufreq_driver.getavg = cpufreq_get_measured_perf;
-+		pax_close_kernel();
-+	}
- 
- 	pr_debug("CPU%u - ACPI performance management activated.\n", cpu);
- 	for (i = 0; i < perf->state_count; i++)
 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
-index 6485547..477033e 100644
+index 04548f7..457a342 100644
 --- a/drivers/cpufreq/cpufreq.c
 +++ b/drivers/cpufreq/cpufreq.c
-@@ -1854,7 +1854,7 @@ static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
+@@ -2069,7 +2069,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
  	return NOTIFY_OK;
  }
  
 -static struct notifier_block __refdata cpufreq_cpu_notifier = {
 +static struct notifier_block cpufreq_cpu_notifier = {
-     .notifier_call = cpufreq_cpu_callback,
+ 	.notifier_call = cpufreq_cpu_callback,
  };
  
-@@ -1886,8 +1886,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
+@@ -2101,8 +2101,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
  
  	pr_debug("trying to register driver %s\n", driver_data->name);
  
@@ -37705,10 +37324,10 @@ index 6485547..477033e 100644
  	write_lock_irqsave(&cpufreq_driver_lock, flags);
  	if (cpufreq_driver) {
 diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
-index a86ff72..aad2b03 100644
+index 0806c31..6a73276 100644
 --- a/drivers/cpufreq/cpufreq_governor.c
 +++ b/drivers/cpufreq/cpufreq_governor.c
-@@ -235,7 +235,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+@@ -187,7 +187,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
  	struct dbs_data *dbs_data;
  	struct od_cpu_dbs_info_s *od_dbs_info = NULL;
  	struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
@@ -37717,7 +37336,7 @@ index a86ff72..aad2b03 100644
  	struct od_dbs_tuners *od_tuners = NULL;
  	struct cs_dbs_tuners *cs_tuners = NULL;
  	struct cpu_dbs_common_info *cpu_cdbs;
-@@ -298,7 +298,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+@@ -253,7 +253,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
  
  		if ((cdata->governor == GOV_CONSERVATIVE) &&
  				(!policy->governor->initialized)) {
@@ -37726,7 +37345,7 @@ index a86ff72..aad2b03 100644
  
  			cpufreq_register_notifier(cs_ops->notifier_block,
  					CPUFREQ_TRANSITION_NOTIFIER);
-@@ -315,7 +315,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
+@@ -273,7 +273,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
  
  			if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
  				(policy->governor->initialized == 1)) {
@@ -37736,10 +37355,10 @@ index a86ff72..aad2b03 100644
  				cpufreq_unregister_notifier(cs_ops->notifier_block,
  						CPUFREQ_TRANSITION_NOTIFIER);
 diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
-index 0d9e6be..461fd3b 100644
+index 88cd39f..87f0393 100644
 --- a/drivers/cpufreq/cpufreq_governor.h
 +++ b/drivers/cpufreq/cpufreq_governor.h
-@@ -204,7 +204,7 @@ struct common_dbs_data {
+@@ -202,7 +202,7 @@ struct common_dbs_data {
  	void (*exit)(struct dbs_data *dbs_data);
  
  	/* Governor specific ops, see below */
@@ -37747,12 +37366,30 @@ index 0d9e6be..461fd3b 100644
 +	const void *gov_ops;
  };
  
- /* Governer Per policy data */
+ /* Governor Per policy data */
+@@ -222,7 +222,7 @@ struct od_ops {
+ 	unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
+ 			unsigned int freq_next, unsigned int relation);
+ 	void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
+-};
++} __no_const;
+ 
+ struct cs_ops {
+ 	struct notifier_block *notifier_block;
 diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
-index c087347..dad6268 100644
+index 32f26f6..feb657b 100644
 --- a/drivers/cpufreq/cpufreq_ondemand.c
 +++ b/drivers/cpufreq/cpufreq_ondemand.c
-@@ -615,14 +615,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
+@@ -522,7 +522,7 @@ static void od_exit(struct dbs_data *dbs_data)
+ 
+ define_get_cpu_dbs_routines(od_cpu_dbs_info);
+ 
+-static struct od_ops od_ops = {
++static struct od_ops od_ops __read_only = {
+ 	.powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
+ 	.powersave_bias_target = generic_powersave_bias_target,
+ 	.freq_increase = dbs_freq_increase,
+@@ -577,14 +577,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
  		(struct cpufreq_policy *, unsigned int, unsigned int),
  		unsigned int powersave_bias)
  {
@@ -37774,10 +37411,10 @@ index c087347..dad6268 100644
  }
  EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
 diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
-index bfd6273..e39dd63 100644
+index 4cf0d28..5830372 100644
 --- a/drivers/cpufreq/cpufreq_stats.c
 +++ b/drivers/cpufreq/cpufreq_stats.c
-@@ -365,7 +365,7 @@ static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
+@@ -352,7 +352,7 @@ static int cpufreq_stat_cpu_callback(struct notifier_block *nfb,
  }
  
  /* priority=1 so this will get called before cpufreq_remove_dev */
@@ -37787,7 +37424,7 @@ index bfd6273..e39dd63 100644
  	.priority = 1,
  };
 diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
-index 421ef37..e708530c 100644
+index 2f0a2a6..93d728e 100644
 --- a/drivers/cpufreq/p4-clockmod.c
 +++ b/drivers/cpufreq/p4-clockmod.c
 @@ -160,10 +160,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
@@ -37819,7 +37456,7 @@ index 421ef37..e708530c 100644
  	if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
  		printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
 diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
-index c71ee14..7c2e183 100644
+index ac76b48..2445bc6 100644
 --- a/drivers/cpufreq/sparc-us3-cpufreq.c
 +++ b/drivers/cpufreq/sparc-us3-cpufreq.c
 @@ -18,14 +18,12 @@
@@ -37866,7 +37503,7 @@ index c71ee14..7c2e183 100644
  static int __init us3_freq_init(void)
  {
  	unsigned long manuf, impl, ver;
-@@ -208,57 +219,15 @@ static int __init us3_freq_init(void)
+@@ -208,55 +219,15 @@ static int __init us3_freq_init(void)
  	    (impl == CHEETAH_IMPL ||
  	     impl == CHEETAH_PLUS_IMPL ||
  	     impl == JAGUAR_IMPL ||
@@ -37874,12 +37511,11 @@ index c71ee14..7c2e183 100644
 -		struct cpufreq_driver *driver;
 -
 -		ret = -ENOMEM;
--		driver = kzalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
+-		driver = kzalloc(sizeof(*driver), GFP_KERNEL);
 -		if (!driver)
 -			goto err_out;
 -
--		us3_freq_table = kzalloc(
--			(NR_CPUS * sizeof(struct us3_freq_percpu_info)),
+-		us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
 -			GFP_KERNEL);
 -		if (!us3_freq_table)
 -			goto err_out;
@@ -37889,7 +37525,6 @@ index c71ee14..7c2e183 100644
 -		driver->target = us3_freq_target;
 -		driver->get = us3_freq_get;
 -		driver->exit = us3_freq_cpu_exit;
--		driver->owner = THIS_MODULE,
 -		strcpy(driver->name, "UltraSPARC-III");
 -
 -		cpufreq_us3_driver = driver;
@@ -37928,7 +37563,7 @@ index c71ee14..7c2e183 100644
  
  MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
 diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
-index 618e6f4..e89d915 100644
+index f897d51..15da295 100644
 --- a/drivers/cpufreq/speedstep-centrino.c
 +++ b/drivers/cpufreq/speedstep-centrino.c
 @@ -353,8 +353,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
@@ -37946,10 +37581,10 @@ index 618e6f4..e89d915 100644
  	if (policy->cpu != 0)
  		return -ENODEV;
 diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
-index c3a93fe..e808f24 100644
+index d75040d..4738ca5 100644
 --- a/drivers/cpuidle/cpuidle.c
 +++ b/drivers/cpuidle/cpuidle.c
-@@ -254,7 +254,7 @@ static int poll_idle(struct cpuidle_device *dev,
+@@ -252,7 +252,7 @@ static int poll_idle(struct cpuidle_device *dev,
  
  static void poll_idle_init(struct cpuidle_driver *drv)
  {
@@ -37981,10 +37616,10 @@ index ea2f8e7..70ac501 100644
  }
  
 diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
-index 428754a..8bdf9cc 100644
+index 8739cc0..dc859d0 100644
 --- a/drivers/cpuidle/sysfs.c
 +++ b/drivers/cpuidle/sysfs.c
-@@ -131,7 +131,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
+@@ -134,7 +134,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
  	NULL
  };
  
@@ -37994,7 +37629,7 @@ index 428754a..8bdf9cc 100644
  	.name = "cpuidle",
  };
 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
-index ebf130e..e32d8a9 100644
+index 12fea3e..1e28f47 100644
 --- a/drivers/crypto/hifn_795x.c
 +++ b/drivers/crypto/hifn_795x.c
 @@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
@@ -38016,19 +37651,10 @@ index ebf130e..e32d8a9 100644
  	err = pci_request_regions(pdev, name);
  	if (err)
 diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
-index 3b36797..db0b0c0 100644
+index c99c00d..990a4b2 100644
 --- a/drivers/devfreq/devfreq.c
 +++ b/drivers/devfreq/devfreq.c
-@@ -477,7 +477,7 @@ struct devfreq *devfreq_add_device(struct device *dev,
- 						GFP_KERNEL);
- 	devfreq->last_stat_updated = jiffies;
- 
--	dev_set_name(&devfreq->dev, dev_name(dev));
-+	dev_set_name(&devfreq->dev, "%s", dev_name(dev));
- 	err = device_register(&devfreq->dev);
- 	if (err) {
- 		put_device(&devfreq->dev);
-@@ -588,7 +588,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
+@@ -607,7 +607,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
  		goto err_out;
  	}
  
@@ -38037,7 +37663,7 @@ index 3b36797..db0b0c0 100644
  
  	list_for_each_entry(devfreq, &devfreq_list, node) {
  		int ret = 0;
-@@ -676,7 +676,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
+@@ -695,7 +695,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
  		}
  	}
  
@@ -38046,11 +37672,11 @@ index 3b36797..db0b0c0 100644
  err_out:
  	mutex_unlock(&devfreq_list_lock);
  
-diff --git a/drivers/dma/sh/shdma.c b/drivers/dma/sh/shdma.c
-index b70709b..1d8d02a 100644
---- a/drivers/dma/sh/shdma.c
-+++ b/drivers/dma/sh/shdma.c
-@@ -476,7 +476,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
+diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
+index 1069e88..dfcd642 100644
+--- a/drivers/dma/sh/shdmac.c
++++ b/drivers/dma/sh/shdmac.c
+@@ -511,7 +511,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
  	return ret;
  }
  
@@ -38076,10 +37702,10 @@ index 211021d..201d47f 100644
  EXPORT_SYMBOL_GPL(edac_device_alloc_index);
  
 diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
-index c4d700a..0b57abd 100644
+index 9f7e0e60..348c875 100644
 --- a/drivers/edac/edac_mc_sysfs.c
 +++ b/drivers/edac/edac_mc_sysfs.c
-@@ -148,7 +148,7 @@ static const char * const edac_caps[] = {
+@@ -150,7 +150,7 @@ static const char * const edac_caps[] = {
  struct dev_ch_attribute {
  	struct device_attribute attr;
  	int channel;
@@ -38088,7 +37714,7 @@ index c4d700a..0b57abd 100644
  
  #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
  	struct dev_ch_attribute dev_attr_legacy_##_name = \
-@@ -1005,14 +1005,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
+@@ -1007,14 +1007,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
  	}
  
  	if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
@@ -38266,10 +37892,10 @@ index 57ea7f4..af06b76 100644
  	card->driver->update_phy_reg(card, 4,
  				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
 diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
-index 664a6ff..af13580 100644
+index de4aa40..49ab1f2 100644
 --- a/drivers/firewire/core-device.c
 +++ b/drivers/firewire/core-device.c
-@@ -232,7 +232,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
+@@ -253,7 +253,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
  struct config_rom_attribute {
  	struct device_attribute attr;
  	u32 key;
@@ -38279,7 +37905,7 @@ index 664a6ff..af13580 100644
  static ssize_t show_immediate(struct device *dev,
  			      struct device_attribute *dattr, char *buf)
 diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
-index 28a94c7..58da63a 100644
+index e5af0e3..d318058 100644
 --- a/drivers/firewire/core-transaction.c
 +++ b/drivers/firewire/core-transaction.c
 @@ -38,6 +38,7 @@
@@ -38316,22 +37942,10 @@ index 94a58a0..f5eba42 100644
  	container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
  
 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
-index eb760a2..d71c868 100644
+index fa0affb..aa448eb 100644
 --- a/drivers/firmware/dmi_scan.c
 +++ b/drivers/firmware/dmi_scan.c
-@@ -497,11 +497,6 @@ void __init dmi_scan_machine(void)
- 		}
- 	}
- 	else {
--		/*
--		 * no iounmap() for that ioremap(); it would be a no-op, but
--		 * it's so early in setup that sucker gets confused into doing
--		 * what it shouldn't if we actually call it.
--		 */
- 		p = dmi_ioremap(0xF0000, 0x10000);
- 		if (p == NULL)
- 			goto error;
-@@ -792,7 +787,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
+@@ -791,7 +791,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
  	if (buf == NULL)
  		return -1;
  
@@ -38367,7 +37981,7 @@ index 5145fa3..0d3babd 100644
  	return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
  }
 diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
-index 8bd1bb6..c48b0c6 100644
+index 8a7432a..28fb839 100644
 --- a/drivers/firmware/efi/efivars.c
 +++ b/drivers/firmware/efi/efivars.c
 @@ -452,7 +452,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
@@ -38395,10 +38009,10 @@ index 2a90ba6..07f3733 100644
  	ret = sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
  
 diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
-index e16d932..f0206ef 100644
+index 814addb..0937d7f 100644
 --- a/drivers/gpio/gpio-ich.c
 +++ b/drivers/gpio/gpio-ich.c
-@@ -69,7 +69,7 @@ struct ichx_desc {
+@@ -71,7 +71,7 @@ struct ichx_desc {
  	/* Some chipsets have quirks, let these use their own request/get */
  	int (*request)(struct gpio_chip *chip, unsigned offset);
  	int (*get)(struct gpio_chip *chip, unsigned offset);
@@ -38421,10 +38035,10 @@ index 9902732..64b62dd 100644
  	return -EINVAL;
  }
 diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
-index ed1334e..ee0dd42 100644
+index c722c3b..2ec6040 100644
 --- a/drivers/gpu/drm/drm_crtc_helper.c
 +++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -321,7 +321,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
+@@ -328,7 +328,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
  	struct drm_crtc *tmp;
  	int crtc_mask = 1;
  
@@ -38434,10 +38048,19 @@ index ed1334e..ee0dd42 100644
  	dev = crtc->dev;
  
 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index 2ab782c..d994a37 100644
+index fe58d08..07bc38e 100644
 --- a/drivers/gpu/drm/drm_drv.c
 +++ b/drivers/gpu/drm/drm_drv.c
-@@ -306,7 +306,7 @@ module_exit(drm_core_exit);
+@@ -186,7 +186,7 @@ static void drm_legacy_dev_reinit(struct drm_device *dev)
+ 	atomic_set(&dev->vma_count, 0);
+ 
+ 	for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
+-		atomic_set(&dev->counts[i], 0);
++		atomic_set_unchecked(&dev->counts[i], 0);
+ 
+ 	dev->sigdata.lock = NULL;
+ 
+@@ -302,7 +302,7 @@ module_exit(drm_core_exit);
  /**
   * Copy and IOCTL return string to user space
   */
@@ -38446,7 +38069,7 @@ index 2ab782c..d994a37 100644
  {
  	int len;
  
-@@ -376,7 +376,7 @@ long drm_ioctl(struct file *filp,
+@@ -372,7 +372,7 @@ long drm_ioctl(struct file *filp,
  	struct drm_file *file_priv = filp->private_data;
  	struct drm_device *dev;
  	const struct drm_ioctl_desc *ioctl = NULL;
@@ -38455,7 +38078,7 @@ index 2ab782c..d994a37 100644
  	unsigned int nr = DRM_IOCTL_NR(cmd);
  	int retcode = -EINVAL;
  	char stack_kdata[128];
-@@ -389,7 +389,7 @@ long drm_ioctl(struct file *filp,
+@@ -385,7 +385,7 @@ long drm_ioctl(struct file *filp,
  		return -ENODEV;
  
  	atomic_inc(&dev->ioctl_count);
@@ -38465,19 +38088,10 @@ index 2ab782c..d994a37 100644
  
  	if ((nr >= DRM_CORE_IOCTL_COUNT) &&
 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index 429e07d..e681a2c 100644
+index 3f84277..c627c54 100644
 --- a/drivers/gpu/drm/drm_fops.c
 +++ b/drivers/gpu/drm/drm_fops.c
-@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
- 	}
- 
- 	for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
--		atomic_set(&dev->counts[i], 0);
-+		atomic_set_unchecked(&dev->counts[i], 0);
- 
- 	dev->sigdata.lock = NULL;
- 
-@@ -135,7 +135,7 @@ int drm_open(struct inode *inode, struct file *filp)
+@@ -97,7 +97,7 @@ int drm_open(struct inode *inode, struct file *filp)
  	if (drm_device_is_unplugged(dev))
  		return -ENODEV;
  
@@ -38486,7 +38100,7 @@ index 429e07d..e681a2c 100644
  		need_setup = 1;
  	mutex_lock(&dev->struct_mutex);
  	old_imapping = inode->i_mapping;
-@@ -151,7 +151,7 @@ int drm_open(struct inode *inode, struct file *filp)
+@@ -113,7 +113,7 @@ int drm_open(struct inode *inode, struct file *filp)
  	retcode = drm_open_helper(inode, filp, dev);
  	if (retcode)
  		goto err_undo;
@@ -38495,7 +38109,7 @@ index 429e07d..e681a2c 100644
  	if (need_setup) {
  		retcode = drm_setup(dev);
  		if (retcode)
-@@ -166,7 +166,7 @@ err_undo:
+@@ -128,7 +128,7 @@ err_undo:
  	iput(container_of(dev->dev_mapping, struct inode, i_data));
  	dev->dev_mapping = old_mapping;
  	mutex_unlock(&dev->struct_mutex);
@@ -38504,7 +38118,7 @@ index 429e07d..e681a2c 100644
  	return retcode;
  }
  EXPORT_SYMBOL(drm_open);
-@@ -441,7 +441,7 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -405,7 +405,7 @@ int drm_release(struct inode *inode, struct file *filp)
  
  	mutex_lock(&drm_global_mutex);
  
@@ -38513,7 +38127,7 @@ index 429e07d..e681a2c 100644
  
  	if (dev->driver->preclose)
  		dev->driver->preclose(dev, file_priv);
-@@ -450,10 +450,10 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -414,10 +414,10 @@ int drm_release(struct inode *inode, struct file *filp)
  	 * Begin inline drm_release
  	 */
  
@@ -38526,7 +38140,7 @@ index 429e07d..e681a2c 100644
  
  	/* Release any auth tokens that might point to this file_priv,
  	   (do that under the drm_global_mutex) */
-@@ -550,8 +550,8 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -516,8 +516,8 @@ int drm_release(struct inode *inode, struct file *filp)
  	 * End inline drm_release
  	 */
  
@@ -38599,7 +38213,7 @@ index f731116..629842c 100644
  		item->object = NULL;
  	}
 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
-index d4b20ce..77a8d41 100644
+index 5329832..b503f49 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)
@@ -38630,7 +38244,7 @@ index d4b20ce..77a8d41 100644
  			type = "??";
  		else
  			type = types[map->type];
-@@ -253,7 +257,11 @@ int drm_vma_info(struct seq_file *m, void *data)
+@@ -257,7 +261,11 @@ int drm_vma_info(struct seq_file *m, void *data)
  			   vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
  			   vma->vm_flags & VM_LOCKED ? 'l' : '-',
  			   vma->vm_flags & VM_IO ? 'i' : '-',
@@ -38694,19 +38308,6 @@ index 2f4c434..dd12cd2 100644
  	else
  		ret = drm_ioctl(filp, cmd, arg);
  
-diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
-index e77bd8b..1571b85 100644
---- a/drivers/gpu/drm/drm_ioctl.c
-+++ b/drivers/gpu/drm/drm_ioctl.c
-@@ -252,7 +252,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
--			stats->data[i].value = atomic_read(&dev->counts[i]);
-+			stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
- 		stats->data[i].type = dev->types[i];
- 	}
- 
 diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
 index d752c96..fe08455 100644
 --- a/drivers/gpu/drm/drm_lock.c
@@ -38730,10 +38331,10 @@ index d752c96..fe08455 100644
  	if (drm_lock_free(&master->lock, lock->context)) {
  		/* FIXME: Should really bail out here. */
 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index 16f3ec5..b28f9ca 100644
+index 39d8645..59e06fa 100644
 --- a/drivers/gpu/drm/drm_stub.c
 +++ b/drivers/gpu/drm/drm_stub.c
-@@ -501,7 +501,7 @@ void drm_unplug_dev(struct drm_device *dev)
+@@ -484,7 +484,7 @@ void drm_unplug_dev(struct drm_device *dev)
  
  	drm_device_set_unplugged(dev);
  
@@ -38743,10 +38344,10 @@ index 16f3ec5..b28f9ca 100644
  	}
  	mutex_unlock(&drm_global_mutex);
 diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
-index 0229665..f61329c 100644
+index 2290b3b..22056a1 100644
 --- a/drivers/gpu/drm/drm_sysfs.c
 +++ b/drivers/gpu/drm/drm_sysfs.c
-@@ -499,7 +499,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event);
+@@ -524,7 +524,7 @@ EXPORT_SYMBOL(drm_sysfs_hotplug_event);
  int drm_sysfs_device_add(struct drm_minor *minor)
  {
  	int err;
@@ -38756,10 +38357,10 @@ index 0229665..f61329c 100644
  	minor->kdev.parent = minor->dev->dev;
  
 diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
-index 004ecdf..db1f6e0 100644
+index ab1892eb..d7009ca 100644
 --- a/drivers/gpu/drm/i810/i810_dma.c
 +++ b/drivers/gpu/drm/i810/i810_dma.c
-@@ -945,8 +945,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
+@@ -944,8 +944,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
  				 dma->buflist[vertex->idx],
  				 vertex->discard, vertex->used);
  
@@ -38770,7 +38371,7 @@ index 004ecdf..db1f6e0 100644
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-@@ -1106,8 +1106,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
+@@ -1105,8 +1105,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);
  
@@ -38782,7 +38383,7 @@ index 004ecdf..db1f6e0 100644
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
-index 6e0acad..93c8289 100644
+index d4d16ed..8fb0b51 100644
 --- a/drivers/gpu/drm/i810/i810_drv.h
 +++ b/drivers/gpu/drm/i810/i810_drv.h
 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
@@ -38797,10 +38398,10 @@ index 6e0acad..93c8289 100644
  	int front_offset;
  } drm_i810_private_t;
 diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
-index e913d32..4d9b351 100644
+index a6f4cb5..6b2beb2 100644
 --- a/drivers/gpu/drm/i915/i915_debugfs.c
 +++ b/drivers/gpu/drm/i915/i915_debugfs.c
-@@ -499,7 +499,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
+@@ -624,7 +624,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
  			   I915_READ(GTIMR));
  	}
  	seq_printf(m, "Interrupts received: %d\n",
@@ -38810,10 +38411,10 @@ index e913d32..4d9b351 100644
  		if (IS_GEN6(dev) || IS_GEN7(dev)) {
  			seq_printf(m,
 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 17d9b0b..860e6d9 100644
+index d5c784d..06e5c36 100644
 --- a/drivers/gpu/drm/i915/i915_dma.c
 +++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -1259,7 +1259,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
+@@ -1263,7 +1263,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
  	bool can_switch;
  
  	spin_lock(&dev->count_lock);
@@ -38823,10 +38424,10 @@ index 17d9b0b..860e6d9 100644
  	return can_switch;
  }
 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 47d8b68..52f5d8d 100644
+index ab0f2c0..53c1bda 100644
 --- a/drivers/gpu/drm/i915/i915_drv.h
 +++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -916,7 +916,7 @@ typedef struct drm_i915_private {
+@@ -1181,7 +1181,7 @@ typedef struct drm_i915_private {
  	drm_dma_handle_t *status_page_dmah;
  	struct resource mch_res;
  
@@ -38835,20 +38436,11 @@ index 47d8b68..52f5d8d 100644
  
  	/* protects the irq masks */
  	spinlock_t irq_lock;
-@@ -1813,7 +1813,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapter(
- 		struct drm_i915_private *dev_priv, unsigned port);
- extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
- extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
--extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
-+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
- {
- 	return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
- }
 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index 117ce38..eefd237 100644
+index bf34577..3fd2ffa 100644
 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -727,9 +727,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
+@@ -768,9 +768,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
  
  static int
  validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
@@ -38896,10 +38488,10 @@ index 3c59584..500f2e9 100644
  
  	return ret;
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index c8d16a6..ca71b5e 100644
+index 4b91228..590c643 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -670,7 +670,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
+@@ -1085,7 +1085,7 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
  	int pipe;
  	u32 pipe_stats[I915_MAX_PIPES];
  
@@ -38908,25 +38500,16 @@ index c8d16a6..ca71b5e 100644
  
  	while (true) {
  		iir = I915_READ(VLV_IIR);
-@@ -835,7 +835,7 @@ static irqreturn_t ivybridge_irq_handler(int irq, void *arg)
+@@ -1390,7 +1390,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
  	irqreturn_t ret = IRQ_NONE;
- 	int i;
- 
--	atomic_inc(&dev_priv->irq_received);
-+	atomic_inc_unchecked(&dev_priv->irq_received);
- 
- 	/* disable master interrupt before clearing iir  */
- 	de_ier = I915_READ(DEIER);
-@@ -925,7 +925,7 @@ static irqreturn_t ironlake_irq_handler(int irq, void *arg)
- 	int ret = IRQ_NONE;
- 	u32 de_iir, gt_iir, de_ier, pm_iir, sde_ier;
+ 	bool err_int_reenable = false;
  
 -	atomic_inc(&dev_priv->irq_received);
 +	atomic_inc_unchecked(&dev_priv->irq_received);
  
- 	/* disable master interrupt before clearing iir  */
- 	de_ier = I915_READ(DEIER);
-@@ -2135,7 +2135,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
+ 	/* We get interrupts on unclaimed registers, so check for this before we
+ 	 * do any I915_{READ,WRITE}. */
+@@ -2146,7 +2146,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
  {
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  
@@ -38935,7 +38518,7 @@ index c8d16a6..ca71b5e 100644
  
  	I915_WRITE(HWSTAM, 0xeffe);
  
-@@ -2170,7 +2170,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
+@@ -2164,7 +2164,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  	int pipe;
  
@@ -38944,7 +38527,7 @@ index c8d16a6..ca71b5e 100644
  
  	/* VLV magic */
  	I915_WRITE(VLV_IMR, 0);
-@@ -2457,7 +2457,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
+@@ -2452,7 +2452,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  	int pipe;
  
@@ -38953,7 +38536,7 @@ index c8d16a6..ca71b5e 100644
  
  	for_each_pipe(pipe)
  		I915_WRITE(PIPESTAT(pipe), 0);
-@@ -2536,7 +2536,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
+@@ -2530,7 +2530,7 @@ static irqreturn_t i8xx_irq_handler(int irq, void *arg)
  		I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
  		I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
  
@@ -38962,7 +38545,7 @@ index c8d16a6..ca71b5e 100644
  
  	iir = I915_READ16(IIR);
  	if (iir == 0)
-@@ -2611,7 +2611,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
+@@ -2604,7 +2604,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  	int pipe;
  
@@ -38971,7 +38554,7 @@ index c8d16a6..ca71b5e 100644
  
  	if (I915_HAS_HOTPLUG(dev)) {
  		I915_WRITE(PORT_HOTPLUG_EN, 0);
-@@ -2710,7 +2710,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
+@@ -2703,7 +2703,7 @@ static irqreturn_t i915_irq_handler(int irq, void *arg)
  		I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
  	int pipe, ret = IRQ_NONE;
  
@@ -38980,7 +38563,7 @@ index c8d16a6..ca71b5e 100644
  
  	iir = I915_READ(IIR);
  	do {
-@@ -2837,7 +2837,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
+@@ -2827,7 +2827,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  	int pipe;
  
@@ -38989,7 +38572,7 @@ index c8d16a6..ca71b5e 100644
  
  	I915_WRITE(PORT_HOTPLUG_EN, 0);
  	I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
-@@ -2944,7 +2944,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
+@@ -2941,7 +2941,7 @@ static irqreturn_t i965_irq_handler(int irq, void *arg)
  		I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
  		I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
  
@@ -38999,10 +38582,10 @@ index c8d16a6..ca71b5e 100644
  	iir = I915_READ(IIR);
  
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index c714d4d..665732e 100644
+index 333aa1b..0183e38 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -8939,13 +8939,13 @@ struct intel_quirk {
+@@ -9976,13 +9976,13 @@ struct intel_quirk {
  	int subsystem_vendor;
  	int subsystem_device;
  	void (*hook)(struct drm_device *dev);
@@ -39018,7 +38601,7 @@ index c714d4d..665732e 100644
  
  static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
  {
-@@ -8953,18 +8953,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
+@@ -9990,18 +9990,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
  	return 1;
  }
  
@@ -39050,7 +38633,7 @@ index c714d4d..665732e 100644
  	},
  };
 diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
-index 54558a0..2d97005 100644
+index ca4bc54..ee598a2 100644
 --- a/drivers/gpu/drm/mga/mga_drv.h
 +++ b/drivers/gpu/drm/mga/mga_drv.h
 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
@@ -39141,7 +38724,7 @@ index 598c281..60d590e 100644
  
  	*sequence = cur_fence;
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
-index 6aa2137..fe8dc55 100644
+index 3e72876..d1c15ad 100644
 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
 @@ -965,7 +965,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
@@ -39154,42 +38737,19 @@ index 6aa2137..fe8dc55 100644
  #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
  
 diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
-index f2b30f8..d0f9a95 100644
+index 994fd6e..6e12565 100644
 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h
 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
-@@ -92,7 +92,7 @@ struct nouveau_drm {
+@@ -94,7 +94,6 @@ struct nouveau_drm {
  		struct drm_global_reference mem_global_ref;
  		struct ttm_bo_global_ref bo_global_ref;
  		struct ttm_bo_device bdev;
 -		atomic_t validate_sequence;
-+		atomic_unchecked_t validate_sequence;
  		int (*move)(struct nouveau_channel *,
  			    struct ttm_buffer_object *,
  			    struct ttm_mem_reg *, struct ttm_mem_reg *);
-diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
-index 5bccf31..7b5667c 100644
---- a/drivers/gpu/drm/nouveau/nouveau_gem.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
-@@ -323,7 +323,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
- 	int ret, i;
- 	struct nouveau_bo *res_bo = NULL;
- 
--	sequence = atomic_add_return(1, &drm->ttm.validate_sequence);
-+	sequence = atomic_add_return_unchecked(1, &drm->ttm.validate_sequence);
- retry:
- 	if (++trycnt > 100000) {
- 		NV_ERROR(cli, "%s failed and gave up.\n", __func__);
-@@ -360,7 +360,7 @@ retry:
- 		if (ret) {
- 			validate_fini(op, NULL);
- 			if (unlikely(ret == -EAGAIN)) {
--				sequence = atomic_add_return(1, &drm->ttm.validate_sequence);
-+				sequence = atomic_add_return_unchecked(1, &drm->ttm.validate_sequence);
- 				ret = ttm_bo_reserve_slowpath(&nvbo->bo, true,
- 							      sequence);
- 				if (!ret)
 diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
-index 08214bc..9208577 100644
+index c1a7e5a..38b8539 100644
 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
 @@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
@@ -39202,10 +38762,10 @@ index 08214bc..9208577 100644
  
  	if (nr < DRM_COMMAND_BASE)
 diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
-index 25d3495..d81aaf6 100644
+index 81638d7..2e45854 100644
 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
-@@ -62,7 +62,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
+@@ -65,7 +65,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
  	bool can_switch;
  
  	spin_lock(&dev->count_lock);
@@ -39214,8 +38774,127 @@ index 25d3495..d81aaf6 100644
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
+diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
+index eb89653..613cf71 100644
+--- a/drivers/gpu/drm/qxl/qxl_cmd.c
++++ b/drivers/gpu/drm/qxl/qxl_cmd.c
+@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
+ 	int ret;
+ 
+ 	mutex_lock(&qdev->async_io_mutex);
+-	irq_num = atomic_read(&qdev->irq_received_io_cmd);
++	irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
+ 	if (qdev->last_sent_io_cmd > irq_num) {
+ 		if (intr)
+ 			ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
+-							       atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
++							       atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
+ 		else
+ 			ret = wait_event_timeout(qdev->io_cmd_event,
+-						 atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
++						 atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
+ 		/* 0 is timeout, just bail the "hw" has gone away */
+ 		if (ret <= 0)
+ 			goto out;
+-		irq_num = atomic_read(&qdev->irq_received_io_cmd);
++		irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
+ 	}
+ 	outb(val, addr);
+ 	qdev->last_sent_io_cmd = irq_num + 1;
+ 	if (intr)
+ 		ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
+-						       atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
++						       atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
+ 	else
+ 		ret = wait_event_timeout(qdev->io_cmd_event,
+-					 atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
++					 atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
+ out:
+ 	if (ret > 0)
+ 		ret = 0;
+diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
+index c3c2bbd..bc3c0fb 100644
+--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
++++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
+@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
+ 	struct drm_info_node *node = (struct drm_info_node *) m->private;
+ 	struct qxl_device *qdev = node->minor->dev->dev_private;
+ 
+-	seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
+-	seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
+-	seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
+-	seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
++	seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
++	seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
++	seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
++	seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
+ 	seq_printf(m, "%d\n", qdev->irq_received_error);
+ 	return 0;
+ }
+diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
+index f7c9add..fb971d2 100644
+--- a/drivers/gpu/drm/qxl/qxl_drv.h
++++ b/drivers/gpu/drm/qxl/qxl_drv.h
+@@ -290,10 +290,10 @@ struct qxl_device {
+ 	unsigned int last_sent_io_cmd;
+ 
+ 	/* interrupt handling */
+-	atomic_t irq_received;
+-	atomic_t irq_received_display;
+-	atomic_t irq_received_cursor;
+-	atomic_t irq_received_io_cmd;
++	atomic_unchecked_t irq_received;
++	atomic_unchecked_t irq_received_display;
++	atomic_unchecked_t irq_received_cursor;
++	atomic_unchecked_t irq_received_io_cmd;
+ 	unsigned irq_received_error;
+ 	wait_queue_head_t display_event;
+ 	wait_queue_head_t cursor_event;
+diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
+index 21393dc..329f3a9 100644
+--- a/drivers/gpu/drm/qxl/qxl_irq.c
++++ b/drivers/gpu/drm/qxl/qxl_irq.c
+@@ -33,19 +33,19 @@ irqreturn_t qxl_irq_handler(DRM_IRQ_ARGS)
+ 
+ 	pending = xchg(&qdev->ram_header->int_pending, 0);
+ 
+-	atomic_inc(&qdev->irq_received);
++	atomic_inc_unchecked(&qdev->irq_received);
+ 
+ 	if (pending & QXL_INTERRUPT_DISPLAY) {
+-		atomic_inc(&qdev->irq_received_display);
++		atomic_inc_unchecked(&qdev->irq_received_display);
+ 		wake_up_all(&qdev->display_event);
+ 		qxl_queue_garbage_collect(qdev, false);
+ 	}
+ 	if (pending & QXL_INTERRUPT_CURSOR) {
+-		atomic_inc(&qdev->irq_received_cursor);
++		atomic_inc_unchecked(&qdev->irq_received_cursor);
+ 		wake_up_all(&qdev->cursor_event);
+ 	}
+ 	if (pending & QXL_INTERRUPT_IO_CMD) {
+-		atomic_inc(&qdev->irq_received_io_cmd);
++		atomic_inc_unchecked(&qdev->irq_received_io_cmd);
+ 		wake_up_all(&qdev->io_cmd_event);
+ 	}
+ 	if (pending & QXL_INTERRUPT_ERROR) {
+@@ -82,10 +82,10 @@ int qxl_irq_init(struct qxl_device *qdev)
+ 	init_waitqueue_head(&qdev->io_cmd_event);
+ 	INIT_WORK(&qdev->client_monitors_config_work,
+ 		  qxl_client_monitors_config_work_func);
+-	atomic_set(&qdev->irq_received, 0);
+-	atomic_set(&qdev->irq_received_display, 0);
+-	atomic_set(&qdev->irq_received_cursor, 0);
+-	atomic_set(&qdev->irq_received_io_cmd, 0);
++	atomic_set_unchecked(&qdev->irq_received, 0);
++	atomic_set_unchecked(&qdev->irq_received_display, 0);
++	atomic_set_unchecked(&qdev->irq_received_cursor, 0);
++	atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
+ 	qdev->irq_received_error = 0;
+ 	ret = drm_irq_install(qdev->ddev);
+ 	qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
 diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
-index 489cb8c..0b8d0d3 100644
+index 037786d..2a95e33 100644
 --- a/drivers/gpu/drm/qxl/qxl_ttm.c
 +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
 @@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
@@ -39238,14 +38917,24 @@ index 489cb8c..0b8d0d3 100644
  	}
  	vma->vm_ops = &qxl_ttm_vm_ops;
  	return 0;
-@@ -556,25 +558,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
+@@ -558,25 +560,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
  static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
  {
  #if defined(CONFIG_DEBUG_FS)
 -	static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
 -	static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
 -	unsigned i;
--
++	static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
++		{
++			.name = "qxl_mem_mm",
++			.show = &qxl_mm_dump_table,
++		},
++		{
++			.name = "qxl_surf_mm",
++			.show = &qxl_mm_dump_table,
++		}
++	};
+ 
 -	for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
 -		if (i == 0)
 -			sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
@@ -39258,30 +38947,19 @@ index 489cb8c..0b8d0d3 100644
 -			qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
 -		else
 -			qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
-+	static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
-+		{
-+			.name = "qxl_mem_mm",
-+			.show = &qxl_mm_dump_table,
-+		},
-+		{
-+			.name = "qxl_surf_mm",
-+			.show = &qxl_mm_dump_table,
-+		}
-+	};
- 
--	}
--	return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
 +	pax_open_kernel();
 +	*(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
 +	*(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
 +	pax_close_kernel();
-+
+ 
+-	}
+-	return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
 +	return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
  #else
  	return 0;
  #endif
 diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
-index d4660cf..70dbe65 100644
+index c451257..0ad2134 100644
 --- a/drivers/gpu/drm/r128/r128_cce.c
 +++ b/drivers/gpu/drm/r128/r128_cce.c
 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
@@ -39294,7 +38972,7 @@ index d4660cf..70dbe65 100644
  	/* We don't support anything other than bus-mastering ring mode,
  	 * but the ring can be in either AGP or PCI space for the ring
 diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
-index 930c71b..499aded 100644
+index 56eb5e3..c4ec43d 100644
 --- a/drivers/gpu/drm/r128/r128_drv.h
 +++ b/drivers/gpu/drm/r128/r128_drv.h
 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
@@ -39372,7 +39050,7 @@ index 2ea4f09..d391371 100644
  		return IRQ_HANDLED;
  	}
 diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
-index 19bb7e6..de7e2a2 100644
+index 01dd9ae..6352f04 100644
 --- a/drivers/gpu/drm/r128/r128_state.c
 +++ b/drivers/gpu/drm/r128/r128_state.c
 @@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
@@ -39389,10 +39067,10 @@ index 19bb7e6..de7e2a2 100644
  
  #endif
 diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
-index 5a82b6b..9e69c73 100644
+index af85299..ed9ac8d 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)
+@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
  	regex_t mask_rex;
  	regmatch_t match[4];
  	char buf[1024];
@@ -39410,10 +39088,10 @@ index 5a82b6b..9e69c73 100644
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index 8df1525..62e95ef 100644
+index 841d0e0..9eaa268 100644
 --- a/drivers/gpu/drm/radeon/radeon_device.c
 +++ b/drivers/gpu/drm/radeon/radeon_device.c
-@@ -1014,7 +1014,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
+@@ -1117,7 +1117,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
  	bool can_switch;
  
  	spin_lock(&dev->count_lock);
@@ -39526,10 +39204,10 @@ index 4d20910..6726b6d 100644
  	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
-index 6c0ce89..57a2529 100644
+index 71245d6..94c556d 100644
 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
-@@ -782,7 +782,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
+@@ -784,7 +784,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
  	man->size = size >> PAGE_SHIFT;
  }
  
@@ -39538,7 +39216,7 @@ index 6c0ce89..57a2529 100644
  static const struct vm_operations_struct *ttm_vm_ops = NULL;
  
  static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-@@ -823,8 +823,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
+@@ -825,8 +825,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
  	}
  	if (unlikely(ttm_vm_ops == NULL)) {
  		ttm_vm_ops = vma->vm_ops;
@@ -39549,12 +39227,13 @@ index 6c0ce89..57a2529 100644
  	}
  	vma->vm_ops = &radeon_ttm_vm_ops;
  	return 0;
-@@ -853,38 +855,33 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
+@@ -855,38 +857,33 @@ static int radeon_mm_dump_table(struct seq_file *m, void *data)
  static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
  {
  #if defined(CONFIG_DEBUG_FS)
 -	static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2];
 -	static char radeon_mem_types_names[RADEON_DEBUGFS_MEM_TYPES+2][32];
+-	unsigned i;
 +	static struct drm_info_list radeon_mem_types_list[RADEON_DEBUGFS_MEM_TYPES+2] = {
 +		{
 +			.name = "radeon_vram_mm",
@@ -39573,7 +39252,7 @@ index 6c0ce89..57a2529 100644
 +			.show = &ttm_dma_page_alloc_debugfs,
 +		},
 +	};
- 	unsigned i;
++	unsigned i = RADEON_DEBUGFS_MEM_TYPES + 1;
  
 -	for (i = 0; i < RADEON_DEBUGFS_MEM_TYPES; i++) {
 -		if (i == 0)
@@ -39613,13 +39292,13 @@ index 6c0ce89..57a2529 100644
  	return radeon_debugfs_add_files(rdev, radeon_mem_types_list, i);
  
 diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
-index 55880d5..9e95342 100644
+index 1447d79..40b2a5b 100644
 --- a/drivers/gpu/drm/radeon/rs690.c
 +++ b/drivers/gpu/drm/radeon/rs690.c
-@@ -327,9 +327,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
- 		if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
+@@ -345,9 +345,11 @@ static void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
+ 		if (max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
  			rdev->pm.sideport_bandwidth.full)
- 			rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
+ 			max_bandwidth = rdev->pm.sideport_bandwidth;
 -		read_delay_latency.full = dfixed_const(370 * 800 * 1000);
 +		read_delay_latency.full = dfixed_const(800 * 1000);
  		read_delay_latency.full = dfixed_div(read_delay_latency,
@@ -39627,7 +39306,7 @@ index 55880d5..9e95342 100644
 +		a.full = dfixed_const(370);
 +		read_delay_latency.full = dfixed_mul(read_delay_latency, a);
  	} else {
- 		if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
+ 		if (max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
  			rdev->pm.k8_bandwidth.full)
 diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
 index dbc2def..0a9f710 100644
@@ -39652,12 +39331,12 @@ index dbc2def..0a9f710 100644
  		kobject_put(&zone->kobj);
  		return ret;
 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
-index bd2a3b4..122d9ad 100644
+index 863bef9..cba15cf 100644
 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
-@@ -394,9 +394,9 @@ static int ttm_pool_get_num_unused_pages(void)
- static int ttm_pool_mm_shrink(struct shrinker *shrink,
- 			      struct shrink_control *sc)
+@@ -391,9 +391,9 @@ out:
+ static unsigned long
+ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
  {
 -	static atomic_t start_pool = ATOMIC_INIT(0);
 +	static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
@@ -39666,9 +39345,9 @@ index bd2a3b4..122d9ad 100644
 +	unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
  	struct ttm_page_pool *pool;
  	int shrink_pages = sc->nr_to_scan;
- 
+ 	unsigned long freed = 0;
 diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
-index dc0c065..58a0782 100644
+index 97e9d61..bf23c461 100644
 --- a/drivers/gpu/drm/udl/udl_fb.c
 +++ b/drivers/gpu/drm/udl/udl_fb.c
 @@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
@@ -39680,7 +39359,7 @@ index dc0c065..58a0782 100644
  
  	pr_warn("released /dev/fb%d user=%d count=%d\n",
 diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
-index 893a650..6190d3b 100644
+index a811ef2..ff99b05 100644
 --- a/drivers/gpu/drm/via/via_drv.h
 +++ b/drivers/gpu/drm/via/via_drv.h
 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
@@ -39776,7 +39455,7 @@ index ac98964..5dbf512 100644
  	case VIA_IRQ_ABSOLUTE:
  		break;
 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
-index 13aeda7..4a952d1 100644
+index 150ec64..f5165f2 100644
 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
 @@ -290,7 +290,7 @@ struct vmw_private {
@@ -39886,10 +39565,10 @@ index 8a8725c2..afed796 100644
  			marker = list_first_entry(&queue->head,
  						 struct vmw_marker, head);
 diff --git a/drivers/gpu/host1x/drm/dc.c b/drivers/gpu/host1x/drm/dc.c
-index 8c04943..4370ed9 100644
+index b1a05ad..1c9d899 100644
 --- a/drivers/gpu/host1x/drm/dc.c
 +++ b/drivers/gpu/host1x/drm/dc.c
-@@ -999,7 +999,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
+@@ -1004,7 +1004,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
  	}
  
  	for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
@@ -39898,11 +39577,33 @@ index 8c04943..4370ed9 100644
  
  	err = drm_debugfs_create_files(dc->debugfs_files,
  				       ARRAY_SIZE(debugfs_files),
+diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
+index ec0ae2d..dc0780b 100644
+--- a/drivers/gpu/vga/vga_switcheroo.c
++++ b/drivers/gpu/vga/vga_switcheroo.c
+@@ -643,7 +643,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
+ 
+ /* this version is for the case where the power switch is separate
+    to the device being powered down. */
+-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
++int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
+ {
+ 	/* copy over all the bus versions */
+ 	if (dev->bus && dev->bus->pm) {
+@@ -688,7 +688,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
+ 	return ret;
+ }
+ 
+-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
++int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
+ {
+ 	/* copy over all the bus versions */
+ 	if (dev->bus && dev->bus->pm) {
 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index c4e5cdf..7ab7631 100644
+index c08b5c1..6c3d50b 100644
 --- a/drivers/hid/hid-core.c
 +++ b/drivers/hid/hid-core.c
-@@ -2355,7 +2355,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
+@@ -2415,7 +2415,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
  
  int hid_add_device(struct hid_device *hdev)
  {
@@ -39911,7 +39612,7 @@ index c4e5cdf..7ab7631 100644
  	int ret;
  
  	if (WARN_ON(hdev->status & HID_STAT_ADDED))
-@@ -2389,7 +2389,7 @@ int hid_add_device(struct hid_device *hdev)
+@@ -2449,7 +2449,7 @@ int hid_add_device(struct hid_device *hdev)
  	/* XXX hack, any other cleaner solution after the driver core
  	 * is converted to allow more than 20 bytes as the device name? */
  	dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
@@ -39920,61 +39621,8 @@ index c4e5cdf..7ab7631 100644
  
  	hid_debug_register(hdev, dev_name(&hdev->dev));
  	ret = device_add(&hdev->dev);
-diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 3d8e58a..bf8b8ce 100644
---- a/drivers/hid/hid-multitouch.c
-+++ b/drivers/hid/hid-multitouch.c
-@@ -325,12 +325,21 @@ static void mt_feature_mapping(struct hid_device *hdev,
- 			dev_err(&hdev->dev, "HID_DG_INPUTMODE out of range\n");
- 			break;
- 		}
-+		/* Ignore if value index is out of bounds. */
-+		if (td->inputmode_index < 0 ||
-+		    td->inputmode_index >= field->report_count) {
-+			dev_err(&hdev->dev, "HID_DG_INPUTMODE out of range\n");
-+			td->inputmode = -1;
-+		}
- 
- 		td->inputmode = field->report->id;
- 		td->inputmode_index = usage->usage_index;
- 
- 		break;
- 	case HID_DG_CONTACTMAX:
-+		/* Ignore if value count is out of bounds. */
-+		if (field->report_count < 1)
-+			break;
- 		td->maxcontact_report_id = field->report->id;
- 		td->maxcontacts = field->value[0];
- 		if (!td->maxcontacts &&
-@@ -745,15 +754,21 @@ static void mt_touch_report(struct hid_device *hid, struct hid_report *report)
- 	unsigned count;
- 	int r, n;
- 
-+	if (report->maxfield == 0)
-+		return;
-+
- 	/*
- 	 * Includes multi-packet support where subsequent
- 	 * packets are sent with zero contactcount.
- 	 */
--	if (td->cc_index >= 0) {
--		struct hid_field *field = report->field[td->cc_index];
--		int value = field->value[td->cc_value_index];
--		if (value)
--			td->num_expected = value;
-+	if (td->cc_index >= 0 && td->cc_index < report->maxfield) {
-+		field = report->field[td->cc_index];
-+		if (td->cc_value_index >= 0 &&
-+		    td->cc_value_index < field->report_count) {
-+			int value = field->value[td->cc_value_index];
-+			if (value)
-+				td->num_expected = value;
-+		}
- 	}
- 
- 	for (r = 0; r < report->maxfield; r++) {
 diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
-index 90124ff..3761764 100644
+index c13fb5b..55a3802 100644
 --- a/drivers/hid/hid-wiimote-debug.c
 +++ b/drivers/hid/hid-wiimote-debug.c
 @@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
@@ -39987,7 +39635,7 @@ index 90124ff..3761764 100644
  
  	*off += size;
 diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
-index 0bb3bb8..1222415 100644
+index cedc6da..2c3da2a 100644
 --- a/drivers/hid/uhid.c
 +++ b/drivers/hid/uhid.c
 @@ -47,7 +47,7 @@ struct uhid_device {
@@ -39999,7 +39647,7 @@ index 0bb3bb8..1222415 100644
  	struct uhid_event report_buf;
  };
  
-@@ -187,7 +187,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum,
+@@ -163,7 +163,7 @@ static int uhid_hid_get_raw(struct hid_device *hid, unsigned char rnum,
  
  	spin_lock_irqsave(&uhid->qlock, flags);
  	ev->type = UHID_FEATURE;
@@ -40008,7 +39656,7 @@ index 0bb3bb8..1222415 100644
  	ev->u.feature.rnum = rnum;
  	ev->u.feature.rtype = report_type;
  
-@@ -471,7 +471,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid,
+@@ -446,7 +446,7 @@ static int uhid_dev_feature_answer(struct uhid_device *uhid,
  	spin_lock_irqsave(&uhid->qlock, flags);
  
  	/* id for old report; drop it silently */
@@ -40018,10 +39666,10 @@ index 0bb3bb8..1222415 100644
  	if (atomic_read(&uhid->report_done))
  		goto unlock;
 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
-index 0b122f8..b1d8160 100644
+index 6de6c98..18319e9 100644
 --- a/drivers/hv/channel.c
 +++ b/drivers/hv/channel.c
-@@ -394,8 +394,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
+@@ -406,8 +406,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
  	int ret = 0;
  	int t;
  
@@ -40033,7 +39681,7 @@ index 0b122f8..b1d8160 100644
  	ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
  	if (ret)
 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
-index ae49237..380d4c9 100644
+index 88f4096..e50452e 100644
 --- a/drivers/hv/hv.c
 +++ b/drivers/hv/hv.c
 @@ -112,7 +112,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
@@ -40046,7 +39694,7 @@ index ae49237..380d4c9 100644
  	__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
  			      "=a"(hv_status_lo) : "d" (control_hi),
 diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
-index deb5c25..ed2d4fd 100644
+index 7e17a54..a50a33d 100644
 --- a/drivers/hv/hv_balloon.c
 +++ b/drivers/hv/hv_balloon.c
 @@ -464,7 +464,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
@@ -40058,15 +39706,15 @@ index deb5c25..ed2d4fd 100644
  
  static int dm_ring_size = (5 * PAGE_SIZE);
  
-@@ -825,7 +825,7 @@ static void hot_add_req(struct work_struct *dummy)
- 	memset(&resp, 0, sizeof(struct dm_hot_add_response));
- 	resp.hdr.type = DM_MEM_HOT_ADD_RESPONSE;
- 	resp.hdr.size = sizeof(struct dm_hot_add_response);
+@@ -886,7 +886,7 @@ static void hot_add_req(struct work_struct *dummy)
+ 		pr_info("Memory hot add failed\n");
+ 
+ 	dm->state = DM_INITIALIZED;
 -	resp.hdr.trans_id = atomic_inc_return(&trans_id);
 +	resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
- 
- #ifdef CONFIG_MEMORY_HOTPLUG
- 	pg_start = dm->ha_wrk.ha_page_range.finfo.start_page;
+ 	vmbus_sendpacket(dm->dev->channel, &resp,
+ 			sizeof(struct dm_hot_add_response),
+ 			(unsigned long)NULL,
 @@ -960,7 +960,7 @@ static void post_status(struct hv_dynmem_device *dm)
  	memset(&status, 0, sizeof(struct dm_status));
  	status.hdr.type = DM_STATUS_REPORT;
@@ -40085,15 +39733,15 @@ index deb5c25..ed2d4fd 100644
  		return;
  
  	vmbus_sendpacket(dm->dev->channel, &status,
-@@ -1081,7 +1081,7 @@ static void balloon_up(struct work_struct *dummy)
- 		bl_resp = (struct dm_balloon_response *)send_buffer;
- 		memset(send_buffer, 0, PAGE_SIZE);
- 		bl_resp->hdr.type = DM_BALLOON_RESPONSE;
--		bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
-+		bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
- 		bl_resp->hdr.size = sizeof(struct dm_balloon_response);
- 		bl_resp->more_pages = 1;
+@@ -1108,7 +1108,7 @@ static void balloon_up(struct work_struct *dummy)
+ 		 */
  
+ 		do {
+-			bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
++			bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
+ 			ret = vmbus_sendpacket(dm_device.dev->channel,
+ 						bl_resp,
+ 						bl_resp->hdr.size,
 @@ -1152,7 +1152,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
  
  	memset(&resp, 0, sizeof(struct dm_unballoon_response));
@@ -40131,10 +39779,10 @@ index deb5c25..ed2d4fd 100644
  	cap_msg.caps.cap_bits.balloon = 1;
  	cap_msg.caps.cap_bits.hot_add = 1;
 diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
-index 12f2f9e..679603c 100644
+index d84918f..7f38f9f 100644
 --- a/drivers/hv/hyperv_vmbus.h
 +++ b/drivers/hv/hyperv_vmbus.h
-@@ -591,7 +591,7 @@ enum vmbus_connect_state {
+@@ -595,7 +595,7 @@ enum vmbus_connect_state {
  struct vmbus_connection {
  	enum vmbus_connect_state conn_state;
  
@@ -40144,10 +39792,10 @@ index 12f2f9e..679603c 100644
  	/*
  	 * Represents channel interrupts. Each bit position represents a
 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
-index 4004e54..c2de226 100644
+index f9fe46f..356b119 100644
 --- a/drivers/hv/vmbus_drv.c
 +++ b/drivers/hv/vmbus_drv.c
-@@ -668,10 +668,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
+@@ -672,10 +672,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
  {
  	int ret = 0;
  
@@ -40161,7 +39809,7 @@ index 4004e54..c2de226 100644
  	child_device_obj->device.bus = &hv_bus;
  	child_device_obj->device.parent = &hv_acpi_dev->dev;
 diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
-index 6351aba..dc4aaf4 100644
+index a9e3d01..9dd246e 100644
 --- a/drivers/hwmon/acpi_power_meter.c
 +++ b/drivers/hwmon/acpi_power_meter.c
 @@ -117,7 +117,7 @@ struct sensor_template {
@@ -40224,10 +39872,10 @@ index b25c643..a13460d 100644
  {
  	sysfs_attr_init(&attr->attr);
 diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
-index 658ce3a..0d0c2f3 100644
+index 78be661..4dd032f 100644
 --- a/drivers/hwmon/coretemp.c
 +++ b/drivers/hwmon/coretemp.c
-@@ -790,7 +790,7 @@ static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
+@@ -797,7 +797,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
  	return NOTIFY_OK;
  }
  
@@ -40237,7 +39885,7 @@ index 658ce3a..0d0c2f3 100644
  };
  
 diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
-index 1429f6e..ee03d59 100644
+index 632f1dc..57e6a58 100644
 --- a/drivers/hwmon/ibmaem.c
 +++ b/drivers/hwmon/ibmaem.c
 @@ -926,7 +926,7 @@ static int aem_register_sensors(struct aem_data *data,
@@ -40250,7 +39898,7 @@ index 1429f6e..ee03d59 100644
  
  	/* Set up read-only sensors */
 diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
-index 52b77af..aed1ddf 100644
+index 708081b..fe2d4ab 100644
 --- a/drivers/hwmon/iio_hwmon.c
 +++ b/drivers/hwmon/iio_hwmon.c
 @@ -73,7 +73,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
@@ -40262,8 +39910,26 @@ index 52b77af..aed1ddf 100644
  	int ret, i;
  	int in_i = 1, temp_i = 1, curr_i = 1;
  	enum iio_chan_type type;
+diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
+index 6eb03ce..bea7e3e 100644
+--- a/drivers/hwmon/nct6775.c
++++ b/drivers/hwmon/nct6775.c
+@@ -936,10 +936,10 @@ static struct attribute_group *
+ nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
+ 			  int repeat)
+ {
+-	struct attribute_group *group;
++	attribute_group_no_const *group;
+ 	struct sensor_device_attr_u *su;
+-	struct sensor_device_attribute *a;
+-	struct sensor_device_attribute_2 *a2;
++	sensor_device_attribute_no_const *a;
++	sensor_device_attribute_2_no_const *a2;
+ 	struct attribute **attrs;
+ 	struct sensor_device_template **t;
+ 	int err, i, j, count;
 diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
-index 9add6092..ee7ba3f 100644
+index 9319fcf..189ff45 100644
 --- a/drivers/hwmon/pmbus/pmbus_core.c
 +++ b/drivers/hwmon/pmbus/pmbus_core.c
 @@ -781,7 +781,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
@@ -40312,7 +39978,7 @@ index 9add6092..ee7ba3f 100644
  	label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
  	if (!label)
 diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
-index 2507f90..1645765 100644
+index 97cd45a..ac54d8b 100644
 --- a/drivers/hwmon/sht15.c
 +++ b/drivers/hwmon/sht15.c
 @@ -169,7 +169,7 @@ struct sht15_data {
@@ -40364,10 +40030,10 @@ index 2507f90..1645765 100644
  	}
  
 diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
-index 76f157b..9c0db1b 100644
+index 38944e9..ae9e5ed 100644
 --- a/drivers/hwmon/via-cputemp.c
 +++ b/drivers/hwmon/via-cputemp.c
-@@ -296,7 +296,7 @@ static int __cpuinit via_cputemp_cpu_callback(struct notifier_block *nfb,
+@@ -296,7 +296,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
  	return NOTIFY_OK;
  }
  
@@ -40389,6 +40055,19 @@ index 07f01ac..d79ad3d 100644
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(amd756_lock);
+diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
+index dae3ddf..26e21d1 100644
+--- a/drivers/i2c/busses/i2c-diolan-u2c.c
++++ b/drivers/i2c/busses/i2c-diolan-u2c.c
+@@ -99,7 +99,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
+ /* usb layer */
+ 
+ /* Send command to device, and get response. */
+-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
++static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
+ {
+ 	int ret = 0;
+ 	int actual;
 diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
 index 2ca268d..c6acbdf 100644
 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c
@@ -40416,7 +40095,7 @@ index c3ccdea..5b3dc1a 100644
  		if (IS_ERR(rdwr_pa[i].buf)) {
  			res = PTR_ERR(rdwr_pa[i].buf);
 diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
-index 2ff6204..218c16e 100644
+index 0b510ba..4fbb5085 100644
 --- a/drivers/ide/ide-cd.c
 +++ b/drivers/ide/ide-cd.c
 @@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
@@ -40429,7 +40108,7 @@ index 2ff6204..218c16e 100644
  	}
  }
 diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
-index e145931..08bfc59 100644
+index f95c697..0a1b05c 100644
 --- a/drivers/iio/industrialio-core.c
 +++ b/drivers/iio/industrialio-core.c
 @@ -506,7 +506,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
@@ -40732,7 +40411,7 @@ index 1f95bba..9530f87 100644
  				      sdata, wqe->wr.wr.atomic.swap);
  		goto send_comp;
 diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
-index 4d599ce..697b17f 100644
+index f2a3f48..673ec79 100644
 --- a/drivers/infiniband/hw/mlx4/mad.c
 +++ b/drivers/infiniband/hw/mlx4/mad.c
 @@ -98,7 +98,7 @@ __be64 mlx4_ib_gen_node_guid(void)
@@ -40744,11 +40423,24 @@ index 4d599ce..697b17f 100644
  		cpu_to_be64(0xff00000000000000LL);
  }
  
+diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
+index 25b2cdf..099ff97 100644
+--- a/drivers/infiniband/hw/mlx4/mcg.c
++++ b/drivers/infiniband/hw/mlx4/mcg.c
+@@ -1040,7 +1040,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
+ {
+ 	char name[20];
+ 
+-	atomic_set(&ctx->tid, 0);
++	atomic_set_unchecked(&ctx->tid, 0);
+ 	sprintf(name, "mlx4_ib_mcg%d", ctx->port);
+ 	ctx->mcg_wq = create_singlethread_workqueue(name);
+ 	if (!ctx->mcg_wq)
 diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
-index f61ec26..ebf72cf 100644
+index 036b663..c9a8c73 100644
 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
 +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
-@@ -398,7 +398,7 @@ struct mlx4_ib_demux_ctx {
+@@ -404,7 +404,7 @@ struct mlx4_ib_demux_ctx {
  	struct list_head	mcg_mgid0_list;
  	struct workqueue_struct	*mcg_wq;
  	struct mlx4_ib_demux_pv_ctx **tun;
@@ -40758,7 +40450,7 @@ index f61ec26..ebf72cf 100644
  };
  
 diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
-index 9d3e5c1..d9afe4a 100644
+index 9d3e5c1..6f166df 100644
 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c
 +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
 @@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
@@ -40770,10 +40462,59 @@ index 9d3e5c1..d9afe4a 100644
  {
  	struct mthca_mailbox *mailbox;
  	u32 *outbox;
+@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
+ 			     CMD_TIME_CLASS_B);
+ }
+ 
+-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
++int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
+ 		    int num_mtt)
+ {
+ 	return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
+@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
+ 			 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
+ }
+ 
+-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
++int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
+ 		   int eq_num)
+ {
+ 	return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
+@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
+ 			 CMD_TIME_CLASS_B);
+ }
+ 
+-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
++int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
+ 		  int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
+ 		  void *in_mad, void *response_mad)
+ {
+diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
+index 87897b9..7e79542 100644
+--- a/drivers/infiniband/hw/mthca/mthca_main.c
++++ b/drivers/infiniband/hw/mthca/mthca_main.c
+@@ -692,7 +692,7 @@ err_close:
+ 	return err;
+ }
+ 
+-static int mthca_setup_hca(struct mthca_dev *dev)
++static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
+ {
+ 	int err;
+ 
 diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
-index ed9a989..e0c5871 100644
+index ed9a989..6aa5dc2 100644
 --- a/drivers/infiniband/hw/mthca/mthca_mr.c
 +++ b/drivers/infiniband/hw/mthca/mthca_mr.c
+@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
+  * through the bitmaps)
+  */
+ 
+-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
++static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
+ {
+ 	int o;
+ 	int m;
 @@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
  		return key;
  }
@@ -40783,6 +40524,28 @@ index ed9a989..e0c5871 100644
  		   u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
  {
  	struct mthca_mailbox *mailbox;
+@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
+ 	return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
+ }
+ 
+-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
++int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
+ 			u64 *buffer_list, int buffer_size_shift,
+ 			int list_len, u64 iova, u64 total_size,
+ 			u32 access, struct mthca_mr *mr)
+diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
+index 5b71d43..35a9e14 100644
+--- a/drivers/infiniband/hw/mthca/mthca_provider.c
++++ b/drivers/infiniband/hw/mthca/mthca_provider.c
+@@ -763,7 +763,7 @@ unlock:
+ 	return 0;
+ }
+ 
+-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
++static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
+ {
+ 	struct mthca_dev *dev = to_mdev(ibcq->device);
+ 	struct mthca_cq *cq = to_mcq(ibcq);
 diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
 index 4291410..d2ab1fb 100644
 --- a/drivers/infiniband/hw/nes/nes.c
@@ -40865,7 +40628,7 @@ index 33cc589..3bd6538 100644
  extern u32 int_mod_timer_init;
  extern u32 int_mod_cq_depth_256;
 diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
-index 24b9f1a..00fd004 100644
+index 6b29249..57081dd 100644
 --- a/drivers/infiniband/hw/nes/nes_cm.c
 +++ b/drivers/infiniband/hw/nes/nes_cm.c
 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
@@ -40992,7 +40755,7 @@ index 24b9f1a..00fd004 100644
  			nes_disconnect(nesqp, 1);
  
  			cm_id->provider_data = nesqp;
-@@ -3033,7 +3033,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+@@ -3035,7 +3035,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
  
  	nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
  		nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
@@ -41001,7 +40764,7 @@ index 24b9f1a..00fd004 100644
  
  	nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
  			netdev_refcnt_read(nesvnic->netdev));
-@@ -3228,7 +3228,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
+@@ -3224,7 +3224,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
  	struct nes_cm_core *cm_core;
  	u8 *start_buff;
  
@@ -41010,9 +40773,9 @@ index 24b9f1a..00fd004 100644
  	cm_node = (struct nes_cm_node *)cm_id->provider_data;
  	loopback = cm_node->loopbackpartner;
  	cm_core = cm_node->cm_core;
-@@ -3288,7 +3288,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
- 		  ntohl(cm_id->local_addr.sin_addr.s_addr),
- 		  ntohs(cm_id->local_addr.sin_port));
+@@ -3286,7 +3286,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+ 		  ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
+ 		  ntohs(laddr->sin_port));
  
 -	atomic_inc(&cm_connects);
 +	atomic_inc_unchecked(&cm_connects);
@@ -41028,7 +40791,7 @@ index 24b9f1a..00fd004 100644
  	}
  
  	cm_id->add_ref(cm_id);
-@@ -3499,7 +3499,7 @@ static void cm_event_connected(struct nes_cm_event *event)
+@@ -3505,7 +3505,7 @@ static void cm_event_connected(struct nes_cm_event *event)
  
  	if (nesqp->destroyed)
  		return;
@@ -41036,8 +40799,8 @@ index 24b9f1a..00fd004 100644
 +	atomic_inc_unchecked(&cm_connecteds);
  	nes_debug(NES_DBG_CM, "QP%u attempting to connect to  0x%08X:0x%04X on"
  		  " local port 0x%04X. jiffies = %lu.\n",
- 		  nesqp->hwqp.qp_id,
-@@ -3679,7 +3679,7 @@ static void cm_event_reset(struct nes_cm_event *event)
+ 		  nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
+@@ -3686,7 +3686,7 @@ static void cm_event_reset(struct nes_cm_event *event)
  
  	cm_id->add_ref(cm_id);
  	ret = cm_id->event_handler(cm_id, &cm_event);
@@ -41046,7 +40809,7 @@ index 24b9f1a..00fd004 100644
  	cm_event.event = IW_CM_EVENT_CLOSE;
  	cm_event.status = 0;
  	cm_event.provider_data = cm_id->provider_data;
-@@ -3715,7 +3715,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
+@@ -3726,7 +3726,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
  		return;
  	cm_id = cm_node->cm_id;
  
@@ -41055,7 +40818,7 @@ index 24b9f1a..00fd004 100644
  	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
  		  cm_node, cm_id, jiffies);
  
-@@ -3755,7 +3755,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
+@@ -3770,7 +3770,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
  		return;
  	cm_id = cm_node->cm_id;
  
@@ -41162,7 +40925,7 @@ index 49eb511..a774366 100644
  
  /**
 diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
-index 8f67fe2..8960859 100644
+index 5b53ca5..443da3c 100644
 --- a/drivers/infiniband/hw/nes/nes_verbs.c
 +++ b/drivers/infiniband/hw/nes/nes_verbs.c
 @@ -46,9 +46,9 @@
@@ -41187,7 +40950,7 @@ index 8f67fe2..8960859 100644
  	switch (init_attr->qp_type) {
  		case IB_QPT_RC:
  			if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
-@@ -1465,7 +1465,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
+@@ -1466,7 +1466,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
  	struct iw_cm_event cm_event;
  	int ret = 0;
  
@@ -41197,19 +40960,19 @@ index 8f67fe2..8960859 100644
  
  	/* Blow away the connection if it exists. */
 diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
-index 4d11575..3e890e5 100644
+index 1946101..09766d2 100644
 --- a/drivers/infiniband/hw/qib/qib.h
 +++ b/drivers/infiniband/hw/qib/qib.h
-@@ -51,6 +51,7 @@
- #include <linux/completion.h>
+@@ -52,6 +52,7 @@
  #include <linux/kref.h>
  #include <linux/sched.h>
+ #include <linux/kthread.h>
 +#include <linux/slab.h>
  
  #include "qib_common.h"
  #include "qib_verbs.h"
 diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
-index da739d9..da1c7f4 100644
+index 922a7fe..bb035db 100644
 --- a/drivers/input/gameport/gameport.c
 +++ b/drivers/input/gameport/gameport.c
 @@ -487,14 +487,14 @@ EXPORT_SYMBOL(gameport_set_phys);
@@ -41230,27 +40993,27 @@ index da739d9..da1c7f4 100644
  	gameport->dev.release = gameport_release_port;
  	if (gameport->parent)
 diff --git a/drivers/input/input.c b/drivers/input/input.c
-index c044699..174d71a 100644
+index e75d015..57d1c28 100644
 --- a/drivers/input/input.c
 +++ b/drivers/input/input.c
-@@ -2019,7 +2019,7 @@ static void devm_input_device_unregister(struct device *dev, void *res)
+@@ -1734,7 +1734,7 @@ EXPORT_SYMBOL_GPL(input_class);
   */
- int input_register_device(struct input_dev *dev)
+ struct input_dev *input_allocate_device(void)
  {
 -	static atomic_t input_no = ATOMIC_INIT(0);
 +	static atomic_unchecked_t input_no = ATOMIC_INIT(0);
- 	struct input_devres *devres = NULL;
- 	struct input_handler *handler;
- 	unsigned int packet_size;
-@@ -2074,7 +2074,7 @@ int input_register_device(struct input_dev *dev)
- 		dev->setkeycode = input_default_setkeycode;
+ 	struct input_dev *dev;
  
- 	dev_set_name(&dev->dev, "input%ld",
--		     (unsigned long) atomic_inc_return(&input_no) - 1);
-+		     (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
+ 	dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
+@@ -1749,7 +1749,7 @@ struct input_dev *input_allocate_device(void)
+ 		INIT_LIST_HEAD(&dev->node);
  
- 	error = device_add(&dev->dev);
- 	if (error)
+ 		dev_set_name(&dev->dev, "input%ld",
+-			     (unsigned long) atomic_inc_return(&input_no) - 1);
++			     (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
+ 
+ 		__module_get(THIS_MODULE);
+ 	}
 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
 index 04c69af..5f92d00 100644
 --- a/drivers/input/joystick/sidewinder.c
@@ -41264,10 +41027,10 @@ index 04c69af..5f92d00 100644
  #include <linux/input.h>
  #include <linux/gameport.h>
 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
-index fa061d4..4a6957c 100644
+index 75e3b10..fb390fd 100644
 --- a/drivers/input/joystick/xpad.c
 +++ b/drivers/input/joystick/xpad.c
-@@ -735,7 +735,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
+@@ -736,7 +736,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
  
  static int xpad_led_probe(struct usb_xpad *xpad)
  {
@@ -41276,7 +41039,7 @@ index fa061d4..4a6957c 100644
  	long led_no;
  	struct xpad_led *led;
  	struct led_classdev *led_cdev;
-@@ -748,7 +748,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
+@@ -749,7 +749,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
  	if (!led)
  		return -ENOMEM;
  
@@ -41334,7 +41097,7 @@ index 4c842c3..590b0bf 100644
  
  	return count;
 diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
-index 25fc597..558bf3b3 100644
+index 2b56855..5a55837 100644
 --- a/drivers/input/serio/serio.c
 +++ b/drivers/input/serio/serio.c
 @@ -496,7 +496,7 @@ static void serio_release_port(struct device *dev)
@@ -41378,7 +41141,7 @@ index 59df2e7..8f1cafb 100644
  	INIT_LIST_HEAD(&serio_raw->client_list);
  	init_waitqueue_head(&serio_raw->wait);
 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index d8f98b1..f62a640 100644
+index fbe9ca7..dbee61d 100644
 --- a/drivers/iommu/iommu.c
 +++ b/drivers/iommu/iommu.c
 @@ -583,7 +583,7 @@ static struct notifier_block iommu_bus_nb = {
@@ -41391,10 +41154,10 @@ index d8f98b1..f62a640 100644
  
  /**
 diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
-index dcfea4e..f4226b2 100644
+index 39f81ae..2660096 100644
 --- a/drivers/iommu/irq_remapping.c
 +++ b/drivers/iommu/irq_remapping.c
-@@ -354,7 +354,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
+@@ -356,7 +356,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
  void panic_if_irq_remap(const char *msg)
  {
  	if (irq_remapping_enabled)
@@ -41403,7 +41166,7 @@ index dcfea4e..f4226b2 100644
  }
  
  static void ir_ack_apic_edge(struct irq_data *data)
-@@ -375,10 +375,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
+@@ -377,10 +377,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
  
  void irq_remap_modify_chip_defaults(struct irq_chip *chip)
  {
@@ -41421,7 +41184,7 @@ index dcfea4e..f4226b2 100644
  
  bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
 diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
-index 19ceaa6..3625818 100644
+index d0e9480..d2b6340 100644
 --- a/drivers/irqchip/irq-gic.c
 +++ b/drivers/irqchip/irq-gic.c
 @@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
@@ -41637,45 +41400,42 @@ index e74df7c..03a03ba 100644
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c
-index 22b720e..77025f5 100644
---- a/drivers/isdn/mISDN/dsp_core.c
-+++ b/drivers/isdn/mISDN/dsp_core.c
-@@ -288,8 +288,10 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
- 	u8 *data;
- 	int len;
+diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
+index a4f05c5..1433bc5 100644
+--- a/drivers/isdn/mISDN/dsp_cmx.c
++++ b/drivers/isdn/mISDN/dsp_cmx.c
+@@ -1628,7 +1628,7 @@ unsigned long	dsp_spl_jiffies; /* calculate the next time to fire */
+ static u16	dsp_count; /* last sample count */
+ static int	dsp_count_valid; /* if we have last sample count */
  
--	if (skb->len < sizeof(int))
-+	if (skb->len < sizeof(int)) {
- 		printk(KERN_ERR "%s: PH_CONTROL message too short\n", __func__);
-+		return -EINVAL;
-+	}
- 	cont = *((int *)skb->data);
- 	len = skb->len - sizeof(int);
- 	data = skb->data + sizeof(int);
+-void
++void __intentional_overflow(-1)
+ dsp_cmx_send(void *arg)
+ {
+ 	struct dsp_conf *conf;
 diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
-index 6a8405d..0bd1c7e 100644
+index d93e245..e7ece6b 100644
 --- a/drivers/leds/leds-clevo-mail.c
 +++ b/drivers/leds/leds-clevo-mail.c
 @@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
   * detected as working, but in reality it is not) as low as
   * possible.
   */
--static struct dmi_system_id __initdata clevo_mail_led_dmi_table[] = {
-+static const struct dmi_system_id __initconst clevo_mail_led_dmi_table[] = {
+-static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
++static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
  	{
  		.callback = clevo_mail_led_dmi_callback,
  		.ident = "Clevo D410J",
 diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
-index 64e204e..c6bf189 100644
+index 5b8f938..b73d657 100644
 --- a/drivers/leds/leds-ss4200.c
 +++ b/drivers/leds/leds-ss4200.c
 @@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
   * detected as working, but in reality it is not) as low as
   * possible.
   */
--static struct dmi_system_id __initdata nas_led_whitelist[] = {
-+static const struct dmi_system_id __initconst nas_led_whitelist[] = {
+-static struct dmi_system_id nas_led_whitelist[] __initdata = {
++static struct dmi_system_id nas_led_whitelist[] __initconst = {
  	{
  		.callback = ss4200_led_dmi_callback,
  		.ident = "Intel SS4200-E",
@@ -41711,7 +41471,7 @@ index 0bf1e4e..b4bf44e 100644
  
  	printk(KERN_INFO "lguest: mapped switcher at %p\n",
 diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
-index 5b9ac32..2ef4f26 100644
+index bfb39bb..08a603b 100644
 --- a/drivers/lguest/page_tables.c
 +++ b/drivers/lguest/page_tables.c
 @@ -559,7 +559,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
@@ -41724,7 +41484,7 @@ index 5b9ac32..2ef4f26 100644
  	/* If the entry's not present, there's nothing to release. */
  	if (pmd_flags(*spmd) & _PAGE_PRESENT) {
 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
-index f0a3347..f6608b2 100644
+index 5169239..47cb4db 100644
 --- a/drivers/lguest/x86/core.c
 +++ b/drivers/lguest/x86/core.c
 @@ -59,7 +59,7 @@ static struct {
@@ -41844,10 +41604,10 @@ index 0003992..854bbce 100644
  	cl->fn = fn;
  	cl->wq = wq;
 diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
-index b4713ce..b30139b 100644
+index 547c4c5..5be1de4 100644
 --- a/drivers/md/bcache/super.c
 +++ b/drivers/md/bcache/super.c
-@@ -1603,7 +1603,7 @@ err_unlock_gc:
+@@ -1644,7 +1644,7 @@ err_unlock_gc:
  err:
  	closure_sync(&op.cl);
  	/* XXX: test this, it's broken */
@@ -41857,7 +41617,7 @@ index b4713ce..b30139b 100644
  
  static bool can_attach_cache(struct cache *ca, struct cache_set *c)
 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
-index 5a2c754..0fa55db 100644
+index a7fd821..9dcf6c3 100644
 --- a/drivers/md/bitmap.c
 +++ b/drivers/md/bitmap.c
 @@ -1779,7 +1779,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
@@ -41870,10 +41630,10 @@ index 5a2c754..0fa55db 100644
  
  	seq_printf(seq, "\n");
 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
-index 81a79b7..87a0f73 100644
+index afe0814..8cf3794 100644
 --- a/drivers/md/dm-ioctl.c
 +++ b/drivers/md/dm-ioctl.c
-@@ -1697,7 +1697,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
+@@ -1745,7 +1745,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
  	    cmd == DM_LIST_VERSIONS_CMD)
  		return 0;
  
@@ -41883,7 +41643,7 @@ index 81a79b7..87a0f73 100644
  			DMWARN("name not supplied when creating device");
  			return -EINVAL;
 diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
-index 699b5be..eac0a15 100644
+index 9584443..9fc9ac9 100644
 --- a/drivers/md/dm-raid1.c
 +++ b/drivers/md/dm-raid1.c
 @@ -40,7 +40,7 @@ enum dm_raid1_error {
@@ -41949,7 +41709,7 @@ index 699b5be..eac0a15 100644
  	ms->mirror[mirror].error_type = 0;
  	ms->mirror[mirror].offset = offset;
  
-@@ -1340,7 +1340,7 @@ static void mirror_resume(struct dm_target *ti)
+@@ -1339,7 +1339,7 @@ static void mirror_resume(struct dm_target *ti)
   */
  static char device_status_char(struct mirror *m)
  {
@@ -41958,11 +41718,35 @@ index 699b5be..eac0a15 100644
  		return 'A';
  
  	return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
+diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
+index 3d404c1..b62af0e 100644
+--- a/drivers/md/dm-stats.c
++++ b/drivers/md/dm-stats.c
+@@ -382,7 +382,7 @@ do_sync_free:
+ 		synchronize_rcu_expedited();
+ 		dm_stat_free(&s->rcu_head);
+ 	} else {
+-		ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
++		ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
+ 		call_rcu(&s->rcu_head, dm_stat_free);
+ 	}
+ 	return 0;
+@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
+ 				       ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
+ 					(ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
+ 				       ));
+-		ACCESS_ONCE(last->last_sector) = end_sector;
+-		ACCESS_ONCE(last->last_rw) = bi_rw;
++		ACCESS_ONCE_RW(last->last_sector) = end_sector;
++		ACCESS_ONCE_RW(last->last_rw) = bi_rw;
+ 	}
+ 
+ 	rcu_read_lock();
 diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
-index d907ca6..cfb8384 100644
+index 73c1712..7347292 100644
 --- a/drivers/md/dm-stripe.c
 +++ b/drivers/md/dm-stripe.c
-@@ -20,7 +20,7 @@ struct stripe {
+@@ -21,7 +21,7 @@ struct stripe {
  	struct dm_dev *dev;
  	sector_t physical_start;
  
@@ -41971,7 +41755,7 @@ index d907ca6..cfb8384 100644
  };
  
  struct stripe_c {
-@@ -185,7 +185,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
+@@ -186,7 +186,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
  			kfree(sc);
  			return r;
  		}
@@ -41980,7 +41764,7 @@ index d907ca6..cfb8384 100644
  	}
  
  	ti->private = sc;
-@@ -326,7 +326,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
+@@ -327,7 +327,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
  		DMEMIT("%d ", sc->stripes);
  		for (i = 0; i < sc->stripes; i++)  {
  			DMEMIT("%s ", sc->stripe[i].dev->name);
@@ -41989,7 +41773,7 @@ index d907ca6..cfb8384 100644
  				'D' : 'A';
  		}
  		buffer[i] = '\0';
-@@ -371,8 +371,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
+@@ -372,8 +372,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
  	 */
  	for (i = 0; i < sc->stripes; i++)
  		if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
@@ -42001,10 +41785,19 @@ index d907ca6..cfb8384 100644
  				schedule_work(&sc->trigger_event);
  		}
 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
-index 9e3a045..9d0f95b 100644
+index 41d907b..34b87ee 100644
 --- a/drivers/md/dm-table.c
 +++ b/drivers/md/dm-table.c
-@@ -389,7 +389,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
+@@ -286,7 +286,7 @@ static struct dm_dev_internal *find_device(struct list_head *l, dev_t dev)
+ static int open_dev(struct dm_dev_internal *d, dev_t dev,
+ 		    struct mapped_device *md)
+ {
+-	static char *_claim_ptr = "I belong to device-mapper";
++	static char _claim_ptr[] = "I belong to device-mapper";
+ 	struct block_device *bdev;
+ 
+ 	int r;
+@@ -354,7 +354,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
  	if (!dev_size)
  		return 0;
  
@@ -42036,10 +41829,10 @@ index 60bce43..9b997d0 100644
  	pmd->bl_info.value_type.inc = data_block_inc;
  	pmd->bl_info.value_type.dec = data_block_dec;
 diff --git a/drivers/md/dm.c b/drivers/md/dm.c
-index 1c13071..4bb0452 100644
+index b3e26c7..1efca94 100644
 --- a/drivers/md/dm.c
 +++ b/drivers/md/dm.c
-@@ -169,9 +169,9 @@ struct mapped_device {
+@@ -179,9 +179,9 @@ struct mapped_device {
  	/*
  	 * Event handling.
  	 */
@@ -42051,8 +41844,8 @@ index 1c13071..4bb0452 100644
  	struct list_head uevent_list;
  	spinlock_t uevent_lock; /* Protect access to uevent_list */
  
-@@ -1884,8 +1884,8 @@ static struct mapped_device *alloc_dev(int minor)
- 	rwlock_init(&md->map_lock);
+@@ -1985,8 +1985,8 @@ static struct mapped_device *alloc_dev(int minor)
+ 	spin_lock_init(&md->deferred_lock);
  	atomic_set(&md->holders, 1);
  	atomic_set(&md->open_count, 0);
 -	atomic_set(&md->event_nr, 0);
@@ -42062,7 +41855,7 @@ index 1c13071..4bb0452 100644
  	INIT_LIST_HEAD(&md->uevent_list);
  	spin_lock_init(&md->uevent_lock);
  
-@@ -2033,7 +2033,7 @@ static void event_callback(void *context)
+@@ -2139,7 +2139,7 @@ static void event_callback(void *context)
  
  	dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
  
@@ -42071,7 +41864,7 @@ index 1c13071..4bb0452 100644
  	wake_up(&md->eventq);
  }
  
-@@ -2701,18 +2701,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
+@@ -2832,18 +2832,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
  
  uint32_t dm_next_uevent_seq(struct mapped_device *md)
  {
@@ -42094,7 +41887,7 @@ index 1c13071..4bb0452 100644
  
  void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
 diff --git a/drivers/md/md.c b/drivers/md/md.c
-index 2290b95..77ca464 100644
+index ba46d97..f8f5019 100644
 --- a/drivers/md/md.c
 +++ b/drivers/md/md.c
 @@ -234,10 +234,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
@@ -42119,7 +41912,7 @@ index 2290b95..77ca464 100644
  	wake_up(&md_event_waiters);
  }
  
-@@ -1501,7 +1501,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
+@@ -1502,7 +1502,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
  	if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
  	    (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
  		rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
@@ -42128,7 +41921,7 @@ index 2290b95..77ca464 100644
  
  	rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
  	bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
-@@ -1745,7 +1745,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
+@@ -1746,7 +1746,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
  	else
  		sb->resync_offset = cpu_to_le64(0);
  
@@ -42137,7 +41930,7 @@ index 2290b95..77ca464 100644
  
  	sb->raid_disks = cpu_to_le32(mddev->raid_disks);
  	sb->size = cpu_to_le64(mddev->dev_sectors);
-@@ -2750,7 +2750,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
+@@ -2751,7 +2751,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
  static ssize_t
  errors_show(struct md_rdev *rdev, char *page)
  {
@@ -42146,7 +41939,7 @@ index 2290b95..77ca464 100644
  }
  
  static ssize_t
-@@ -2759,7 +2759,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
+@@ -2760,7 +2760,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
  	char *e;
  	unsigned long n = simple_strtoul(buf, &e, 10);
  	if (*buf && (*e == 0 || *e == '\n')) {
@@ -42155,7 +41948,7 @@ index 2290b95..77ca464 100644
  		return len;
  	}
  	return -EINVAL;
-@@ -3207,8 +3207,8 @@ int md_rdev_init(struct md_rdev *rdev)
+@@ -3208,8 +3208,8 @@ int md_rdev_init(struct md_rdev *rdev)
  	rdev->sb_loaded = 0;
  	rdev->bb_page = NULL;
  	atomic_set(&rdev->nr_pending, 0);
@@ -42166,7 +41959,7 @@ index 2290b95..77ca464 100644
  
  	INIT_LIST_HEAD(&rdev->same_set);
  	init_waitqueue_head(&rdev->blocked_wait);
-@@ -7010,7 +7010,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
+@@ -7043,7 +7043,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
  
  		spin_unlock(&pers_lock);
  		seq_printf(seq, "\n");
@@ -42175,7 +41968,7 @@ index 2290b95..77ca464 100644
  		return 0;
  	}
  	if (v == (void*)2) {
-@@ -7113,7 +7113,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
+@@ -7146,7 +7146,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
  		return error;
  
  	seq = file->private_data;
@@ -42184,7 +41977,7 @@ index 2290b95..77ca464 100644
  	return error;
  }
  
-@@ -7127,7 +7127,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
+@@ -7160,7 +7160,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
  	/* always allow read */
  	mask = POLLIN | POLLRDNORM;
  
@@ -42193,7 +41986,7 @@ index 2290b95..77ca464 100644
  		mask |= POLLERR | POLLPRI;
  	return mask;
  }
-@@ -7171,7 +7171,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
+@@ -7204,7 +7204,7 @@ static int is_mddev_idle(struct mddev *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]) -
@@ -42203,7 +41996,7 @@ index 2290b95..77ca464 100644
  		 * as sync_io is counted when a request starts, and
  		 * disk_stats is counted when it completes.
 diff --git a/drivers/md/md.h b/drivers/md/md.h
-index 653f992b6..6af6c40 100644
+index 608050c..6e77db5d 100644
 --- a/drivers/md/md.h
 +++ b/drivers/md/md.h
 @@ -94,13 +94,13 @@ struct md_rdev {
@@ -42222,7 +42015,7 @@ index 653f992b6..6af6c40 100644
  					   * for reporting to userspace and storing
  					   * in superblock.
  					   */
-@@ -434,7 +434,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
+@@ -446,7 +446,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
  
  static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
  {
@@ -42244,10 +42037,10 @@ index 3e6d115..ffecdeb 100644
  /*----------------------------------------------------------------*/
  
 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
-index afaa5d4..c139824 100644
+index aacf6bf..67d63f2 100644
 --- a/drivers/md/raid1.c
 +++ b/drivers/md/raid1.c
-@@ -1823,7 +1823,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
+@@ -1824,7 +1824,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
  			if (r1_sync_page_io(rdev, sect, s,
  					    bio->bi_io_vec[idx].bv_page,
  					    READ) != 0)
@@ -42256,7 +42049,7 @@ index afaa5d4..c139824 100644
  		}
  		sectors -= s;
  		sect += s;
-@@ -2050,7 +2050,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
+@@ -2051,7 +2051,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
  			    test_bit(In_sync, &rdev->flags)) {
  				if (r1_sync_page_io(rdev, sect, s,
  						    conf->tmppage, READ)) {
@@ -42266,10 +42059,10 @@ index afaa5d4..c139824 100644
  					       "md/raid1:%s: read error corrected "
  					       "(%d sectors at %llu on %s)\n",
 diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
-index 0add868..372c6ec 100644
+index 73dc8a3..bdd515a 100644
 --- a/drivers/md/raid10.c
 +++ b/drivers/md/raid10.c
-@@ -1941,7 +1941,7 @@ static void end_sync_read(struct bio *bio, int error)
+@@ -1963,7 +1963,7 @@ static void end_sync_read(struct bio *bio, int error)
  		/* The write handler will notice the lack of
  		 * R10BIO_Uptodate and record any errors etc
  		 */
@@ -42278,7 +42071,7 @@ index 0add868..372c6ec 100644
  			   &conf->mirrors[d].rdev->corrected_errors);
  
  	/* for reconstruct, we always reschedule after a read.
-@@ -2299,7 +2299,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
+@@ -2321,7 +2321,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
  {
  	struct timespec cur_time_mon;
  	unsigned long hours_since_last;
@@ -42287,7 +42080,7 @@ index 0add868..372c6ec 100644
  
  	ktime_get_ts(&cur_time_mon);
  
-@@ -2321,9 +2321,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
+@@ -2343,9 +2343,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
  	 * overflowing the shift of read_errors by hours_since_last.
  	 */
  	if (hours_since_last >= 8 * sizeof(read_errors))
@@ -42299,7 +42092,7 @@ index 0add868..372c6ec 100644
  }
  
  static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
-@@ -2377,8 +2377,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2399,8 +2399,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
  		return;
  
  	check_decay_read_errors(mddev, rdev);
@@ -42310,7 +42103,7 @@ index 0add868..372c6ec 100644
  		char b[BDEVNAME_SIZE];
  		bdevname(rdev->bdev, b);
  
-@@ -2386,7 +2386,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2408,7 +2408,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
  		       "md/raid10:%s: %s: Raid device exceeded "
  		       "read_error threshold [cur %d:max %d]\n",
  		       mdname(mddev), b,
@@ -42319,7 +42112,7 @@ index 0add868..372c6ec 100644
  		printk(KERN_NOTICE
  		       "md/raid10:%s: %s: Failing raid device\n",
  		       mdname(mddev), b);
-@@ -2541,7 +2541,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2563,7 +2563,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
  					       sect +
  					       choose_data_offset(r10_bio, rdev)),
  				       bdevname(rdev->bdev, b));
@@ -42329,10 +42122,10 @@ index 0add868..372c6ec 100644
  
  			rdev_dec_pending(rdev, mddev);
 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index 4bed545..8d22d0b 100644
+index 8a0665d..984c46d 100644
 --- a/drivers/md/raid5.c
 +++ b/drivers/md/raid5.c
-@@ -1776,21 +1776,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
+@@ -1887,21 +1887,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
  				mdname(conf->mddev), STRIPE_SECTORS,
  				(unsigned long long)s,
  				bdevname(rdev->bdev, b));
@@ -42358,7 +42151,7 @@ index 4bed545..8d22d0b 100644
  		if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
  			printk_ratelimited(
  				KERN_WARNING
-@@ -1818,7 +1818,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
+@@ -1929,7 +1929,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
  				mdname(conf->mddev),
  				(unsigned long long)s,
  				bdn);
@@ -42394,7 +42187,7 @@ index 9b6c3bb..baeb5c7 100644
  #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
  extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
 diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
-index c7a9be1..683f6f8 100644
+index ecf21d9..b992428d 100644
 --- a/drivers/media/pci/cx88/cx88-video.c
 +++ b/drivers/media/pci/cx88/cx88-video.c
 @@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
@@ -42411,10 +42204,10 @@ index c7a9be1..683f6f8 100644
  module_param_array(video_nr, int, NULL, 0444);
  module_param_array(vbi_nr,   int, NULL, 0444);
 diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
-index 07b8460..e6d7265 100644
+index c08ae3e..eb59af1 100644
 --- a/drivers/media/pci/ivtv/ivtv-driver.c
 +++ b/drivers/media/pci/ivtv/ivtv-driver.c
-@@ -84,7 +84,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
+@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
  MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
  
  /* ivtv instance counter */
@@ -42424,7 +42217,7 @@ index 07b8460..e6d7265 100644
  /* Parameter declarations */
  static int cardtype[IVTV_MAX_CARDS];
 diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
-index d338b19..aae4f9e 100644
+index dfd0a21..6bbb465 100644
 --- a/drivers/media/platform/omap/omap_vout.c
 +++ b/drivers/media/platform/omap/omap_vout.c
 @@ -63,7 +63,6 @@ enum omap_vout_channels {
@@ -42435,7 +42228,7 @@ index d338b19..aae4f9e 100644
  /* Variables configurable through module params*/
  static u32 video1_numbuffers = 3;
  static u32 video2_numbuffers = 3;
-@@ -1015,6 +1014,12 @@ static int omap_vout_open(struct file *file)
+@@ -1014,6 +1013,12 @@ static int omap_vout_open(struct file *file)
  {
  	struct videobuf_queue *q;
  	struct omap_vout_device *vout = NULL;
@@ -42448,7 +42241,7 @@ index d338b19..aae4f9e 100644
  
  	vout = video_drvdata(file);
  	v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
-@@ -1032,10 +1037,6 @@ static int omap_vout_open(struct file *file)
+@@ -1031,10 +1036,6 @@ static int omap_vout_open(struct file *file)
  	vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
  
  	q = &vout->vbq;
@@ -42499,10 +42292,10 @@ index b713403..53cb5ad 100644
  	if (done && done != layer->shadow_buf)
  		vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
 diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
-index ef0efdf..8c78eb6 100644
+index 641b1f0..49cff30 100644
 --- a/drivers/media/platform/s5p-tv/mixer_video.c
 +++ b/drivers/media/platform/s5p-tv/mixer_video.c
-@@ -209,7 +209,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
+@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
  	layer->geo.src.height = layer->geo.src.full_height;
  
  	mxr_geometry_dump(mdev, &layer->geo);
@@ -42511,7 +42304,7 @@ index ef0efdf..8c78eb6 100644
  	mxr_geometry_dump(mdev, &layer->geo);
  }
  
-@@ -227,7 +227,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
+@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
  	layer->geo.dst.full_width = mbus_fmt.width;
  	layer->geo.dst.full_height = mbus_fmt.height;
  	layer->geo.dst.field = mbus_fmt.field;
@@ -42520,7 +42313,7 @@ index ef0efdf..8c78eb6 100644
  
  	mxr_geometry_dump(mdev, &layer->geo);
  }
-@@ -333,7 +333,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
+@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
  	/* set source size to highest accepted value */
  	geo->src.full_width = max(geo->dst.full_width, pix->width);
  	geo->src.full_height = max(geo->dst.full_height, pix->height);
@@ -42529,7 +42322,7 @@ index ef0efdf..8c78eb6 100644
  	mxr_geometry_dump(mdev, &layer->geo);
  	/* set cropping to total visible screen */
  	geo->src.width = pix->width;
-@@ -341,12 +341,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
+@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
  	geo->src.x_offset = 0;
  	geo->src.y_offset = 0;
  	/* assure consistency of geometry */
@@ -42544,7 +42337,7 @@ index ef0efdf..8c78eb6 100644
  	mxr_geometry_dump(mdev, &layer->geo);
  
  	/* returning results */
-@@ -473,7 +473,7 @@ static int mxr_s_selection(struct file *file, void *fh,
+@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
  		target->width = s->r.width;
  		target->height = s->r.height;
  
@@ -42553,7 +42346,7 @@ index ef0efdf..8c78eb6 100644
  
  		/* retrieve update selection rectangle */
  		res.left = target->x_offset;
-@@ -954,13 +954,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -955,13 +955,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
  	mxr_output_get(mdev);
  
  	mxr_layer_update_output(layer);
@@ -42569,7 +42362,7 @@ index ef0efdf..8c78eb6 100644
  	mxr_streamer_get(mdev);
  
  	return 0;
-@@ -1030,7 +1030,7 @@ static int stop_streaming(struct vb2_queue *vq)
+@@ -1031,7 +1031,7 @@ static int stop_streaming(struct vb2_queue *vq)
  	spin_unlock_irqrestore(&layer->enq_slock, flags);
  
  	/* disabling layer in hardware */
@@ -42578,7 +42371,7 @@ index ef0efdf..8c78eb6 100644
  	/* remove one streamer */
  	mxr_streamer_put(mdev);
  	/* allow changes in output configuration */
-@@ -1069,8 +1069,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
+@@ -1070,8 +1070,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
  
  void mxr_layer_release(struct mxr_layer *layer)
  {
@@ -42589,7 +42382,7 @@ index ef0efdf..8c78eb6 100644
  }
  
  void mxr_base_layer_release(struct mxr_layer *layer)
-@@ -1096,7 +1096,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
+@@ -1097,7 +1097,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
  
  	layer->mdev = mdev;
  	layer->idx = idx;
@@ -42634,7 +42427,7 @@ index 545c04c..a14bded 100644
  unlock:
  	mutex_unlock(&dev->lock);
 diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
-index bd4d3a7..ffc0b9d 100644
+index 5236035..c622c74 100644
 --- a/drivers/media/radio/radio-maxiradio.c
 +++ b/drivers/media/radio/radio-maxiradio.c
 @@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
@@ -42647,7 +42440,7 @@ index bd4d3a7..ffc0b9d 100644
  #define PCI_VENDOR_ID_GUILLEMOT 0x5046
  #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
 diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
-index 8fa18ab..caee70f 100644
+index b914772..7ddbf9b 100644
 --- a/drivers/media/radio/radio-shark.c
 +++ b/drivers/media/radio/radio-shark.c
 @@ -79,7 +79,7 @@ struct shark_device {
@@ -42673,10 +42466,10 @@ index 9fb6697..f167415 100644
  static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
  {
 diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
-index 9dc8baf..796d52f 100644
+index 9c9084c..a9e8dfb 100644
 --- a/drivers/media/radio/radio-si476x.c
 +++ b/drivers/media/radio/radio-si476x.c
-@@ -1456,7 +1456,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
+@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
  	struct si476x_radio *radio;
  	struct v4l2_ctrl *ctrl;
  
@@ -42686,10 +42479,10 @@ index 9dc8baf..796d52f 100644
  	radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
  	if (!radio)
 diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
-index 1cf382a..c22998c 100644
+index 46da365..3ba4206 100644
 --- a/drivers/media/rc/rc-main.c
 +++ b/drivers/media/rc/rc-main.c
-@@ -1030,7 +1030,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
+@@ -1065,7 +1065,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
  int rc_register_device(struct rc_dev *dev)
  {
  	static bool raw_init = false; /* raw decoders loaded? */
@@ -42698,7 +42491,7 @@ index 1cf382a..c22998c 100644
  	struct rc_map *rc_map;
  	const char *path;
  	int rc;
-@@ -1061,7 +1061,7 @@ int rc_register_device(struct rc_dev *dev)
+@@ -1096,7 +1096,7 @@ int rc_register_device(struct rc_dev *dev)
  	 */
  	mutex_lock(&dev->lock);
  
@@ -42734,7 +42527,7 @@ index 71b22f5..a63b33f 100644
  /* debug */
  static int dvb_usb_dw2102_debug;
 diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-index f129551..ecf6514 100644
+index 8f7a6a4..59502dd 100644
 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
 +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
 @@ -326,7 +326,7 @@ struct v4l2_buffer32 {
@@ -42765,10 +42558,10 @@ index f129551..ecf6514 100644
  	return 0;
  }
 diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
-index 8ed5da2..47fee46 100644
+index 02d1b63..5fd6b16 100644
 --- a/drivers/media/v4l2-core/v4l2-device.c
 +++ b/drivers/media/v4l2-core/v4l2-device.c
-@@ -74,9 +74,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
+@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
  EXPORT_SYMBOL_GPL(v4l2_device_put);
  
  int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
@@ -42781,10 +42574,10 @@ index 8ed5da2..47fee46 100644
  
  	if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 7658586..1079260 100644
+index 68e6b5e..d8b923e 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1995,7 +1995,8 @@ struct v4l2_ioctl_info {
+@@ -1939,7 +1939,8 @@ struct v4l2_ioctl_info {
  				struct file *file, void *fh, void *p);
  	} u;
  	void (*debug)(const void *arg, bool write_only);
@@ -42794,7 +42587,7 @@ index 7658586..1079260 100644
  
  /* This control needs a priority check */
  #define INFO_FL_PRIO	(1 << 0)
-@@ -2177,7 +2178,7 @@ static long __video_do_ioctl(struct file *file,
+@@ -2120,7 +2121,7 @@ static long __video_do_ioctl(struct file *file,
  	struct video_device *vfd = video_devdata(file);
  	const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
  	bool write_only = false;
@@ -42803,7 +42596,7 @@ index 7658586..1079260 100644
  	const struct v4l2_ioctl_info *info;
  	void *fh = file->private_data;
  	struct v4l2_fh *vfh = NULL;
-@@ -2251,7 +2252,7 @@ done:
+@@ -2194,7 +2195,7 @@ done:
  }
  
  static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
@@ -42812,7 +42605,7 @@ index 7658586..1079260 100644
  {
  	int ret = 0;
  
-@@ -2267,7 +2268,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
+@@ -2210,7 +2211,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
  				ret = -EINVAL;
  				break;
  			}
@@ -42821,7 +42614,7 @@ index 7658586..1079260 100644
  			*kernel_ptr = (void *)&buf->m.planes;
  			*array_size = sizeof(struct v4l2_plane) * buf->length;
  			ret = 1;
-@@ -2302,7 +2303,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
+@@ -2245,7 +2246,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
  				ret = -EINVAL;
  				break;
  			}
@@ -42925,13 +42718,12 @@ index 727819c..ad74694 100644
 -			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)
-+		return NULL;
-+
 +	if (h->info_kbuf == NULL)
 +		if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
 +			return h->info_kbuf;
@@ -42943,7 +42735,7 @@ index 727819c..ad74694 100644
  	return h->info_kbuf;
  }
 diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
-index b7d87cd..9890039 100644
+index b7d87cd..3fb36da 100644
 --- a/drivers/message/i2o/i2o_proc.c
 +++ b/drivers/message/i2o/i2o_proc.c
 @@ -255,12 +255,6 @@ static char *scsi_devices[] = {
@@ -42959,6 +42751,19 @@ index b7d87cd..9890039 100644
  static int i2o_report_query_status(struct seq_file *seq, int block_status,
  				   char *group)
  {
+@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
+ static int i2o_seq_show_hw(struct seq_file *seq, void *v)
+ {
+ 	struct i2o_controller *c = (struct i2o_controller *)seq->private;
+-	static u32 work32[5];
+-	static u8 *work8 = (u8 *) work32;
+-	static u16 *work16 = (u16 *) work32;
++	u32 work32[5];
++	u8 *work8 = (u8 *) work32;
++	u16 *work16 = (u16 *) work32;
+ 	int token;
+ 	u32 hwcap;
+ 
 @@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
  	} *result;
  
@@ -42997,9 +42802,15 @@ index b7d87cd..9890039 100644
  		seq_printf(seq, "%8d ", dst->module_size);
  		seq_printf(seq, "%8d ", dst->mpb_size);
  		seq_printf(seq, "0x%04x", dst->module_flags);
-@@ -1250,7 +1240,6 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
+@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
+ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
+ {
+ 	struct i2o_device *d = (struct i2o_device *)seq->private;
+-	static u32 work32[128];	// allow for "stuff" + up to 256 byte (max) serial number
++	u32 work32[128];	// allow for "stuff" + up to 256 byte (max) serial number
  	// == (allow) 512d bytes (max)
- 	static u16 *work16 = (u16 *) work32;
+-	static u16 *work16 = (u16 *) work32;
++	u16 *work16 = (u16 *) work32;
  	int token;
 -	char tmp[16 + 1];
  
@@ -43074,6 +42885,19 @@ index b7d87cd..9890039 100644
  
  	return 0;
  }
+@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
+ static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
+ {
+ 	struct i2o_device *d = (struct i2o_device *)seq->private;
+-	static u32 work32[12];
+-	static u16 *work16 = (u16 *) work32;
+-	static u8 *work8 = (u8 *) work32;
++	u32 work32[12];
++	u16 *work16 = (u16 *) work32;
++	u8 *work8 = (u8 *) work32;
+ 	int token;
+ 
+ 	token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
 diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
 index a8c08f3..155fe3d 100644
 --- a/drivers/message/i2o/iop.c
@@ -43102,7 +42926,7 @@ index a8c08f3..155fe3d 100644
  #endif
  
 diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
-index 45ece11..8efa218 100644
+index fcbb2e9..2635e11 100644
 --- a/drivers/mfd/janz-cmodio.c
 +++ b/drivers/mfd/janz-cmodio.c
 @@ -13,6 +13,7 @@
@@ -43113,8 +42937,34 @@ index 45ece11..8efa218 100644
  #include <linux/init.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
+diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
+index de7fb80..7c1b931 100644
+--- a/drivers/mfd/max8925-i2c.c
++++ b/drivers/mfd/max8925-i2c.c
+@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
+ 				   const struct i2c_device_id *id)
+ {
+ 	struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
+-	static struct max8925_chip *chip;
++	struct max8925_chip *chip;
+ 	struct device_node *node = client->dev.of_node;
+ 
+ 	if (node && !pdata) {
+diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
+index d792772..cd73ba3 100644
+--- a/drivers/mfd/tps65910.c
++++ b/drivers/mfd/tps65910.c
+@@ -229,7 +229,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
+ 		    struct tps65910_platform_data *pdata)
+ {
+ 	int ret = 0;
+-	static struct regmap_irq_chip *tps6591x_irqs_chip;
++	struct regmap_irq_chip *tps6591x_irqs_chip;
+ 
+ 	if (!irq) {
+ 		dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
 diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
-index a5f9888..1c0ed56 100644
+index 9aa6d1e..1631bfc 100644
 --- a/drivers/mfd/twl4030-irq.c
 +++ b/drivers/mfd/twl4030-irq.c
 @@ -35,6 +35,7 @@
@@ -43125,7 +42975,7 @@ index a5f9888..1c0ed56 100644
  
  #include "twl-core.h"
  
-@@ -728,10 +729,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
+@@ -726,10 +727,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
  	 * Install an irq handler for each of the SIH modules;
  	 * clone dummy irq_chip since PIH can't *do* anything
  	 */
@@ -43141,42 +42991,21 @@ index a5f9888..1c0ed56 100644
  
  	for (i = irq_base; i < irq_end; i++) {
  		irq_set_chip_and_handler(i, &twl4030_irq_chip,
-diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
-index 277a8db..0e0b754 100644
---- a/drivers/mfd/twl6030-irq.c
-+++ b/drivers/mfd/twl6030-irq.c
-@@ -387,10 +387,12 @@ int twl6030_init_irq(struct device *dev, int irq_num)
- 	 * install an irq handler for each of the modules;
- 	 * clone dummy irq_chip since PIH can't *do* anything
- 	 */
--	twl6030_irq_chip = dummy_irq_chip;
--	twl6030_irq_chip.name = "twl6030";
--	twl6030_irq_chip.irq_set_type = NULL;
--	twl6030_irq_chip.irq_set_wake = twl6030_irq_set_wake;
-+	pax_open_kernel();
-+	memcpy((void *)&twl6030_irq_chip, &dummy_irq_chip, sizeof twl6030_irq_chip);
-+	*(const char **)&twl6030_irq_chip.name = "twl6030";
-+	*(void **)&twl6030_irq_chip.irq_set_type = NULL;
-+	*(void **)&twl6030_irq_chip.irq_set_wake = twl6030_irq_set_wake;
-+	pax_close_kernel();
- 
- 	for (i = irq_base; i < irq_end; i++) {
- 		irq_set_chip_and_handler(i, &twl6030_irq_chip,
 diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
-index f32550a..e3e52a2 100644
+index 464419b..64bae8d 100644
 --- a/drivers/misc/c2port/core.c
 +++ b/drivers/misc/c2port/core.c
-@@ -920,7 +920,9 @@ struct c2port_device *c2port_device_register(char *name,
- 	mutex_init(&c2dev->mutex);
+@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
+ 		goto error_idr_alloc;
+ 	c2dev->id = ret;
  
- 	/* Create binary file */
--	c2port_bin_attrs.size = ops->blocks_num * ops->block_size;
+-	bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
 +	pax_open_kernel();
-+	*(size_t *)&c2port_bin_attrs.size = ops->blocks_num * ops->block_size;
++	*(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
 +	pax_close_kernel();
- 	ret = device_create_bin_file(c2dev->dev, &c2port_bin_attrs);
- 	if (unlikely(ret))
- 		goto error_device_create_bin_file;
+ 
+ 	c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
+ 				   "c2port%d", c2dev->id);
 diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
 index 36f5d52..32311c3 100644
 --- a/drivers/misc/kgdbts.c
@@ -43200,7 +43029,7 @@ index 36f5d52..32311c3 100644
  	if (memcmp(before, after, BREAK_INSTR_SIZE)) {
  		printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
-index 4cd4a3d..b48cbc7 100644
+index 036effe..b3a6336 100644
 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
 @@ -498,7 +498,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
@@ -43268,7 +43097,7 @@ index 2f30bad..c4c13d0 100644
  		mcs_op_statistics[op].max = nsec;
  }
 diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
-index 797d796..ae8f01e 100644
+index 4f76359..cdfcb2e 100644
 --- a/drivers/misc/sgi-gru/gruprocfs.c
 +++ b/drivers/misc/sgi-gru/gruprocfs.c
 @@ -32,9 +32,9 @@
@@ -43353,31 +43182,6 @@ index 5c3ce24..4915ccb 100644
 -	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;
--	atomic_long_t mesq_send;
--	atomic_long_t mesq_send_failed;
--	atomic_long_t mesq_noop;
--	atomic_long_t mesq_send_unexpected_error;
--	atomic_long_t mesq_send_lb_overflow;
--	atomic_long_t mesq_send_qlimit_reached;
--	atomic_long_t mesq_send_amo_nacked;
--	atomic_long_t mesq_send_put_nacked;
--	atomic_long_t mesq_page_overflow;
--	atomic_long_t mesq_qf_locked;
--	atomic_long_t mesq_qf_noop_not_full;
--	atomic_long_t mesq_qf_switch_head_failed;
--	atomic_long_t mesq_qf_unexpected_error;
--	atomic_long_t mesq_noop_unexpected_error;
--	atomic_long_t mesq_noop_lb_overflow;
--	atomic_long_t mesq_noop_qlimit_reached;
--	atomic_long_t mesq_noop_amo_nacked;
--	atomic_long_t mesq_noop_put_nacked;
--	atomic_long_t mesq_noop_page_overflow;
 +	atomic_long_unchecked_t vdata_alloc;
 +	atomic_long_unchecked_t vdata_free;
 +	atomic_long_unchecked_t gts_alloc;
@@ -43429,10 +43233,33 @@ index 5c3ce24..4915ccb 100644
 +	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_t copy_gpa;
+-	atomic_long_t read_gpa;
 +	atomic_long_unchecked_t copy_gpa;
 +	atomic_long_unchecked_t read_gpa;
-+
+ 
+-	atomic_long_t mesq_receive;
+-	atomic_long_t mesq_receive_none;
+-	atomic_long_t mesq_send;
+-	atomic_long_t mesq_send_failed;
+-	atomic_long_t mesq_noop;
+-	atomic_long_t mesq_send_unexpected_error;
+-	atomic_long_t mesq_send_lb_overflow;
+-	atomic_long_t mesq_send_qlimit_reached;
+-	atomic_long_t mesq_send_amo_nacked;
+-	atomic_long_t mesq_send_put_nacked;
+-	atomic_long_t mesq_page_overflow;
+-	atomic_long_t mesq_qf_locked;
+-	atomic_long_t mesq_qf_noop_not_full;
+-	atomic_long_t mesq_qf_switch_head_failed;
+-	atomic_long_t mesq_qf_unexpected_error;
+-	atomic_long_t mesq_noop_unexpected_error;
+-	atomic_long_t mesq_noop_lb_overflow;
+-	atomic_long_t mesq_noop_qlimit_reached;
+-	atomic_long_t mesq_noop_amo_nacked;
+-	atomic_long_t mesq_noop_put_nacked;
+-	atomic_long_t mesq_noop_page_overflow;
 +	atomic_long_unchecked_t mesq_receive;
 +	atomic_long_unchecked_t mesq_receive_none;
 +	atomic_long_unchecked_t mesq_send;
@@ -43512,7 +43339,7 @@ index b94d5f7..7f494c5 100644
  extern int xpc_disengage_timedout;
  extern int xpc_activate_IRQ_rcvd;
 diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
-index d971817..33bdca5 100644
+index 82dc574..8539ab2 100644
 --- a/drivers/misc/sgi-xp/xpc_main.c
 +++ b/drivers/misc/sgi-xp/xpc_main.c
 @@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
@@ -43534,10 +43361,10 @@ index d971817..33bdca5 100644
  
  		break;
 diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
-index 49f04bc..65660c2 100644
+index ef18348..1b53cf0 100644
 --- a/drivers/mmc/core/mmc_ops.c
 +++ b/drivers/mmc/core/mmc_ops.c
-@@ -247,7 +247,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
+@@ -213,7 +213,7 @@ mmc_send_cxd_data(struct mmc_card *card, struct mmc_host *host,
  	void *data_buf;
  	int is_on_stack;
  
@@ -43547,21 +43374,36 @@ index 49f04bc..65660c2 100644
  		/*
  		 * dma onto stack is unsafe/nonportable, but callers to this
 diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
-index 0b74189..818358f 100644
+index 81b2994..dce857e 100644
 --- a/drivers/mmc/host/dw_mmc.h
 +++ b/drivers/mmc/host/dw_mmc.h
-@@ -202,5 +202,5 @@ struct dw_mci_drv_data {
+@@ -203,5 +203,5 @@ struct dw_mci_drv_data {
  	void		(*prepare_command)(struct dw_mci *host, u32 *cmdr);
  	void		(*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
  	int		(*parse_dt)(struct dw_mci *host);
 -};
 +} __do_const;
  #endif /* _DW_MMC_H_ */
+diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
+index c3785ed..1984c44 100644
+--- a/drivers/mmc/host/mmci.c
++++ b/drivers/mmc/host/mmci.c
+@@ -1482,7 +1482,9 @@ static int mmci_probe(struct amba_device *dev,
+ 	}
+ 
+ 	if (variant->busy_detect) {
+-		mmci_ops.card_busy = mmci_card_busy;
++		pax_open_kernel();
++		*(void **)&mmci_ops.card_busy = mmci_card_busy;
++		pax_close_kernel();
+ 		mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
+ 	}
+ 
 diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
-index c6f6246..60760a8 100644
+index 6debda9..2ba7427 100644
 --- a/drivers/mmc/host/sdhci-s3c.c
 +++ b/drivers/mmc/host/sdhci-s3c.c
-@@ -664,9 +664,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
+@@ -668,9 +668,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
  	 * we can use overriding functions instead of default.
  	 */
  	if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
@@ -43576,8 +43418,21 @@ index c6f6246..60760a8 100644
  	}
  
  	/* It supports additional host capabilities if needed */
+diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
+index 096993f..f02c23b 100644
+--- a/drivers/mtd/chips/cfi_cmdset_0020.c
++++ b/drivers/mtd/chips/cfi_cmdset_0020.c
+@@ -669,7 +669,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
+ 	size_t	 totlen = 0, thislen;
+ 	int	 ret = 0;
+ 	size_t	 buflen = 0;
+-	static char *buffer;
++	char *buffer;
+ 
+ 	if (!ECCBUF_SIZE) {
+ 		/* We should fall back to a general writev implementation.
 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
-index 0c8bb6b..6f35deb 100644
+index 2ed2bb3..2d0b82e 100644
 --- a/drivers/mtd/nand/denali.c
 +++ b/drivers/mtd/nand/denali.c
 @@ -24,6 +24,7 @@
@@ -43601,12 +43456,12 @@ index 51b9d6a..52af9a7 100644
  #include <linux/mtd/nand.h>
  #include <linux/mtd/nftl.h>
 diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
-index f9d5615..99dd95f 100644
+index 4b8e895..6b3c498 100644
 --- a/drivers/mtd/sm_ftl.c
 +++ b/drivers/mtd/sm_ftl.c
-@@ -56,7 +56,7 @@ ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
+@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
  #define SM_CIS_VENDOR_OFFSET 0x59
- struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
+ static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
  {
 -	struct attribute_group *attr_group;
 +	attribute_group_no_const *attr_group;
@@ -43614,10 +43469,10 @@ index f9d5615..99dd95f 100644
  	struct sm_sysfs_attribute *vendor_attribute;
  
 diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
-index 8395b09..ff4d276 100644
+index dd8057d..22aaf36 100644
 --- a/drivers/net/bonding/bond_main.c
 +++ b/drivers/net/bonding/bond_main.c
-@@ -4883,7 +4883,7 @@ static unsigned int bond_get_num_tx_queues(void)
+@@ -4511,7 +4511,7 @@ static unsigned int bond_get_num_tx_queues(void)
  	return tx_queues;
  }
  
@@ -43626,7 +43481,7 @@ index 8395b09..ff4d276 100644
  	.kind			= "bond",
  	.priv_size		= sizeof(struct bonding),
  	.setup			= bond_setup,
-@@ -5008,8 +5008,8 @@ static void __exit bonding_exit(void)
+@@ -4636,8 +4636,8 @@ static void __exit bonding_exit(void)
  
  	bond_destroy_debugfs();
  
@@ -43637,7 +43492,7 @@ index 8395b09..ff4d276 100644
  #ifdef CONFIG_NET_POLL_CONTROLLER
  	/*
 diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
-index e1d2643..7f4133b 100644
+index f92f001..0b2f9bf 100644
 --- a/drivers/net/ethernet/8390/ax88796.c
 +++ b/drivers/net/ethernet/8390/ax88796.c
 @@ -872,9 +872,11 @@ static int ax_probe(struct platform_device *pdev)
@@ -43654,10 +43509,10 @@ index e1d2643..7f4133b 100644
  
  	if (!request_mem_region(mem->start, mem_size, pdev->name)) {
 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
-index 151675d..0139a9d 100644
+index da8fcaa..f4b5d3b 100644
 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
-@@ -1112,7 +1112,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
+@@ -1138,7 +1138,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
  static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
  {
  	/* RX_MODE controlling object */
@@ -43666,47 +43521,11 @@ index 151675d..0139a9d 100644
  
  	/* multicast configuration controlling object */
  	bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
-diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
-index ce1a916..10b52b0 100644
---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
-+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
-@@ -960,6 +960,9 @@ static int bnx2x_set_dump(struct net_device *dev, struct ethtool_dump *val)
- 	struct bnx2x *bp = netdev_priv(dev);
- 
- 	/* Use the ethtool_dump "flag" field as the dump preset index */
-+	if (val->flag < 1 || val->flag > DUMP_MAX_PRESETS)
-+		return -EINVAL;
-+
- 	bp->dump_preset_idx = val->flag;
- 	return 0;
- }
-@@ -986,8 +989,6 @@ static int bnx2x_get_dump_data(struct net_device *dev,
- 	struct bnx2x *bp = netdev_priv(dev);
- 	struct dump_header dump_hdr = {0};
- 
--	memset(p, 0, dump->len);
--
- 	/* Disable parity attentions as long as following dump may
- 	 * cause false alarms by reading never written registers. We
- 	 * will re-enable parity attentions right after the dump.
-diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-index b4c9dea..2a9927f 100644
---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
-@@ -11497,6 +11497,8 @@ static int bnx2x_init_bp(struct bnx2x *bp)
- 		bp->min_msix_vec_cnt = 2;
- 	BNX2X_DEV_INFO("bp->min_msix_vec_cnt %d", bp->min_msix_vec_cnt);
- 
-+	bp->dump_preset_idx = 1;
-+
- 	return rc;
- }
- 
 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
-index 32a9609..0b1c53a 100644
+index 9fbeee5..5e3e37a 100644
 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
-@@ -2387,15 +2387,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
+@@ -2590,15 +2590,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
  	return rc;
  }
  
@@ -43728,10 +43547,10 @@ index 32a9609..0b1c53a 100644
  }
  
 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
-index 43c00bc..dd1d03d 100644
+index 658f4e3..15074a6 100644
 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
-@@ -1321,8 +1321,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
+@@ -1325,8 +1325,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
  
  /********************* RX MODE ****************/
  
@@ -43742,7 +43561,7 @@ index 43c00bc..dd1d03d 100644
  /**
   * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
 diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
-index ff6e30e..87e8452 100644
+index 7025780..e55a71c 100644
 --- a/drivers/net/ethernet/broadcom/tg3.h
 +++ b/drivers/net/ethernet/broadcom/tg3.h
 @@ -147,6 +147,7 @@
@@ -43753,20 +43572,6 @@ index ff6e30e..87e8452 100644
  #define  CHIPREV_ID_5750_C2		 0x4202
  #define  CHIPREV_ID_5752_A0_HW		 0x5000
  #define  CHIPREV_ID_5752_A0		 0x6000
-diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
-index 71497e8..b650951 100644
---- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
-+++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
-@@ -3037,7 +3037,9 @@ static void t3_io_resume(struct pci_dev *pdev)
- 	CH_ALERT(adapter, "adapter recovering, PEX ERR 0x%x\n",
- 		 t3_read_reg(adapter, A_PCIE_PEX_ERR));
- 
-+	rtnl_lock();
- 	t3_resume_ports(adapter);
-+	rtnl_unlock();
- }
- 
- static const struct pci_error_handlers t3_err_handler = {
 diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
 index 8cffcdf..aadf043 100644
 --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
@@ -43780,8 +43585,21 @@ index 8cffcdf..aadf043 100644
  
  #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
  
+diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+index c73cabd..cd278b1 100644
+--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
++++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+@@ -2186,7 +2186,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
+ 
+ 	int i;
+ 	struct adapter *ap = netdev2adap(dev);
+-	static const unsigned int *reg_ranges;
++	const unsigned int *reg_ranges;
+ 	int arr_size = 0, buf_size = 0;
+ 
+ 	if (is_t4(ap->chip)) {
 diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
-index 4c83003..2a2a5b9 100644
+index 263b92c..f05134b 100644
 --- a/drivers/net/ethernet/dec/tulip/de4x5.c
 +++ b/drivers/net/ethernet/dec/tulip/de4x5.c
 @@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
@@ -43803,10 +43621,10 @@ index 4c83003..2a2a5b9 100644
  	break;
      }
 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
-index 7371626..2d90469 100644
+index 2c38cc4..0323f6e 100644
 --- a/drivers/net/ethernet/emulex/benet/be_main.c
 +++ b/drivers/net/ethernet/emulex/benet/be_main.c
-@@ -469,7 +469,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
+@@ -470,7 +470,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
  
  	if (wrapped)
  		newacc += 65536;
@@ -43814,9 +43632,9 @@ index 7371626..2d90469 100644
 +	ACCESS_ONCE_RW(*acc) = newacc;
  }
  
- void populate_erx_stats(struct be_adapter *adapter,
+ static void populate_erx_stats(struct be_adapter *adapter,
 diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
-index 21b85fb..b49e5fc 100644
+index 212f44b..fb69959 100644
 --- a/drivers/net/ethernet/faraday/ftgmac100.c
 +++ b/drivers/net/ethernet/faraday/ftgmac100.c
 @@ -31,6 +31,8 @@
@@ -43829,7 +43647,7 @@ index 21b85fb..b49e5fc 100644
  
  #include "ftgmac100.h"
 diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
-index a6eda8d..935d273 100644
+index 8be5b40..081bc1b 100644
 --- a/drivers/net/ethernet/faraday/ftmac100.c
 +++ b/drivers/net/ethernet/faraday/ftmac100.c
 @@ -31,6 +31,8 @@
@@ -43842,7 +43660,7 @@ index a6eda8d..935d273 100644
  #include "ftmac100.h"
  
 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-index 331987d..3be1135 100644
+index 5184e2a..acb28c3 100644
 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
 @@ -776,7 +776,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
@@ -43880,13 +43698,13 @@ index fbe5363..266b4e3 100644
  		__vxge_hw_mempool_create(vpath->hldev,
  			fifo->config->memblock_size,
 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
-index 5e7fb1d..f8d1810 100644
+index f09e787..f3916a8 100644
 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
-@@ -1948,7 +1948,9 @@ int qlcnic_83xx_config_default_opmode(struct qlcnic_adapter *adapter)
- 		op_mode = QLC_83XX_DEFAULT_OPMODE;
+@@ -2055,7 +2055,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
  
- 	if (op_mode == QLC_83XX_DEFAULT_OPMODE) {
+ 	} else if (ret == QLC_83XX_DEFAULT_OPMODE) {
+ 		ahw->nic_mode = QLC_83XX_DEFAULT_MODE;
 -		adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
 +		pax_open_kernel();
 +		*(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
@@ -43895,70 +43713,54 @@ index 5e7fb1d..f8d1810 100644
  	} else {
  		return -EIO;
 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
-index b0c3de9..fc5857e 100644
+index 0248a4c..9648d96 100644
 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
-@@ -200,15 +200,21 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
- 	if (priv_level == QLCNIC_NON_PRIV_FUNC) {
+@@ -191,17 +191,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
+ 	case QLCNIC_NON_PRIV_FUNC:
  		ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
  		ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
 -		nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
 +		pax_open_kernel();
 +		*(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
 +		pax_close_kernel();
- 	} else if (priv_level == QLCNIC_PRIV_FUNC) {
+ 		break;
+ 	case QLCNIC_PRIV_FUNC:
  		ahw->op_mode = QLCNIC_PRIV_FUNC;
  		ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
 -		nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
 +		pax_open_kernel();
 +		*(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
 +		pax_close_kernel();
- 	} else if (priv_level == QLCNIC_MGMT_FUNC) {
+ 		break;
+ 	case QLCNIC_MGMT_FUNC:
  		ahw->op_mode = QLCNIC_MGMT_FUNC;
  		ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
 -		nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
 +		pax_open_kernel();
 +		*(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
 +		pax_close_kernel();
- 	} else {
- 		return -EIO;
- 	}
-diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
-index 6acf82b..14b097e 100644
---- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
-+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
-@@ -206,10 +206,10 @@ int qlcnic_fw_cmd_set_drv_version(struct qlcnic_adapter *adapter)
- 	if (err) {
- 		dev_info(&adapter->pdev->dev,
- 			 "Failed to set driver version in firmware\n");
--		return -EIO;
-+		err = -EIO;
- 	}
--
--	return 0;
-+	qlcnic_free_mbx_args(&cmd);
-+	return err;
- }
- 
- int
-diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
-index d3f8797..82a03d3 100644
---- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
-+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c
-@@ -262,7 +262,7 @@ void qlcnic_82xx_change_filter(struct qlcnic_adapter *adapter, u64 *uaddr,
- 
- 	mac_req = (struct qlcnic_mac_req *)&(req->words[0]);
- 	mac_req->op = vlan_id ? QLCNIC_MAC_VLAN_ADD : QLCNIC_MAC_ADD;
--	memcpy(mac_req->mac_addr, &uaddr, ETH_ALEN);
-+	memcpy(mac_req->mac_addr, uaddr, ETH_ALEN);
- 
- 	vlan_req = (struct qlcnic_vlan_req *)&req->words[1];
- 	vlan_req->vlan_id = cpu_to_le16(vlan_id);
+ 		break;
+ 	default:
+ 		dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
+diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+index 1551360..ed6510f 100644
+--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
++++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
+@@ -1108,7 +1108,7 @@ int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
+ 	struct qlcnic_dump_entry *entry;
+ 	struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
+ 	struct qlcnic_dump_template_hdr *tmpl_hdr = fw_dump->tmpl_hdr;
+-	static const struct qlcnic_dump_operations *fw_dump_ops;
++	const struct qlcnic_dump_operations *fw_dump_ops;
+ 	struct device *dev = &adapter->pdev->dev;
+ 	struct qlcnic_hardware_context *ahw;
+ 	void *temp_buffer;
 diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index e9b5d77a..1898ba7 100644
+index fb3f8dc..9d2ff38 100644
 --- a/drivers/net/ethernet/realtek/r8169.c
 +++ b/drivers/net/ethernet/realtek/r8169.c
-@@ -753,22 +753,22 @@ struct rtl8169_private {
+@@ -759,22 +759,22 @@ struct rtl8169_private {
  	struct mdio_ops {
  		void (*write)(struct rtl8169_private *, int, int);
  		int (*read)(struct rtl8169_private *, int);
@@ -43986,18 +43788,18 @@ index e9b5d77a..1898ba7 100644
  	int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
  	int (*get_settings)(struct net_device *, struct ethtool_cmd *);
 diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
-index 9a95abf..36df7f9 100644
+index 03acf57..e1251ff 100644
 --- a/drivers/net/ethernet/sfc/ptp.c
 +++ b/drivers/net/ethernet/sfc/ptp.c
-@@ -535,7 +535,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
- 		       (u32)((u64)ptp->start.dma_addr >> 32));
+@@ -539,7 +539,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
+ 		       ptp->start.dma_addr);
  
  	/* Clear flag that signals MC ready */
 -	ACCESS_ONCE(*start) = 0;
 +	ACCESS_ONCE_RW(*start) = 0;
- 	efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
- 			   MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
- 
+ 	rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
+ 				MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
+ 	EFX_BUG_ON_PARANOID(rc);
 diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
 index 50617c5..b13724c 100644
 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
@@ -44049,7 +43851,7 @@ index 0775f0a..d4fb316 100644
  	/* Ignore return since this msg is optional. */
  	rndis_filter_send_request(dev, request);
 diff --git a/drivers/net/ieee802154/fakehard.c b/drivers/net/ieee802154/fakehard.c
-index bf0d55e..82bcfbd 100644
+index bf0d55e..82bcfbd1 100644
 --- a/drivers/net/ieee802154/fakehard.c
 +++ b/drivers/net/ieee802154/fakehard.c
 @@ -364,7 +364,7 @@ static int ieee802154fake_probe(struct platform_device *pdev)
@@ -44062,10 +43864,10 @@ index bf0d55e..82bcfbd 100644
  	priv = netdev_priv(dev);
  	priv->phy = phy;
 diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
-index 06eba6e..a06bf31 100644
+index 9bf46bd..bfdaa84 100644
 --- a/drivers/net/macvlan.c
 +++ b/drivers/net/macvlan.c
-@@ -909,13 +909,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
+@@ -939,13 +939,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
  int macvlan_link_register(struct rtnl_link_ops *ops)
  {
  	/* common fields */
@@ -44088,7 +43890,7 @@ index 06eba6e..a06bf31 100644
  
  	return rtnl_link_register(ops);
  };
-@@ -971,7 +973,7 @@ static int macvlan_device_event(struct notifier_block *unused,
+@@ -1001,7 +1003,7 @@ static int macvlan_device_event(struct notifier_block *unused,
  	return NOTIFY_DONE;
  }
  
@@ -44098,10 +43900,10 @@ index 06eba6e..a06bf31 100644
  };
  
 diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
-index c70ff7d..10fcffc 100644
+index dc76670..e18f39c 100644
 --- a/drivers/net/macvtap.c
 +++ b/drivers/net/macvtap.c
-@@ -1116,7 +1116,7 @@ static int macvtap_device_event(struct notifier_block *unused,
+@@ -1189,7 +1189,7 @@ static int macvtap_device_event(struct notifier_block *unused,
  	return NOTIFY_DONE;
  }
  
@@ -44158,10 +43960,10 @@ index 1252d9c..80e660b 100644
  
  	/* We've got a compressed packet; read the change byte */
 diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
-index fe3fd77..b048392 100644
+index 6327df2..e6e1ebe 100644
 --- a/drivers/net/team/team.c
 +++ b/drivers/net/team/team.c
-@@ -2686,7 +2686,7 @@ static int team_device_event(struct notifier_block *unused,
+@@ -2873,7 +2873,7 @@ static int team_device_event(struct notifier_block *unused,
  	return NOTIFY_DONE;
  }
  
@@ -44171,10 +43973,10 @@ index fe3fd77..b048392 100644
  };
  
 diff --git a/drivers/net/tun.c b/drivers/net/tun.c
-index 9ef85fe..64e88b0 100644
+index 782e38b..d076fdc 100644
 --- a/drivers/net/tun.c
 +++ b/drivers/net/tun.c
-@@ -1884,7 +1884,7 @@ unlock:
+@@ -1834,7 +1834,7 @@ unlock:
  }
  
  static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
@@ -44183,8 +43985,8 @@ index 9ef85fe..64e88b0 100644
  {
  	struct tun_file *tfile = file->private_data;
  	struct tun_struct *tun;
-@@ -1896,6 +1896,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
- 	int vnet_hdr_sz;
+@@ -1847,6 +1847,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
+ 	unsigned int ifindex;
  	int ret;
  
 +	if (ifreq_len > sizeof ifr)
@@ -44194,7 +43996,7 @@ index 9ef85fe..64e88b0 100644
  		if (copy_from_user(&ifr, argp, ifreq_len))
  			return -EFAULT;
 diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
-index cba1d46..f703766 100644
+index 86292e6..8d34433 100644
 --- a/drivers/net/usb/hso.c
 +++ b/drivers/net/usb/hso.c
 @@ -71,7 +71,7 @@
@@ -44275,7 +44077,7 @@ index cba1d46..f703766 100644
  					/* Setup and send a ctrl req read on
  					 * port i */
  					if (!serial->rx_urb_filled[0]) {
-@@ -3057,7 +3056,7 @@ static int hso_resume(struct usb_interface *iface)
+@@ -3062,7 +3061,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)) {
@@ -44307,10 +44109,10 @@ index a79e9d3..78cd4fa 100644
  
  	/* we will have to manufacture ethernet headers, prepare template */
 diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-index 054489f..aee050a 100644
+index 2ef5b62..6fa0ec3 100644
 --- a/drivers/net/vxlan.c
 +++ b/drivers/net/vxlan.c
-@@ -1579,7 +1579,7 @@ nla_put_failure:
+@@ -2615,7 +2615,7 @@ nla_put_failure:
  	return -EMSGSIZE;
  }
  
@@ -44319,6 +44121,32 @@ index 054489f..aee050a 100644
  	.kind		= "vxlan",
  	.maxtype	= IFLA_VXLAN_MAX,
  	.policy		= vxlan_policy,
+diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
+index 0b60295..b8bfa5b 100644
+--- a/drivers/net/wimax/i2400m/rx.c
++++ b/drivers/net/wimax/i2400m/rx.c
+@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
+ 		if (i2400m->rx_roq == NULL)
+ 			goto error_roq_alloc;
+ 
+-		rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
++		rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
+ 			     GFP_KERNEL);
+ 		if (rd == NULL) {
+ 			result = -ENOMEM;
+diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
+index 7fe1964..7016de0 100644
+--- a/drivers/net/wireless/airo.c
++++ b/drivers/net/wireless/airo.c
+@@ -7844,7 +7844,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
+ 	struct airo_info *ai = dev->ml_priv;
+ 	int  ridcode;
+         int  enabled;
+-	static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
++	int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
+ 	unsigned char *iobuf;
+ 
+ 	/* Only super-user can write RIDs */
 diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
 index 34c8a33..3261fdc 100644
 --- a/drivers/net/wireless/at76c50x-usb.c
@@ -44332,6 +44160,50 @@ index 34c8a33..3261fdc 100644
  {
  	return msecs_to_jiffies((s->poll_timeout[2] << 16)
  				| (s->poll_timeout[1] << 8)
+diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
+index ef3329e..c28ff5d 100644
+--- a/drivers/net/wireless/ath/ath10k/htc.c
++++ b/drivers/net/wireless/ath/ath10k/htc.c
+@@ -963,7 +963,10 @@ void ath10k_htc_stop(struct ath10k_htc *htc)
+ /* registered target arrival callback from the HIF layer */
+ int ath10k_htc_init(struct ath10k *ar)
+ {
+-	struct ath10k_hif_cb htc_callbacks;
++	static struct ath10k_hif_cb htc_callbacks = {
++		.rx_completion = ath10k_htc_rx_completion_handler,
++		.tx_completion = ath10k_htc_tx_completion_handler,
++	};
+ 	struct ath10k_htc_ep *ep = NULL;
+ 	struct ath10k_htc *htc = &ar->htc;
+ 
+@@ -973,8 +976,6 @@ int ath10k_htc_init(struct ath10k *ar)
+ 	ath10k_htc_reset_endpoint_states(htc);
+ 
+ 	/* setup HIF layer callbacks */
+-	htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
+-	htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
+ 	htc->ar = ar;
+ 
+ 	/* Get HIF default pipe for HTC message exchange */
+diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
+index e1dd8c7..9f91b3f 100644
+--- a/drivers/net/wireless/ath/ath10k/htc.h
++++ b/drivers/net/wireless/ath/ath10k/htc.h
+@@ -271,12 +271,12 @@ enum ath10k_htc_ep_id {
+ 
+ struct ath10k_htc_ops {
+ 	void (*target_send_suspend_complete)(struct ath10k *ar);
+-};
++} __no_const;
+ 
+ struct ath10k_htc_ep_ops {
+ 	void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
+ 	void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
+-};
++} __no_const;
+ 
+ /* service connection information */
+ struct ath10k_htc_svc_conn_req {
 diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
 index 8d78253..bebbb68 100644
 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
@@ -44416,7 +44288,7 @@ index 8d78253..bebbb68 100644
  		| set11nRateFlags(i->rates, 2)
  		| set11nRateFlags(i->rates, 3)
 diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-index 301bf72..3f5654f 100644
+index f6c5c1b..6058354 100644
 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
 @@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
@@ -44538,10 +44410,10 @@ index 301bf72..3f5654f 100644
  
  static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
 diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
-index ae30343..a117806 100644
+index 69a907b..91e071c 100644
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -652,7 +652,7 @@ struct ath_hw_private_ops {
+@@ -657,7 +657,7 @@ struct ath_hw_private_ops {
  
  	/* ANI */
  	void (*ani_cache_ini_regs)(struct ath_hw *ah);
@@ -44550,17 +44422,30 @@ index ae30343..a117806 100644
  
  /**
   * struct ath_spec_scan - parameters for Atheros spectral scan
-@@ -721,7 +721,7 @@ struct ath_hw_ops {
- 				     struct ath_spec_scan *param);
- 	void (*spectral_scan_trigger)(struct ath_hw *ah);
- 	void (*spectral_scan_wait)(struct ath_hw *ah);
+@@ -729,7 +729,7 @@ struct ath_hw_ops {
+ #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
+ 	void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
+ #endif
 -};
 +} __no_const;
  
  struct ath_nf_limits {
  	s16 max;
+diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
+index 92190da..f3a4c4c 100644
+--- a/drivers/net/wireless/b43/phy_lp.c
++++ b/drivers/net/wireless/b43/phy_lp.c
+@@ -2514,7 +2514,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
+ {
+ 	struct ssb_bus *bus = dev->dev->sdev->bus;
+ 
+-	static const struct b206x_channel *chandata = NULL;
++	const struct b206x_channel *chandata = NULL;
+ 	u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
+ 	u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
+ 	u16 old_comm15, scale;
 diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
-index b37a582..680835d 100644
+index 9581d07..84f6a76 100644
 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
 @@ -3639,7 +3639,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
@@ -44575,10 +44460,10 @@ index b37a582..680835d 100644
  
  	D_INFO("*** LOAD DRIVER ***\n");
 diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
-index d532948..e0d8bb1 100644
+index d94f8ab..5b568c8 100644
 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
 +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
-@@ -203,7 +203,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
+@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
  {
  	struct iwl_priv *priv = file->private_data;
  	char buf[64];
@@ -44587,7 +44472,7 @@ index d532948..e0d8bb1 100644
  	u32 offset, len;
  
  	memset(buf, 0, sizeof(buf));
-@@ -473,7 +473,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
+@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
  	struct iwl_priv *priv = file->private_data;
  
  	char buf[8];
@@ -44596,7 +44481,7 @@ index d532948..e0d8bb1 100644
  	u32 reset_flag;
  
  	memset(buf, 0, sizeof(buf));
-@@ -554,7 +554,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
+@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
  {
  	struct iwl_priv *priv = file->private_data;
  	char buf[8];
@@ -44605,7 +44490,7 @@ index d532948..e0d8bb1 100644
  	int ht40;
  
  	memset(buf, 0, sizeof(buf));
-@@ -606,7 +606,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
+@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
  {
  	struct iwl_priv *priv = file->private_data;
  	char buf[8];
@@ -44614,7 +44499,7 @@ index d532948..e0d8bb1 100644
  	int value;
  
  	memset(buf, 0, sizeof(buf));
-@@ -698,10 +698,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
+@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
  DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
  DEBUGFS_READ_FILE_OPS(current_sleep_command);
  
@@ -44629,7 +44514,7 @@ index d532948..e0d8bb1 100644
  	"%-32s    current  cumulative       delta         max\n";
  
  static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
-@@ -1871,7 +1871,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
+@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
  {
  	struct iwl_priv *priv = file->private_data;
  	char buf[8];
@@ -44638,7 +44523,7 @@ index d532948..e0d8bb1 100644
  	int clear;
  
  	memset(buf, 0, sizeof(buf));
-@@ -1916,7 +1916,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
+@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
  {
  	struct iwl_priv *priv = file->private_data;
  	char buf[8];
@@ -44647,7 +44532,7 @@ index d532948..e0d8bb1 100644
  	int trace;
  
  	memset(buf, 0, sizeof(buf));
-@@ -1987,7 +1987,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
+@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
  {
  	struct iwl_priv *priv = file->private_data;
  	char buf[8];
@@ -44656,7 +44541,7 @@ index d532948..e0d8bb1 100644
  	int missed;
  
  	memset(buf, 0, sizeof(buf));
-@@ -2028,7 +2028,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
+@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
  
  	struct iwl_priv *priv = file->private_data;
  	char buf[8];
@@ -44665,7 +44550,7 @@ index d532948..e0d8bb1 100644
  	int plcp;
  
  	memset(buf, 0, sizeof(buf));
-@@ -2088,7 +2088,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
+@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
  
  	struct iwl_priv *priv = file->private_data;
  	char buf[8];
@@ -44674,7 +44559,7 @@ index d532948..e0d8bb1 100644
  	int flush;
  
  	memset(buf, 0, sizeof(buf));
-@@ -2178,7 +2178,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
+@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
  
  	struct iwl_priv *priv = file->private_data;
  	char buf[8];
@@ -44683,7 +44568,7 @@ index d532948..e0d8bb1 100644
  	int rts;
  
  	if (!priv->cfg->ht_params)
-@@ -2220,7 +2220,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
+@@ -2205,7 +2205,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
  {
  	struct iwl_priv *priv = file->private_data;
  	char buf[8];
@@ -44692,7 +44577,7 @@ index d532948..e0d8bb1 100644
  
  	memset(buf, 0, sizeof(buf));
  	buf_size = min(count, sizeof(buf) -  1);
-@@ -2254,7 +2254,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
+@@ -2239,7 +2239,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
  	struct iwl_priv *priv = file->private_data;
  	u32 event_log_flag;
  	char buf[8];
@@ -44701,7 +44586,7 @@ index d532948..e0d8bb1 100644
  
  	/* check that the interface is up */
  	if (!iwl_is_ready(priv))
-@@ -2308,7 +2308,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
+@@ -2293,7 +2293,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
  	struct iwl_priv *priv = file->private_data;
  	char buf[8];
  	u32 calib_disabled;
@@ -44711,10 +44596,10 @@ index d532948..e0d8bb1 100644
  	memset(buf, 0, sizeof(buf));
  	buf_size = min(count, sizeof(buf) - 1);
 diff --git a/drivers/net/wireless/iwlwifi/dvm/main.c b/drivers/net/wireless/iwlwifi/dvm/main.c
-index a8afc7b..de058b2 100644
+index 7aad766..06addb4 100644
 --- a/drivers/net/wireless/iwlwifi/dvm/main.c
 +++ b/drivers/net/wireless/iwlwifi/dvm/main.c
-@@ -1189,7 +1189,7 @@ static void iwl_option_config(struct iwl_priv *priv)
+@@ -1123,7 +1123,7 @@ static void iwl_option_config(struct iwl_priv *priv)
  static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
  {
  	struct iwl_nvm_data *data = priv->nvm_data;
@@ -44723,7 +44608,7 @@ index a8afc7b..de058b2 100644
  
  	if (data->sku_cap_11n_enable &&
  	    !priv->cfg->ht_params) {
-@@ -1203,7 +1203,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
+@@ -1137,7 +1137,6 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv)
  		return -EINVAL;
  	}
  
@@ -44732,10 +44617,10 @@ index a8afc7b..de058b2 100644
  		       data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",
  		       data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",
 diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
-index aeb70e1..d7b5bb5 100644
+index c3f904d..4cadf83 100644
 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
 +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
-@@ -1329,7 +1329,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
+@@ -1252,7 +1252,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
  	struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
  
  	char buf[8];
@@ -44744,7 +44629,7 @@ index aeb70e1..d7b5bb5 100644
  	u32 reset_flag;
  
  	memset(buf, 0, sizeof(buf));
-@@ -1350,7 +1350,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
+@@ -1273,7 +1273,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
  {
  	struct iwl_trans *trans = file->private_data;
  	char buf[8];
@@ -44754,10 +44639,10 @@ index aeb70e1..d7b5bb5 100644
  
  	memset(buf, 0, sizeof(buf));
 diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
-index cb34c78..9fec0dc 100644
+index 2cd3f54..e936f90 100644
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -2195,25 +2195,19 @@ static int __init init_mac80211_hwsim(void)
+@@ -2196,25 +2196,19 @@ static int __init init_mac80211_hwsim(void)
  
  	if (channels > 1) {
  		hwsim_if_comb.num_different_channels = channels;
@@ -44810,10 +44695,10 @@ index 8169a85..7fa3b47 100644
  
  	tmp = cpu_to_le32(rts_threshold);
 diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
-index 7510723..5ba37f5 100644
+index fe4c572..99dedfa 100644
 --- a/drivers/net/wireless/rt2x00/rt2x00.h
 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -386,7 +386,7 @@ struct rt2x00_intf {
+@@ -387,7 +387,7 @@ struct rt2x00_intf {
  	 * for hardware which doesn't support hardware
  	 * sequence counting.
  	 */
@@ -44823,7 +44708,7 @@ index 7510723..5ba37f5 100644
  
  static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
 diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
-index 1f17f5b..16cddd3 100644
+index 66a2db8..70cad04 100644
 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
 @@ -252,9 +252,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
@@ -44891,10 +44776,10 @@ index 1c627da..69f7d17 100644
  		wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
  			      WL127X_IFTYPE_SR_VER,  WL127X_MAJOR_SR_VER,
 diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
-index 9fa692d..b31fee0 100644
+index 7aa0eb8..5a9ef38 100644
 --- a/drivers/net/wireless/ti/wl18xx/main.c
 +++ b/drivers/net/wireless/ti/wl18xx/main.c
-@@ -1687,8 +1687,10 @@ static int wl18xx_setup(struct wl1271 *wl)
+@@ -1730,8 +1730,10 @@ static int wl18xx_setup(struct wl1271 *wl)
  	}
  
  	if (!checksum_param) {
@@ -44920,6 +44805,19 @@ index 7ef0b4a..ff65c28 100644
  	u16 int_num;
  
  	ZD_ASSERT(in_interrupt());
+diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
+index 59f95d8..53e0e7f 100644
+--- a/drivers/nfc/nfcwilink.c
++++ b/drivers/nfc/nfcwilink.c
+@@ -513,7 +513,7 @@ static struct nci_ops nfcwilink_ops = {
+ 
+ static int nfcwilink_probe(struct platform_device *pdev)
+ {
+-	static struct nfcwilink *drv;
++	struct nfcwilink *drv;
+ 	int rc;
+ 	__u32 protocols;
+ 
 diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
 index d93b2b6..ae50401 100644
 --- a/drivers/oprofile/buffer_sync.c
@@ -44986,7 +44884,7 @@ index ed2c3ec..deda85a 100644
  }
  
 diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
-index 84a208d..d61b0a1 100644
+index ee2cfce..7f8f699 100644
 --- a/drivers/oprofile/oprofile_files.c
 +++ b/drivers/oprofile/oprofile_files.c
 @@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
@@ -44999,7 +44897,7 @@ index 84a208d..d61b0a1 100644
  {
  	return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
 diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
-index 917d28e..d62d981 100644
+index 59659ce..6c860a0 100644
 --- a/drivers/oprofile/oprofile_stats.c
 +++ b/drivers/oprofile/oprofile_stats.c
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
@@ -45020,7 +44918,7 @@ index 917d28e..d62d981 100644
  
  
 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
-index 38b6fc0..b5cbfce 100644
+index 1fc622b..8c48fc3 100644
 --- a/drivers/oprofile/oprofile_stats.h
 +++ b/drivers/oprofile/oprofile_stats.h
 @@ -13,11 +13,11 @@
@@ -45041,23 +44939,34 @@ index 38b6fc0..b5cbfce 100644
  
  extern struct oprofile_stat_struct oprofile_stats;
 diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
-index 7c12d9c..558bf3bb 100644
+index 3f49345..c750d0b 100644
 --- a/drivers/oprofile/oprofilefs.c
 +++ b/drivers/oprofile/oprofilefs.c
-@@ -190,7 +190,7 @@ static const struct file_operations atomic_ro_fops = {
+@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
+ 
+ static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
+ {
+-	atomic_t *val = file->private_data;
+-	return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
++	atomic_unchecked_t *val = file->private_data;
++	return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
+ }
+ 
  
+@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
  
- int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
+ 
+ int oprofilefs_create_ro_atomic(struct dentry *root,
 -	char const *name, atomic_t *val)
 +	char const *name, atomic_unchecked_t *val)
  {
- 	return __oprofilefs_create_file(sb, root, name,
+ 	return __oprofilefs_create_file(root, name,
  					&atomic_ro_fops, 0444, val);
 diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
-index 93404f7..4a313d8 100644
+index 61be1d9..dec05d7 100644
 --- a/drivers/oprofile/timer_int.c
 +++ b/drivers/oprofile/timer_int.c
-@@ -93,7 +93,7 @@ static int __cpuinit oprofile_cpu_notify(struct notifier_block *self,
+@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
  	return NOTIFY_OK;
  }
  
@@ -45089,10 +44998,10 @@ index 92ed045..62d39bd7 100644
  #endif /* IEEE1284.3 support. */
  
 diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
-index c35e8ad..fc33beb 100644
+index 2f5786c..61ab4d1 100644
 --- a/drivers/pci/hotplug/acpiphp_ibm.c
 +++ b/drivers/pci/hotplug/acpiphp_ibm.c
-@@ -464,7 +464,9 @@ static int __init ibm_acpiphp_init(void)
+@@ -463,7 +463,9 @@ static int __init ibm_acpiphp_init(void)
  		goto init_cleanup;
  	}
  
@@ -45215,10 +45124,10 @@ index ec20f74..c1d961e 100644
  	mutex_lock(&pci_hp_mutex);
  	/*
 diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
-index 7d72c5e..edce02c 100644
+index f4a18f5..ff2463c 100644
 --- a/drivers/pci/hotplug/pciehp_core.c
 +++ b/drivers/pci/hotplug/pciehp_core.c
-@@ -91,7 +91,7 @@ static int init_slot(struct controller *ctrl)
+@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
  	struct slot *slot = ctrl->slot;
  	struct hotplug_slot *hotplug = NULL;
  	struct hotplug_slot_info *info = NULL;
@@ -45227,31 +45136,11 @@ index 7d72c5e..edce02c 100644
  	char name[SLOT_NAME_SIZE];
  	int retval = -ENOMEM;
  
-diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
-index 5127f3f..b225573 100644
---- a/drivers/pci/hotplug/pciehp_hpc.c
-+++ b/drivers/pci/hotplug/pciehp_hpc.c
-@@ -773,14 +773,12 @@ static void pcie_shutdown_notification(struct controller *ctrl)
- static int pcie_init_slot(struct controller *ctrl)
- {
- 	struct slot *slot;
--	char name[32];
- 
- 	slot = kzalloc(sizeof(*slot), GFP_KERNEL);
- 	if (!slot)
- 		return -ENOMEM;
- 
--	snprintf(name, sizeof(name), "pciehp-%u", PSN(ctrl));
--	slot->wq = alloc_workqueue(name, 0, 0);
-+	slot->wq = alloc_workqueue("pciehp-%u", 0, 0, PSN(ctrl));
- 	if (!slot->wq)
- 		goto abort;
- 
 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
-index 5b4a9d9..cd5ac1f 100644
+index 7128cfd..a0640d6 100644
 --- a/drivers/pci/pci-sysfs.c
 +++ b/drivers/pci/pci-sysfs.c
-@@ -1071,7 +1071,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
+@@ -1083,7 +1083,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
  {
  	/* allocate attribute structure, piggyback attribute name */
  	int name_len = write_combine ? 13 : 10;
@@ -45260,7 +45149,7 @@ index 5b4a9d9..cd5ac1f 100644
  	int retval;
  
  	res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
-@@ -1256,7 +1256,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
+@@ -1268,7 +1268,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
  static int pci_create_capabilities_sysfs(struct pci_dev *dev)
  {
  	int retval;
@@ -45269,7 +45158,7 @@ index 5b4a9d9..cd5ac1f 100644
  
  	/* If the device has VPD, try to expose it in sysfs. */
  	if (dev->vpd) {
-@@ -1303,7 +1303,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
+@@ -1315,7 +1315,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
  {
  	int retval;
  	int rom_size = 0;
@@ -45279,10 +45168,10 @@ index 5b4a9d9..cd5ac1f 100644
  	if (!sysfs_initialized)
  		return -EACCES;
 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index d1182c4..2a138ec 100644
+index 8a00c06..18a9715 100644
 --- a/drivers/pci/pci.h
 +++ b/drivers/pci/pci.h
-@@ -92,7 +92,7 @@ struct pci_vpd_ops {
+@@ -95,7 +95,7 @@ struct pci_vpd_ops {
  struct pci_vpd {
  	unsigned int len;
  	const struct pci_vpd_ops *ops;
@@ -45292,7 +45181,7 @@ index d1182c4..2a138ec 100644
  
  int pci_vpd_pci22_init(struct pci_dev *dev);
 diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
-index d320df6..ca9a8f6 100644
+index 403a443..034e050 100644
 --- a/drivers/pci/pcie/aspm.c
 +++ b/drivers/pci/pcie/aspm.c
 @@ -27,9 +27,9 @@
@@ -45309,11 +45198,11 @@ index d320df6..ca9a8f6 100644
  #define ASPM_STATE_ALL		(ASPM_STATE_L0S | ASPM_STATE_L1)
  
 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index ea37072..10e58e5 100644
+index 7ef0f86..17b710f 100644
 --- a/drivers/pci/probe.c
 +++ b/drivers/pci/probe.c
-@@ -173,7 +173,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
- 	struct pci_bus_region region;
+@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
+ 	struct pci_bus_region region, inverted_region;
  	bool bar_too_big = false, bar_disabled = false;
  
 -	mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
@@ -45322,10 +45211,10 @@ index ea37072..10e58e5 100644
  	/* No printks while decoding is disabled! */
  	if (!dev->mmio_always_on) {
 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
-index 0812608..b04018c 100644
+index cdc7836..528635c 100644
 --- a/drivers/pci/proc.c
 +++ b/drivers/pci/proc.c
-@@ -453,7 +453,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
+@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
  static int __init pci_proc_init(void)
  {
  	struct pci_dev *dev = NULL;
@@ -45356,7 +45245,7 @@ index 3e5b4497..dcdfb70 100644
  		.ident = "Samsung Series 5 550 - Touchpad",
  		.matches = {
 diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
-index 6b22938..bc9700e 100644
+index 62f8030..c7f2a45 100644
 --- a/drivers/platform/x86/msi-laptop.c
 +++ b/drivers/platform/x86/msi-laptop.c
 @@ -1000,12 +1000,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
@@ -45380,11 +45269,24 @@ index 6b22938..bc9700e 100644
  	}
  
  	/* disable hardware control by fn key */
+diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
+index 70222f2..8c8ce66 100644
+--- a/drivers/platform/x86/msi-wmi.c
++++ b/drivers/platform/x86/msi-wmi.c
+@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
+ static void msi_wmi_notify(u32 value, void *context)
+ {
+ 	struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
+-	static struct key_entry *key;
++	struct key_entry *key;
+ 	union acpi_object *obj;
+ 	acpi_status status;
+ 
 diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
-index 2ac045f..39c443d 100644
+index 3484dd2..13ee730 100644
 --- a/drivers/platform/x86/sony-laptop.c
 +++ b/drivers/platform/x86/sony-laptop.c
-@@ -2483,7 +2483,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
+@@ -2448,7 +2448,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
  }
  
  /* High speed charging function */
@@ -45394,10 +45296,10 @@ index 2ac045f..39c443d 100644
  static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
  		struct device_attribute *attr,
 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
-index 54d31c0..3f896d3 100644
+index 4e86e97..04d50d1 100644
 --- a/drivers/platform/x86/thinkpad_acpi.c
 +++ b/drivers/platform/x86/thinkpad_acpi.c
-@@ -2093,7 +2093,7 @@ static int hotkey_mask_get(void)
+@@ -2091,7 +2091,7 @@ static int hotkey_mask_get(void)
  	return 0;
  }
  
@@ -45406,7 +45308,7 @@ index 54d31c0..3f896d3 100644
  {
  	/* log only what the user can fix... */
  	const u32 wantedmask = hotkey_driver_mask &
-@@ -2324,11 +2324,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
+@@ -2318,11 +2318,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
  	}
  }
  
@@ -45418,7 +45320,7 @@ index 54d31c0..3f896d3 100644
  #define TPACPI_COMPARE_KEY(__scancode, __member) \
  	do { \
  		if ((event_mask & (1 << __scancode)) && \
-@@ -2342,36 +2337,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2336,36 +2331,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
  			tpacpi_hotkey_send_key(__scancode); \
  	} while (0)
  
@@ -45485,7 +45387,7 @@ index 54d31c0..3f896d3 100644
  	TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
  	TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
  	TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
-@@ -2405,7 +2406,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2399,7 +2400,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
  		    oldn->volume_level != newn->volume_level) {
  			/* recently muted, or repeated mute keypress, or
  			 * multiple presses ending in mute */
@@ -45494,7 +45396,7 @@ index 54d31c0..3f896d3 100644
  			TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
  		}
  	} else {
-@@ -2415,7 +2416,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2409,7 +2410,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
  			TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
  		}
  		if (oldn->volume_level != newn->volume_level) {
@@ -45503,7 +45405,7 @@ index 54d31c0..3f896d3 100644
  		} else if (oldn->volume_toggle != newn->volume_toggle) {
  			/* repeated vol up/down keypress at end of scale ? */
  			if (newn->volume_level == 0)
-@@ -2428,7 +2429,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2422,7 +2423,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
  	/* handle brightness */
  	if (oldn->brightness_level != newn->brightness_level) {
  		issue_brightnesschange(oldn->brightness_level,
@@ -45513,7 +45415,7 @@ index 54d31c0..3f896d3 100644
  	} else if (oldn->brightness_toggle != newn->brightness_toggle) {
  		/* repeated key presses that didn't change state */
  		if (newn->brightness_level == 0)
-@@ -2437,10 +2439,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2431,10 +2433,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
  				&& !tp_features.bright_unkfw)
  			TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
  	}
@@ -45525,19 +45427,6 @@ index 54d31c0..3f896d3 100644
  
  /*
   * Polling driver
-diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
-index e4ac38a..b13344c 100644
---- a/drivers/platform/x86/wmi.c
-+++ b/drivers/platform/x86/wmi.c
-@@ -743,7 +743,7 @@ static int wmi_create_device(const struct guid_block *gblock,
- 	wblock->dev.class = &wmi_class;
- 
- 	wmi_gtoa(gblock->guid, guid_string);
--	dev_set_name(&wblock->dev, guid_string);
-+	dev_set_name(&wblock->dev, "%s", guid_string);
- 
- 	dev_set_drvdata(&wblock->dev, wblock);
- 
 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
 index 769d265..a3a05ca 100644
 --- a/drivers/pnp/pnpbios/bioscalls.c
@@ -45599,7 +45488,7 @@ index 769d265..a3a05ca 100644
 +	pax_close_kernel();
  }
 diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
-index 3e6db1c..1fbbdae 100644
+index d95e101..67f0c3f 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)
@@ -45665,7 +45554,7 @@ index cc439fd..8fa30df 100644
  
  #endif /* CONFIG_SYSFS */
 diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
-index 1c517c3..ffa2f17 100644
+index 00e6672..2642c08 100644
 --- a/drivers/power/power_supply_core.c
 +++ b/drivers/power/power_supply_core.c
 @@ -24,7 +24,10 @@
@@ -45680,7 +45569,7 @@ index 1c517c3..ffa2f17 100644
  
  static bool __power_supply_is_supplied_by(struct power_supply *supplier,
  					 struct power_supply *supply)
-@@ -554,7 +557,7 @@ static int __init power_supply_class_init(void)
+@@ -584,7 +587,7 @@ static int __init power_supply_class_init(void)
  		return PTR_ERR(power_supply_class);
  
  	power_supply_class->dev_uevent = power_supply_uevent;
@@ -45690,7 +45579,7 @@ index 1c517c3..ffa2f17 100644
  	return 0;
  }
 diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
-index 29178f7..c65f324 100644
+index 44420d1..967126e 100644
 --- a/drivers/power/power_supply_sysfs.c
 +++ b/drivers/power/power_supply_sysfs.c
 @@ -230,17 +230,15 @@ static struct attribute_group power_supply_attr_group = {
@@ -45714,10 +45603,10 @@ index 29178f7..c65f324 100644
  		__power_supply_attrs[i] = &power_supply_attrs[i].attr;
  }
 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
-index 815d6df..811633a 100644
+index a01b8b3..37c2afe 100644
 --- a/drivers/regulator/core.c
 +++ b/drivers/regulator/core.c
-@@ -3529,7 +3529,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
+@@ -3307,7 +3307,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
  {
  	const struct regulation_constraints *constraints = NULL;
  	const struct regulator_init_data *init_data;
@@ -45726,7 +45615,7 @@ index 815d6df..811633a 100644
  	struct regulator_dev *rdev;
  	struct device *dev;
  	int ret, i;
-@@ -3599,7 +3599,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
+@@ -3377,7 +3377,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
  	rdev->dev.of_node = config->of_node;
  	rdev->dev.parent = dev;
  	dev_set_name(&rdev->dev, "regulator.%d",
@@ -45736,10 +45625,10 @@ index 815d6df..811633a 100644
  	if (ret != 0) {
  		put_device(&rdev->dev);
 diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
-index d428ef9..fdc0357 100644
+index 144bcac..d20e7db 100644
 --- a/drivers/regulator/max8660.c
 +++ b/drivers/regulator/max8660.c
-@@ -333,8 +333,10 @@ static int max8660_probe(struct i2c_client *client,
+@@ -420,8 +420,10 @@ static int max8660_probe(struct i2c_client *client,
  		max8660->shadow_regs[MAX8660_OVER1] = 5;
  	} else {
  		/* Otherwise devices can be toggled via software */
@@ -45753,26 +45642,26 @@ index d428ef9..fdc0357 100644
  
  	/*
 diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
-index adb1414..c13e0ce 100644
+index 5b77ab7..a62f061 100644
 --- a/drivers/regulator/max8973-regulator.c
 +++ b/drivers/regulator/max8973-regulator.c
-@@ -401,9 +401,11 @@ static int max8973_probe(struct i2c_client *client,
- 	if (!pdata->enable_ext_control) {
+@@ -406,9 +406,11 @@ static int max8973_probe(struct i2c_client *client,
+ 	if (!pdata || !pdata->enable_ext_control) {
  		max->desc.enable_reg = MAX8973_VOUT;
  		max->desc.enable_mask = MAX8973_VOUT_ENABLE;
--		max8973_dcdc_ops.enable = regulator_enable_regmap;
--		max8973_dcdc_ops.disable = regulator_disable_regmap;
--		max8973_dcdc_ops.is_enabled = regulator_is_enabled_regmap;
+-		max->ops.enable = regulator_enable_regmap;
+-		max->ops.disable = regulator_disable_regmap;
+-		max->ops.is_enabled = regulator_is_enabled_regmap;
 +		pax_open_kernel();
-+		*(void **)&max8973_dcdc_ops.enable = regulator_enable_regmap;
-+		*(void **)&max8973_dcdc_ops.disable = regulator_disable_regmap;
-+		*(void **)&max8973_dcdc_ops.is_enabled = regulator_is_enabled_regmap;
++		*(void **)&max->ops.enable = regulator_enable_regmap;
++		*(void **)&max->ops.disable = regulator_disable_regmap;
++		*(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
 +		pax_close_kernel();
  	}
  
- 	max->enable_external_control = pdata->enable_ext_control;
+ 	if (pdata) {
 diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
-index b716283..3cc4349 100644
+index 1037e07..e64dea1 100644
 --- a/drivers/regulator/mc13892-regulator.c
 +++ b/drivers/regulator/mc13892-regulator.c
 @@ -582,10 +582,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
@@ -45791,10 +45680,10 @@ index b716283..3cc4349 100644
  	mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
  					ARRAY_SIZE(mc13892_regulators));
 diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
-index f1cb706..4c7832a 100644
+index 24e733c..bfbaa3e 100644
 --- a/drivers/rtc/rtc-cmos.c
 +++ b/drivers/rtc/rtc-cmos.c
-@@ -724,7 +724,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
+@@ -731,7 +731,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
  	hpet_rtc_timer_init();
  
  	/* export at least the first block of NVRAM */
@@ -45827,7 +45716,7 @@ index d049393..bb20be0 100644
  
  	case RTC_PIE_ON:
 diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
-index b53992a..776df84 100644
+index ca18fd1..055e42d 100644
 --- a/drivers/rtc/rtc-ds1307.c
 +++ b/drivers/rtc/rtc-ds1307.c
 @@ -107,7 +107,7 @@ struct ds1307 {
@@ -45840,12 +45729,12 @@ index b53992a..776df84 100644
  	unsigned long		flags;
  #define HAS_NVRAM	0		/* bit 0 == sysfs file active */
 diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
-index 130f29a..6179d03 100644
+index fcb0329..d77b7f2 100644
 --- a/drivers/rtc/rtc-m48t59.c
 +++ b/drivers/rtc/rtc-m48t59.c
-@@ -482,7 +482,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
- 		goto out;
- 	}
+@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
+ 	if (IS_ERR(m48t59->rtc))
+ 		return PTR_ERR(m48t59->rtc);
  
 -	m48t59_nvram_attr.size = pdata->offset;
 +	pax_open_kernel();
@@ -45853,7 +45742,48 @@ index 130f29a..6179d03 100644
 +	pax_close_kernel();
  
  	ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
- 	if (ret) {
+ 	if (ret)
+diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
+index 14b5f8d..cc9bd26 100644
+--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
++++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
+@@ -827,7 +827,7 @@ ahd_pci_intr(struct ahd_softc *ahd)
+ 		for (bit = 0; bit < 8; bit++) {
+ 
+ 			if ((pci_status[i] & (0x1 << bit)) != 0) {
+-				static const char *s;
++				const char *s;
+ 
+ 				s = pci_status_strings[bit];
+ 				if (i == 7/*TARG*/ && bit == 3)
+@@ -887,23 +887,15 @@ ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat)
+ 
+ 		for (bit = 0; bit < 8; bit++) {
+ 
+-			if ((split_status[i] & (0x1 << bit)) != 0) {
+-				static const char *s;
+-
+-				s = split_status_strings[bit];
+-				printk(s, ahd_name(ahd),
++			if ((split_status[i] & (0x1 << bit)) != 0)
++				printk(split_status_strings[bit], ahd_name(ahd),
+ 				       split_status_source[i]);
+-			}
+ 
+ 			if (i > 1)
+ 				continue;
+ 
+-			if ((sg_split_status[i] & (0x1 << bit)) != 0) {
+-				static const char *s;
+-
+-				s = split_status_strings[bit];
+-				printk(s, ahd_name(ahd), "SG");
+-			}
++			if ((sg_split_status[i] & (0x1 << bit)) != 0)
++				printk(split_status_strings[bit], ahd_name(ahd), "SG");
+ 		}
+ 	}
+ 	/*
 diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
 index e693af6..2e525b6 100644
 --- a/drivers/scsi/bfa/bfa_fcpim.h
@@ -45868,7 +45798,7 @@ index e693af6..2e525b6 100644
  void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
  		void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
 diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
-index 23a90e7..9cf04ee 100644
+index 90814fe..4384138 100644
 --- a/drivers/scsi/bfa/bfa_ioc.h
 +++ b/drivers/scsi/bfa/bfa_ioc.h
 @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
@@ -45880,17 +45810,17 @@ index 23a90e7..9cf04ee 100644
  
  /*
   * IOC event notification mechanism.
-@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
- 	void		(*ioc_sync_ack)		(struct bfa_ioc_s *ioc);
- 	bfa_boolean_t	(*ioc_sync_complete)	(struct bfa_ioc_s *ioc);
- 	bfa_boolean_t	(*ioc_lpu_read_stat)	(struct bfa_ioc_s *ioc);
+@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
+ 	void		(*ioc_set_alt_fwstate)	(struct bfa_ioc_s *ioc,
+ 					enum bfi_ioc_state fwstate);
+ 	enum bfi_ioc_state	(*ioc_get_alt_fwstate)	(struct bfa_ioc_s *ioc);
 -};
 +} __no_const;
  
  /*
   * Queue element to wait for room in request queue. FIFO order is
 diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
-index 8c05ae01..b2cf224 100644
+index c9382d6..6619864 100644
 --- a/drivers/scsi/fcoe/fcoe_sysfs.c
 +++ b/drivers/scsi/fcoe/fcoe_sysfs.c
 @@ -33,8 +33,8 @@
@@ -45956,10 +45886,10 @@ index df0c3c7..b00e1d0 100644
  
  	/* These three are default values which can be overridden */
 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 7f4f790..b75b92a 100644
+index 891c86b..dd1224a0 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
-@@ -554,7 +554,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
+@@ -578,7 +578,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
  	unsigned long flags;
  
  	if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
@@ -45968,7 +45898,7 @@ index 7f4f790..b75b92a 100644
  
  	if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
  		a = rq->head[rq->current_entry];
-@@ -3422,7 +3422,7 @@ static void start_io(struct ctlr_info *h)
+@@ -3444,7 +3444,7 @@ static void start_io(struct ctlr_info *h)
  	while (!list_empty(&h->reqQ)) {
  		c = list_entry(h->reqQ.next, struct CommandList, list);
  		/* can't do anything if fifo is full */
@@ -45977,7 +45907,7 @@ index 7f4f790..b75b92a 100644
  			dev_warn(&h->pdev->dev, "fifo full\n");
  			break;
  		}
-@@ -3444,7 +3444,7 @@ static void start_io(struct ctlr_info *h)
+@@ -3466,7 +3466,7 @@ static void start_io(struct ctlr_info *h)
  
  		/* Tell the controller execute command */
  		spin_unlock_irqrestore(&h->lock, flags);
@@ -45986,7 +45916,7 @@ index 7f4f790..b75b92a 100644
  		spin_lock_irqsave(&h->lock, flags);
  	}
  	spin_unlock_irqrestore(&h->lock, flags);
-@@ -3452,17 +3452,17 @@ static void start_io(struct ctlr_info *h)
+@@ -3474,17 +3474,17 @@ static void start_io(struct ctlr_info *h)
  
  static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
  {
@@ -46007,7 +45937,7 @@ index 7f4f790..b75b92a 100644
  		(h->interrupts_enabled == 0);
  }
  
-@@ -4364,7 +4364,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
+@@ -4386,7 +4386,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
  	if (prod_index < 0)
  		return -ENODEV;
  	h->product_name = products[prod_index].product_name;
@@ -46016,7 +45946,7 @@ index 7f4f790..b75b92a 100644
  
  	pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
  			       PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
-@@ -4646,7 +4646,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
+@@ -4668,7 +4668,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
  
  	assert_spin_locked(&lockup_detector_lock);
  	remove_ctlr_from_lockup_detector_list(h);
@@ -46025,7 +45955,7 @@ index 7f4f790..b75b92a 100644
  	spin_lock_irqsave(&h->lock, flags);
  	h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
  	spin_unlock_irqrestore(&h->lock, flags);
-@@ -4823,7 +4823,7 @@ reinit_after_soft_reset:
+@@ -4845,7 +4845,7 @@ reinit_after_soft_reset:
  	}
  
  	/* make sure the board interrupts are off */
@@ -46034,7 +45964,7 @@ index 7f4f790..b75b92a 100644
  
  	if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
  		goto clean2;
-@@ -4857,7 +4857,7 @@ reinit_after_soft_reset:
+@@ -4879,7 +4879,7 @@ reinit_after_soft_reset:
  		 * fake ones to scoop up any residual completions.
  		 */
  		spin_lock_irqsave(&h->lock, flags);
@@ -46043,7 +45973,7 @@ index 7f4f790..b75b92a 100644
  		spin_unlock_irqrestore(&h->lock, flags);
  		free_irqs(h);
  		rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
-@@ -4876,9 +4876,9 @@ reinit_after_soft_reset:
+@@ -4898,9 +4898,9 @@ reinit_after_soft_reset:
  		dev_info(&h->pdev->dev, "Board READY.\n");
  		dev_info(&h->pdev->dev,
  			"Waiting for stale completions to drain.\n");
@@ -46055,7 +45985,7 @@ index 7f4f790..b75b92a 100644
  
  		rc = controller_reset_failed(h->cfgtable);
  		if (rc)
-@@ -4899,7 +4899,7 @@ reinit_after_soft_reset:
+@@ -4921,7 +4921,7 @@ reinit_after_soft_reset:
  	}
  
  	/* Turn the interrupts on so we can service requests */
@@ -46064,7 +45994,7 @@ index 7f4f790..b75b92a 100644
  
  	hpsa_hba_inquiry(h);
  	hpsa_register_scsi(h);	/* hook ourselves into SCSI subsystem */
-@@ -4954,7 +4954,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
+@@ -4976,7 +4976,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
  	 * To write all data in the battery backed cache to disks
  	 */
  	hpsa_flush_cache(h);
@@ -46073,7 +46003,7 @@ index 7f4f790..b75b92a 100644
  	hpsa_free_irqs_and_disable_msix(h);
  }
  
-@@ -5122,7 +5122,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
+@@ -5144,7 +5144,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
  		return;
  	}
  	/* Change the access methods to the performant access methods */
@@ -46083,7 +46013,7 @@ index 7f4f790..b75b92a 100644
  }
  
 diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
-index 9816479..c5d4e97 100644
+index bc85e72..ae04a39 100644
 --- a/drivers/scsi/hpsa.h
 +++ b/drivers/scsi/hpsa.h
 @@ -79,7 +79,7 @@ struct ctlr_info {
@@ -46096,7 +46026,7 @@ index 9816479..c5d4e97 100644
  	/* queue and queue Info */
  	struct list_head reqQ;
 diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
-index 8b928c6..9c76300 100644
+index 5879929..32b241d 100644
 --- a/drivers/scsi/libfc/fc_exch.c
 +++ b/drivers/scsi/libfc/fc_exch.c
 @@ -100,12 +100,12 @@ struct fc_exch_mgr {
@@ -46254,10 +46184,10 @@ index 161c98e..6d563b3 100644
  	.qc_issue		= sas_ata_qc_issue,
  	.qc_fill_rtf		= sas_ata_qc_fill_rtf,
 diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
-index bcc56ca..6f4174a 100644
+index 4e1b75c..0bbdfa9 100644
 --- a/drivers/scsi/lpfc/lpfc.h
 +++ b/drivers/scsi/lpfc/lpfc.h
-@@ -431,7 +431,7 @@ struct lpfc_vport {
+@@ -432,7 +432,7 @@ struct lpfc_vport {
  	struct dentry *debug_nodelist;
  	struct dentry *vport_debugfs_root;
  	struct lpfc_debugfs_trc *disc_trc;
@@ -46287,7 +46217,7 @@ index bcc56ca..6f4174a 100644
  	struct dentry *idiag_root;
  	struct dentry *idiag_pci_cfg;
 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
-index f525ecb..32549a4 100644
+index 60084e6..0e2e700 100644
 --- a/drivers/scsi/lpfc/lpfc_debugfs.c
 +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
 @@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
@@ -46351,7 +46281,7 @@ index f525ecb..32549a4 100644
  	dtp->jif = jiffies;
  #endif
  	return;
-@@ -4182,7 +4182,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
+@@ -4168,7 +4168,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
  						 "slow_ring buffer\n");
  				goto debug_failed;
  			}
@@ -46360,7 +46290,7 @@ index f525ecb..32549a4 100644
  			memset(phba->slow_ring_trc, 0,
  				(sizeof(struct lpfc_debugfs_trc) *
  				lpfc_debugfs_max_slow_ring_trc));
-@@ -4228,7 +4228,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
+@@ -4214,7 +4214,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
  				 "buffer\n");
  		goto debug_failed;
  	}
@@ -46370,10 +46300,10 @@ index f525ecb..32549a4 100644
  	snprintf(name, sizeof(name), "discovery_trace");
  	vport->debug_disc_trc =
 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
-index cb465b2..2e7b25f 100644
+index 647f5bf..d0068b9 100644
 --- a/drivers/scsi/lpfc/lpfc_init.c
 +++ b/drivers/scsi/lpfc/lpfc_init.c
-@@ -10950,8 +10950,10 @@ lpfc_init(void)
+@@ -10952,8 +10952,10 @@ lpfc_init(void)
  			"misc_register returned with status %d", error);
  
  	if (lpfc_enable_npiv) {
@@ -46387,10 +46317,10 @@ index cb465b2..2e7b25f 100644
  	lpfc_transport_template =
  				fc_attach_transport(&lpfc_transport_functions);
 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
-index 8523b278e..ce1d812 100644
+index c913e8c..d34a119 100644
 --- a/drivers/scsi/lpfc/lpfc_scsi.c
 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
-@@ -331,7 +331,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
+@@ -353,7 +353,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
  	uint32_t evt_posted;
  
  	spin_lock_irqsave(&phba->hbalock, flags);
@@ -46399,7 +46329,7 @@ index 8523b278e..ce1d812 100644
  	phba->last_rsrc_error_time = jiffies;
  
  	if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
-@@ -372,7 +372,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport  *vport,
+@@ -394,7 +394,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport  *vport,
  	unsigned long flags;
  	struct lpfc_hba *phba = vport->phba;
  	uint32_t evt_posted;
@@ -46408,7 +46338,7 @@ index 8523b278e..ce1d812 100644
  
  	if (vport->cfg_lun_queue_depth <= queue_depth)
  		return;
-@@ -416,8 +416,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
+@@ -438,8 +438,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
  	unsigned long num_rsrc_err, num_cmd_success;
  	int i;
  
@@ -46419,7 +46349,7 @@ index 8523b278e..ce1d812 100644
  
  	/*
  	 * The error and success command counters are global per
-@@ -445,8 +445,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
+@@ -467,8 +467,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
  			}
  		}
  	lpfc_destroy_vport_work_array(phba, vports);
@@ -46430,7 +46360,7 @@ index 8523b278e..ce1d812 100644
  }
  
  /**
-@@ -480,8 +480,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
+@@ -502,8 +502,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
  			}
  		}
  	lpfc_destroy_vport_work_array(phba, vports);
@@ -46441,8 +46371,48 @@ index 8523b278e..ce1d812 100644
  }
  
  /**
+diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+index 7f0af4f..193ac3e 100644
+--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
++++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+@@ -1557,7 +1557,7 @@ _scsih_get_resync(struct device *dev)
+ {
+ 	struct scsi_device *sdev = to_scsi_device(dev);
+ 	struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
+-	static struct _raid_device *raid_device;
++	struct _raid_device *raid_device;
+ 	unsigned long flags;
+ 	Mpi2RaidVolPage0_t vol_pg0;
+ 	Mpi2ConfigReply_t mpi_reply;
+@@ -1609,7 +1609,7 @@ _scsih_get_state(struct device *dev)
+ {
+ 	struct scsi_device *sdev = to_scsi_device(dev);
+ 	struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
+-	static struct _raid_device *raid_device;
++	struct _raid_device *raid_device;
+ 	unsigned long flags;
+ 	Mpi2RaidVolPage0_t vol_pg0;
+ 	Mpi2ConfigReply_t mpi_reply;
+@@ -6637,7 +6637,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
+     struct fw_event_work *fw_event)
+ {
+ 	Mpi2EventDataIrOperationStatus_t *event_data = fw_event->event_data;
+-	static struct _raid_device *raid_device;
++	struct _raid_device *raid_device;
+ 	unsigned long flags;
+ 	u16 handle;
+ 
+@@ -7108,7 +7108,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
+ 	u64 sas_address;
+ 	struct _sas_device *sas_device;
+ 	struct _sas_node *expander_device;
+-	static struct _raid_device *raid_device;
++	struct _raid_device *raid_device;
+ 	u8 retry_count;
+ 	unsigned long flags;
+ 
 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
-index 8e1b737..50ff510 100644
+index 1eb7b028..b2a6080 100644
 --- a/drivers/scsi/pmcraid.c
 +++ b/drivers/scsi/pmcraid.c
 @@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
@@ -46549,10 +46519,10 @@ index e1d150f..6c6df44 100644
  	/* To indicate add/delete/modify during CCN */
  	u8 change_detected;
 diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
-index bf60c63..74d4dce 100644
+index 5f174b8..98d32b0 100644
 --- a/drivers/scsi/qla2xxx/qla_attr.c
 +++ b/drivers/scsi/qla2xxx/qla_attr.c
-@@ -2001,7 +2001,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
+@@ -2040,7 +2040,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
  	return 0;
  }
  
@@ -46561,7 +46531,7 @@ index bf60c63..74d4dce 100644
  
  	.show_host_node_name = 1,
  	.show_host_port_name = 1,
-@@ -2048,7 +2048,7 @@ struct fc_function_template qla2xxx_transport_functions = {
+@@ -2088,7 +2088,7 @@ struct fc_function_template qla2xxx_transport_functions = {
  	.bsg_timeout = qla24xx_bsg_timeout,
  };
  
@@ -46571,10 +46541,10 @@ index bf60c63..74d4dce 100644
  	.show_host_node_name = 1,
  	.show_host_port_name = 1,
 diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
-index 026bfde..90c4018 100644
+index 4446bf5..9a3574d 100644
 --- a/drivers/scsi/qla2xxx/qla_gbl.h
 +++ b/drivers/scsi/qla2xxx/qla_gbl.h
-@@ -528,8 +528,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
+@@ -538,8 +538,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
  struct device_attribute;
  extern struct device_attribute *qla2x00_host_attrs[];
  struct fc_function_template;
@@ -46586,10 +46556,10 @@ index 026bfde..90c4018 100644
  extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
  extern void qla2x00_init_host_attr(scsi_qla_host_t *);
 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
-index ad72c1d..afc9a98 100644
+index 9f01bbb..5e1dcee 100644
 --- a/drivers/scsi/qla2xxx/qla_os.c
 +++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -1571,8 +1571,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
+@@ -1572,8 +1572,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
  		    !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
  			/* Ok, a 64bit DMA mask is applicable. */
  			ha->flags.enable_64bit_addressing = 1;
@@ -46603,10 +46573,10 @@ index ad72c1d..afc9a98 100644
  		}
  	}
 diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
-index ddf16a8..80f4dd0 100644
+index 41327d4..feb03d479 100644
 --- a/drivers/scsi/qla4xxx/ql4_def.h
 +++ b/drivers/scsi/qla4xxx/ql4_def.h
-@@ -291,7 +291,7 @@ struct ddb_entry {
+@@ -296,7 +296,7 @@ struct ddb_entry {
  					   * (4000 only) */
  	atomic_t relogin_timer;		  /* Max Time to wait for
  					   * relogin to complete */
@@ -46616,10 +46586,10 @@ index ddf16a8..80f4dd0 100644
  	uint32_t default_time2wait;	  /* Default Min time between
  					   * relogins (+aens) */
 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
-index 4d231c1..2892c37 100644
+index f8a0a26..ec03cee 100644
 --- a/drivers/scsi/qla4xxx/ql4_os.c
 +++ b/drivers/scsi/qla4xxx/ql4_os.c
-@@ -2971,12 +2971,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
+@@ -3066,12 +3066,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
  		 */
  		if (!iscsi_is_session_online(cls_sess)) {
  			/* Reset retry relogin timer */
@@ -46634,7 +46604,7 @@ index 4d231c1..2892c37 100644
  				ddb_entry->default_time2wait + 4));
  			set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
  			atomic_set(&ddb_entry->retry_relogin_timer,
-@@ -5081,7 +5081,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
+@@ -5209,7 +5209,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
  
  	atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
  	atomic_set(&ddb_entry->relogin_timer, 0);
@@ -46657,10 +46627,10 @@ index eaa808e..95f8841 100644
  	/* check if the device is still usable */
  	if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
-index 86d5220..f22c51a 100644
+index d1549b7..2f60767 100644
 --- a/drivers/scsi/scsi_lib.c
 +++ b/drivers/scsi/scsi_lib.c
-@@ -1458,7 +1458,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
+@@ -1474,7 +1474,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
  	shost = sdev->host;
  	scsi_init_cmd_errh(cmd);
  	cmd->result = DID_NO_CONNECT << 16;
@@ -46669,7 +46639,7 @@ index 86d5220..f22c51a 100644
  
  	/*
  	 * SCSI request completion path will do scsi_device_unbusy(),
-@@ -1484,9 +1484,9 @@ static void scsi_softirq_done(struct request *rq)
+@@ -1500,9 +1500,9 @@ static void scsi_softirq_done(struct request *rq)
  
  	INIT_LIST_HEAD(&cmd->eh_entry);
  
@@ -46682,10 +46652,10 @@ index 86d5220..f22c51a 100644
  	disposition = scsi_decide_disposition(cmd);
  	if (disposition != SUCCESS &&
 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
-index 931a7d9..0c2a754 100644
+index 40c6394..62356c2 100644
 --- a/drivers/scsi/scsi_sysfs.c
 +++ b/drivers/scsi/scsi_sysfs.c
-@@ -658,7 +658,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr,	\
+@@ -687,7 +687,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr,	\
  		    char *buf)						\
  {									\
  	struct scsi_device *sdev = to_scsi_device(dev);			\
@@ -46708,7 +46678,7 @@ index 84a1fdf..693b0d6 100644
  		/*
  		 * TODO: need to fixup sg_tablesize, max_segment_size,
 diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
-index e106c27..11a380e 100644
+index 4628fd5..a94a1c2 100644
 --- a/drivers/scsi/scsi_transport_fc.c
 +++ b/drivers/scsi/scsi_transport_fc.c
 @@ -497,7 +497,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
@@ -46748,10 +46718,10 @@ index e106c27..11a380e 100644
  	/*
  	 * Check for overflow; dev_loss_tmo is u32
 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
-index 133926b..903000d 100644
+index e4a989f..293090c 100644
 --- a/drivers/scsi/scsi_transport_iscsi.c
 +++ b/drivers/scsi/scsi_transport_iscsi.c
-@@ -80,7 +80,7 @@ struct iscsi_internal {
+@@ -79,7 +79,7 @@ struct iscsi_internal {
  	struct transport_container session_cont;
  };
  
@@ -46760,7 +46730,7 @@ index 133926b..903000d 100644
  static struct workqueue_struct *iscsi_eh_timer_workq;
  
  static DEFINE_IDA(iscsi_sess_ida);
-@@ -1738,7 +1738,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
+@@ -1737,7 +1737,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
  	int err;
  
  	ihost = shost->shost_data;
@@ -46769,7 +46739,7 @@ index 133926b..903000d 100644
  
  	if (target_id == ISCSI_MAX_TARGET) {
  		id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
-@@ -3944,7 +3944,7 @@ static __init int iscsi_transport_init(void)
+@@ -4077,7 +4077,7 @@ static __init int iscsi_transport_init(void)
  	printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
  		ISCSI_TRANSPORT_VERSION);
  
@@ -46810,10 +46780,10 @@ index f379c7f..e8fc69c 100644
  
  	transport_setup_device(&rport->dev);
 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 734a29a..6b06e4a 100644
+index 5693f6d7..b0bf05a 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
-@@ -2923,7 +2923,7 @@ static int sd_probe(struct device *dev)
+@@ -2934,7 +2934,7 @@ static int sd_probe(struct device *dev)
  	sdkp->disk = gd;
  	sdkp->index = index;
  	atomic_set(&sdkp->openers, 0);
@@ -46822,15 +46792,6 @@ index 734a29a..6b06e4a 100644
  
  	if (!sdp->request_queue->rq_timeout) {
  		if (sdp->type != TYPE_MOD)
-@@ -2936,7 +2936,7 @@ static int sd_probe(struct device *dev)
- 	device_initialize(&sdkp->dev);
- 	sdkp->dev.parent = dev;
- 	sdkp->dev.class = &sd_disk_class;
--	dev_set_name(&sdkp->dev, dev_name(dev));
-+	dev_set_name(&sdkp->dev, "%s", dev_name(dev));
- 
- 	if (device_add(&sdkp->dev))
- 		goto out_free_index;
 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
 index df5e961..df6b97f 100644
 --- a/drivers/scsi/sg.c
@@ -46845,10 +46806,10 @@ index df5e961..df6b97f 100644
  		return blk_trace_startstop(sdp->device->request_queue, 1);
  	case BLKTRACESTOP:
 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index 32b7bb1..2f1c4bd 100644
+index 9e039c6..ae9e800 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -1631,7 +1631,7 @@ int spi_bus_unlock(struct spi_master *master)
+@@ -1762,7 +1762,7 @@ int spi_bus_unlock(struct spi_master *master)
  EXPORT_SYMBOL_GPL(spi_bus_unlock);
  
  /* portable code must never pass more than 32 bytes */
@@ -46858,7 +46819,7 @@ index 32b7bb1..2f1c4bd 100644
  static u8	*buf;
  
 diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
-index ec9e2ae..cd15d67 100644
+index 2c61783..4d49e4e 100644
 --- a/drivers/staging/android/timed_output.c
 +++ b/drivers/staging/android/timed_output.c
 @@ -25,7 +25,7 @@
@@ -46869,25 +46830,173 @@ index ec9e2ae..cd15d67 100644
 +static atomic_unchecked_t device_count;
  
  static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
- 		char *buf)
-@@ -59,7 +59,7 @@ static int create_timed_output_class(void)
+ 			   char *buf)
+@@ -63,7 +63,7 @@ static int create_timed_output_class(void)
  		timed_output_class = class_create(THIS_MODULE, "timed_output");
  		if (IS_ERR(timed_output_class))
  			return PTR_ERR(timed_output_class);
 -		atomic_set(&device_count, 0);
 +		atomic_set_unchecked(&device_count, 0);
+ 		timed_output_class->dev_groups = timed_output_groups;
  	}
  
- 	return 0;
-@@ -76,7 +76,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
+@@ -81,7 +81,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
  	if (ret < 0)
  		return ret;
  
 -	tdev->index = atomic_inc_return(&device_count);
 +	tdev->index = atomic_inc_return_unchecked(&device_count);
  	tdev->dev = device_create(timed_output_class, NULL,
- 		MKDEV(0, tdev->index), NULL, tdev->name);
+ 		MKDEV(0, tdev->index), NULL, "%s", tdev->name);
  	if (IS_ERR(tdev->dev))
+diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
+index 0247a20..cb9595c 100644
+--- a/drivers/staging/gdm724x/gdm_tty.c
++++ b/drivers/staging/gdm724x/gdm_tty.c
+@@ -45,7 +45,7 @@
+ #define gdm_tty_send_control(n, r, v, d, l) (\
+ 	n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
+ 
+-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
++#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
+ 
+ static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
+ static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
+diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
+index ef5064e..fce01db 100644
+--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
++++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
+@@ -478,13 +478,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
+ 	return 0;
+ }
+ 
+-sfw_test_client_ops_t brw_test_client;
+-void brw_init_test_client(void)
+-{
+-	brw_test_client.tso_init       = brw_client_init;
+-	brw_test_client.tso_fini       = brw_client_fini;
+-	brw_test_client.tso_prep_rpc   = brw_client_prep_rpc;
+-	brw_test_client.tso_done_rpc   = brw_client_done_rpc;
++sfw_test_client_ops_t brw_test_client = {
++	.tso_init       = brw_client_init,
++	.tso_fini       = brw_client_fini,
++	.tso_prep_rpc   = brw_client_prep_rpc,
++	.tso_done_rpc   = brw_client_done_rpc,
+ };
+ 
+ srpc_service_t brw_test_service;
+diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
+index 483c785..e1a2a7b 100644
+--- a/drivers/staging/lustre/lnet/selftest/framework.c
++++ b/drivers/staging/lustre/lnet/selftest/framework.c
+@@ -1635,12 +1635,10 @@ static srpc_service_t sfw_services[] =
+ 
+ extern sfw_test_client_ops_t ping_test_client;
+ extern srpc_service_t	ping_test_service;
+-extern void ping_init_test_client(void);
+ extern void ping_init_test_service(void);
+ 
+ extern sfw_test_client_ops_t brw_test_client;
+ extern srpc_service_t	brw_test_service;
+-extern void brw_init_test_client(void);
+ extern void brw_init_test_service(void);
+ 
+ 
+@@ -1684,12 +1682,10 @@ sfw_startup (void)
+ 	INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
+ 	INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
+ 
+-	brw_init_test_client();
+ 	brw_init_test_service();
+ 	rc = sfw_register_test(&brw_test_service, &brw_test_client);
+ 	LASSERT (rc == 0);
+ 
+-	ping_init_test_client();
+ 	ping_init_test_service();
+ 	rc = sfw_register_test(&ping_test_service, &ping_test_client);
+ 	LASSERT (rc == 0);
+diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
+index f0f9194..b589047 100644
+--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
++++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
+@@ -210,14 +210,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
+ 	return 0;
+ }
+ 
+-sfw_test_client_ops_t ping_test_client;
+-void ping_init_test_client(void)
+-{
+-	ping_test_client.tso_init     = ping_client_init;
+-	ping_test_client.tso_fini     = ping_client_fini;
+-	ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
+-	ping_test_client.tso_done_rpc = ping_client_done_rpc;
+-}
++sfw_test_client_ops_t ping_test_client = {
++	.tso_init     = ping_client_init,
++	.tso_fini     = ping_client_fini,
++	.tso_prep_rpc = ping_client_prep_rpc,
++	.tso_done_rpc = ping_client_done_rpc,
++};
+ 
+ srpc_service_t ping_test_service;
+ void ping_init_test_service(void)
+diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
+index 7020d9c..0d3b580 100644
+--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
++++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
+@@ -1141,7 +1141,7 @@ struct ldlm_callback_suite {
+ 	ldlm_completion_callback lcs_completion;
+ 	ldlm_blocking_callback   lcs_blocking;
+ 	ldlm_glimpse_callback    lcs_glimpse;
+-};
++} __no_const;
+ 
+ /* ldlm_lockd.c */
+ int ldlm_del_waiting_lock(struct ldlm_lock *lock);
+diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
+index a612255..9a9e2dd 100644
+--- a/drivers/staging/lustre/lustre/include/obd.h
++++ b/drivers/staging/lustre/lustre/include/obd.h
+@@ -1417,7 +1417,7 @@ struct md_ops {
+ 	 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
+ 	 * wrapper function in include/linux/obd_class.h.
+ 	 */
+-};
++} __no_const;
+ 
+ struct lsm_operations {
+ 	void (*lsm_free)(struct lov_stripe_md *);
+diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
+index fc6c977..df1f956 100644
+--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
++++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
+@@ -219,7 +219,7 @@ DECLARE_PROC_HANDLER(proc_debug_mb)
+ int LL_PROC_PROTO(proc_console_max_delay_cs)
+ {
+ 	int rc, max_delay_cs;
+-	ctl_table_t dummy = *table;
++	ctl_table_no_const dummy = *table;
+ 	cfs_duration_t d;
+ 
+ 	dummy.data = &max_delay_cs;
+@@ -250,7 +250,7 @@ int LL_PROC_PROTO(proc_console_max_delay_cs)
+ int LL_PROC_PROTO(proc_console_min_delay_cs)
+ {
+ 	int rc, min_delay_cs;
+-	ctl_table_t dummy = *table;
++	ctl_table_no_const dummy = *table;
+ 	cfs_duration_t d;
+ 
+ 	dummy.data = &min_delay_cs;
+@@ -281,7 +281,7 @@ int LL_PROC_PROTO(proc_console_min_delay_cs)
+ int LL_PROC_PROTO(proc_console_backoff)
+ {
+ 	int rc, backoff;
+-	ctl_table_t dummy = *table;
++	ctl_table_no_const dummy = *table;
+ 
+ 	dummy.data = &backoff;
+ 	dummy.proc_handler = &proc_dointvec;
 diff --git a/drivers/staging/media/solo6x10/solo6x10-core.c b/drivers/staging/media/solo6x10/solo6x10-core.c
 index 3675020..e80d92c 100644
 --- a/drivers/staging/media/solo6x10/solo6x10-core.c
@@ -46928,10 +47037,10 @@ index 6f91d2e..3f011d2 100644
  	unsigned int		p2m_timeouts;
  
 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
-index 34afc16..ffe44dd 100644
+index e14a1bb..9cb9bbe 100644
 --- a/drivers/staging/octeon/ethernet-rx.c
 +++ b/drivers/staging/octeon/ethernet-rx.c
-@@ -421,11 +421,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
+@@ -419,11 +419,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
  				/* Increment RX stats for virtual ports */
  				if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
  #ifdef CONFIG_64BIT
@@ -46947,7 +47056,7 @@ index 34afc16..ffe44dd 100644
  #endif
  				}
  				netif_receive_skb(skb);
-@@ -437,9 +437,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
+@@ -434,9 +434,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
  					   dev->name);
  				*/
  #ifdef CONFIG_64BIT
@@ -46979,6 +47088,32 @@ index c3a90e7..023619a 100644
  #endif
  	}
  
+diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
+index 439c3c9..2d74293 100644
+--- a/drivers/staging/rtl8188eu/include/hal_intf.h
++++ b/drivers/staging/rtl8188eu/include/hal_intf.h
+@@ -271,7 +271,7 @@ struct hal_ops {
+ 	s32 (*c2h_handler)(struct adapter *padapter,
+ 			   struct c2h_evt_hdr *c2h_evt);
+ 	c2h_id_filter c2h_id_filter_ccx;
+-};
++} __no_const;
+ 
+ enum rt_eeprom_type {
+ 	EEPROM_93C46,
+diff --git a/drivers/staging/rtl8188eu/include/rtw_io.h b/drivers/staging/rtl8188eu/include/rtw_io.h
+index eb6f0e5..e6a0958 100644
+--- a/drivers/staging/rtl8188eu/include/rtw_io.h
++++ b/drivers/staging/rtl8188eu/include/rtw_io.h
+@@ -126,7 +126,7 @@ struct _io_ops {
+ 	u32 (*_write_scsi)(struct intf_hdl *pintfhdl,u32 cnt, u8 *pmem);
+ 	void (*_read_port_cancel)(struct intf_hdl *pintfhdl);
+ 	void (*_write_port_cancel)(struct intf_hdl *pintfhdl);
+-};
++} __no_const;
+ 
+ struct io_req {
+ 	struct list_head list;
 diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
 index dc23395..cf7e9b1 100644
 --- a/drivers/staging/rtl8712/rtl871x_io.h
@@ -47063,7 +47198,7 @@ index d07fcb5..358e1e1 100644
  		return;
  	}
 diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
-index 8417c2f..ef5ebd6 100644
+index 8acff44..bdb2fca 100644
 --- a/drivers/staging/vt6655/hostap.c
 +++ b/drivers/staging/vt6655/hostap.c
 @@ -69,14 +69,13 @@ static int msglevel = MSG_LEVEL_INFO;
@@ -47085,7 +47220,7 @@ index 8417c2f..ef5ebd6 100644
  
 @@ -88,6 +87,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
  	*apdev_priv = *pDevice;
- 	memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
+ 	eth_hw_addr_inherit(pDevice->apdev, dev);
  
 +	/* only half broken now */
 +	apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
@@ -47122,30 +47257,8 @@ index c699a30..b90a5fd 100644
  	pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
  	pDevice->apdev->type = ARPHRD_IEEE80211;
-diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
-index d128ce2..fc1f9a1 100644
---- a/drivers/staging/zcache/tmem.h
-+++ b/drivers/staging/zcache/tmem.h
-@@ -225,7 +225,7 @@ struct tmem_pamops {
- 	bool (*is_remote)(void *);
- 	int (*replace_in_obj)(void *, struct tmem_obj *);
- #endif
--};
-+} __no_const;
- extern void tmem_register_pamops(struct tmem_pamops *m);
- 
- /* memory allocation methods provided by the host implementation */
-@@ -234,7 +234,7 @@ struct tmem_hostops {
- 	void (*obj_free)(struct tmem_obj *, struct tmem_pool *);
- 	struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
- 	void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
--};
-+} __no_const;
- extern void tmem_register_hostops(struct tmem_hostops *m);
- 
- /* core tmem accessor functions */
 diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
-index d3536f5..a0c2ce9 100644
+index e51b09a..5ebac31 100644
 --- a/drivers/target/sbp/sbp_target.c
 +++ b/drivers/target/sbp/sbp_target.c
 @@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
@@ -47167,23 +47280,23 @@ index d3536f5..a0c2ce9 100644
  	login->tgt_agt = sbp_target_agent_register(login);
  	if (IS_ERR(login->tgt_agt)) {
 diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
-index 4630481..c26782a 100644
+index d90dbb0..6cbe585 100644
 --- a/drivers/target/target_core_device.c
 +++ b/drivers/target/target_core_device.c
-@@ -1400,7 +1400,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
- 	spin_lock_init(&dev->se_port_lock);
+@@ -1431,7 +1431,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
  	spin_lock_init(&dev->se_tmr_lock);
  	spin_lock_init(&dev->qf_cmd_lock);
+ 	sema_init(&dev->caw_sem, 1);
 -	atomic_set(&dev->dev_ordered_id, 0);
 +	atomic_set_unchecked(&dev->dev_ordered_id, 0);
  	INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
  	spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
  	INIT_LIST_HEAD(&dev->t10_pr.registration_list);
 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
-index 21e3158..43c6004 100644
+index 0b0009b..215e88e 100644
 --- a/drivers/target/target_core_transport.c
 +++ b/drivers/target/target_core_transport.c
-@@ -1080,7 +1080,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
+@@ -1137,7 +1137,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
  	 * Used to determine when ORDERED commands should go from
  	 * Dormant to Active status.
  	 */
@@ -47219,7 +47332,7 @@ index 33f83fe..d80f8e1 100644
  				struct tty_struct *tty;
  				struct tty_ldisc *ld;
 diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
-index eb255e8..f637a57 100644
+index 9eba119..5070303 100644
 --- a/drivers/tty/hvc/hvc_console.c
 +++ b/drivers/tty/hvc/hvc_console.c
 @@ -338,7 +338,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
@@ -47231,7 +47344,7 @@ index eb255e8..f637a57 100644
  		spin_unlock_irqrestore(&hp->port.lock, flags);
  		hvc_kick();
  		return 0;
-@@ -388,7 +388,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
+@@ -393,7 +393,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
  
  	spin_lock_irqsave(&hp->port.lock, flags);
  
@@ -47240,7 +47353,7 @@ index eb255e8..f637a57 100644
  		spin_unlock_irqrestore(&hp->port.lock, flags);
  		/* We are done with the tty pointer now. */
  		tty_port_tty_set(&hp->port, NULL);
-@@ -406,9 +406,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
+@@ -415,9 +415,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
  		 */
  		tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
  	} else {
@@ -47252,7 +47365,7 @@ index eb255e8..f637a57 100644
  		spin_unlock_irqrestore(&hp->port.lock, flags);
  	}
  }
-@@ -438,12 +438,12 @@ static void hvc_hangup(struct tty_struct *tty)
+@@ -447,12 +447,12 @@ static void hvc_hangup(struct tty_struct *tty)
  	 * open->hangup case this can be called after the final close so prevent
  	 * that from happening for now.
  	 */
@@ -47267,7 +47380,7 @@ index eb255e8..f637a57 100644
  	spin_unlock_irqrestore(&hp->port.lock, flags);
  	tty_port_tty_set(&hp->port, NULL);
  
-@@ -491,7 +491,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
+@@ -500,7 +500,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
  		return -EPIPE;
  
  	/* FIXME what's this (unprotected) check for? */
@@ -47593,7 +47706,7 @@ index 1deaca4..c8582d4 100644
  	tty_port_tty_set(&ch->port, tty);
  	mutex_lock(&ch->port.mutex);
 diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
-index 6422390..49003ac 100644
+index c0f76da..d974c32 100644
 --- a/drivers/tty/n_gsm.c
 +++ b/drivers/tty/n_gsm.c
 @@ -1632,7 +1632,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
@@ -47605,7 +47718,7 @@ index 6422390..49003ac 100644
  		kfree(dlci);
  		return NULL;
  	}
-@@ -2932,7 +2932,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
+@@ -2935,7 +2935,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
  	struct gsm_dlci *dlci = tty->driver_data;
  	struct tty_port *port = &dlci->port;
  
@@ -47615,10 +47728,10 @@ index 6422390..49003ac 100644
  	dlci_get(dlci->gsm->dlci[0]);
  	mux_get(dlci->gsm);
 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
-index 6c7fe90..9241dab 100644
+index ff58293..71c87bc 100644
 --- a/drivers/tty/n_tty.c
 +++ b/drivers/tty/n_tty.c
-@@ -2203,6 +2203,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
+@@ -2502,6 +2502,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
  {
  	*ops = tty_ldisc_N_TTY;
  	ops->owner = NULL;
@@ -47628,10 +47741,10 @@ index 6c7fe90..9241dab 100644
  }
  EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
 diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
-index abfd990..5ab5da9 100644
+index 25c9bc7..24077b7 100644
 --- a/drivers/tty/pty.c
 +++ b/drivers/tty/pty.c
-@@ -796,8 +796,10 @@ static void __init unix98_pty_init(void)
+@@ -790,8 +790,10 @@ static void __init unix98_pty_init(void)
  		panic("Couldn't register Unix98 pts driver");
  
  	/* Now create the /dev/ptmx special device */
@@ -47675,7 +47788,7 @@ index 354564e..fe50d9a 100644
  	clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
  	spin_unlock_irqrestore(&info->port.lock, flags);
 diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
-index e2520ab..034e20b 100644
+index 1274499..f541382 100644
 --- a/drivers/tty/serial/ioc4_serial.c
 +++ b/drivers/tty/serial/ioc4_serial.c
 @@ -437,7 +437,7 @@ struct ioc4_soft {
@@ -47706,7 +47819,7 @@ index e2520ab..034e20b 100644
  
  		this_mir = this_ir = pending_intrs(soft, intr_type);
 diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
-index 1002054..dd644a8 100644
+index a260cde..6b2b5ce 100644
 --- a/drivers/tty/serial/kgdboc.c
 +++ b/drivers/tty/serial/kgdboc.c
 @@ -24,8 +24,9 @@
@@ -47812,19 +47925,19 @@ index 1002054..dd644a8 100644
  /* This is only available if kgdboc is a built in for early debugging */
  static int __init kgdboc_early_init(char *opt)
 diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
-index b11e997..6d25a3b 100644
+index b5d779c..3622cfe 100644
 --- a/drivers/tty/serial/msm_serial.c
 +++ b/drivers/tty/serial/msm_serial.c
-@@ -857,7 +857,7 @@ static struct uart_driver msm_uart_driver = {
+@@ -897,7 +897,7 @@ static struct uart_driver msm_uart_driver = {
  	.cons = MSM_CONSOLE,
  };
  
 -static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
 +static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
  
- static int __init msm_serial_probe(struct platform_device *pdev)
- {
-@@ -867,7 +867,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
+ static const struct of_device_id msm_uartdm_table[] = {
+ 	{ .compatible = "qcom,msm-uartdm" },
+@@ -912,7 +912,7 @@ static int __init msm_serial_probe(struct platform_device *pdev)
  	int irq;
  
  	if (pdev->id == -1)
@@ -47834,10 +47947,10 @@ index b11e997..6d25a3b 100644
  	if (unlikely(pdev->id < 0 || pdev->id >= UART_NR))
  		return -ENXIO;
 diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
-index 0c8a9fa..234a95f 100644
+index f3dfa19..342f2ff 100644
 --- a/drivers/tty/serial/samsung.c
 +++ b/drivers/tty/serial/samsung.c
-@@ -453,11 +453,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
+@@ -456,11 +456,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
  	}
  }
  
@@ -47854,7 +47967,7 @@ index 0c8a9fa..234a95f 100644
  	dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
  	    port->mapbase, port->membase);
  
-@@ -1124,10 +1129,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
+@@ -1127,10 +1132,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
  	/* setup info for port */
  	port->dev	= &platdev->dev;
  
@@ -47866,10 +47979,10 @@ index 0c8a9fa..234a95f 100644
  
  	if (cfg->uart_flags & UPF_CONS_FLOW) {
 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
-index f87dbfd..42ad4b1 100644
+index 0f02351..07c59c5 100644
 --- a/drivers/tty/serial/serial_core.c
 +++ b/drivers/tty/serial/serial_core.c
-@@ -1454,7 +1454,7 @@ static void uart_hangup(struct tty_struct *tty)
+@@ -1448,7 +1448,7 @@ static void uart_hangup(struct tty_struct *tty)
  		uart_flush_buffer(tty);
  		uart_shutdown(tty, state);
  		spin_lock_irqsave(&port->lock, flags);
@@ -47878,7 +47991,7 @@ index f87dbfd..42ad4b1 100644
  		clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
  		spin_unlock_irqrestore(&port->lock, flags);
  		tty_port_tty_set(port, NULL);
-@@ -1550,7 +1550,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
+@@ -1544,7 +1544,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
  		goto end;
  	}
  
@@ -47887,7 +48000,7 @@ index f87dbfd..42ad4b1 100644
  	if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
  		retval = -ENXIO;
  		goto err_dec_count;
-@@ -1578,7 +1578,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
+@@ -1572,7 +1572,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
  	/*
  	 * Make sure the device is in D0 state.
  	 */
@@ -47896,7 +48009,7 @@ index f87dbfd..42ad4b1 100644
  		uart_change_pm(state, UART_PM_STATE_ON);
  
  	/*
-@@ -1596,7 +1596,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
+@@ -1590,7 +1590,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
  end:
  	return retval;
  err_dec_count:
@@ -47906,7 +48019,7 @@ index f87dbfd..42ad4b1 100644
  	goto end;
  }
 diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
-index 8eaf1ab..85c030d 100644
+index e1ce141..6d4ed80 100644
 --- a/drivers/tty/synclink.c
 +++ b/drivers/tty/synclink.c
 @@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
@@ -47916,7 +48029,7 @@ index 8eaf1ab..85c030d 100644
 -			 __FILE__,__LINE__, info->device_name, info->port.count);
 +			 __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
  
- 	if (tty_port_close_start(&info->port, tty, filp) == 0)			 
+ 	if (tty_port_close_start(&info->port, tty, filp) == 0)
  		goto cleanup;
 @@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
  cleanup:			
@@ -48156,7 +48269,7 @@ index 1abf946..1ee34fc 100644
  
  	if (!retval)
 diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
-index ff17138..e38b41e 100644
+index dc6e969..5dc8786 100644
 --- a/drivers/tty/synclinkmp.c
 +++ b/drivers/tty/synclinkmp.c
 @@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
@@ -48295,10 +48408,10 @@ index ff17138..e38b41e 100644
  	if (!retval)
  		port->flags |= ASYNC_NORMAL_ACTIVE;
 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index b51c154..17d55d1 100644
+index 40a9fe9..a3f10cc 100644
 --- a/drivers/tty/sysrq.c
 +++ b/drivers/tty/sysrq.c
-@@ -1022,7 +1022,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
+@@ -1075,7 +1075,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
  static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
  				   size_t count, loff_t *ppos)
  {
@@ -48308,10 +48421,10 @@ index b51c154..17d55d1 100644
  
  		if (get_user(c, buf))
 diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
-index 59d26ef5..3135b94 100644
+index c74a00a..02cf211a 100644
 --- a/drivers/tty/tty_io.c
 +++ b/drivers/tty/tty_io.c
-@@ -3467,7 +3467,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
+@@ -3474,7 +3474,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
  
  void tty_default_fops(struct file_operations *fops)
  {
@@ -48321,28 +48434,28 @@ index 59d26ef5..3135b94 100644
  
  /*
 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
-index 1afe192..73d2c20 100644
+index 6458e11..6cfc218 100644
 --- a/drivers/tty/tty_ldisc.c
 +++ b/drivers/tty/tty_ldisc.c
-@@ -66,7 +66,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
- 	raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
+@@ -72,7 +72,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
+ 	raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
  	tty_ldiscs[disc] = new_ldisc;
  	new_ldisc->num = disc;
 -	new_ldisc->refcount = 0;
 +	atomic_set(&new_ldisc->refcount, 0);
- 	raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+ 	raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
  
  	return ret;
-@@ -94,7 +94,7 @@ int tty_unregister_ldisc(int disc)
+@@ -100,7 +100,7 @@ int tty_unregister_ldisc(int disc)
  		return -EINVAL;
  
- 	raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
+ 	raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
 -	if (tty_ldiscs[disc]->refcount)
 +	if (atomic_read(&tty_ldiscs[disc]->refcount))
  		ret = -EBUSY;
  	else
  		tty_ldiscs[disc] = NULL;
-@@ -115,7 +115,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
+@@ -121,7 +121,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
  	if (ldops) {
  		ret = ERR_PTR(-EAGAIN);
  		if (try_module_get(ldops->owner)) {
@@ -48351,24 +48464,15 @@ index 1afe192..73d2c20 100644
  			ret = ldops;
  		}
  	}
-@@ -128,7 +128,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
+@@ -134,7 +134,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
  	unsigned long flags;
  
- 	raw_spin_lock_irqsave(&tty_ldisc_lock, flags);
+ 	raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
 -	ldops->refcount--;
 +	atomic_dec(&ldops->refcount);
  	module_put(ldops->owner);
- 	raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
+ 	raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
  }
-@@ -196,7 +196,7 @@ static inline void tty_ldisc_put(struct tty_ldisc *ld)
- 	/* unreleased reader reference(s) will cause this WARN */
- 	WARN_ON(!atomic_dec_and_test(&ld->users));
- 
--	ld->ops->refcount--;
-+	atomic_dec(&ld->ops->refcount);
- 	module_put(ld->ops->owner);
- 	kfree(ld);
- 	raw_spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
 index f597e88..b7f68ed 100644
 --- a/drivers/tty/tty_port.c
@@ -48437,10 +48541,10 @@ index f597e88..b7f68ed 100644
  	tty_port_tty_set(port, tty);
  
 diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
-index a9af1b9a..1e08e7f 100644
+index d0e3a44..5f8b754 100644
 --- a/drivers/tty/vt/keyboard.c
 +++ b/drivers/tty/vt/keyboard.c
-@@ -647,6 +647,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
+@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
  	     kbd->kbdmode == VC_OFF) &&
  	     value != KVAL(K_SAK))
  		return;		/* SAK is allowed even in raw mode */
@@ -48457,7 +48561,7 @@ index a9af1b9a..1e08e7f 100644
  	fn_handler[value](vc);
  }
  
-@@ -1795,9 +1805,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
+@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
  	if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
  		return -EFAULT;
  
@@ -48467,7 +48571,7 @@ index a9af1b9a..1e08e7f 100644
  	switch (cmd) {
  	case KDGKBENT:
  		/* Ensure another thread doesn't free it under us */
-@@ -1812,6 +1819,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
+@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
  		spin_unlock_irqrestore(&kbd_event_lock, flags);
  		return put_user(val, &user_kbe->kb_value);
  	case KDSKBENT:
@@ -48477,7 +48581,7 @@ index a9af1b9a..1e08e7f 100644
  		if (!perm)
  			return -EPERM;
  		if (!i && v == K_NOSUCHMAP) {
-@@ -1902,9 +1912,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
  	int i, j, k;
  	int ret;
  
@@ -48487,7 +48591,7 @@ index a9af1b9a..1e08e7f 100644
  	kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
  	if (!kbs) {
  		ret = -ENOMEM;
-@@ -1938,6 +1945,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
  		kfree(kbs);
  		return ((p && *p) ? -EOVERFLOW : 0);
  	case KDSKBSENT:
@@ -48498,7 +48602,7 @@ index a9af1b9a..1e08e7f 100644
  			ret = -EPERM;
  			goto reterr;
 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
-index 2d57a00..74d14de 100644
+index 0e808cf..d7d274b 100644
 --- a/drivers/uio/uio.c
 +++ b/drivers/uio/uio.c
 @@ -25,6 +25,7 @@
@@ -48509,7 +48613,7 @@ index 2d57a00..74d14de 100644
  
  #define UIO_MAX_DEVICES		(1U << MINORBITS)
  
-@@ -32,10 +33,10 @@ struct uio_device {
+@@ -32,7 +33,7 @@ struct uio_device {
  	struct module		*owner;
  	struct device		*dev;
  	int			minor;
@@ -48517,21 +48621,17 @@ index 2d57a00..74d14de 100644
 +	atomic_unchecked_t	event;
  	struct fasync_struct	*async_queue;
  	wait_queue_head_t	wait;
--	int			vma_count;
-+	local_t			vma_count;
  	struct uio_info		*info;
- 	struct kobject		*map_dir;
- 	struct kobject		*portio_dir;
-@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
+@@ -243,7 +244,7 @@ static ssize_t event_show(struct device *dev,
  			  struct device_attribute *attr, char *buf)
  {
  	struct uio_device *idev = dev_get_drvdata(dev);
 -	return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
 +	return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
  }
+ static DEVICE_ATTR_RO(event);
  
- static struct device_attribute uio_class_attributes[] = {
-@@ -398,7 +399,7 @@ void uio_event_notify(struct uio_info *info)
+@@ -401,7 +402,7 @@ void uio_event_notify(struct uio_info *info)
  {
  	struct uio_device *idev = info->uio_dev;
  
@@ -48540,7 +48640,7 @@ index 2d57a00..74d14de 100644
  	wake_up_interruptible(&idev->wait);
  	kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
  }
-@@ -451,7 +452,7 @@ static int uio_open(struct inode *inode, struct file *filep)
+@@ -454,7 +455,7 @@ static int uio_open(struct inode *inode, struct file *filep)
  	}
  
  	listener->dev = idev;
@@ -48549,7 +48649,7 @@ index 2d57a00..74d14de 100644
  	filep->private_data = listener;
  
  	if (idev->info->open) {
-@@ -502,7 +503,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
+@@ -505,7 +506,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
  		return -EIO;
  
  	poll_wait(filep, &idev->wait, wait);
@@ -48558,7 +48658,7 @@ index 2d57a00..74d14de 100644
  		return POLLIN | POLLRDNORM;
  	return 0;
  }
-@@ -527,7 +528,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
+@@ -530,7 +531,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
  	do {
  		set_current_state(TASK_INTERRUPTIBLE);
  
@@ -48567,23 +48667,31 @@ index 2d57a00..74d14de 100644
  		if (event_count != listener->event_count) {
  			if (copy_to_user(buf, &event_count, count))
  				retval = -EFAULT;
-@@ -596,13 +597,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
- static void uio_vma_open(struct vm_area_struct *vma)
+@@ -587,9 +588,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
+ static int uio_find_mem_index(struct vm_area_struct *vma)
  {
  	struct uio_device *idev = vma->vm_private_data;
--	idev->vma_count++;
-+	local_inc(&idev->vma_count);
- }
++	unsigned long size;
+ 
+ 	if (vma->vm_pgoff < MAX_UIO_MAPS) {
+-		if (idev->info->mem[vma->vm_pgoff].size == 0)
++		size = idev->info->mem[vma->vm_pgoff].size;
++		if (size == 0)
++			return -1;
++		if (vma->vm_end - vma->vm_start > size)
+ 			return -1;
+ 		return (int)vma->vm_pgoff;
+ 	}
+@@ -647,6 +652,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
+ 		return -EINVAL;
+ 	mem = idev->info->mem + mi;
  
- static void uio_vma_close(struct vm_area_struct *vma)
- {
- 	struct uio_device *idev = vma->vm_private_data;
--	idev->vma_count--;
-+	local_dec(&idev->vma_count);
- }
++	if (mem->addr & ~PAGE_MASK)
++		return -ENODEV;
+ 	if (vma->vm_end - vma->vm_start > mem->size)
+ 		return -EINVAL;
  
- static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-@@ -830,7 +831,7 @@ int __uio_register_device(struct module *owner,
+@@ -818,7 +825,7 @@ int __uio_register_device(struct module *owner,
  	idev->owner = owner;
  	idev->info = info;
  	init_waitqueue_head(&idev->wait);
@@ -48606,10 +48714,10 @@ index 8a7eb77..c00402f 100644
  		pos += tmp;
  
 diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
-index d3527dd..26effa2 100644
+index 25a7bfc..57f3cf5 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
+@@ -331,7 +331,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);
@@ -48618,7 +48726,7 @@ index d3527dd..26effa2 100644
  		return;
  	}
  
-@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -358,7 +358,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);
@@ -48627,7 +48735,7 @@ index d3527dd..26effa2 100644
  			goto out;
  		}
  
-@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -367,14 +367,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);
@@ -48644,7 +48752,7 @@ index d3527dd..26effa2 100644
  			goto out;
  		}
  
-@@ -389,7 +389,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -386,7 +386,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);
@@ -48653,7 +48761,7 @@ index d3527dd..26effa2 100644
  			goto out;
  		}
  
-@@ -417,7 +417,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
  
  		vcc->push(vcc, skb);
  
@@ -48662,7 +48770,7 @@ index d3527dd..26effa2 100644
  	out:
  		skb_trim(sarb, 0);
  	}
-@@ -623,7 +623,7 @@ static void usbatm_tx_process(unsigned long data)
+@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
  			struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
  
  			usbatm_pop(vcc, skb);
@@ -48671,7 +48779,7 @@ index d3527dd..26effa2 100644
  
  			skb = skb_dequeue(&instance->sndqueue);
  		}
-@@ -779,11 +779,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
+@@ -756,11 +756,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",
@@ -48719,11 +48827,40 @@ index 2a3bbdf..91d72cf 100644
  	if (file->f_version != event_count) {
  		file->f_version = event_count;
  		return POLLIN | POLLRDNORM;
+diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
+index 71dc5d7..6135ff2 100644
+--- a/drivers/usb/core/devio.c
++++ b/drivers/usb/core/devio.c
+@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
+ 	struct dev_state *ps = file->private_data;
+ 	struct usb_device *dev = ps->dev;
+ 	ssize_t ret = 0;
+-	unsigned len;
++	size_t len;
+ 	loff_t pos;
+ 	int i;
+ 
+@@ -229,13 +229,13 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
+ 	for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
+ 		struct usb_config_descriptor *config =
+ 			(struct usb_config_descriptor *)dev->rawdescriptors[i];
+-		unsigned int length = le16_to_cpu(config->wTotalLength);
++		size_t length = le16_to_cpu(config->wTotalLength);
+ 
+ 		if (*ppos < pos + length) {
+ 
+ 			/* The descriptor may claim to be longer than it
+ 			 * really is.  Here is the actual allocated length. */
+-			unsigned alloclen =
++			size_t alloclen =
+ 				le16_to_cpu(dev->config[i].desc.wTotalLength);
+ 
+ 			len = length - (*ppos - pos);
 diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index d3aa353..0e284af 100644
+index f20a044..d1059aa 100644
 --- a/drivers/usb/core/hcd.c
 +++ b/drivers/usb/core/hcd.c
-@@ -1527,7 +1527,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
+@@ -1552,7 +1552,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
  	 */
  	usb_get_urb(urb);
  	atomic_inc(&urb->use_count);
@@ -48732,7 +48869,7 @@ index d3aa353..0e284af 100644
  	usbmon_urb_submit(&hcd->self, urb);
  
  	/* NOTE requirements on root-hub callers (usbfs and the hub
-@@ -1554,7 +1554,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
+@@ -1579,7 +1579,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
  		urb->hcpriv = NULL;
  		INIT_LIST_HEAD(&urb->urb_list);
  		atomic_dec(&urb->use_count);
@@ -48742,7 +48879,7 @@ index d3aa353..0e284af 100644
  			wake_up(&usb_kill_urb_queue);
  		usb_put_urb(urb);
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 1424a89..62da951 100644
+index 243c672..8b66fbb 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
 @@ -27,6 +27,7 @@
@@ -48753,7 +48890,7 @@ index 1424a89..62da951 100644
  
  #include <asm/uaccess.h>
  #include <asm/byteorder.h>
-@@ -4436,6 +4437,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
+@@ -4467,6 +4468,10 @@ static void hub_port_connect_change(struct usb_hub *hub, int port1,
    			goto done;
  		return;
  	}
@@ -48765,36 +48902,54 @@ index 1424a89..62da951 100644
  		unit_load = 150;
  	else
 diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
-index 444d30e..f15c850 100644
+index 82927e1..4993dbf 100644
 --- a/drivers/usb/core/message.c
 +++ b/drivers/usb/core/message.c
 @@ -129,7 +129,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
-  * method can wait for it to complete.  Since you don't have a handle on the
-  * URB used, you can't cancel the request.
+  * Return: If successful, the number of bytes transferred. Otherwise, a negative
+  * error number.
   */
 -int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
 +int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
  		    __u8 requesttype, __u16 value, __u16 index, void *data,
  		    __u16 size, int timeout)
  {
+@@ -181,7 +181,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
+  * If successful, 0. Otherwise a negative error number. The number of actual
+  * bytes transferred will be stored in the @actual_length paramater.
+  */
+-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
++int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
+ 		      void *data, int len, int *actual_length, int timeout)
+ {
+ 	return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
+@@ -221,7 +221,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
+  * bytes transferred will be stored in the @actual_length paramater.
+  *
+  */
+-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
++int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
+ 		 void *data, int len, int *actual_length, int timeout)
+ {
+ 	struct urb *urb;
 diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
-index aa38db4..0a08682 100644
+index ca516ac..6c36ee4 100644
 --- a/drivers/usb/core/sysfs.c
 +++ b/drivers/usb/core/sysfs.c
-@@ -239,7 +239,7 @@ show_urbnum(struct device *dev, struct device_attribute *attr, char *buf)
+@@ -236,7 +236,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
  	struct usb_device *udev;
  
  	udev = to_usb_device(dev);
 -	return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
 +	return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
  }
- static DEVICE_ATTR(urbnum, S_IRUGO, show_urbnum, NULL);
+ static DEVICE_ATTR_RO(urbnum);
  
 diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
-index b10da72..43aa0b2 100644
+index 0a6ee2e..6f8d7e8 100644
 --- a/drivers/usb/core/usb.c
 +++ b/drivers/usb/core/usb.c
-@@ -389,7 +389,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
+@@ -433,7 +433,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
  	set_dev_node(&dev->dev, dev_to_node(bus->controller));
  	dev->state = USB_STATE_ATTACHED;
  	dev->lpm_disable_count = 1;
@@ -48804,10 +48959,10 @@ index b10da72..43aa0b2 100644
  	INIT_LIST_HEAD(&dev->ep0.urb_list);
  	dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
 diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
-index 14d28d6..5f511ac 100644
+index 5452c0f..34c9145 100644
 --- a/drivers/usb/dwc3/gadget.c
 +++ b/drivers/usb/dwc3/gadget.c
-@@ -550,8 +550,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
+@@ -532,8 +532,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
  		if (!usb_endpoint_xfer_isoc(desc))
  			return 0;
  
@@ -48942,6 +49097,28 @@ index b369292..9f3ba40 100644
  		gs_buf_free(&port->port_write_buf);
  	gs_free_requests(gser->out, &port->read_pool, NULL);
  	gs_free_requests(gser->out, &port->read_queue, NULL);
+diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
+index 835fc08..f8b22bf 100644
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -762,7 +762,7 @@ static struct urb *request_single_step_set_feature_urb(
+ 	urb->transfer_flags = URB_DIR_IN;
+ 	usb_get_urb(urb);
+ 	atomic_inc(&urb->use_count);
+-	atomic_inc(&urb->dev->urbnum);
++	atomic_inc_unchecked(&urb->dev->urbnum);
+ 	urb->setup_dma = dma_map_single(
+ 			hcd->self.controller,
+ 			urb->setup_packet,
+@@ -829,7 +829,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
+ 	urb->status = -EINPROGRESS;
+ 	usb_get_urb(urb);
+ 	atomic_inc(&urb->use_count);
+-	atomic_inc(&urb->dev->urbnum);
++	atomic_inc_unchecked(&urb->dev->urbnum);
+ 	retval = submit_single_step_set_feature(hcd, urb, 0);
+ 	if (!retval && !wait_for_completion_timeout(&done,
+ 						msecs_to_jiffies(2000))) {
 diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
 index ba6a5d6..f88f7f3 100644
 --- a/drivers/usb/misc/appledisplay.c
@@ -48965,7 +49142,7 @@ index ba6a5d6..f88f7f3 100644
  	props.type = BACKLIGHT_RAW;
  	props.max_brightness = 0xff;
 diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
-index 5f3bcd3..bfca43f 100644
+index c69bb50..215ef37 100644
 --- a/drivers/usb/serial/console.c
 +++ b/drivers/usb/serial/console.c
 @@ -124,7 +124,7 @@ static int usb_console_setup(struct console *co, char *options)
@@ -48977,7 +49154,7 @@ index 5f3bcd3..bfca43f 100644
  	if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
  		if (serial->type->set_termios) {
  			/*
-@@ -174,7 +174,7 @@ static int usb_console_setup(struct console *co, char *options)
+@@ -170,7 +170,7 @@ static int usb_console_setup(struct console *co, char *options)
  	}
  	/* Now that any required fake tty operations are completed restore
  	 * the tty port count */
@@ -48986,7 +49163,7 @@ index 5f3bcd3..bfca43f 100644
  	/* The console is special in terms of closing the device so
  	 * indicate this port is now acting as a system console. */
  	port->port.console = 1;
-@@ -187,7 +187,7 @@ static int usb_console_setup(struct console *co, char *options)
+@@ -183,7 +183,7 @@ static int usb_console_setup(struct console *co, char *options)
   free_tty:
  	kfree(tty);
   reset_open_count:
@@ -48995,6 +49172,15 @@ index 5f3bcd3..bfca43f 100644
  	usb_autopm_put_interface(serial->interface);
   error_get_interface:
  	usb_serial_put(serial);
+@@ -194,7 +194,7 @@ static int usb_console_setup(struct console *co, char *options)
+ static void usb_console_write(struct console *co,
+ 					const char *buf, unsigned count)
+ {
+-	static struct usbcons_info *info = &usbcons_info;
++	struct usbcons_info *info = &usbcons_info;
+ 	struct usb_serial_port *port = info->port;
+ 	struct usb_serial *serial;
+ 	int retval = -ENODEV;
 diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
 index 75f70f0..d467e1a 100644
 --- a/drivers/usb/storage/usb.h
@@ -49009,32 +49195,32 @@ index 75f70f0..d467e1a 100644
  
  /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
 diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
-index d6bea3e..60b250e 100644
+index cf250c2..ad9d904 100644
 --- a/drivers/usb/wusbcore/wa-hc.h
 +++ b/drivers/usb/wusbcore/wa-hc.h
-@@ -192,7 +192,7 @@ struct wahc {
- 	struct list_head xfer_delayed_list;
+@@ -199,7 +199,7 @@ struct wahc {
  	spinlock_t xfer_list_lock;
- 	struct work_struct xfer_work;
+ 	struct work_struct xfer_enqueue_work;
+ 	struct work_struct xfer_error_work;
 -	atomic_t xfer_id_count;
 +	atomic_unchecked_t xfer_id_count;
  };
  
  
-@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
- 	INIT_LIST_HEAD(&wa->xfer_delayed_list);
+@@ -255,7 +255,7 @@ static inline void wa_init(struct wahc *wa)
  	spin_lock_init(&wa->xfer_list_lock);
- 	INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
+ 	INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
+ 	INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
 -	atomic_set(&wa->xfer_id_count, 1);
 +	atomic_set_unchecked(&wa->xfer_id_count, 1);
  }
  
  /**
 diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
-index 028fc83..65bb105 100644
+index 3dcf66f..8faaf6e 100644
 --- a/drivers/usb/wusbcore/wa-xfer.c
 +++ b/drivers/usb/wusbcore/wa-xfer.c
-@@ -296,7 +296,7 @@ out:
+@@ -300,7 +300,7 @@ out:
   */
  static void wa_xfer_id_init(struct wa_xfer *xfer)
  {
@@ -49044,10 +49230,10 @@ index 028fc83..65bb105 100644
  
  /*
 diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
-index 6d78736..65be90e 100644
+index 1eab4ac..e21efc9 100644
 --- a/drivers/vfio/vfio.c
 +++ b/drivers/vfio/vfio.c
-@@ -486,7 +486,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
+@@ -488,7 +488,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
  		return 0;
  
  	/* TODO Prevent device auto probing */
@@ -49056,15 +49242,6 @@ index 6d78736..65be90e 100644
  	     iommu_group_id(group->iommu_group));
  
  	return 0;
-@@ -506,7 +506,7 @@ static int vfio_group_nb_del_dev(struct vfio_group *group, struct device *dev)
- 	if (likely(!device))
- 		return 0;
- 
--	WARN("Device %s removed from live group %d!\n", dev_name(dev),
-+	WARN(1, "Device %s removed from live group %d!\n", dev_name(dev),
- 	     iommu_group_id(group->iommu_group));
- 
- 	vfio_device_put(device);
 diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
 index 5174eba..86e764a 100644
 --- a/drivers/vhost/vringh.c
@@ -49078,8 +49255,21 @@ index 5174eba..86e764a 100644
  	return 0;
  }
  
+diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
+index e43401a..dd49b3f 100644
+--- a/drivers/video/arcfb.c
++++ b/drivers/video/arcfb.c
+@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
+ 		return -ENOSPC;
+ 
+ 	err = 0;
+-	if ((count + p) > fbmemlength) {
++	if (count > (fbmemlength - p)) {
+ 		count = fbmemlength - p;
+ 		err = -ENOSPC;
+ 	}
 diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
-index 8c55011..eed4ae1a 100644
+index a4dfe8c..297ddd9 100644
 --- a/drivers/video/aty/aty128fb.c
 +++ b/drivers/video/aty/aty128fb.c
 @@ -149,7 +149,7 @@ enum {
@@ -49092,10 +49282,10 @@ index 8c55011..eed4ae1a 100644
  	"PCI",
  	"PRO AGP",
 diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
-index 4f27fdc..d3537e6 100644
+index 9b0f12c..024673d 100644
 --- a/drivers/video/aty/atyfb_base.c
 +++ b/drivers/video/aty/atyfb_base.c
-@@ -1325,10 +1325,14 @@ static int atyfb_set_par(struct fb_info *info)
+@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
  	par->accel_flags = var->accel_flags; /* hack */
  
  	if (var->accel_flags) {
@@ -49135,19 +49325,6 @@ index 95ec042..e6affdd 100644
  
  	return 0;
  }
-diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
-index c74e7aa..e3c2790 100644
---- a/drivers/video/backlight/backlight.c
-+++ b/drivers/video/backlight/backlight.c
-@@ -304,7 +304,7 @@ struct backlight_device *backlight_device_register(const char *name,
- 	new_bd->dev.class = backlight_class;
- 	new_bd->dev.parent = parent;
- 	new_bd->dev.release = bl_device_release;
--	dev_set_name(&new_bd->dev, name);
-+	dev_set_name(&new_bd->dev, "%s", name);
- 	dev_set_drvdata(&new_bd->dev, devdata);
- 
- 	/* Set default properties */
 diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
 index bca6ccc..252107e 100644
 --- a/drivers/video/backlight/kb3886_bl.c
@@ -49161,19 +49338,6 @@ index bca6ccc..252107e 100644
  	{
  		.ident = "Sahara Touch-iT",
  		.matches = {
-diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
-index 34fb6bd..3649fd9 100644
---- a/drivers/video/backlight/lcd.c
-+++ b/drivers/video/backlight/lcd.c
-@@ -219,7 +219,7 @@ struct lcd_device *lcd_device_register(const char *name, struct device *parent,
- 	new_ld->dev.class = lcd_class;
- 	new_ld->dev.parent = parent;
- 	new_ld->dev.release = lcd_device_release;
--	dev_set_name(&new_ld->dev, name);
-+	dev_set_name(&new_ld->dev, "%s", name);
- 	dev_set_drvdata(&new_ld->dev, devdata);
- 
- 	rc = device_register(&new_ld->dev);
 diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
 index 900aa4e..6d49418 100644
 --- a/drivers/video/fb_defio.c
@@ -49198,25 +49362,11 @@ index 900aa4e..6d49418 100644
  	mutex_destroy(&fbdefio->lock);
  }
  EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
-diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
-index 5c3960d..15cf8fc 100644
---- a/drivers/video/fbcmap.c
-+++ b/drivers/video/fbcmap.c
-@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
- 		rc = -ENODEV;
- 		goto out;
- 	}
--	if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
--				!info->fbops->fb_setcmap)) {
-+	if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
- 		rc = -EINVAL;
- 		goto out1;
- 	}
 diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
-index 098bfc6..796841d 100644
+index dacaf74..8478a46 100644
 --- a/drivers/video/fbmem.c
 +++ b/drivers/video/fbmem.c
-@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
+@@ -433,7 +433,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) {
@@ -49225,7 +49375,7 @@ index 098bfc6..796841d 100644
  			info->fbops->fb_imageblit(info, image);
  			image->dx -= image->width + 8;
  		}
-@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
+@@ -445,7 +445,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) {
@@ -49234,7 +49384,7 @@ index 098bfc6..796841d 100644
  			info->fbops->fb_imageblit(info, image);
  			image->dy -= image->height + 8;
  		}
-@@ -1166,7 +1166,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
+@@ -1175,7 +1175,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;
@@ -49244,7 +49394,7 @@ index 098bfc6..796841d 100644
  		if (!registered_fb[con2fb.framebuffer])
  			request_module("fb%d", con2fb.framebuffer);
 diff --git a/drivers/video/hyperv_fb.c b/drivers/video/hyperv_fb.c
-index 0f3b33c..b4304eb 100644
+index 8d456dc..b4fa44b 100644
 --- a/drivers/video/hyperv_fb.c
 +++ b/drivers/video/hyperv_fb.c
 @@ -233,7 +233,7 @@ static uint screen_fb_size;
@@ -49278,12 +49428,11 @@ index 7672d2e..b56437f 100644
  	par->dev_flags |= LOCKUP;
  	info->pixmap.scan_align = 1;
 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 3c14e43..eafa544 100644
+index 3c14e43..2630570 100644
 --- a/drivers/video/logo/logo_linux_clut224.ppm
 +++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -1,1604 +1,1123 @@
- P3
--# Standard 224-color Linux logo
+@@ -2,1603 +2,1123 @@ P3
+ # Standard 224-color Linux logo
  80 80
  255
 -  0   0   0   0   0   0   0   0   0   0   0   0
@@ -52085,19 +52234,28 @@ index ff22871..b129bed 100644
  
  	info->var.accel_flags = (!noaccel);
  
-diff --git a/drivers/video/output.c b/drivers/video/output.c
-index 0d6f2cd..6285b97 100644
---- a/drivers/video/output.c
-+++ b/drivers/video/output.c
-@@ -97,7 +97,7 @@ struct output_device *video_output_register(const char *name,
- 	new_dev->props = op;
- 	new_dev->dev.class = &video_output_class;
- 	new_dev->dev.parent = dev;
--	dev_set_name(&new_dev->dev, name);
-+	dev_set_name(&new_dev->dev, "%s", name);
- 	dev_set_drvdata(&new_dev->dev, devdata);
- 	ret_code = device_register(&new_dev->dev);
- 	if (ret_code) {
+diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c
+index fafe7c9..93197b9 100644
+--- a/drivers/video/omap2/dss/display.c
++++ b/drivers/video/omap2/dss/display.c
+@@ -137,12 +137,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
+ 	snprintf(dssdev->alias, sizeof(dssdev->alias),
+ 			"display%d", disp_num_counter++);
+ 
++	pax_open_kernel();
+ 	if (drv && drv->get_resolution == NULL)
+-		drv->get_resolution = omapdss_default_get_resolution;
++		*(void **)&drv->get_resolution = omapdss_default_get_resolution;
+ 	if (drv && drv->get_recommended_bpp == NULL)
+-		drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
++		*(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
+ 	if (drv && drv->get_timings == NULL)
+-		drv->get_timings = omapdss_default_get_timings;
++		*(void **)&drv->get_timings = omapdss_default_get_timings;
++	pax_close_kernel();
+ 
+ 	mutex_lock(&panel_list_mutex);
+ 	list_add_tail(&dssdev->panel_list, &panel_list);
 diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
 index 05c2dc3..ea1f391 100644
 --- a/drivers/video/s1d13xxxfb.c
@@ -52116,7 +52274,7 @@ index 05c2dc3..ea1f391 100644
  			FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
  		break;
 diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c
-index b2b33fc..f9f4658 100644
+index e188ada..aac63c8 100644
 --- a/drivers/video/smscufx.c
 +++ b/drivers/video/smscufx.c
 @@ -1175,7 +1175,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
@@ -52131,10 +52289,10 @@ index b2b33fc..f9f4658 100644
  
  	pr_debug("released /dev/fb%d user=%d count=%d",
 diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
-index ec03e72..f578436 100644
+index d2e5bc3..4cb05d1 100644
 --- a/drivers/video/udlfb.c
 +++ b/drivers/video/udlfb.c
-@@ -623,11 +623,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
+@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
  		dlfb_urb_completion(urb);
  
  error:
@@ -52229,7 +52387,7 @@ index ec03e72..f578436 100644
  	return count;
  }
 diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
-index e328a61..1b08ecb 100644
+index 7aec6f3..e3b2d55 100644
 --- a/drivers/video/uvesafb.c
 +++ b/drivers/video/uvesafb.c
 @@ -19,6 +19,7 @@
@@ -52240,7 +52398,7 @@ index e328a61..1b08ecb 100644
  #include <video/edid.h>
  #include <video/uvesafb.h>
  #ifdef CONFIG_X86
-@@ -569,10 +570,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
+@@ -566,10 +567,32 @@ static int 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 {
@@ -52273,15 +52431,15 @@ index e328a61..1b08ecb 100644
  		printk(KERN_INFO "uvesafb: protected mode interface info at "
  				 "%04x:%04x\n",
  				 (u16)task->t.regs.es, (u16)task->t.regs.edi);
-@@ -817,13 +840,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
+@@ -814,13 +837,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
  	par->ypan = ypan;
  
  	if (par->pmi_setpal || par->ypan) {
 +#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
  		if (__supported_pte_mask & _PAGE_NX) {
  			par->pmi_setpal = par->ypan = 0;
- 			printk(KERN_WARNING "uvesafb: NX protection is actively."
- 				"We have better not to use the PMI.\n");
+ 			printk(KERN_WARNING "uvesafb: NX protection is active, "
+ 					    "better not use the PMI.\n");
 -		} else {
 +		} else
 +#endif
@@ -52290,7 +52448,7 @@ index e328a61..1b08ecb 100644
  	}
  #else
  	/* The protected mode interface is not available on non-x86. */
-@@ -1457,8 +1481,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
+@@ -1454,8 +1478,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
  	info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
  
  	/* Disable blanking if the user requested so. */
@@ -52304,7 +52462,7 @@ index e328a61..1b08ecb 100644
  
  	/*
  	 * Find out how much IO memory is required for the mode with
-@@ -1534,8 +1561,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
+@@ -1531,8 +1558,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
  	info->flags = FBINFO_FLAG_DEFAULT |
  			(par->ypan ? FBINFO_HWACCEL_YPAN : 0);
  
@@ -52318,7 +52476,7 @@ index e328a61..1b08ecb 100644
  }
  
  static void uvesafb_init_mtrr(struct fb_info *info)
-@@ -1836,6 +1866,11 @@ out:
+@@ -1796,6 +1826,11 @@ out:
  	if (par->vbe_modes)
  		kfree(par->vbe_modes);
  
@@ -52330,7 +52488,7 @@ index e328a61..1b08ecb 100644
  	framebuffer_release(info);
  	return err;
  }
-@@ -1862,6 +1897,12 @@ static int uvesafb_remove(struct platform_device *dev)
+@@ -1823,6 +1858,12 @@ static int uvesafb_remove(struct platform_device *dev)
  				kfree(par->vbe_state_orig);
  			if (par->vbe_state_saved)
  				kfree(par->vbe_state_saved);
@@ -52344,7 +52502,7 @@ index e328a61..1b08ecb 100644
  
  		framebuffer_release(info);
 diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
-index 501b340..d80aa17 100644
+index bd83233..7d8a5aa 100644
 --- a/drivers/video/vesafb.c
 +++ b/drivers/video/vesafb.c
 @@ -9,6 +9,7 @@
@@ -52355,8 +52513,8 @@ index 501b340..d80aa17 100644
  #include <linux/kernel.h>
  #include <linux/errno.h>
  #include <linux/string.h>
-@@ -52,8 +53,8 @@ static int   vram_remap __initdata;		/* Set amount of memory to be used */
- static int   vram_total __initdata;		/* Set total amount of memory */
+@@ -52,8 +53,8 @@ static int   vram_remap;			/* Set amount of memory to be used */
+ static int   vram_total;			/* 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 */
 -static void  (*pmi_start)(void) __read_mostly;
@@ -52366,15 +52524,15 @@ index 501b340..d80aa17 100644
  static int   depth      __read_mostly;
  static int   vga_compat __read_mostly;
  /* --------------------------------------------------------------------- */
-@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
- 	unsigned int size_vmode;
+@@ -234,6 +235,7 @@ static int vesafb_probe(struct platform_device *dev)
  	unsigned int size_remap;
  	unsigned int size_total;
+ 	char *option = NULL;
 +	void *pmi_code = NULL;
  
- 	if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
- 		return -ENODEV;
-@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
+ 	/* ignore error return of fb_get_options */
+ 	fb_get_options("vesafb", &option);
+@@ -280,10 +282,6 @@ static int vesafb_probe(struct platform_device *dev)
  		size_remap = size_total;
  	vesafb_fix.smem_len = size_remap;
  
@@ -52385,7 +52543,7 @@ index 501b340..d80aa17 100644
  	if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
  		printk(KERN_WARNING
  		       "vesafb: cannot reserve video memory at 0x%lx\n",
-@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
+@@ -312,9 +310,21 @@ static int 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);
  
@@ -52409,7 +52567,7 @@ index 501b340..d80aa17 100644
  	}
  
  	if (screen_info.vesapm_seg < 0xc000)
-@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
+@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
  
  	if (ypan || pmi_setpal) {
  		unsigned short *pmi_base;
@@ -52437,7 +52595,7 @@ index 501b340..d80aa17 100644
  		printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
  		if (pmi_base[3]) {
  			printk(KERN_INFO "vesafb: pmi: ports = ");
-@@ -472,8 +498,11 @@ static int __init vesafb_probe(struct platform_device *dev)
+@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
  	info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
  		(ypan ? FBINFO_HWACCEL_YPAN : 0);
  
@@ -52451,7 +52609,7 @@ index 501b340..d80aa17 100644
  
  	if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
  		err = -ENOMEM;
-@@ -488,6 +517,11 @@ static int __init vesafb_probe(struct platform_device *dev)
+@@ -493,6 +522,11 @@ static int vesafb_probe(struct platform_device *dev)
  	       info->node, info->fix.id);
  	return 0;
  err:
@@ -52494,10 +52652,10 @@ index fef20db..d28b1ab 100644
  		return -ENOMEM;
  	return 0;
 diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
-index 055562c..fdfb10d 100644
+index 9ff073f..05cef23 100644
 --- a/fs/9p/vfs_addr.c
 +++ b/fs/9p/vfs_addr.c
-@@ -186,7 +186,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
+@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
  
  	retval = v9fs_file_write_internal(inode,
  					  v9inode->writeback_fid,
@@ -52507,10 +52665,10 @@ index 055562c..fdfb10d 100644
  	if (retval > 0)
  		retval = 0;
 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
-index d86edc8..40ff2fb 100644
+index 94de6d1..8d81256 100644
 --- a/fs/9p/vfs_inode.c
 +++ b/fs/9p/vfs_inode.c
-@@ -1314,7 +1314,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
  void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -52555,51 +52713,18 @@ index 789bc25..fafaeea 100644
  			     &data);
  	if (!inode) {
 diff --git a/fs/aio.c b/fs/aio.c
-index ebd06fd..41c850d 100644
+index 6efb7f6..37da952 100644
 --- a/fs/aio.c
 +++ b/fs/aio.c
-@@ -160,7 +160,7 @@ static int aio_setup_ring(struct kioctx *ctx)
+@@ -338,7 +338,7 @@ static int aio_setup_ring(struct kioctx *ctx)
  	size += sizeof(struct io_event) * nr_events;
- 	nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
  
+ 	nr_pages = PFN_UP(size);
 -	if (nr_pages < 0)
 +	if (nr_pages <= 0)
  		return -EINVAL;
  
- 	nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-@@ -952,6 +952,7 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op)
- static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat)
- {
- 	ssize_t ret;
-+	struct iovec iovstack;
- 
- 	kiocb->ki_nr_segs = kiocb->ki_nbytes;
- 
-@@ -959,17 +960,22 @@ static ssize_t aio_setup_vectored_rw(int rw, struct kiocb *kiocb, bool compat)
- 	if (compat)
- 		ret = compat_rw_copy_check_uvector(rw,
- 				(struct compat_iovec __user *)kiocb->ki_buf,
--				kiocb->ki_nr_segs, 1, &kiocb->ki_inline_vec,
-+				kiocb->ki_nr_segs, 1, &iovstack,
- 				&kiocb->ki_iovec);
- 	else
- #endif
- 		ret = rw_copy_check_uvector(rw,
- 				(struct iovec __user *)kiocb->ki_buf,
--				kiocb->ki_nr_segs, 1, &kiocb->ki_inline_vec,
-+				kiocb->ki_nr_segs, 1, &iovstack,
- 				&kiocb->ki_iovec);
- 	if (ret < 0)
- 		return ret;
- 
-+	if (kiocb->ki_iovec == &iovstack) {
-+		kiocb->ki_inline_vec = iovstack;
-+		kiocb->ki_iovec = &kiocb->ki_inline_vec;
-+	}
-+
- 	/* ki_nbytes now reflect bytes instead of segs */
- 	kiocb->ki_nbytes = ret;
- 	return 0;
+ 	file = aio_private_file(ctx, nr_pages);
 diff --git a/fs/attr.c b/fs/attr.c
 index 1449adb..a2038c2 100644
 --- a/fs/attr.c
@@ -52613,7 +52738,7 @@ index 1449adb..a2038c2 100644
  			goto out_sig;
  		if (offset > inode->i_sb->s_maxbytes)
 diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
-index 3db70da..7aeec5b 100644
+index 689e40d..515cac5 100644
 --- a/fs/autofs4/waitq.c
 +++ b/fs/autofs4/waitq.c
 @@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
@@ -52625,7 +52750,7 @@ index 3db70da..7aeec5b 100644
  	ssize_t wr = 0;
  
  	sigpipe = sigismember(&current->pending.signal, SIGPIPE);
-@@ -346,6 +346,10 @@ static int validate_request(struct autofs_wait_queue **wait,
+@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
  	return 1;
  }
  
@@ -52636,7 +52761,7 @@ index 3db70da..7aeec5b 100644
  int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
  		enum autofs_notify notify)
  {
-@@ -379,7 +383,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
+@@ -373,7 +377,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
  
  	/* If this is a direct mount request create a dummy name */
  	if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
@@ -52650,7 +52775,7 @@ index 3db70da..7aeec5b 100644
  		qstr.len = autofs4_getpath(sbi, dentry, &name);
  		if (!qstr.len) {
 diff --git a/fs/befs/endian.h b/fs/befs/endian.h
-index 2722387..c8dd2a7 100644
+index 2722387..56059b5 100644
 --- a/fs/befs/endian.h
 +++ b/fs/befs/endian.h
 @@ -11,7 +11,7 @@
@@ -52671,11 +52796,20 @@ index 2722387..c8dd2a7 100644
  fs32_to_cpu(const struct super_block *sb, fs32 n)
  {
  	if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
+@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
+ 		return (__force fs32)cpu_to_be32(n);
+ }
+ 
+-static inline u16
++static inline u16 __intentional_overflow(-1)
+ fs16_to_cpu(const struct super_block *sb, fs16 n)
+ {
+ 	if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
 diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
-index f95dddc..b1e2c1c 100644
+index e9c75e2..1baece1 100644
 --- a/fs/befs/linuxvfs.c
 +++ b/fs/befs/linuxvfs.c
-@@ -510,7 +510,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
+@@ -514,7 +514,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) {
@@ -52685,7 +52819,7 @@ index f95dddc..b1e2c1c 100644
  			kfree(link);
  	}
 diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
-index bce8769..7fc7544 100644
+index 89dec7f..361b0d75 100644
 --- a/fs/binfmt_aout.c
 +++ b/fs/binfmt_aout.c
 @@ -16,6 +16,7 @@
@@ -52727,7 +52861,7 @@ index bce8769..7fc7544 100644
  	if (ex.a_data + ex.a_bss > rlim)
  		return -ENOMEM;
  
-@@ -267,6 +274,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
+@@ -265,6 +272,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
  
  	install_exec_creds(bprm);
  
@@ -52755,7 +52889,7 @@ index bce8769..7fc7544 100644
  	if (N_MAGIC(ex) == OMAGIC) {
  		unsigned long text_addr, map_size;
  		loff_t pos;
-@@ -324,7 +352,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
+@@ -322,7 +350,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
  		}
  
  		error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
@@ -52765,7 +52899,7 @@ index bce8769..7fc7544 100644
  				fd_offset + ex.a_text);
  		if (error != N_DATADDR(ex)) {
 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 3aac8e9..1fd8b35 100644
+index 4c94a79..f428019 100644
 --- a/fs/binfmt_elf.c
 +++ b/fs/binfmt_elf.c
 @@ -34,6 +34,7 @@
@@ -52919,7 +53053,22 @@ index 3aac8e9..1fd8b35 100644
  				error = -ENOMEM;
  				goto out_close;
  			}
-@@ -538,6 +567,315 @@ out:
+@@ -525,9 +554,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+ 		elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
+ 
+ 		/* Map the last of the bss segment */
+-		error = vm_brk(elf_bss, last_bss - elf_bss);
+-		if (BAD_ADDR(error))
+-			goto out_close;
++		if (last_bss > elf_bss) {
++			error = vm_brk(elf_bss, last_bss - elf_bss);
++			if (BAD_ADDR(error))
++				goto out_close;
++		}
+ 	}
+ 
+ 	error = load_addr;
+@@ -538,6 +569,315 @@ out:
  	return error;
  }
  
@@ -53235,7 +53384,7 @@ index 3aac8e9..1fd8b35 100644
  /*
   * These are the functions used to load ELF style executables and shared
   * libraries.  There is no binary dependent code anywhere else.
-@@ -554,6 +892,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
+@@ -554,6 +894,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
  {
  	unsigned int random_variable = 0;
  
@@ -53247,7 +53396,7 @@ index 3aac8e9..1fd8b35 100644
  	if ((current->flags & PF_RANDOMIZE) &&
  		!(current->personality & ADDR_NO_RANDOMIZE)) {
  		random_variable = get_random_int() & STACK_RND_MASK;
-@@ -572,7 +915,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -572,7 +917,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
   	unsigned long load_addr = 0, load_bias = 0;
  	int load_addr_set = 0;
  	char * elf_interpreter = NULL;
@@ -53256,7 +53405,7 @@ index 3aac8e9..1fd8b35 100644
  	struct elf_phdr *elf_ppnt, *elf_phdata;
  	unsigned long elf_bss, elf_brk;
  	int retval, i;
-@@ -582,12 +925,12 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -582,12 +927,12 @@ static int load_elf_binary(struct linux_binprm *bprm)
  	unsigned long start_code, end_code, start_data, end_data;
  	unsigned long reloc_func_desc __maybe_unused = 0;
  	int executable_stack = EXSTACK_DEFAULT;
@@ -53270,7 +53419,7 @@ index 3aac8e9..1fd8b35 100644
  
  	loc = kmalloc(sizeof(*loc), GFP_KERNEL);
  	if (!loc) {
-@@ -723,11 +1066,81 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -723,11 +1068,81 @@ static int load_elf_binary(struct linux_binprm *bprm)
  		goto out_free_dentry;
  
  	/* OK, This is the point of no return */
@@ -53353,7 +53502,7 @@ index 3aac8e9..1fd8b35 100644
  	if (elf_read_implies_exec(loc->elf_ex, executable_stack))
  		current->personality |= READ_IMPLIES_EXEC;
  
-@@ -819,6 +1232,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -817,6 +1232,20 @@ static int load_elf_binary(struct linux_binprm *bprm)
  #else
  			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
  #endif
@@ -53374,7 +53523,7 @@ index 3aac8e9..1fd8b35 100644
  		}
  
  		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-@@ -851,9 +1278,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -849,9 +1278,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
  		 * allowed task size. Note that p_filesz must always be
  		 * <= p_memsz so it is only necessary to check p_memsz.
  		 */
@@ -53387,7 +53536,7 @@ index 3aac8e9..1fd8b35 100644
  			/* set_brk can never work. Avoid overflows. */
  			send_sig(SIGKILL, current, 0);
  			retval = -EINVAL;
-@@ -892,17 +1319,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
+@@ -890,17 +1319,45 @@ static int load_elf_binary(struct linux_binprm *bprm)
  		goto out_free_dentry;
  	}
  	if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
@@ -53401,13 +53550,11 @@ index 3aac8e9..1fd8b35 100644
 +		 */
  	}
  
--	if (elf_interpreter) {
--		unsigned long interp_map_addr = 0;
 +#ifdef CONFIG_PAX_RANDMMAP
 +	if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
 +		unsigned long start, size, flags;
 +		vm_flags_t vm_flags;
- 
++
 +		start = ELF_PAGEALIGN(elf_brk);
 +		size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
 +		flags = MAP_FIXED | MAP_PRIVATE;
@@ -53432,14 +53579,16 @@ index 3aac8e9..1fd8b35 100644
 +	}
 +#endif
 +
-+	if (elf_interpreter) {
+ 	if (elf_interpreter) {
+-		unsigned long interp_map_addr = 0;
+-
  		elf_entry = load_elf_interp(&loc->interp_elf_ex,
  					    interpreter,
 -					    &interp_map_addr,
  					    load_bias);
  		if (!IS_ERR((void *)elf_entry)) {
  			/*
-@@ -1124,7 +1579,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
+@@ -1122,7 +1579,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
   * Decide what to dump of a segment, part, all or none.
   */
  static unsigned long vma_dump_size(struct vm_area_struct *vma,
@@ -53448,7 +53597,7 @@ index 3aac8e9..1fd8b35 100644
  {
  #define FILTER(type)	(mm_flags & (1UL << MMF_DUMP_##type))
  
-@@ -1162,7 +1617,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
+@@ -1160,7 +1617,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
  	if (vma->vm_file == NULL)
  		return 0;
  
@@ -53457,7 +53606,7 @@ index 3aac8e9..1fd8b35 100644
  		goto whole;
  
  	/*
-@@ -1387,9 +1842,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
+@@ -1385,9 +1842,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;
@@ -53469,7 +53618,7 @@ index 3aac8e9..1fd8b35 100644
  	fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
  }
  
-@@ -1398,7 +1853,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
+@@ -1396,7 +1853,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
  {
  	mm_segment_t old_fs = get_fs();
  	set_fs(KERNEL_DS);
@@ -53478,7 +53627,7 @@ index 3aac8e9..1fd8b35 100644
  	set_fs(old_fs);
  	fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
  }
-@@ -2025,14 +2480,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
+@@ -2023,14 +2480,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,
@@ -53495,7 +53644,7 @@ index 3aac8e9..1fd8b35 100644
  	return size;
  }
  
-@@ -2125,7 +2580,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2123,7 +2580,7 @@ static int elf_core_dump(struct coredump_params *cprm)
  
  	dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
  
@@ -53504,7 +53653,7 @@ index 3aac8e9..1fd8b35 100644
  	offset += elf_core_extra_data_size();
  	e_shoff = offset;
  
-@@ -2139,10 +2594,12 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2137,10 +2594,12 @@ static int elf_core_dump(struct coredump_params *cprm)
  	offset = dataoff;
  
  	size += sizeof(*elf);
@@ -53517,7 +53666,7 @@ index 3aac8e9..1fd8b35 100644
  	if (size > cprm->limit
  	    || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
  		goto end_coredump;
-@@ -2156,7 +2613,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2154,7 +2613,7 @@ static int elf_core_dump(struct coredump_params *cprm)
  		phdr.p_offset = offset;
  		phdr.p_vaddr = vma->vm_start;
  		phdr.p_paddr = 0;
@@ -53526,7 +53675,7 @@ index 3aac8e9..1fd8b35 100644
  		phdr.p_memsz = vma->vm_end - vma->vm_start;
  		offset += phdr.p_filesz;
  		phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
-@@ -2167,6 +2624,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2165,6 +2624,7 @@ static int elf_core_dump(struct coredump_params *cprm)
  		phdr.p_align = ELF_EXEC_PAGESIZE;
  
  		size += sizeof(phdr);
@@ -53534,7 +53683,7 @@ index 3aac8e9..1fd8b35 100644
  		if (size > cprm->limit
  		    || !dump_write(cprm->file, &phdr, sizeof(phdr)))
  			goto end_coredump;
-@@ -2191,7 +2649,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2189,7 +2649,7 @@ static int elf_core_dump(struct coredump_params *cprm)
  		unsigned long addr;
  		unsigned long end;
  
@@ -53543,7 +53692,7 @@ index 3aac8e9..1fd8b35 100644
  
  		for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
  			struct page *page;
-@@ -2200,6 +2658,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2198,6 +2658,7 @@ static int elf_core_dump(struct coredump_params *cprm)
  			page = get_dump_page(addr);
  			if (page) {
  				void *kaddr = kmap(page);
@@ -53551,7 +53700,7 @@ index 3aac8e9..1fd8b35 100644
  				stop = ((size += PAGE_SIZE) > cprm->limit) ||
  					!dump_write(cprm->file, kaddr,
  						    PAGE_SIZE);
-@@ -2217,6 +2676,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2215,6 +2676,7 @@ static int elf_core_dump(struct coredump_params *cprm)
  
  	if (e_phnum == PN_XNUM) {
  		size += sizeof(*shdr4extnum);
@@ -53559,7 +53708,7 @@ index 3aac8e9..1fd8b35 100644
  		if (size > cprm->limit
  		    || !dump_write(cprm->file, shdr4extnum,
  				   sizeof(*shdr4extnum)))
-@@ -2237,6 +2697,167 @@ out:
+@@ -2235,6 +2697,167 @@ out:
  
  #endif		/* CONFIG_ELF_CORE */
  
@@ -53764,7 +53913,7 @@ index d50bbe5..af3b649 100644
  			goto err;
  		}
 diff --git a/fs/bio.c b/fs/bio.c
-index 5e7507d..418c639 100644
+index ea5035d..a2932eb 100644
 --- a/fs/bio.c
 +++ b/fs/bio.c
 @@ -1106,7 +1106,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
@@ -53795,10 +53944,10 @@ index 5e7507d..418c639 100644
  	bio_for_each_segment_all(bvec, bio, i) {
  		char *addr = page_address(bvec->bv_page);
 diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 85f5c85..d6f0b1a 100644
+index 1e86823..8e34695 100644
 --- a/fs/block_dev.c
 +++ b/fs/block_dev.c
-@@ -658,7 +658,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
+@@ -637,7 +637,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
  	else if (bdev->bd_contains == bdev)
  		return true;  	 /* is a whole device which isn't held */
  
@@ -53808,10 +53957,10 @@ index 85f5c85..d6f0b1a 100644
  	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 7fb054b..ad36c67 100644
+index 61b5bcd..7eeede8 100644
 --- a/fs/btrfs/ctree.c
 +++ b/fs/btrfs/ctree.c
-@@ -1076,9 +1076,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
+@@ -1028,9 +1028,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
  		free_extent_buffer(buf);
  		add_root_to_dirty_list(root);
  	} else {
@@ -53828,10 +53977,10 @@ index 7fb054b..ad36c67 100644
  
  		WARN_ON(trans->transid != btrfs_header_generation(parent));
 diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
-index f26f38c..3d0f149 100644
+index cbd9523..5cca781 100644
 --- a/fs/btrfs/delayed-inode.c
 +++ b/fs/btrfs/delayed-inode.c
-@@ -458,7 +458,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
+@@ -459,7 +459,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
  
  static void finish_one_item(struct btrfs_delayed_root *delayed_root)
  {
@@ -53840,7 +53989,7 @@ index f26f38c..3d0f149 100644
  	if ((atomic_dec_return(&delayed_root->items) <
  	    BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
  	    waitqueue_active(&delayed_root->wait))
-@@ -1391,7 +1391,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
+@@ -1378,7 +1378,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
  static int refs_newer(struct btrfs_delayed_root *delayed_root,
  		      int seq, int count)
  {
@@ -53849,7 +53998,7 @@ index f26f38c..3d0f149 100644
  
  	if (val < seq || val >= seq + count)
  		return 1;
-@@ -1408,7 +1408,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
+@@ -1395,7 +1395,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
  	if (atomic_read(&delayed_root->items) < BTRFS_DELAYED_BACKGROUND)
  		return;
  
@@ -53859,7 +54008,7 @@ index f26f38c..3d0f149 100644
  	if (atomic_read(&delayed_root->items) >= BTRFS_DELAYED_WRITEBACK) {
  		int ret;
 diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
-index 1d5c5f7..0ba0afc 100644
+index a4b38f9..f86a509 100644
 --- a/fs/btrfs/delayed-inode.h
 +++ b/fs/btrfs/delayed-inode.h
 @@ -43,7 +43,7 @@ struct btrfs_delayed_root {
@@ -53881,10 +54030,10 @@ index 1d5c5f7..0ba0afc 100644
  	spin_lock_init(&delayed_root->lock);
  	init_waitqueue_head(&delayed_root->wait);
 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 8dedf40..1a83977 100644
+index 9d46f60..a8f09eb 100644
 --- a/fs/btrfs/ioctl.c
 +++ b/fs/btrfs/ioctl.c
-@@ -3084,9 +3084,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -3464,9 +3464,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
  	for (i = 0; i < num_types; i++) {
  		struct btrfs_space_info *tmp;
  
@@ -53897,7 +54046,7 @@ index 8dedf40..1a83977 100644
  		info = NULL;
  		rcu_read_lock();
  		list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -3108,10 +3111,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -3488,10 +3491,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
  				memcpy(dest, &space, sizeof(space));
  				dest++;
  				space_args.total_spaces++;
@@ -53909,23 +54058,23 @@ index 8dedf40..1a83977 100644
  		up_read(&info->groups_sem);
  	}
 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
-index f0857e0..e7023c5 100644
+index e913328..a34fb36 100644
 --- a/fs/btrfs/super.c
 +++ b/fs/btrfs/super.c
-@@ -265,7 +265,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
+@@ -266,7 +266,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
  		           function, line, errstr);
  		return;
  	}
 -	ACCESS_ONCE(trans->transaction->aborted) = errno;
 +	ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
- 	__btrfs_std_error(root->fs_info, function, line, errno, NULL);
- }
- /*
+ 	/* Wake up anybody who may be waiting on this transaction */
+ 	wake_up(&root->fs_info->transaction_wait);
+ 	wake_up(&root->fs_info->transaction_blocked_wait);
 diff --git a/fs/buffer.c b/fs/buffer.c
-index d2a4d1b..df798ca 100644
+index 6024877..7bd000a 100644
 --- a/fs/buffer.c
 +++ b/fs/buffer.c
-@@ -3367,7 +3367,7 @@ void __init buffer_init(void)
+@@ -3426,7 +3426,7 @@ void __init buffer_init(void)
  	bh_cachep = kmem_cache_create("buffer_head",
  			sizeof(struct buffer_head), 0,
  				(SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
@@ -53995,7 +54144,7 @@ index 0a1467b..6a53245 100644
  
  	cache->bstop_percent = bstop;
 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
-index 4938251..7e01445 100644
+index 5349473..d6c0b93 100644
 --- a/fs/cachefiles/internal.h
 +++ b/fs/cachefiles/internal.h
 @@ -59,7 +59,7 @@ struct cachefiles_cache {
@@ -54033,7 +54182,7 @@ index 4938251..7e01445 100644
  
  #else
 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
-index 8c01c5fc..15f982e 100644
+index f4a08d7..5aa4599 100644
 --- a/fs/cachefiles/namei.c
 +++ b/fs/cachefiles/namei.c
 @@ -317,7 +317,7 @@ try_again:
@@ -54076,10 +54225,10 @@ index eccd339..4c1d995 100644
  			return 0;
  
 diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
-index 317f9ee..3d24511 100644
+index ebaff36..7e3ea26 100644
 --- a/fs/cachefiles/rdwr.c
 +++ b/fs/cachefiles/rdwr.c
-@@ -966,7 +966,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
+@@ -950,7 +950,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(
@@ -54089,23 +54238,23 @@ index 317f9ee..3d24511 100644
  			kunmap(page);
  			file_end_write(file);
 diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
-index f02d82b..2632cf86 100644
+index 868b61d..58835a5 100644
 --- a/fs/ceph/dir.c
 +++ b/fs/ceph/dir.c
-@@ -243,7 +243,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
+@@ -240,7 +240,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
  	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
  	struct ceph_mds_client *mdsc = fsc->mdsc;
- 	unsigned frag = fpos_frag(filp->f_pos);
--	int off = fpos_off(filp->f_pos);
-+	unsigned int off = fpos_off(filp->f_pos);
+ 	unsigned frag = fpos_frag(ctx->pos);
+-	int off = fpos_off(ctx->pos);
++	unsigned int off = fpos_off(ctx->pos);
  	int err;
  	u32 ftype;
  	struct ceph_mds_reply_info_parsed *rinfo;
 diff --git a/fs/ceph/super.c b/fs/ceph/super.c
-index 7d377c9..3fb6559 100644
+index 6a0951e..03fac6d 100644
 --- a/fs/ceph/super.c
 +++ b/fs/ceph/super.c
-@@ -839,7 +839,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
+@@ -870,7 +870,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
  /*
   * construct our own bdi so we can control readahead, etc.
   */
@@ -54114,7 +54263,7 @@ index 7d377c9..3fb6559 100644
  
  static int ceph_register_bdi(struct super_block *sb,
  			     struct ceph_fs_client *fsc)
-@@ -856,7 +856,7 @@ static int ceph_register_bdi(struct super_block *sb,
+@@ -887,7 +887,7 @@ static int ceph_register_bdi(struct super_block *sb,
  			default_backing_dev_info.ra_pages;
  
  	err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
@@ -54124,10 +54273,10 @@ index 7d377c9..3fb6559 100644
  		sb->s_bdi = &fsc->backing_dev_info;
  	return err;
 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
-index d597483..747901b 100644
+index f3ac415..3d2420c 100644
 --- a/fs/cifs/cifs_debug.c
 +++ b/fs/cifs/cifs_debug.c
-@@ -284,8 +284,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
+@@ -286,8 +286,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
  
  	if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
  #ifdef CONFIG_CIFS_STATS2
@@ -54138,7 +54287,7 @@ index d597483..747901b 100644
  #endif /* CONFIG_CIFS_STATS2 */
  		spin_lock(&cifs_tcp_ses_lock);
  		list_for_each(tmp1, &cifs_tcp_ses_list) {
-@@ -298,7 +298,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
+@@ -300,7 +300,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
  					tcon = list_entry(tmp3,
  							  struct cifs_tcon,
  							  tcon_list);
@@ -54147,7 +54296,7 @@ index d597483..747901b 100644
  					if (server->ops->clear_stats)
  						server->ops->clear_stats(tcon);
  				}
-@@ -330,8 +330,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
+@@ -332,8 +332,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
  			smBufAllocCount.counter, cifs_min_small);
  #ifdef CONFIG_CIFS_STATS2
  	seq_printf(m, "Total Large %d Small %d Allocations\n",
@@ -54158,7 +54307,7 @@ index d597483..747901b 100644
  #endif /* CONFIG_CIFS_STATS2 */
  
  	seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
-@@ -360,7 +360,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
+@@ -362,7 +362,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
  				if (tcon->need_reconnect)
  					seq_puts(m, "\tDISCONNECTED ");
  				seq_printf(m, "\nSMBs: %d",
@@ -54168,10 +54317,10 @@ index d597483..747901b 100644
  					server->ops->print_stats(m, tcon);
  			}
 diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
-index 3752b9f..8db5569 100644
+index 77fc5e1..e3d13e6 100644
 --- a/fs/cifs/cifsfs.c
 +++ b/fs/cifs/cifsfs.c
-@@ -1035,7 +1035,7 @@ cifs_init_request_bufs(void)
+@@ -1056,7 +1056,7 @@ cifs_init_request_bufs(void)
  */
  	cifs_req_cachep = kmem_cache_create("cifs_request",
  					    CIFSMaxBufSize + max_hdr_size, 0,
@@ -54180,7 +54329,7 @@ index 3752b9f..8db5569 100644
  	if (cifs_req_cachep == NULL)
  		return -ENOMEM;
  
-@@ -1062,7 +1062,7 @@ cifs_init_request_bufs(void)
+@@ -1083,7 +1083,7 @@ cifs_init_request_bufs(void)
  	efficient to alloc 1 per page off the slab compared to 17K (5page)
  	alloc of large cifs buffers even when page debugging is on */
  	cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
@@ -54189,7 +54338,7 @@ index 3752b9f..8db5569 100644
  			NULL);
  	if (cifs_sm_req_cachep == NULL) {
  		mempool_destroy(cifs_req_poolp);
-@@ -1147,8 +1147,8 @@ init_cifs(void)
+@@ -1168,8 +1168,8 @@ init_cifs(void)
  	atomic_set(&bufAllocCount, 0);
  	atomic_set(&smBufAllocCount, 0);
  #ifdef CONFIG_CIFS_STATS2
@@ -54201,10 +54350,10 @@ index 3752b9f..8db5569 100644
  
  	atomic_set(&midCount, 0);
 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
-index ea3a0b3..0194e39 100644
+index c8e03f8..75362f6 100644
 --- a/fs/cifs/cifsglob.h
 +++ b/fs/cifs/cifsglob.h
-@@ -752,35 +752,35 @@ struct cifs_tcon {
+@@ -758,35 +758,35 @@ struct cifs_tcon {
  	__u16 Flags;		/* optional support bits */
  	enum statusEnum tidStatus;
  #ifdef CONFIG_CIFS_STATS
@@ -54264,7 +54413,7 @@ index ea3a0b3..0194e39 100644
  		} smb2_stats;
  #endif /* CONFIG_CIFS_SMB2 */
  	} stats;
-@@ -1081,7 +1081,7 @@ convert_delimiter(char *path, char delim)
+@@ -1111,7 +1111,7 @@ convert_delimiter(char *path, char delim)
  }
  
  #ifdef CONFIG_CIFS_STATS
@@ -54273,7 +54422,7 @@ index ea3a0b3..0194e39 100644
  
  static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
  					    unsigned int bytes)
-@@ -1446,8 +1446,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
+@@ -1477,8 +1477,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
  /* Various Debug counters */
  GLOBAL_EXTERN atomic_t bufAllocCount;    /* current number allocated  */
  #ifdef CONFIG_CIFS_STATS2
@@ -54285,10 +54434,10 @@ index ea3a0b3..0194e39 100644
  GLOBAL_EXTERN atomic_t smBufAllocCount;
  GLOBAL_EXTERN atomic_t midCount;
 diff --git a/fs/cifs/link.c b/fs/cifs/link.c
-index b83c3f5..6437caa 100644
+index 7e36ceb..109252f 100644
 --- a/fs/cifs/link.c
 +++ b/fs/cifs/link.c
-@@ -616,7 +616,7 @@ symlink_exit:
+@@ -624,7 +624,7 @@ symlink_exit:
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
  {
@@ -54298,10 +54447,10 @@ index b83c3f5..6437caa 100644
  		kfree(p);
  }
 diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
-index 1bec014..f329411 100644
+index 138a011..cf9e13a 100644
 --- a/fs/cifs/misc.c
 +++ b/fs/cifs/misc.c
-@@ -169,7 +169,7 @@ cifs_buf_get(void)
+@@ -170,7 +170,7 @@ cifs_buf_get(void)
  		memset(ret_buf, 0, buf_size + 3);
  		atomic_inc(&bufAllocCount);
  #ifdef CONFIG_CIFS_STATS2
@@ -54310,7 +54459,7 @@ index 1bec014..f329411 100644
  #endif /* CONFIG_CIFS_STATS2 */
  	}
  
-@@ -204,7 +204,7 @@ cifs_small_buf_get(void)
+@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
  	/*	memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
  		atomic_inc(&smBufAllocCount);
  #ifdef CONFIG_CIFS_STATS2
@@ -54320,10 +54469,10 @@ index 1bec014..f329411 100644
  
  	}
 diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
-index 3efdb9d..e845a5e 100644
+index e50554b..c011413 100644
 --- a/fs/cifs/smb1ops.c
 +++ b/fs/cifs/smb1ops.c
-@@ -591,27 +591,27 @@ static void
+@@ -609,27 +609,27 @@ static void
  cifs_clear_stats(struct cifs_tcon *tcon)
  {
  #ifdef CONFIG_CIFS_STATS
@@ -54372,7 +54521,7 @@ index 3efdb9d..e845a5e 100644
  #endif
  }
  
-@@ -620,36 +620,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
+@@ -638,36 +638,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
  {
  #ifdef CONFIG_CIFS_STATS
  	seq_printf(m, " Oplocks breaks: %d",
@@ -54429,10 +54578,10 @@ index 3efdb9d..e845a5e 100644
  }
  
 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
-index f2e76f3..c44fac7 100644
+index 861b332..5506392 100644
 --- a/fs/cifs/smb2ops.c
 +++ b/fs/cifs/smb2ops.c
-@@ -274,8 +274,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
+@@ -282,8 +282,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
  #ifdef CONFIG_CIFS_STATS
  	int i;
  	for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
@@ -54443,7 +54592,7 @@ index f2e76f3..c44fac7 100644
  	}
  #endif
  }
-@@ -284,66 +284,66 @@ static void
+@@ -311,65 +311,65 @@ static void
  smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
  {
  #ifdef CONFIG_CIFS_STATS
@@ -54461,7 +54610,6 @@ index f2e76f3..c44fac7 100644
 -		   atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
 +		   atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
 +		   atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
- #define SMB2LOGOFF		0x0002 /* trivial request/resp */
  	seq_printf(m, "\nLogoffs: %d sent %d failed",
 -		   atomic_read(&sent[SMB2_LOGOFF_HE]),
 -		   atomic_read(&failed[SMB2_LOGOFF_HE]));
@@ -54551,10 +54699,10 @@ index f2e76f3..c44fac7 100644
  }
  
 diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
-index 2b95ce2..d079d75 100644
+index edccb52..16bc6db 100644
 --- a/fs/cifs/smb2pdu.c
 +++ b/fs/cifs/smb2pdu.c
-@@ -1760,8 +1760,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
+@@ -1957,8 +1957,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
  	default:
  		cifs_dbg(VFS, "info level %u isn't supported\n",
  			 srch_inf->info_level);
@@ -54613,7 +54761,7 @@ index 1da168c..8bc7ff6 100644
  
  	return hit;
 diff --git a/fs/compat.c b/fs/compat.c
-index fc3b55d..7b568ae 100644
+index 6af20de..fec3fbb 100644
 --- a/fs/compat.c
 +++ b/fs/compat.c
 @@ -54,7 +54,7 @@
@@ -54643,15 +54791,15 @@ index fc3b55d..7b568ae 100644
  		goto out;
  	if (nr_segs > fast_segs) {
  		ret = -ENOMEM;
-@@ -833,6 +833,7 @@ struct compat_old_linux_dirent {
- 
+@@ -834,6 +834,7 @@ struct compat_old_linux_dirent {
  struct compat_readdir_callback {
+ 	struct dir_context ctx;
  	struct compat_old_linux_dirent __user *dirent;
 +	struct file * file;
  	int result;
  };
  
-@@ -850,6 +851,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
+@@ -851,6 +852,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
  		buf->result = -EOVERFLOW;
  		return -EOVERFLOW;
  	}
@@ -54662,23 +54810,23 @@ index fc3b55d..7b568ae 100644
  	buf->result++;
  	dirent = buf->dirent;
  	if (!access_ok(VERIFY_WRITE, dirent,
-@@ -880,6 +885,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
+@@ -882,6 +887,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
+ 	if (!f.file)
+ 		return -EBADF;
  
- 	buf.result = 0;
- 	buf.dirent = dirent;
 +	buf.file = f.file;
- 
- 	error = vfs_readdir(f.file, compat_fillonedir, &buf);
+ 	error = iterate_dir(f.file, &buf.ctx);
  	if (buf.result)
-@@ -899,6 +905,7 @@ struct compat_linux_dirent {
- struct compat_getdents_callback {
+ 		error = buf.result;
+@@ -901,6 +907,7 @@ struct compat_getdents_callback {
+ 	struct dir_context ctx;
  	struct compat_linux_dirent __user *current_dir;
  	struct compat_linux_dirent __user *previous;
 +	struct file * file;
  	int count;
  	int error;
  };
-@@ -920,6 +927,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
+@@ -922,6 +929,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
  		buf->error = -EOVERFLOW;
  		return -EOVERFLOW;
  	}
@@ -54689,23 +54837,23 @@ index fc3b55d..7b568ae 100644
  	dirent = buf->previous;
  	if (dirent) {
  		if (__put_user(offset, &dirent->d_off))
-@@ -965,6 +976,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
- 	buf.previous = NULL;
- 	buf.count = count;
- 	buf.error = 0;
-+	buf.file = f.file;
+@@ -967,6 +978,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
+ 	if (!f.file)
+ 		return -EBADF;
  
- 	error = vfs_readdir(f.file, compat_filldir, &buf);
++	buf.file = f.file;
+ 	error = iterate_dir(f.file, &buf.ctx);
  	if (error >= 0)
-@@ -985,6 +997,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
- struct compat_getdents_callback64 {
+ 		error = buf.error;
+@@ -987,6 +999,7 @@ struct compat_getdents_callback64 {
+ 	struct dir_context ctx;
  	struct linux_dirent64 __user *current_dir;
  	struct linux_dirent64 __user *previous;
 +	struct file * file;
  	int count;
  	int error;
  };
-@@ -1001,6 +1014,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
+@@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
  	buf->error = -EINVAL;	/* only used if we fail.. */
  	if (reclen > buf->count)
  		return -EINVAL;
@@ -54716,22 +54864,14 @@ index fc3b55d..7b568ae 100644
  	dirent = buf->previous;
  
  	if (dirent) {
-@@ -1050,13 +1067,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
- 	buf.previous = NULL;
- 	buf.count = count;
- 	buf.error = 0;
-+	buf.file = f.file;
+@@ -1052,6 +1069,7 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
+ 	if (!f.file)
+ 		return -EBADF;
  
- 	error = vfs_readdir(f.file, compat_filldir64, &buf);
++	buf.file = f.file;
+ 	error = iterate_dir(f.file, &buf.ctx);
  	if (error >= 0)
  		error = buf.error;
- 	lastdirent = buf.previous;
- 	if (lastdirent) {
--		typeof(lastdirent->d_off) d_off = f.file->f_pos;
-+		typeof(((struct linux_dirent64 *)0)->d_off) d_off = f.file->f_pos;
- 		if (__put_user_unaligned(d_off, &lastdirent->d_off))
- 			error = -EFAULT;
- 		else
 diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
 index a81147e..20bf2b5 100644
 --- a/fs/compat_binfmt_elf.c
@@ -54751,10 +54891,10 @@ index a81147e..20bf2b5 100644
  
  /*
 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
-index 996cdc5..15e2f33 100644
+index 5d19acf..9ab093b 100644
 --- a/fs/compat_ioctl.c
 +++ b/fs/compat_ioctl.c
-@@ -622,7 +622,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
+@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
  			return -EFAULT;
                  if (__get_user(udata, &ss32->iomem_base))
  			return -EFAULT;
@@ -54763,7 +54903,7 @@ index 996cdc5..15e2f33 100644
                  if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
  		    __get_user(ss.port_high, &ss32->port_high))
  			return -EFAULT;
-@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
+@@ -702,8 +702,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
  	for (i = 0; i < nmsgs; i++) {
  		if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
  			return -EFAULT;
@@ -54774,7 +54914,7 @@ index 996cdc5..15e2f33 100644
  			return -EFAULT;
  	}
  	return sys_ioctl(fd, cmd, (unsigned long)tdata);
-@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
+@@ -796,7 +796,7 @@ static int compat_ioctl_preallocate(struct file *file,
  	    copy_in_user(&p->l_len,	&p32->l_len,	sizeof(s64)) ||
  	    copy_in_user(&p->l_sysid,	&p32->l_sysid,	sizeof(s32)) ||
  	    copy_in_user(&p->l_pid,	&p32->l_pid,	sizeof(u32)) ||
@@ -54783,7 +54923,7 @@ index 996cdc5..15e2f33 100644
  		return -EFAULT;
  
  	return ioctl_preallocate(file, p);
-@@ -1619,8 +1619,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
+@@ -1616,8 +1616,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
  static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
  {
  	unsigned int a, b;
@@ -54795,65 +54935,38 @@ index 996cdc5..15e2f33 100644
  		return 1;
  	if (a < b)
 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
-index fa38d07..acce73f 100644
+index 511d415..319d0e5 100644
 --- a/fs/configfs/dir.c
 +++ b/fs/configfs/dir.c
-@@ -1577,7 +1577,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
- 			}
- 			for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
- 				struct configfs_dirent *next;
--				const char * name;
-+				const unsigned char * name;
-+				char d_name[sizeof(next->s_dentry->d_iname)];
- 				int len;
- 				struct inode *inode = NULL;
- 
-@@ -1587,7 +1588,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
- 					continue;
- 
- 				name = configfs_get_name(next);
--				len = strlen(name);
-+				if (next->s_dentry && name == next->s_dentry->d_iname) {
-+					len =  next->s_dentry->d_name.len;
-+					memcpy(d_name, name, len);
-+					name = d_name;
-+				} else
-+					len = strlen(name);
+@@ -1558,7 +1558,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
+ 	}
+ 	for (p = q->next; p != &parent_sd->s_children; p = p->next) {
+ 		struct configfs_dirent *next;
+-		const char *name;
++		const unsigned char * name;
++		char d_name[sizeof(next->s_dentry->d_iname)];
+ 		int len;
+ 		struct inode *inode = NULL;
  
- 				/*
- 				 * We'll have a dentry and an inode for
+@@ -1567,7 +1568,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
+ 			continue;
+ 
+ 		name = configfs_get_name(next);
+-		len = strlen(name);
++		if (next->s_dentry && name == next->s_dentry->d_iname) {
++			len =  next->s_dentry->d_name.len;
++			memcpy(d_name, name, len);
++			name = d_name;
++		} else
++			len = strlen(name);
+ 
+ 		/*
+ 		 * We'll have a dentry and an inode for
 diff --git a/fs/coredump.c b/fs/coredump.c
-index dafafba..10b3b27 100644
+index 9bdeca1..2a9b08d 100644
 --- a/fs/coredump.c
 +++ b/fs/coredump.c
-@@ -52,7 +52,7 @@ struct core_name {
- 	char *corename;
- 	int used, size;
- };
--static atomic_t call_count = ATOMIC_INIT(1);
-+static atomic_unchecked_t call_count = ATOMIC_INIT(1);
- 
- /* The maximal length of core_pattern is also specified in sysctl.c */
- 
-@@ -60,7 +60,7 @@ static int expand_corename(struct core_name *cn)
- {
- 	char *old_corename = cn->corename;
- 
--	cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
-+	cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
- 	cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
- 
- 	if (!cn->corename) {
-@@ -157,7 +157,7 @@ static int format_corename(struct core_name *cn, struct coredump_params *cprm)
- 	int pid_in_pattern = 0;
- 	int err = 0;
- 
--	cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
-+	cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
- 	cn->corename = kmalloc(cn->size, GFP_KERNEL);
- 	cn->used = 0;
- 
-@@ -435,8 +435,8 @@ static void wait_for_dump_helpers(struct file *file)
+@@ -438,8 +438,8 @@ static void wait_for_dump_helpers(struct file *file)
  	struct pipe_inode_info *pipe = file->private_data;
  
  	pipe_lock(pipe);
@@ -54864,7 +54977,7 @@ index dafafba..10b3b27 100644
  	wake_up_interruptible_sync(&pipe->wait);
  	kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
  	pipe_unlock(pipe);
-@@ -445,11 +445,11 @@ static void wait_for_dump_helpers(struct file *file)
+@@ -448,11 +448,11 @@ static void wait_for_dump_helpers(struct file *file)
  	 * We actually want wait_event_freezable() but then we need
  	 * to clear TIF_SIGPENDING and improve dump_interrupted().
  	 */
@@ -54879,29 +54992,38 @@ index dafafba..10b3b27 100644
  	pipe_unlock(pipe);
  }
  
-@@ -496,7 +496,8 @@ void do_coredump(siginfo_t *siginfo)
+@@ -499,7 +499,9 @@ void do_coredump(siginfo_t *siginfo)
  	struct files_struct *displaced;
  	bool need_nonrelative = false;
  	bool core_dumped = false;
 -	static atomic_t core_dump_count = ATOMIC_INIT(0);
 +	static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
 +	long signr = siginfo->si_signo;
++	int dumpable;
  	struct coredump_params cprm = {
  		.siginfo = siginfo,
  		.regs = signal_pt_regs(),
-@@ -509,7 +510,10 @@ void do_coredump(siginfo_t *siginfo)
+@@ -512,12 +514,17 @@ void do_coredump(siginfo_t *siginfo)
  		.mm_flags = mm->flags,
  	};
  
 -	audit_core_dumps(siginfo->si_signo);
 +	audit_core_dumps(signr);
 +
++	dumpable = __get_dumpable(cprm.mm_flags);
++
 +	if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
-+		gr_handle_brute_attach(cprm.mm_flags);
++		gr_handle_brute_attach(dumpable);
  
  	binfmt = mm->binfmt;
  	if (!binfmt || !binfmt->core_dump)
-@@ -533,7 +537,7 @@ void do_coredump(siginfo_t *siginfo)
+ 		goto fail;
+-	if (!__get_dumpable(cprm.mm_flags))
++	if (!dumpable)
+ 		goto fail;
+ 
+ 	cred = prepare_creds();
+@@ -536,7 +543,7 @@ void do_coredump(siginfo_t *siginfo)
  		need_nonrelative = true;
  	}
  
@@ -54910,7 +55032,7 @@ index dafafba..10b3b27 100644
  	if (retval < 0)
  		goto fail_creds;
  
-@@ -576,7 +580,7 @@ void do_coredump(siginfo_t *siginfo)
+@@ -579,7 +586,7 @@ void do_coredump(siginfo_t *siginfo)
  		}
  		cprm.limit = RLIM_INFINITY;
  
@@ -54919,7 +55041,7 @@ index dafafba..10b3b27 100644
  		if (core_pipe_limit && (core_pipe_limit < dump_count)) {
  			printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
  			       task_tgid_vnr(current), current->comm);
-@@ -608,6 +612,8 @@ void do_coredump(siginfo_t *siginfo)
+@@ -611,6 +618,8 @@ void do_coredump(siginfo_t *siginfo)
  	} else {
  		struct inode *inode;
  
@@ -54928,7 +55050,7 @@ index dafafba..10b3b27 100644
  		if (cprm.limit < binfmt->min_coredump)
  			goto fail_unlock;
  
-@@ -666,7 +672,7 @@ close_fail:
+@@ -669,7 +678,7 @@ close_fail:
  		filp_close(cprm.file, NULL);
  fail_dropcount:
  	if (ispipe)
@@ -54936,8 +55058,8 @@ index dafafba..10b3b27 100644
 +		atomic_dec_unchecked(&core_dump_count);
  fail_unlock:
  	kfree(cn.corename);
- fail_corename:
-@@ -687,7 +693,7 @@ int dump_write(struct file *file, const void *addr, int nr)
+ 	coredump_finish(mm, core_dumped);
+@@ -689,7 +698,7 @@ int dump_write(struct file *file, const void *addr, int nr)
  {
  	return !dump_interrupted() &&
  		access_ok(VERIFY_READ, addr, nr) &&
@@ -54947,10 +55069,18 @@ index dafafba..10b3b27 100644
  EXPORT_SYMBOL(dump_write);
  
 diff --git a/fs/dcache.c b/fs/dcache.c
-index da89cdf..5347dba 100644
+index 89f9671..5977a84 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -3097,7 +3097,8 @@ void __init vfs_caches_init(unsigned long mempages)
+@@ -2893,6 +2893,7 @@ static int prepend_path(const struct path *path,
+ restart:
+ 	bptr = *buffer;
+ 	blen = *buflen;
++	error = 0;
+ 	dentry = path->dentry;
+ 	vfsmnt = path->mnt;
+ 	mnt = real_mount(vfsmnt);
+@@ -3432,7 +3433,8 @@ void __init vfs_caches_init(unsigned long mempages)
  	mempages -= reserve;
  
  	names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
@@ -54977,7 +55107,7 @@ index c7c83ff..bda9461 100644
  }
  EXPORT_SYMBOL_GPL(debugfs_create_dir);
 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
-index 5eab400..810a3f5 100644
+index 67e9b63..a9adb68 100644
 --- a/fs/ecryptfs/inode.c
 +++ b/fs/ecryptfs/inode.c
 @@ -674,7 +674,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
@@ -55012,7 +55142,7 @@ index e4141f2..d8263e8 100644
  		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 bb60cda..c875ac4 100644
+index bb8afc1..2f5087e 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
 @@ -55,8 +55,20 @@
@@ -55036,7 +55166,7 @@ index bb60cda..c875ac4 100644
  #include <asm/mmu_context.h>
  #include <asm/tlb.h>
  
-@@ -66,17 +78,32 @@
+@@ -66,19 +78,34 @@
  
  #include <trace/events/sched.h>
  
@@ -55063,6 +55193,8 @@ index bb60cda..c875ac4 100644
  void __register_binfmt(struct linux_binfmt * fmt, int insert)
  {
  	BUG_ON(!fmt);
+ 	if (WARN_ON(!fmt->load_binary))
+ 		return;
  	write_lock(&binfmt_lock);
 -	insert ? list_add(&fmt->lh, &formats) :
 -		 list_add_tail(&fmt->lh, &formats);
@@ -55071,7 +55203,7 @@ index bb60cda..c875ac4 100644
  	write_unlock(&binfmt_lock);
  }
  
-@@ -85,7 +112,7 @@ EXPORT_SYMBOL(__register_binfmt);
+@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
  void unregister_binfmt(struct linux_binfmt * fmt)
  {
  	write_lock(&binfmt_lock);
@@ -55080,7 +55212,7 @@ index bb60cda..c875ac4 100644
  	write_unlock(&binfmt_lock);
  }
  
-@@ -180,18 +207,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
+@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
  		int write)
  {
  	struct page *page;
@@ -55102,7 +55234,7 @@ index bb60cda..c875ac4 100644
  		return NULL;
  
  	if (write) {
-@@ -207,6 +226,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
+@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
  		if (size <= ARG_MAX)
  			return page;
  
@@ -55120,10 +55252,10 @@ index bb60cda..c875ac4 100644
  		/*
  		 * Limit to 1/4-th the stack size for the argv+env strings.
  		 * This ensures that:
-@@ -266,6 +296,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+@@ -269,6 +299,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 | VM_STACK_INCOMPLETE_SETUP;
+ 	vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
@@ -55132,7 +55264,7 @@ index bb60cda..c875ac4 100644
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  	INIT_LIST_HEAD(&vma->anon_vma_chain);
  
-@@ -276,6 +311,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+@@ -279,6 +314,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 *);
@@ -55145,7 +55277,7 @@ index bb60cda..c875ac4 100644
  	return 0;
  err:
  	up_write(&mm->mmap_sem);
-@@ -396,7 +437,7 @@ struct user_arg_ptr {
+@@ -399,7 +440,7 @@ struct user_arg_ptr {
  	} ptr;
  };
  
@@ -55154,7 +55286,7 @@ index bb60cda..c875ac4 100644
  {
  	const char __user *native;
  
-@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
+@@ -408,14 +449,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
  		compat_uptr_t compat;
  
  		if (get_user(compat, argv.ptr.compat + nr))
@@ -55171,7 +55303,7 @@ index bb60cda..c875ac4 100644
  
  	return native;
  }
-@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
+@@ -434,7 +475,7 @@ static int count(struct user_arg_ptr argv, int max)
  			if (!p)
  				break;
  
@@ -55180,7 +55312,7 @@ index bb60cda..c875ac4 100644
  				return -EFAULT;
  
  			if (i >= max)
-@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
+@@ -469,7 +510,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
  
  		ret = -EFAULT;
  		str = get_user_arg_ptr(argv, argc);
@@ -55189,7 +55321,7 @@ index bb60cda..c875ac4 100644
  			goto out;
  
  		len = strnlen_user(str, MAX_ARG_STRLEN);
-@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
+@@ -551,7 +592,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
  	int r;
  	mm_segment_t oldfs = get_fs();
  	struct user_arg_ptr argv = {
@@ -55198,7 +55330,7 @@ index bb60cda..c875ac4 100644
  	};
  
  	set_fs(KERNEL_DS);
-@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
+@@ -586,7 +627,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;
  
@@ -55208,7 +55340,7 @@ index bb60cda..c875ac4 100644
  
  	/*
  	 * ensure there are no vmas between where we want to go
-@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
+@@ -595,6 +637,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
  	if (vma != find_vma(mm, new_start))
  		return -EFAULT;
  
@@ -55219,7 +55351,7 @@ index bb60cda..c875ac4 100644
  	/*
  	 * cover the whole range: [new_start, old_end)
  	 */
-@@ -672,10 +718,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -675,10 +721,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
  	stack_top = arch_align_stack(stack_top);
  	stack_top = PAGE_ALIGN(stack_top);
  
@@ -55230,7 +55362,7 @@ index bb60cda..c875ac4 100644
  	stack_shift = vma->vm_end - stack_top;
  
  	bprm->p -= stack_shift;
-@@ -687,8 +729,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -690,8 +732,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
  	bprm->exec -= stack_shift;
  
  	down_write(&mm->mmap_sem);
@@ -55259,7 +55391,7 @@ index bb60cda..c875ac4 100644
  	/*
  	 * Adjust stack execute permissions; explicitly enable for
  	 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
-@@ -707,13 +769,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -710,13 +772,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
  		goto out_unlock;
  	BUG_ON(prev != vma);
  
@@ -55273,7 +55405,7 @@ index bb60cda..c875ac4 100644
  	/* mprotect_fixup is overkill to remove the temporary stack flags */
  	vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
  
-@@ -737,6 +792,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -740,6 +795,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
  #endif
  	current->mm->start_stack = bprm->p;
  	ret = expand_stack(vma, stack_base);
@@ -55301,7 +55433,7 @@ index bb60cda..c875ac4 100644
  	if (ret)
  		ret = -EFAULT;
  
-@@ -772,6 +848,8 @@ struct file *open_exec(const char *name)
+@@ -776,6 +852,8 @@ struct file *open_exec(const char *name)
  
  	fsnotify_open(file);
  
@@ -55310,7 +55442,7 @@ index bb60cda..c875ac4 100644
  	err = deny_write_access(file);
  	if (err)
  		goto exit;
-@@ -795,7 +873,7 @@ int kernel_read(struct file *file, loff_t offset,
+@@ -799,7 +877,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() */
@@ -55319,7 +55451,7 @@ index bb60cda..c875ac4 100644
  	set_fs(old_fs);
  	return result;
  }
-@@ -1251,7 +1329,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
+@@ -1255,7 +1333,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
  	}
  	rcu_read_unlock();
  
@@ -55328,9 +55460,9 @@ index bb60cda..c875ac4 100644
  		bprm->unsafe |= LSM_UNSAFE_SHARE;
  	} else {
  		res = -EAGAIN;
-@@ -1451,6 +1529,31 @@ int search_binary_handler(struct linux_binprm *bprm)
- 
- EXPORT_SYMBOL(search_binary_handler);
+@@ -1451,6 +1529,31 @@ static int exec_binprm(struct linux_binprm *bprm)
+ 	return ret;
+ }
  
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
 +static DEFINE_PER_CPU(u64, exec_counter);
@@ -55360,7 +55492,7 @@ index bb60cda..c875ac4 100644
  /*
   * sys_execve() executes a new program.
   */
-@@ -1458,6 +1561,11 @@ static int do_execve_common(const char *filename,
+@@ -1458,12 +1561,19 @@ static int do_execve_common(const char *filename,
  				struct user_arg_ptr argv,
  				struct user_arg_ptr envp)
  {
@@ -55372,16 +55504,15 @@ index bb60cda..c875ac4 100644
  	struct linux_binprm *bprm;
  	struct file *file;
  	struct files_struct *displaced;
-@@ -1465,6 +1573,8 @@ static int do_execve_common(const char *filename,
+ 	bool clear_in_exec;
  	int retval;
- 	const struct cred *cred = current_cred();
  
-+	gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&cred->user->processes), 1);
++	gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
 +
  	/*
  	 * We move the actual failure in case of RLIMIT_NPROC excess from
  	 * set*uid() to execve() because too many poorly written programs
-@@ -1505,12 +1615,22 @@ static int do_execve_common(const char *filename,
+@@ -1504,12 +1614,22 @@ static int do_execve_common(const char *filename,
  	if (IS_ERR(file))
  		goto out_unmark;
  
@@ -55404,7 +55535,7 @@ index bb60cda..c875ac4 100644
  	retval = bprm_mm_init(bprm);
  	if (retval)
  		goto out_file;
-@@ -1527,24 +1647,70 @@ static int do_execve_common(const char *filename,
+@@ -1526,24 +1646,70 @@ static int do_execve_common(const char *filename,
  	if (retval < 0)
  		goto out;
  
@@ -55464,7 +55595,7 @@ index bb60cda..c875ac4 100644
 +
 +	gr_handle_exec_args(bprm, argv);
  
- 	retval = search_binary_handler(bprm);
+ 	retval = exec_binprm(bprm);
  	if (retval < 0)
 -		goto out;
 +		goto out_fail;
@@ -55479,7 +55610,7 @@ index bb60cda..c875ac4 100644
  	current->fs->in_exec = 0;
  	current->in_execve = 0;
  	acct_update_integrals(current);
-@@ -1553,6 +1719,14 @@ static int do_execve_common(const char *filename,
+@@ -1552,6 +1718,14 @@ static int do_execve_common(const char *filename,
  		put_files_struct(displaced);
  	return retval;
  
@@ -55494,7 +55625,7 @@ index bb60cda..c875ac4 100644
  out:
  	if (bprm->mm) {
  		acct_arg_size(bprm, 0);
-@@ -1707,3 +1881,287 @@ asmlinkage long compat_sys_execve(const char __user * filename,
+@@ -1706,3 +1880,295 @@ asmlinkage long compat_sys_execve(const char __user * filename,
  	return error;
  }
  #endif
@@ -55724,6 +55855,14 @@ index bb60cda..c875ac4 100644
 +#else
 +	unsigned long textlow = (unsigned long)_stext;
 +	unsigned long texthigh = (unsigned long)_etext;
++
++#ifdef CONFIG_X86_64
++	/* check against linear mapping as well */
++	if (high > (unsigned long)__va(__pa(textlow)) &&
++	    low <= (unsigned long)__va(__pa(texthigh)))
++		return true;
++#endif
++
 +#endif
 +
 +	if (high <= textlow || low > texthigh)
@@ -55799,6 +55938,31 @@ index 9f9992b..8b59411 100644
  		return 0;
  	}
  	return 1;
+diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
+index 2d7557d..14e38f94 100644
+--- a/fs/ext2/xattr.c
++++ b/fs/ext2/xattr.c
+@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
+ 	struct buffer_head *bh = NULL;
+ 	struct ext2_xattr_entry *entry;
+ 	char *end;
+-	size_t rest = buffer_size;
++	size_t rest = buffer_size, total_size = 0;
+ 	int error;
+ 
+ 	ea_idebug(inode, "buffer=%p, buffer_size=%ld",
+@@ -305,9 +305,10 @@ bad_block:	ext2_error(inode->i_sb, "ext2_xattr_list",
+ 				buffer += size;
+ 			}
+ 			rest -= size;
++			total_size += size;
+ 		}
+ 	}
+-	error = buffer_size - rest;  /* total size */
++	error = total_size;
+ 
+ cleanup:
+ 	brelse(bh);
 diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
 index 22548f5..41521d8 100644
 --- a/fs/ext3/balloc.c
@@ -55816,11 +55980,36 @@ index 22548f5..41521d8 100644
  		return 0;
  	}
  	return 1;
+diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
+index b1fc963..881228c 100644
+--- a/fs/ext3/xattr.c
++++ b/fs/ext3/xattr.c
+@@ -330,7 +330,7 @@ static int
+ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
+ 			char *buffer, size_t buffer_size)
+ {
+-	size_t rest = buffer_size;
++	size_t rest = buffer_size, total_size = 0;
+ 
+ 	for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
+ 		const struct xattr_handler *handler =
+@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
+ 				buffer += size;
+ 			}
+ 			rest -= size;
++			total_size += size;
+ 		}
+ 	}
+-	return buffer_size - rest;
++	return total_size;
+ }
+ 
+ static int
 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
-index 3742e4c..69a797f 100644
+index dc5d572..4c21f8e 100644
 --- a/fs/ext4/balloc.c
 +++ b/fs/ext4/balloc.c
-@@ -528,8 +528,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
+@@ -534,8 +534,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
  	/* Hm, nope.  Are (enough) root reserved clusters available? */
  	if (uid_eq(sbi->s_resuid, current_fsuid()) ||
  	    (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
@@ -55832,10 +56021,10 @@ index 3742e4c..69a797f 100644
  		if (free_clusters >= (nclusters + dirty_clusters +
  				      resv_clusters))
 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index 5aae3d1..b5da7f8 100644
+index af815ea..99294a6 100644
 --- a/fs/ext4/ext4.h
 +++ b/fs/ext4/ext4.h
-@@ -1252,19 +1252,19 @@ struct ext4_sb_info {
+@@ -1256,19 +1256,19 @@ struct ext4_sb_info {
  	unsigned long s_mb_last_start;
  
  	/* stats for buddy allocator */
@@ -55866,10 +56055,10 @@ index 5aae3d1..b5da7f8 100644
  
  	/* locality groups */
 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
-index 59c6750..a549154 100644
+index a41e3ba..e574a00 100644
 --- a/fs/ext4/mballoc.c
 +++ b/fs/ext4/mballoc.c
-@@ -1865,7 +1865,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
+@@ -1880,7 +1880,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
  		BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
  
  		if (EXT4_SB(sb)->s_mb_stats)
@@ -55878,7 +56067,7 @@ index 59c6750..a549154 100644
  
  		break;
  	}
-@@ -2170,7 +2170,7 @@ repeat:
+@@ -2189,7 +2189,7 @@ repeat:
  			ac->ac_status = AC_STATUS_CONTINUE;
  			ac->ac_flags |= EXT4_MB_HINT_FIRST;
  			cr = 3;
@@ -55887,7 +56076,7 @@ index 59c6750..a549154 100644
  			goto repeat;
  		}
  	}
-@@ -2678,25 +2678,25 @@ int ext4_mb_release(struct super_block *sb)
+@@ -2697,25 +2697,25 @@ int ext4_mb_release(struct super_block *sb)
  	if (sbi->s_mb_stats) {
  		ext4_msg(sb, KERN_INFO,
  		       "mballoc: %u blocks %u reqs (%u success)",
@@ -55923,7 +56112,7 @@ index 59c6750..a549154 100644
  	}
  
  	free_percpu(sbi->s_locality_groups);
-@@ -3150,16 +3150,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
+@@ -3169,16 +3169,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
  	struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
  
  	if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
@@ -55946,7 +56135,7 @@ index 59c6750..a549154 100644
  	}
  
  	if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
-@@ -3559,7 +3559,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
+@@ -3578,7 +3578,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
  	trace_ext4_mb_new_inode_pa(ac, pa);
  
  	ext4_mb_use_inode_pa(ac, pa);
@@ -55955,7 +56144,7 @@ index 59c6750..a549154 100644
  
  	ei = EXT4_I(ac->ac_inode);
  	grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
-@@ -3619,7 +3619,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
+@@ -3638,7 +3638,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
  	trace_ext4_mb_new_group_pa(ac, pa);
  
  	ext4_mb_use_group_pa(ac, pa);
@@ -55964,7 +56153,7 @@ index 59c6750..a549154 100644
  
  	grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
  	lg = ac->ac_lg;
-@@ -3708,7 +3708,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
+@@ -3727,7 +3727,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
  		 * from the bitmap and continue.
  		 */
  	}
@@ -55973,7 +56162,7 @@ index 59c6750..a549154 100644
  
  	return err;
  }
-@@ -3726,7 +3726,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
+@@ -3745,7 +3745,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
  	ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
  	BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
  	mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
@@ -55995,50 +56184,11 @@ index 214461e..3614c89 100644
  	__ext4_warning(sb, function, line,
  		       "MMP failure info: last update time: %llu, last update "
  		       "node: %s, last update device: %s\n",
-diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
-index 49d3c01..9579efd 100644
---- a/fs/ext4/resize.c
-+++ b/fs/ext4/resize.c
-@@ -79,12 +79,20 @@ static int verify_group_input(struct super_block *sb,
- 	ext4_fsblk_t end = start + input->blocks_count;
- 	ext4_group_t group = input->group;
- 	ext4_fsblk_t itend = input->inode_table + sbi->s_itb_per_group;
--	unsigned overhead = ext4_group_overhead_blocks(sb, group);
--	ext4_fsblk_t metaend = start + overhead;
-+	unsigned overhead;
-+	ext4_fsblk_t metaend;
- 	struct buffer_head *bh = NULL;
- 	ext4_grpblk_t free_blocks_count, offset;
- 	int err = -EINVAL;
- 
-+	if (group != sbi->s_groups_count) {
-+		ext4_warning(sb, "Cannot add at group %u (only %u groups)",
-+			     input->group, sbi->s_groups_count);
-+		return -EINVAL;
-+	}
-+
-+	overhead = ext4_group_overhead_blocks(sb, group);
-+	metaend = start + overhead;
- 	input->free_blocks_count = free_blocks_count =
- 		input->blocks_count - 2 - overhead - sbi->s_itb_per_group;
- 
-@@ -96,10 +104,7 @@ static int verify_group_input(struct super_block *sb,
- 		       free_blocks_count, input->reserved_blocks);
- 
- 	ext4_get_group_no_and_offset(sb, start, NULL, &offset);
--	if (group != sbi->s_groups_count)
--		ext4_warning(sb, "Cannot add at group %u (only %u groups)",
--			     input->group, sbi->s_groups_count);
--	else if (offset != 0)
-+	if (offset != 0)
- 			ext4_warning(sb, "Last group not full");
- 	else if (input->reserved_blocks > input->blocks_count / 5)
- 		ext4_warning(sb, "Reserved blocks too high (%u)",
 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 3f7c39e..227f24f 100644
+index 2c2e6cb..7c3ee62 100644
 --- a/fs/ext4/super.c
 +++ b/fs/ext4/super.c
-@@ -1236,7 +1236,7 @@ static ext4_fsblk_t get_sb_block(void **data)
+@@ -1251,7 +1251,7 @@ static ext4_fsblk_t get_sb_block(void **data)
  }
  
  #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
@@ -56047,17 +56197,42 @@ index 3f7c39e..227f24f 100644
  	"Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
  
  #ifdef CONFIG_QUOTA
-@@ -2372,7 +2372,7 @@ struct ext4_attr {
- 	ssize_t (*store)(struct ext4_attr *, struct ext4_sb_info *,
- 			 const char *, size_t);
- 	int offset;
+@@ -2431,7 +2431,7 @@ struct ext4_attr {
+ 		int offset;
+ 		int deprecated_val;
+ 	} u;
 -};
 +} __do_const;
  
  static int parse_strtoull(const char *buf,
  		unsigned long long max, unsigned long long *value)
+diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
+index 1423c48..9c0c6dc 100644
+--- a/fs/ext4/xattr.c
++++ b/fs/ext4/xattr.c
+@@ -381,7 +381,7 @@ static int
+ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
+ 			char *buffer, size_t buffer_size)
+ {
+-	size_t rest = buffer_size;
++	size_t rest = buffer_size, total_size = 0;
+ 
+ 	for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
+ 		const struct xattr_handler *handler =
+@@ -398,9 +398,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
+ 				buffer += size;
+ 			}
+ 			rest -= size;
++			total_size += size;
+ 		}
+ 	}
+-	return buffer_size - rest;
++	return total_size;
+ }
+ 
+ static int
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 6599222..e7bf0de 100644
+index 65343c3..9969dcf 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -107,6 +107,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
@@ -56226,7 +56401,7 @@ index d8ac61d..79a36f0 100644
  	.seq		= SEQCNT_ZERO,
  	.umask		= 0022,
 diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
-index e2cba1f..20319c5 100644
+index b2a86e3..37f425a 100644
 --- a/fs/fscache/cookie.c
 +++ b/fs/fscache/cookie.c
 @@ -19,7 +19,7 @@
@@ -56261,7 +56436,7 @@ index e2cba1f..20319c5 100644
  		_leave(" [ENOMEM]");
  		return NULL;
  	}
-@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
+@@ -114,13 +114,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
  
  	switch (cookie->def->type) {
  	case FSCACHE_COOKIE_TYPE_INDEX:
@@ -56278,7 +56453,7 @@ index e2cba1f..20319c5 100644
  		break;
  	}
  
-@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
+@@ -131,13 +131,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
  		if (fscache_acquire_non_index_cookie(cookie) < 0) {
  			atomic_dec(&parent->n_children);
  			__fscache_cookie_put(cookie);
@@ -56294,7 +56469,7 @@ index e2cba1f..20319c5 100644
  	_leave(" = %p", cookie);
  	return cookie;
  }
-@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
+@@ -173,7 +173,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
  	cache = fscache_select_cache_for_object(cookie->parent);
  	if (!cache) {
  		up_read(&fscache_addremove_sem);
@@ -56303,7 +56478,7 @@ index e2cba1f..20319c5 100644
  		_leave(" = -ENOMEDIUM [no cache]");
  		return -ENOMEDIUM;
  	}
-@@ -255,14 +255,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
+@@ -259,14 +259,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
  	object = cache->ops->alloc_object(cache, cookie);
  	fscache_stat_d(&fscache_n_cop_alloc_object);
  	if (IS_ERR(object)) {
@@ -56321,7 +56496,7 @@ index e2cba1f..20319c5 100644
  
  	_debug("ALLOC OBJ%x: %s {%lx}",
  	       object->debug_id, cookie->def->name, object->events);
-@@ -376,7 +376,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
+@@ -380,7 +380,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
  
  	_enter("{%s}", cookie->def->name);
  
@@ -56330,7 +56505,7 @@ index e2cba1f..20319c5 100644
  
  	/* Only permit invalidation of data files.  Invalidating an index will
  	 * require the caller to release all its attachments to the tree rooted
-@@ -434,10 +434,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
+@@ -438,10 +438,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
  {
  	struct fscache_object *object;
  
@@ -56343,9 +56518,9 @@ index e2cba1f..20319c5 100644
  		_leave(" [no cookie]");
  		return;
  	}
-@@ -471,12 +471,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
+@@ -473,12 +473,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
+ {
  	struct fscache_object *object;
- 	unsigned long event;
  
 -	fscache_stat(&fscache_n_relinquishes);
 +	fscache_stat_unchecked(&fscache_n_relinquishes);
@@ -56359,26 +56534,39 @@ index e2cba1f..20319c5 100644
  		_leave(" [no cookie]");
  		return;
  	}
-@@ -492,7 +492,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
+@@ -598,7 +598,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
+ 	if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
+ 		goto inconsistent;
  
- 	/* wait for the cookie to finish being instantiated (or to fail) */
- 	if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
--		fscache_stat(&fscache_n_relinquishes_waitcrt);
-+		fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
- 		wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
- 			    fscache_wait_bit, TASK_UNINTERRUPTIBLE);
- 	}
+-	op->debug_id = atomic_inc_return(&fscache_op_debug_id);
++	op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
+ 
+ 	atomic_inc(&cookie->n_active);
+ 	if (fscache_submit_op(object, op) < 0)
 diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
-index ee38fef..0a326d4 100644
+index 4226f66..0fb3f45 100644
 --- a/fs/fscache/internal.h
 +++ b/fs/fscache/internal.h
-@@ -148,101 +148,101 @@ extern void fscache_proc_cleanup(void);
+@@ -133,8 +133,8 @@ extern void fscache_operation_gc(struct work_struct *);
+ extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
+ extern int fscache_wait_for_operation_activation(struct fscache_object *,
+ 						 struct fscache_operation *,
+-						 atomic_t *,
+-						 atomic_t *,
++						 atomic_unchecked_t *,
++						 atomic_unchecked_t *,
+ 						 void (*)(struct fscache_operation *));
+ extern void fscache_invalidate_writes(struct fscache_cookie *);
+ 
+@@ -153,101 +153,101 @@ extern void fscache_proc_cleanup(void);
   * stats.c
   */
  #ifdef CONFIG_FSCACHE_STATS
 -extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
 -extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
--
++extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
++extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
+ 
 -extern atomic_t fscache_n_op_pend;
 -extern atomic_t fscache_n_op_run;
 -extern atomic_t fscache_n_op_enqueue;
@@ -56387,13 +56575,26 @@ index ee38fef..0a326d4 100644
 -extern atomic_t fscache_n_op_gc;
 -extern atomic_t fscache_n_op_cancelled;
 -extern atomic_t fscache_n_op_rejected;
--
++extern atomic_unchecked_t fscache_n_op_pend;
++extern atomic_unchecked_t fscache_n_op_run;
++extern atomic_unchecked_t fscache_n_op_enqueue;
++extern atomic_unchecked_t fscache_n_op_deferred_release;
++extern atomic_unchecked_t fscache_n_op_release;
++extern atomic_unchecked_t fscache_n_op_gc;
++extern atomic_unchecked_t fscache_n_op_cancelled;
++extern atomic_unchecked_t fscache_n_op_rejected;
+ 
 -extern atomic_t fscache_n_attr_changed;
 -extern atomic_t fscache_n_attr_changed_ok;
 -extern atomic_t fscache_n_attr_changed_nobufs;
 -extern atomic_t fscache_n_attr_changed_nomem;
 -extern atomic_t fscache_n_attr_changed_calls;
--
++extern atomic_unchecked_t fscache_n_attr_changed;
++extern atomic_unchecked_t fscache_n_attr_changed_ok;
++extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
++extern atomic_unchecked_t fscache_n_attr_changed_nomem;
++extern atomic_unchecked_t fscache_n_attr_changed_calls;
+ 
 -extern atomic_t fscache_n_allocs;
 -extern atomic_t fscache_n_allocs_ok;
 -extern atomic_t fscache_n_allocs_wait;
@@ -56402,7 +56603,15 @@ index ee38fef..0a326d4 100644
 -extern atomic_t fscache_n_allocs_object_dead;
 -extern atomic_t fscache_n_alloc_ops;
 -extern atomic_t fscache_n_alloc_op_waits;
--
++extern atomic_unchecked_t fscache_n_allocs;
++extern atomic_unchecked_t fscache_n_allocs_ok;
++extern atomic_unchecked_t fscache_n_allocs_wait;
++extern atomic_unchecked_t fscache_n_allocs_nobufs;
++extern atomic_unchecked_t fscache_n_allocs_intr;
++extern atomic_unchecked_t fscache_n_allocs_object_dead;
++extern atomic_unchecked_t fscache_n_alloc_ops;
++extern atomic_unchecked_t fscache_n_alloc_op_waits;
+ 
 -extern atomic_t fscache_n_retrievals;
 -extern atomic_t fscache_n_retrievals_ok;
 -extern atomic_t fscache_n_retrievals_wait;
@@ -56413,91 +56622,6 @@ index ee38fef..0a326d4 100644
 -extern atomic_t fscache_n_retrievals_object_dead;
 -extern atomic_t fscache_n_retrieval_ops;
 -extern atomic_t fscache_n_retrieval_op_waits;
--
--extern atomic_t fscache_n_stores;
--extern atomic_t fscache_n_stores_ok;
--extern atomic_t fscache_n_stores_again;
--extern atomic_t fscache_n_stores_nobufs;
--extern atomic_t fscache_n_stores_oom;
--extern atomic_t fscache_n_store_ops;
--extern atomic_t fscache_n_store_calls;
--extern atomic_t fscache_n_store_pages;
--extern atomic_t fscache_n_store_radix_deletes;
--extern atomic_t fscache_n_store_pages_over_limit;
--
--extern atomic_t fscache_n_store_vmscan_not_storing;
--extern atomic_t fscache_n_store_vmscan_gone;
--extern atomic_t fscache_n_store_vmscan_busy;
--extern atomic_t fscache_n_store_vmscan_cancelled;
--extern atomic_t fscache_n_store_vmscan_wait;
--
--extern atomic_t fscache_n_marks;
--extern atomic_t fscache_n_uncaches;
--
--extern atomic_t fscache_n_acquires;
--extern atomic_t fscache_n_acquires_null;
--extern atomic_t fscache_n_acquires_no_cache;
--extern atomic_t fscache_n_acquires_ok;
--extern atomic_t fscache_n_acquires_nobufs;
--extern atomic_t fscache_n_acquires_oom;
--
--extern atomic_t fscache_n_invalidates;
--extern atomic_t fscache_n_invalidates_run;
--
--extern atomic_t fscache_n_updates;
--extern atomic_t fscache_n_updates_null;
--extern atomic_t fscache_n_updates_run;
--
--extern atomic_t fscache_n_relinquishes;
--extern atomic_t fscache_n_relinquishes_null;
--extern atomic_t fscache_n_relinquishes_waitcrt;
--extern atomic_t fscache_n_relinquishes_retire;
--
--extern atomic_t fscache_n_cookie_index;
--extern atomic_t fscache_n_cookie_data;
--extern atomic_t fscache_n_cookie_special;
--
--extern atomic_t fscache_n_object_alloc;
--extern atomic_t fscache_n_object_no_alloc;
--extern atomic_t fscache_n_object_lookups;
--extern atomic_t fscache_n_object_lookups_negative;
--extern atomic_t fscache_n_object_lookups_positive;
--extern atomic_t fscache_n_object_lookups_timed_out;
--extern atomic_t fscache_n_object_created;
--extern atomic_t fscache_n_object_avail;
--extern atomic_t fscache_n_object_dead;
--
--extern atomic_t fscache_n_checkaux_none;
--extern atomic_t fscache_n_checkaux_okay;
--extern atomic_t fscache_n_checkaux_update;
--extern atomic_t fscache_n_checkaux_obsolete;
-+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
-+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
-+
-+extern atomic_unchecked_t fscache_n_op_pend;
-+extern atomic_unchecked_t fscache_n_op_run;
-+extern atomic_unchecked_t fscache_n_op_enqueue;
-+extern atomic_unchecked_t fscache_n_op_deferred_release;
-+extern atomic_unchecked_t fscache_n_op_release;
-+extern atomic_unchecked_t fscache_n_op_gc;
-+extern atomic_unchecked_t fscache_n_op_cancelled;
-+extern atomic_unchecked_t fscache_n_op_rejected;
-+
-+extern atomic_unchecked_t fscache_n_attr_changed;
-+extern atomic_unchecked_t fscache_n_attr_changed_ok;
-+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
-+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
-+extern atomic_unchecked_t fscache_n_attr_changed_calls;
-+
-+extern atomic_unchecked_t fscache_n_allocs;
-+extern atomic_unchecked_t fscache_n_allocs_ok;
-+extern atomic_unchecked_t fscache_n_allocs_wait;
-+extern atomic_unchecked_t fscache_n_allocs_nobufs;
-+extern atomic_unchecked_t fscache_n_allocs_intr;
-+extern atomic_unchecked_t fscache_n_allocs_object_dead;
-+extern atomic_unchecked_t fscache_n_alloc_ops;
-+extern atomic_unchecked_t fscache_n_alloc_op_waits;
-+
 +extern atomic_unchecked_t fscache_n_retrievals;
 +extern atomic_unchecked_t fscache_n_retrievals_ok;
 +extern atomic_unchecked_t fscache_n_retrievals_wait;
@@ -56508,7 +56632,17 @@ index ee38fef..0a326d4 100644
 +extern atomic_unchecked_t fscache_n_retrievals_object_dead;
 +extern atomic_unchecked_t fscache_n_retrieval_ops;
 +extern atomic_unchecked_t fscache_n_retrieval_op_waits;
-+
+ 
+-extern atomic_t fscache_n_stores;
+-extern atomic_t fscache_n_stores_ok;
+-extern atomic_t fscache_n_stores_again;
+-extern atomic_t fscache_n_stores_nobufs;
+-extern atomic_t fscache_n_stores_oom;
+-extern atomic_t fscache_n_store_ops;
+-extern atomic_t fscache_n_store_calls;
+-extern atomic_t fscache_n_store_pages;
+-extern atomic_t fscache_n_store_radix_deletes;
+-extern atomic_t fscache_n_store_pages_over_limit;
 +extern atomic_unchecked_t fscache_n_stores;
 +extern atomic_unchecked_t fscache_n_stores_ok;
 +extern atomic_unchecked_t fscache_n_stores_again;
@@ -56519,39 +56653,73 @@ index ee38fef..0a326d4 100644
 +extern atomic_unchecked_t fscache_n_store_pages;
 +extern atomic_unchecked_t fscache_n_store_radix_deletes;
 +extern atomic_unchecked_t fscache_n_store_pages_over_limit;
-+
+ 
+-extern atomic_t fscache_n_store_vmscan_not_storing;
+-extern atomic_t fscache_n_store_vmscan_gone;
+-extern atomic_t fscache_n_store_vmscan_busy;
+-extern atomic_t fscache_n_store_vmscan_cancelled;
+-extern atomic_t fscache_n_store_vmscan_wait;
 +extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
 +extern atomic_unchecked_t fscache_n_store_vmscan_gone;
 +extern atomic_unchecked_t fscache_n_store_vmscan_busy;
 +extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
 +extern atomic_unchecked_t fscache_n_store_vmscan_wait;
-+
+ 
+-extern atomic_t fscache_n_marks;
+-extern atomic_t fscache_n_uncaches;
 +extern atomic_unchecked_t fscache_n_marks;
 +extern atomic_unchecked_t fscache_n_uncaches;
-+
+ 
+-extern atomic_t fscache_n_acquires;
+-extern atomic_t fscache_n_acquires_null;
+-extern atomic_t fscache_n_acquires_no_cache;
+-extern atomic_t fscache_n_acquires_ok;
+-extern atomic_t fscache_n_acquires_nobufs;
+-extern atomic_t fscache_n_acquires_oom;
 +extern atomic_unchecked_t fscache_n_acquires;
 +extern atomic_unchecked_t fscache_n_acquires_null;
 +extern atomic_unchecked_t fscache_n_acquires_no_cache;
 +extern atomic_unchecked_t fscache_n_acquires_ok;
 +extern atomic_unchecked_t fscache_n_acquires_nobufs;
 +extern atomic_unchecked_t fscache_n_acquires_oom;
-+
+ 
+-extern atomic_t fscache_n_invalidates;
+-extern atomic_t fscache_n_invalidates_run;
 +extern atomic_unchecked_t fscache_n_invalidates;
 +extern atomic_unchecked_t fscache_n_invalidates_run;
-+
+ 
+-extern atomic_t fscache_n_updates;
+-extern atomic_t fscache_n_updates_null;
+-extern atomic_t fscache_n_updates_run;
 +extern atomic_unchecked_t fscache_n_updates;
 +extern atomic_unchecked_t fscache_n_updates_null;
 +extern atomic_unchecked_t fscache_n_updates_run;
-+
+ 
+-extern atomic_t fscache_n_relinquishes;
+-extern atomic_t fscache_n_relinquishes_null;
+-extern atomic_t fscache_n_relinquishes_waitcrt;
+-extern atomic_t fscache_n_relinquishes_retire;
 +extern atomic_unchecked_t fscache_n_relinquishes;
 +extern atomic_unchecked_t fscache_n_relinquishes_null;
 +extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
 +extern atomic_unchecked_t fscache_n_relinquishes_retire;
-+
+ 
+-extern atomic_t fscache_n_cookie_index;
+-extern atomic_t fscache_n_cookie_data;
+-extern atomic_t fscache_n_cookie_special;
 +extern atomic_unchecked_t fscache_n_cookie_index;
 +extern atomic_unchecked_t fscache_n_cookie_data;
 +extern atomic_unchecked_t fscache_n_cookie_special;
-+
+ 
+-extern atomic_t fscache_n_object_alloc;
+-extern atomic_t fscache_n_object_no_alloc;
+-extern atomic_t fscache_n_object_lookups;
+-extern atomic_t fscache_n_object_lookups_negative;
+-extern atomic_t fscache_n_object_lookups_positive;
+-extern atomic_t fscache_n_object_lookups_timed_out;
+-extern atomic_t fscache_n_object_created;
+-extern atomic_t fscache_n_object_avail;
+-extern atomic_t fscache_n_object_dead;
 +extern atomic_unchecked_t fscache_n_object_alloc;
 +extern atomic_unchecked_t fscache_n_object_no_alloc;
 +extern atomic_unchecked_t fscache_n_object_lookups;
@@ -56561,7 +56729,11 @@ index ee38fef..0a326d4 100644
 +extern atomic_unchecked_t fscache_n_object_created;
 +extern atomic_unchecked_t fscache_n_object_avail;
 +extern atomic_unchecked_t fscache_n_object_dead;
-+
+ 
+-extern atomic_t fscache_n_checkaux_none;
+-extern atomic_t fscache_n_checkaux_okay;
+-extern atomic_t fscache_n_checkaux_update;
+-extern atomic_t fscache_n_checkaux_obsolete;
 +extern atomic_unchecked_t fscache_n_checkaux_none;
 +extern atomic_unchecked_t fscache_n_checkaux_okay;
 +extern atomic_unchecked_t fscache_n_checkaux_update;
@@ -56569,7 +56741,7 @@ index ee38fef..0a326d4 100644
  
  extern atomic_t fscache_n_cop_alloc_object;
  extern atomic_t fscache_n_cop_lookup_object;
-@@ -267,6 +267,11 @@ static inline void fscache_stat(atomic_t *stat)
+@@ -272,6 +272,11 @@ static inline void fscache_stat(atomic_t *stat)
  	atomic_inc(stat);
  }
  
@@ -56581,7 +56753,7 @@ index ee38fef..0a326d4 100644
  static inline void fscache_stat_d(atomic_t *stat)
  {
  	atomic_dec(stat);
-@@ -279,6 +284,7 @@ extern const struct file_operations fscache_stats_fops;
+@@ -284,6 +289,7 @@ extern const struct file_operations fscache_stats_fops;
  
  #define __fscache_stat(stat) (NULL)
  #define fscache_stat(stat) do {} while (0)
@@ -56590,100 +56762,73 @@ index ee38fef..0a326d4 100644
  #endif
  
 diff --git a/fs/fscache/object.c b/fs/fscache/object.c
-index 50d41c1..10ee117 100644
+index 86d75a6..5f3d7a0 100644
 --- a/fs/fscache/object.c
 +++ b/fs/fscache/object.c
-@@ -143,7 +143,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
- 		/* Invalidate an object on disk */
- 	case FSCACHE_OBJECT_INVALIDATING:
- 		clear_bit(FSCACHE_OBJECT_EV_INVALIDATE, &object->events);
--		fscache_stat(&fscache_n_invalidates_run);
-+		fscache_stat_unchecked(&fscache_n_invalidates_run);
- 		fscache_stat(&fscache_n_cop_invalidate_object);
- 		fscache_invalidate_object(object);
- 		fscache_stat_d(&fscache_n_cop_invalidate_object);
-@@ -153,7 +153,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
- 		/* update the object metadata on disk */
- 	case FSCACHE_OBJECT_UPDATING:
- 		clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
--		fscache_stat(&fscache_n_updates_run);
-+		fscache_stat_unchecked(&fscache_n_updates_run);
- 		fscache_stat(&fscache_n_cop_update_object);
- 		object->cache->ops->update_object(object);
- 		fscache_stat_d(&fscache_n_cop_update_object);
-@@ -242,7 +242,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
- 		spin_lock(&object->lock);
- 		object->state = FSCACHE_OBJECT_DEAD;
- 		spin_unlock(&object->lock);
--		fscache_stat(&fscache_n_object_dead);
-+		fscache_stat_unchecked(&fscache_n_object_dead);
- 		goto terminal_transit;
- 
- 		/* handle the parent cache of this object being withdrawn from
-@@ -257,7 +257,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
- 		spin_lock(&object->lock);
- 		object->state = FSCACHE_OBJECT_DEAD;
- 		spin_unlock(&object->lock);
--		fscache_stat(&fscache_n_object_dead);
-+		fscache_stat_unchecked(&fscache_n_object_dead);
- 		goto terminal_transit;
- 
- 		/* complain about the object being woken up once it is
-@@ -495,7 +495,7 @@ static void fscache_lookup_object(struct fscache_object *object)
- 	       parent->cookie->def->name, cookie->def->name,
- 	       object->cache->tag->name);
+@@ -451,7 +451,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
+ 	_debug("LOOKUP \"%s\" in \"%s\"",
+ 	       cookie->def->name, object->cache->tag->name);
  
 -	fscache_stat(&fscache_n_object_lookups);
 +	fscache_stat_unchecked(&fscache_n_object_lookups);
  	fscache_stat(&fscache_n_cop_lookup_object);
  	ret = object->cache->ops->lookup_object(object);
  	fscache_stat_d(&fscache_n_cop_lookup_object);
-@@ -506,7 +506,7 @@ static void fscache_lookup_object(struct fscache_object *object)
+@@ -461,7 +461,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
  	if (ret == -ETIMEDOUT) {
  		/* probably stuck behind another object, so move this one to
  		 * the back of the queue */
 -		fscache_stat(&fscache_n_object_lookups_timed_out);
 +		fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
- 		set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
+ 		_leave(" [timeout]");
+ 		return NO_TRANSIT;
  	}
+@@ -489,7 +489,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
+ 	_enter("{OBJ%x,%s}", object->debug_id, object->state->name);
  
-@@ -529,7 +529,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
- 
- 	spin_lock(&object->lock);
- 	if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
+ 	if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
 -		fscache_stat(&fscache_n_object_lookups_negative);
 +		fscache_stat_unchecked(&fscache_n_object_lookups_negative);
  
- 		/* transit here to allow write requests to begin stacking up
- 		 * and read requests to begin returning ENODATA */
-@@ -575,7 +575,7 @@ void fscache_obtained_object(struct fscache_object *object)
+ 		/* Allow write requests to begin stacking up and read requests to begin
+ 		 * returning ENODATA.
+@@ -523,7 +523,7 @@ void fscache_obtained_object(struct fscache_object *object)
+ 	/* if we were still looking up, then we must have a positive lookup
  	 * result, in which case there may be data available */
- 	spin_lock(&object->lock);
- 	if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
+ 	if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
 -		fscache_stat(&fscache_n_object_lookups_positive);
 +		fscache_stat_unchecked(&fscache_n_object_lookups_positive);
  
- 		clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
- 
-@@ -589,7 +589,7 @@ void fscache_obtained_object(struct fscache_object *object)
- 		set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
+ 		/* We do (presumably) have data */
+ 		clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
+@@ -534,7 +534,7 @@ void fscache_obtained_object(struct fscache_object *object)
+ 		clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
+ 		wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
  	} else {
- 		ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
 -		fscache_stat(&fscache_n_object_created);
 +		fscache_stat_unchecked(&fscache_n_object_created);
+ 	}
  
- 		object->state = FSCACHE_OBJECT_AVAILABLE;
- 		spin_unlock(&object->lock);
-@@ -634,7 +634,7 @@ static void fscache_object_available(struct fscache_object *object)
- 	fscache_enqueue_dependents(object);
+ 	set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
+@@ -570,7 +570,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
+ 	fscache_stat_d(&fscache_n_cop_lookup_complete);
  
  	fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
 -	fscache_stat(&fscache_n_object_avail);
 +	fscache_stat_unchecked(&fscache_n_object_avail);
  
  	_leave("");
- }
-@@ -894,7 +894,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
+ 	return transit_to(JUMPSTART_DEPS);
+@@ -716,7 +716,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
+ 
+ 	/* this just shifts the object release to the work processor */
+ 	fscache_put_object(object);
+-	fscache_stat(&fscache_n_object_dead);
++	fscache_stat_unchecked(&fscache_n_object_dead);
+ 
+ 	_leave("");
+ 	return transit_to(OBJECT_DEAD);
+@@ -881,7 +881,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
  	enum fscache_checkaux result;
  
  	if (!object->cookie->def->check_aux) {
@@ -56692,7 +56837,7 @@ index 50d41c1..10ee117 100644
  		return FSCACHE_CHECKAUX_OKAY;
  	}
  
-@@ -903,17 +903,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
+@@ -890,17 +890,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
  	switch (result) {
  		/* entry okay as is */
  	case FSCACHE_CHECKAUX_OKAY:
@@ -56713,8 +56858,26 @@ index 50d41c1..10ee117 100644
  		break;
  
  	default:
+@@ -986,7 +986,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
+ {
+ 	const struct fscache_state *s;
+ 
+-	fscache_stat(&fscache_n_invalidates_run);
++	fscache_stat_unchecked(&fscache_n_invalidates_run);
+ 	fscache_stat(&fscache_n_cop_invalidate_object);
+ 	s = _fscache_invalidate_object(object, event);
+ 	fscache_stat_d(&fscache_n_cop_invalidate_object);
+@@ -1001,7 +1001,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
+ {
+ 	_enter("{OBJ%x},%d", object->debug_id, event);
+ 
+-	fscache_stat(&fscache_n_updates_run);
++	fscache_stat_unchecked(&fscache_n_updates_run);
+ 	fscache_stat(&fscache_n_cop_update_object);
+ 	object->cache->ops->update_object(object);
+ 	fscache_stat_d(&fscache_n_cop_update_object);
 diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
-index 762a9ec..2023284 100644
+index 318071a..379938b 100644
 --- a/fs/fscache/operation.c
 +++ b/fs/fscache/operation.c
 @@ -17,7 +17,7 @@
@@ -56767,7 +56930,7 @@ index 762a9ec..2023284 100644
  		ret = 0;
  	} else {
  		/* If we're in any other state, there must have been an I/O
-@@ -215,11 +215,11 @@ int fscache_submit_op(struct fscache_object *object,
+@@ -212,11 +212,11 @@ int fscache_submit_op(struct fscache_object *object,
  		if (object->n_exclusive > 0) {
  			atomic_inc(&op->usage);
  			list_add_tail(&op->pend_link, &object->pending_ops);
@@ -56781,22 +56944,20 @@ index 762a9ec..2023284 100644
  			fscache_start_operations(object);
  		} else {
  			ASSERTCMP(object->n_exclusive, ==, 0);
-@@ -231,12 +231,12 @@ int fscache_submit_op(struct fscache_object *object,
+@@ -228,10 +228,10 @@ int fscache_submit_op(struct fscache_object *object,
  		object->n_ops++;
  		atomic_inc(&op->usage);
  		list_add_tail(&op->pend_link, &object->pending_ops);
 -		fscache_stat(&fscache_n_op_pend);
 +		fscache_stat_unchecked(&fscache_n_op_pend);
  		ret = 0;
- 	} else if (object->state == FSCACHE_OBJECT_DYING ||
- 		   object->state == FSCACHE_OBJECT_LC_DYING ||
- 		   object->state == FSCACHE_OBJECT_WITHDRAWING) {
+ 	} else if (fscache_object_is_dying(object)) {
 -		fscache_stat(&fscache_n_op_rejected);
 +		fscache_stat_unchecked(&fscache_n_op_rejected);
  		op->state = FSCACHE_OP_ST_CANCELLED;
  		ret = -ENOBUFS;
  	} else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
-@@ -315,7 +315,7 @@ int fscache_cancel_op(struct fscache_operation *op,
+@@ -310,7 +310,7 @@ int fscache_cancel_op(struct fscache_operation *op,
  	ret = -EBUSY;
  	if (op->state == FSCACHE_OP_ST_PENDING) {
  		ASSERT(!list_empty(&op->pend_link));
@@ -56805,7 +56966,7 @@ index 762a9ec..2023284 100644
  		list_del_init(&op->pend_link);
  		if (do_cancel)
  			do_cancel(op);
-@@ -347,7 +347,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
+@@ -342,7 +342,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
  	while (!list_empty(&object->pending_ops)) {
  		op = list_entry(object->pending_ops.next,
  				struct fscache_operation, pend_link);
@@ -56814,7 +56975,7 @@ index 762a9ec..2023284 100644
  		list_del_init(&op->pend_link);
  
  		ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
-@@ -419,7 +419,7 @@ void fscache_put_operation(struct fscache_operation *op)
+@@ -414,7 +414,7 @@ void fscache_put_operation(struct fscache_operation *op)
  		    op->state, ==, FSCACHE_OP_ST_CANCELLED);
  	op->state = FSCACHE_OP_ST_DEAD;
  
@@ -56823,7 +56984,7 @@ index 762a9ec..2023284 100644
  
  	if (op->release) {
  		op->release(op);
-@@ -442,7 +442,7 @@ void fscache_put_operation(struct fscache_operation *op)
+@@ -433,7 +433,7 @@ void fscache_put_operation(struct fscache_operation *op)
  	 * lock, and defer it otherwise */
  	if (!spin_trylock(&object->lock)) {
  		_debug("defer put");
@@ -56832,7 +56993,7 @@ index 762a9ec..2023284 100644
  
  		cache = object->cache;
  		spin_lock(&cache->op_gc_list_lock);
-@@ -495,7 +495,7 @@ void fscache_operation_gc(struct work_struct *work)
+@@ -486,7 +486,7 @@ void fscache_operation_gc(struct work_struct *work)
  
  		_debug("GC DEFERRED REL OBJ%x OP%x",
  		       object->debug_id, op->debug_id);
@@ -56842,7 +57003,7 @@ index 762a9ec..2023284 100644
  		ASSERTCMP(atomic_read(&op->usage), ==, 0);
  		ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
 diff --git a/fs/fscache/page.c b/fs/fscache/page.c
-index ff000e5..c44ec6d 100644
+index 73899c1..ae40c58 100644
 --- a/fs/fscache/page.c
 +++ b/fs/fscache/page.c
 @@ -61,7 +61,7 @@ try_again:
@@ -56872,7 +57033,7 @@ index ff000e5..c44ec6d 100644
 @@ -110,11 +110,11 @@ page_busy:
  	 * sleeping on memory allocation, so we may need to impose a timeout
  	 * too. */
- 	if (!(gfp & __GFP_WAIT)) {
+ 	if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
 -		fscache_stat(&fscache_n_store_vmscan_busy);
 +		fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
  		return false;
@@ -56899,9 +57060,9 @@ index ff000e5..c44ec6d 100644
 -	fscache_stat(&fscache_n_attr_changed_calls);
 +	fscache_stat_unchecked(&fscache_n_attr_changed_calls);
  
- 	if (fscache_object_is_active(object)) {
- 		fscache_stat(&fscache_n_cop_attr_changed);
-@@ -187,11 +187,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+ 	if (fscache_object_is_active(object) &&
+ 	    fscache_use_cookie(object)) {
+@@ -189,11 +189,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
  
  	ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
  
@@ -56915,7 +57076,7 @@ index ff000e5..c44ec6d 100644
  		_leave(" = -ENOMEM");
  		return -ENOMEM;
  	}
-@@ -209,7 +209,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+@@ -211,7 +211,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
  	if (fscache_submit_exclusive_op(object, op) < 0)
  		goto nobufs;
  	spin_unlock(&cookie->lock);
@@ -56924,7 +57085,7 @@ index ff000e5..c44ec6d 100644
  	fscache_put_operation(op);
  	_leave(" = 0");
  	return 0;
-@@ -217,7 +217,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+@@ -219,7 +219,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
  nobufs:
  	spin_unlock(&cookie->lock);
  	kfree(op);
@@ -56933,7 +57094,7 @@ index ff000e5..c44ec6d 100644
  	_leave(" = %d", -ENOBUFS);
  	return -ENOBUFS;
  }
-@@ -255,7 +255,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
+@@ -258,7 +258,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
  	/* allocate a retrieval operation and attempt to submit it */
  	op = kzalloc(sizeof(*op), GFP_NOIO);
  	if (!op) {
@@ -56942,7 +57103,7 @@ index ff000e5..c44ec6d 100644
  		return NULL;
  	}
  
-@@ -283,13 +283,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
+@@ -289,13 +289,13 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
  		return 0;
  	}
  
@@ -56958,44 +57119,45 @@ index ff000e5..c44ec6d 100644
  		_leave(" = -ERESTARTSYS");
  		return -ERESTARTSYS;
  	}
-@@ -318,8 +318,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
+@@ -324,8 +324,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
   */
- static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
- 						 struct fscache_retrieval *op,
--						 atomic_t *stat_op_waits,
--						 atomic_t *stat_object_dead)
-+						 atomic_unchecked_t *stat_op_waits,
-+						 atomic_unchecked_t *stat_object_dead)
+ int fscache_wait_for_operation_activation(struct fscache_object *object,
+ 					  struct fscache_operation *op,
+-					  atomic_t *stat_op_waits,
+-					  atomic_t *stat_object_dead,
++					  atomic_unchecked_t *stat_op_waits,
++					  atomic_unchecked_t *stat_object_dead,
+ 					  void (*do_cancel)(struct fscache_operation *))
  {
  	int ret;
- 
-@@ -327,7 +327,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
- 		goto check_if_dead;
+@@ -335,7 +335,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
  
  	_debug(">>> WT");
--	fscache_stat(stat_op_waits);
-+	fscache_stat_unchecked(stat_op_waits);
- 	if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
+ 	if (stat_op_waits)
+-		fscache_stat(stat_op_waits);
++		fscache_stat_unchecked(stat_op_waits);
+ 	if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
  			fscache_wait_bit_interruptible,
  			TASK_INTERRUPTIBLE) != 0) {
-@@ -344,14 +344,14 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
- 
+@@ -353,7 +353,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
  check_if_dead:
- 	if (op->op.state == FSCACHE_OP_ST_CANCELLED) {
--		fscache_stat(stat_object_dead);
-+		fscache_stat_unchecked(stat_object_dead);
+ 	if (op->state == FSCACHE_OP_ST_CANCELLED) {
+ 		if (stat_object_dead)
+-			fscache_stat(stat_object_dead);
++			fscache_stat_unchecked(stat_object_dead);
  		_leave(" = -ENOBUFS [cancelled]");
  		return -ENOBUFS;
  	}
- 	if (unlikely(fscache_object_is_dead(object))) {
- 		pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->op.state);
- 		fscache_cancel_op(&op->op, fscache_do_cancel_retrieval);
--		fscache_stat(stat_object_dead);
-+		fscache_stat_unchecked(stat_object_dead);
+@@ -361,7 +361,7 @@ check_if_dead:
+ 		pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
+ 		fscache_cancel_op(op, do_cancel);
+ 		if (stat_object_dead)
+-			fscache_stat(stat_object_dead);
++			fscache_stat_unchecked(stat_object_dead);
  		return -ENOBUFS;
  	}
  	return 0;
-@@ -378,7 +378,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -388,7 +388,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
  
  	_enter("%p,%p,,,", cookie, page);
  
@@ -57004,7 +57166,7 @@ index ff000e5..c44ec6d 100644
  
  	if (hlist_empty(&cookie->backing_objects))
  		goto nobufs;
-@@ -417,7 +417,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -428,7 +428,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
  		goto nobufs_unlock_dec;
  	spin_unlock(&cookie->lock);
  
@@ -57013,7 +57175,7 @@ index ff000e5..c44ec6d 100644
  
  	/* pin the netfs read context in case we need to do the actual netfs
  	 * read because we've encountered a cache read failure */
-@@ -447,15 +447,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -459,15 +459,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
  
  error:
  	if (ret == -ENOMEM)
@@ -57034,8 +57196,8 @@ index ff000e5..c44ec6d 100644
  
  	fscache_put_retrieval(op);
  	_leave(" = %d", ret);
-@@ -467,7 +467,7 @@ nobufs_unlock:
- 	spin_unlock(&cookie->lock);
+@@ -480,7 +480,7 @@ nobufs_unlock:
+ 	atomic_dec(&cookie->n_active);
  	kfree(op);
  nobufs:
 -	fscache_stat(&fscache_n_retrievals_nobufs);
@@ -57043,7 +57205,7 @@ index ff000e5..c44ec6d 100644
  	_leave(" = -ENOBUFS");
  	return -ENOBUFS;
  }
-@@ -505,7 +505,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -518,7 +518,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
  
  	_enter("%p,,%d,,,", cookie, *nr_pages);
  
@@ -57052,7 +57214,7 @@ index ff000e5..c44ec6d 100644
  
  	if (hlist_empty(&cookie->backing_objects))
  		goto nobufs;
-@@ -541,7 +541,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -554,7 +554,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
  		goto nobufs_unlock_dec;
  	spin_unlock(&cookie->lock);
  
@@ -57061,7 +57223,7 @@ index ff000e5..c44ec6d 100644
  
  	/* pin the netfs read context in case we need to do the actual netfs
  	 * read because we've encountered a cache read failure */
-@@ -571,15 +571,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -585,15 +585,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
  
  error:
  	if (ret == -ENOMEM)
@@ -57082,8 +57244,8 @@ index ff000e5..c44ec6d 100644
  
  	fscache_put_retrieval(op);
  	_leave(" = %d", ret);
-@@ -591,7 +591,7 @@ nobufs_unlock:
- 	spin_unlock(&cookie->lock);
+@@ -606,7 +606,7 @@ nobufs_unlock:
+ 	atomic_dec(&cookie->n_active);
  	kfree(op);
  nobufs:
 -	fscache_stat(&fscache_n_retrievals_nobufs);
@@ -57091,7 +57253,7 @@ index ff000e5..c44ec6d 100644
  	_leave(" = -ENOBUFS");
  	return -ENOBUFS;
  }
-@@ -615,7 +615,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+@@ -630,7 +630,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
  
  	_enter("%p,%p,,,", cookie, page);
  
@@ -57100,16 +57262,16 @@ index ff000e5..c44ec6d 100644
  
  	if (hlist_empty(&cookie->backing_objects))
  		goto nobufs;
-@@ -647,7 +647,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+@@ -662,7 +662,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
  		goto nobufs_unlock;
  	spin_unlock(&cookie->lock);
  
 -	fscache_stat(&fscache_n_alloc_ops);
 +	fscache_stat_unchecked(&fscache_n_alloc_ops);
  
- 	ret = fscache_wait_for_retrieval_activation(
- 		object, op,
-@@ -663,11 +663,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+ 	ret = fscache_wait_for_operation_activation(
+ 		object, &op->op,
+@@ -679,11 +679,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
  
  error:
  	if (ret == -ERESTARTSYS)
@@ -57124,8 +57286,8 @@ index ff000e5..c44ec6d 100644
  
  	fscache_put_retrieval(op);
  	_leave(" = %d", ret);
-@@ -677,7 +677,7 @@ nobufs_unlock:
- 	spin_unlock(&cookie->lock);
+@@ -694,7 +694,7 @@ nobufs_unlock:
+ 	atomic_dec(&cookie->n_active);
  	kfree(op);
  nobufs:
 -	fscache_stat(&fscache_n_allocs_nobufs);
@@ -57133,7 +57295,7 @@ index ff000e5..c44ec6d 100644
  	_leave(" = -ENOBUFS");
  	return -ENOBUFS;
  }
-@@ -736,7 +736,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -770,7 +770,7 @@ static void fscache_write_op(struct fscache_operation *_op)
  
  	spin_lock(&cookie->stores_lock);
  
@@ -57142,7 +57304,7 @@ index ff000e5..c44ec6d 100644
  
  	/* find a page to store */
  	page = NULL;
-@@ -747,7 +747,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -781,7 +781,7 @@ static void fscache_write_op(struct fscache_operation *_op)
  	page = results[0];
  	_debug("gang %d [%lx]", n, page->index);
  	if (page->index > op->store_limit) {
@@ -57151,7 +57313,7 @@ index ff000e5..c44ec6d 100644
  		goto superseded;
  	}
  
-@@ -759,7 +759,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -793,7 +793,7 @@ static void fscache_write_op(struct fscache_operation *_op)
  	spin_unlock(&cookie->stores_lock);
  	spin_unlock(&object->lock);
  
@@ -57160,7 +57322,7 @@ index ff000e5..c44ec6d 100644
  	fscache_stat(&fscache_n_cop_write_page);
  	ret = object->cache->ops->write_page(op, page);
  	fscache_stat_d(&fscache_n_cop_write_page);
-@@ -860,7 +860,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -896,7 +896,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
  	ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
  	ASSERT(PageFsCache(page));
  
@@ -57169,7 +57331,7 @@ index ff000e5..c44ec6d 100644
  
  	if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
  		_leave(" = -ENOBUFS [invalidating]");
-@@ -916,7 +916,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -954,7 +954,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
  	spin_unlock(&cookie->stores_lock);
  	spin_unlock(&object->lock);
  
@@ -57177,8 +57339,8 @@ index ff000e5..c44ec6d 100644
 +	op->op.debug_id	= atomic_inc_return_unchecked(&fscache_op_debug_id);
  	op->store_limit = object->store_limit;
  
- 	if (fscache_submit_op(object, &op->op) < 0)
-@@ -924,8 +924,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+ 	atomic_inc(&cookie->n_active);
+@@ -963,8 +963,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
  
  	spin_unlock(&cookie->lock);
  	radix_tree_preload_end();
@@ -57189,7 +57351,7 @@ index ff000e5..c44ec6d 100644
  
  	/* the work queue now carries its own ref on the object */
  	fscache_put_operation(&op->op);
-@@ -933,14 +933,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -972,14 +972,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
  	return 0;
  
  already_queued:
@@ -57206,7 +57368,7 @@ index ff000e5..c44ec6d 100644
  	_leave(" = 0");
  	return 0;
  
-@@ -959,14 +959,14 @@ nobufs:
+@@ -999,14 +999,14 @@ nobufs:
  	spin_unlock(&cookie->lock);
  	radix_tree_preload_end();
  	kfree(op);
@@ -57223,7 +57385,7 @@ index ff000e5..c44ec6d 100644
  	_leave(" = -ENOMEM");
  	return -ENOMEM;
  }
-@@ -984,7 +984,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
+@@ -1024,7 +1024,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
  	ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
  	ASSERTCMP(page, !=, NULL);
  
@@ -57232,7 +57394,7 @@ index ff000e5..c44ec6d 100644
  
  	/* cache withdrawal may beat us to it */
  	if (!PageFsCache(page))
-@@ -1035,7 +1035,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
+@@ -1075,7 +1075,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
  	struct fscache_cookie *cookie = op->op.object->cookie;
  
  #ifdef CONFIG_FSCACHE_STATS
@@ -57258,13 +57420,27 @@ index 40d13c7..ddf52b9 100644
 -atomic_t fscache_n_op_gc;
 -atomic_t fscache_n_op_cancelled;
 -atomic_t fscache_n_op_rejected;
--
++atomic_unchecked_t fscache_n_op_pend;
++atomic_unchecked_t fscache_n_op_run;
++atomic_unchecked_t fscache_n_op_enqueue;
++atomic_unchecked_t fscache_n_op_requeue;
++atomic_unchecked_t fscache_n_op_deferred_release;
++atomic_unchecked_t fscache_n_op_release;
++atomic_unchecked_t fscache_n_op_gc;
++atomic_unchecked_t fscache_n_op_cancelled;
++atomic_unchecked_t fscache_n_op_rejected;
+ 
 -atomic_t fscache_n_attr_changed;
 -atomic_t fscache_n_attr_changed_ok;
 -atomic_t fscache_n_attr_changed_nobufs;
 -atomic_t fscache_n_attr_changed_nomem;
 -atomic_t fscache_n_attr_changed_calls;
--
++atomic_unchecked_t fscache_n_attr_changed;
++atomic_unchecked_t fscache_n_attr_changed_ok;
++atomic_unchecked_t fscache_n_attr_changed_nobufs;
++atomic_unchecked_t fscache_n_attr_changed_nomem;
++atomic_unchecked_t fscache_n_attr_changed_calls;
+ 
 -atomic_t fscache_n_allocs;
 -atomic_t fscache_n_allocs_ok;
 -atomic_t fscache_n_allocs_wait;
@@ -57273,7 +57449,15 @@ index 40d13c7..ddf52b9 100644
 -atomic_t fscache_n_allocs_object_dead;
 -atomic_t fscache_n_alloc_ops;
 -atomic_t fscache_n_alloc_op_waits;
--
++atomic_unchecked_t fscache_n_allocs;
++atomic_unchecked_t fscache_n_allocs_ok;
++atomic_unchecked_t fscache_n_allocs_wait;
++atomic_unchecked_t fscache_n_allocs_nobufs;
++atomic_unchecked_t fscache_n_allocs_intr;
++atomic_unchecked_t fscache_n_allocs_object_dead;
++atomic_unchecked_t fscache_n_alloc_ops;
++atomic_unchecked_t fscache_n_alloc_op_waits;
+ 
 -atomic_t fscache_n_retrievals;
 -atomic_t fscache_n_retrievals_ok;
 -atomic_t fscache_n_retrievals_wait;
@@ -57284,89 +57468,6 @@ index 40d13c7..ddf52b9 100644
 -atomic_t fscache_n_retrievals_object_dead;
 -atomic_t fscache_n_retrieval_ops;
 -atomic_t fscache_n_retrieval_op_waits;
--
--atomic_t fscache_n_stores;
--atomic_t fscache_n_stores_ok;
--atomic_t fscache_n_stores_again;
--atomic_t fscache_n_stores_nobufs;
--atomic_t fscache_n_stores_oom;
--atomic_t fscache_n_store_ops;
--atomic_t fscache_n_store_calls;
--atomic_t fscache_n_store_pages;
--atomic_t fscache_n_store_radix_deletes;
--atomic_t fscache_n_store_pages_over_limit;
--
--atomic_t fscache_n_store_vmscan_not_storing;
--atomic_t fscache_n_store_vmscan_gone;
--atomic_t fscache_n_store_vmscan_busy;
--atomic_t fscache_n_store_vmscan_cancelled;
--atomic_t fscache_n_store_vmscan_wait;
--
--atomic_t fscache_n_marks;
--atomic_t fscache_n_uncaches;
--
--atomic_t fscache_n_acquires;
--atomic_t fscache_n_acquires_null;
--atomic_t fscache_n_acquires_no_cache;
--atomic_t fscache_n_acquires_ok;
--atomic_t fscache_n_acquires_nobufs;
--atomic_t fscache_n_acquires_oom;
--
--atomic_t fscache_n_invalidates;
--atomic_t fscache_n_invalidates_run;
--
--atomic_t fscache_n_updates;
--atomic_t fscache_n_updates_null;
--atomic_t fscache_n_updates_run;
--
--atomic_t fscache_n_relinquishes;
--atomic_t fscache_n_relinquishes_null;
--atomic_t fscache_n_relinquishes_waitcrt;
--atomic_t fscache_n_relinquishes_retire;
--
--atomic_t fscache_n_cookie_index;
--atomic_t fscache_n_cookie_data;
--atomic_t fscache_n_cookie_special;
--
--atomic_t fscache_n_object_alloc;
--atomic_t fscache_n_object_no_alloc;
--atomic_t fscache_n_object_lookups;
--atomic_t fscache_n_object_lookups_negative;
--atomic_t fscache_n_object_lookups_positive;
--atomic_t fscache_n_object_lookups_timed_out;
--atomic_t fscache_n_object_created;
--atomic_t fscache_n_object_avail;
--atomic_t fscache_n_object_dead;
--
--atomic_t fscache_n_checkaux_none;
--atomic_t fscache_n_checkaux_okay;
--atomic_t fscache_n_checkaux_update;
--atomic_t fscache_n_checkaux_obsolete;
-+atomic_unchecked_t fscache_n_op_pend;
-+atomic_unchecked_t fscache_n_op_run;
-+atomic_unchecked_t fscache_n_op_enqueue;
-+atomic_unchecked_t fscache_n_op_requeue;
-+atomic_unchecked_t fscache_n_op_deferred_release;
-+atomic_unchecked_t fscache_n_op_release;
-+atomic_unchecked_t fscache_n_op_gc;
-+atomic_unchecked_t fscache_n_op_cancelled;
-+atomic_unchecked_t fscache_n_op_rejected;
-+
-+atomic_unchecked_t fscache_n_attr_changed;
-+atomic_unchecked_t fscache_n_attr_changed_ok;
-+atomic_unchecked_t fscache_n_attr_changed_nobufs;
-+atomic_unchecked_t fscache_n_attr_changed_nomem;
-+atomic_unchecked_t fscache_n_attr_changed_calls;
-+
-+atomic_unchecked_t fscache_n_allocs;
-+atomic_unchecked_t fscache_n_allocs_ok;
-+atomic_unchecked_t fscache_n_allocs_wait;
-+atomic_unchecked_t fscache_n_allocs_nobufs;
-+atomic_unchecked_t fscache_n_allocs_intr;
-+atomic_unchecked_t fscache_n_allocs_object_dead;
-+atomic_unchecked_t fscache_n_alloc_ops;
-+atomic_unchecked_t fscache_n_alloc_op_waits;
-+
 +atomic_unchecked_t fscache_n_retrievals;
 +atomic_unchecked_t fscache_n_retrievals_ok;
 +atomic_unchecked_t fscache_n_retrievals_wait;
@@ -57377,7 +57478,17 @@ index 40d13c7..ddf52b9 100644
 +atomic_unchecked_t fscache_n_retrievals_object_dead;
 +atomic_unchecked_t fscache_n_retrieval_ops;
 +atomic_unchecked_t fscache_n_retrieval_op_waits;
-+
+ 
+-atomic_t fscache_n_stores;
+-atomic_t fscache_n_stores_ok;
+-atomic_t fscache_n_stores_again;
+-atomic_t fscache_n_stores_nobufs;
+-atomic_t fscache_n_stores_oom;
+-atomic_t fscache_n_store_ops;
+-atomic_t fscache_n_store_calls;
+-atomic_t fscache_n_store_pages;
+-atomic_t fscache_n_store_radix_deletes;
+-atomic_t fscache_n_store_pages_over_limit;
 +atomic_unchecked_t fscache_n_stores;
 +atomic_unchecked_t fscache_n_stores_ok;
 +atomic_unchecked_t fscache_n_stores_again;
@@ -57388,39 +57499,73 @@ index 40d13c7..ddf52b9 100644
 +atomic_unchecked_t fscache_n_store_pages;
 +atomic_unchecked_t fscache_n_store_radix_deletes;
 +atomic_unchecked_t fscache_n_store_pages_over_limit;
-+
+ 
+-atomic_t fscache_n_store_vmscan_not_storing;
+-atomic_t fscache_n_store_vmscan_gone;
+-atomic_t fscache_n_store_vmscan_busy;
+-atomic_t fscache_n_store_vmscan_cancelled;
+-atomic_t fscache_n_store_vmscan_wait;
 +atomic_unchecked_t fscache_n_store_vmscan_not_storing;
 +atomic_unchecked_t fscache_n_store_vmscan_gone;
 +atomic_unchecked_t fscache_n_store_vmscan_busy;
 +atomic_unchecked_t fscache_n_store_vmscan_cancelled;
 +atomic_unchecked_t fscache_n_store_vmscan_wait;
-+
+ 
+-atomic_t fscache_n_marks;
+-atomic_t fscache_n_uncaches;
 +atomic_unchecked_t fscache_n_marks;
 +atomic_unchecked_t fscache_n_uncaches;
-+
+ 
+-atomic_t fscache_n_acquires;
+-atomic_t fscache_n_acquires_null;
+-atomic_t fscache_n_acquires_no_cache;
+-atomic_t fscache_n_acquires_ok;
+-atomic_t fscache_n_acquires_nobufs;
+-atomic_t fscache_n_acquires_oom;
 +atomic_unchecked_t fscache_n_acquires;
 +atomic_unchecked_t fscache_n_acquires_null;
 +atomic_unchecked_t fscache_n_acquires_no_cache;
 +atomic_unchecked_t fscache_n_acquires_ok;
 +atomic_unchecked_t fscache_n_acquires_nobufs;
 +atomic_unchecked_t fscache_n_acquires_oom;
-+
+ 
+-atomic_t fscache_n_invalidates;
+-atomic_t fscache_n_invalidates_run;
 +atomic_unchecked_t fscache_n_invalidates;
 +atomic_unchecked_t fscache_n_invalidates_run;
-+
+ 
+-atomic_t fscache_n_updates;
+-atomic_t fscache_n_updates_null;
+-atomic_t fscache_n_updates_run;
 +atomic_unchecked_t fscache_n_updates;
 +atomic_unchecked_t fscache_n_updates_null;
 +atomic_unchecked_t fscache_n_updates_run;
-+
+ 
+-atomic_t fscache_n_relinquishes;
+-atomic_t fscache_n_relinquishes_null;
+-atomic_t fscache_n_relinquishes_waitcrt;
+-atomic_t fscache_n_relinquishes_retire;
 +atomic_unchecked_t fscache_n_relinquishes;
 +atomic_unchecked_t fscache_n_relinquishes_null;
 +atomic_unchecked_t fscache_n_relinquishes_waitcrt;
 +atomic_unchecked_t fscache_n_relinquishes_retire;
-+
+ 
+-atomic_t fscache_n_cookie_index;
+-atomic_t fscache_n_cookie_data;
+-atomic_t fscache_n_cookie_special;
 +atomic_unchecked_t fscache_n_cookie_index;
 +atomic_unchecked_t fscache_n_cookie_data;
 +atomic_unchecked_t fscache_n_cookie_special;
-+
+ 
+-atomic_t fscache_n_object_alloc;
+-atomic_t fscache_n_object_no_alloc;
+-atomic_t fscache_n_object_lookups;
+-atomic_t fscache_n_object_lookups_negative;
+-atomic_t fscache_n_object_lookups_positive;
+-atomic_t fscache_n_object_lookups_timed_out;
+-atomic_t fscache_n_object_created;
+-atomic_t fscache_n_object_avail;
+-atomic_t fscache_n_object_dead;
 +atomic_unchecked_t fscache_n_object_alloc;
 +atomic_unchecked_t fscache_n_object_no_alloc;
 +atomic_unchecked_t fscache_n_object_lookups;
@@ -57430,7 +57575,11 @@ index 40d13c7..ddf52b9 100644
 +atomic_unchecked_t fscache_n_object_created;
 +atomic_unchecked_t fscache_n_object_avail;
 +atomic_unchecked_t fscache_n_object_dead;
-+
+ 
+-atomic_t fscache_n_checkaux_none;
+-atomic_t fscache_n_checkaux_okay;
+-atomic_t fscache_n_checkaux_update;
+-atomic_t fscache_n_checkaux_obsolete;
 +atomic_unchecked_t fscache_n_checkaux_none;
 +atomic_unchecked_t fscache_n_checkaux_okay;
 +atomic_unchecked_t fscache_n_checkaux_update;
@@ -57637,10 +57786,10 @@ index 40d13c7..ddf52b9 100644
  	seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
  		   atomic_read(&fscache_n_cop_alloc_object),
 diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
-index aef34b1..59bfd7b 100644
+index adbfd66..4b25822 100644
 --- a/fs/fuse/cuse.c
 +++ b/fs/fuse/cuse.c
-@@ -600,10 +600,12 @@ static int __init cuse_init(void)
+@@ -603,10 +603,12 @@ static int __init cuse_init(void)
  		INIT_LIST_HEAD(&cuse_conntbl[i]);
  
  	/* inherit and extend fuse_dev_operations */
@@ -57658,7 +57807,7 @@ index aef34b1..59bfd7b 100644
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index 1d55f94..088da65 100644
+index ef74ad5..c9ac759e 100644
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
 @@ -1339,7 +1339,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
@@ -57680,10 +57829,10 @@ index 1d55f94..088da65 100644
  	}
  
 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
-index e67b13d..1461659 100644
+index b7989f2..1f72ec4 100644
 --- a/fs/fuse/dir.c
 +++ b/fs/fuse/dir.c
-@@ -1441,7 +1441,7 @@ static char *read_link(struct dentry *dentry)
+@@ -1438,7 +1438,7 @@ static char *read_link(struct dentry *dentry)
  	return link;
  }
  
@@ -57693,10 +57842,10 @@ index e67b13d..1461659 100644
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
 diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
-index 62b484e..0f9a140 100644
+index 1298766..c964c60 100644
 --- a/fs/gfs2/inode.c
 +++ b/fs/gfs2/inode.c
-@@ -1441,7 +1441,7 @@ out:
+@@ -1515,7 +1515,7 @@ out:
  
  static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -57705,8 +57854,21 @@ index 62b484e..0f9a140 100644
  	if (!IS_ERR(s))
  		kfree(s);
  }
+diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
+index 2543728..14d7bd4 100644
+--- a/fs/hostfs/hostfs_kern.c
++++ b/fs/hostfs/hostfs_kern.c
+@@ -904,7 +904,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+ 
+ static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
+ {
+-	char *s = nd_get_link(nd);
++	const char *s = nd_get_link(nd);
+ 	if (!IS_ERR(s))
+ 		__putname(s);
+ }
 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
-index 4e5f332..3cb6350 100644
+index d19b30a..ef89c36 100644
 --- a/fs/hugetlbfs/inode.c
 +++ b/fs/hugetlbfs/inode.c
 @@ -152,6 +152,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
@@ -57746,7 +57908,7 @@ index 4e5f332..3cb6350 100644
  	info.high_limit = TASK_SIZE;
  	info.align_mask = PAGE_MASK & ~huge_page_mask(h);
  	info.align_offset = 0;
-@@ -898,7 +908,7 @@ static struct file_system_type hugetlbfs_fs_type = {
+@@ -908,7 +918,7 @@ static struct file_system_type hugetlbfs_fs_type = {
  };
  MODULE_ALIAS_FS("hugetlbfs");
  
@@ -57756,10 +57918,10 @@ index 4e5f332..3cb6350 100644
  static int can_do_hugetlb_shm(void)
  {
 diff --git a/fs/inode.c b/fs/inode.c
-index 00d5fc3..98ce7d7 100644
+index b33ba8e..3c79a47 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -878,8 +878,8 @@ unsigned int get_next_ino(void)
+@@ -849,8 +849,8 @@ unsigned int get_next_ino(void)
  
  #ifdef CONFIG_SMP
  	if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
@@ -57799,10 +57961,10 @@ index a6597d6..41b30ec 100644
  
  /*
 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
-index 788e0a9..8433098 100644
+index 6669aa2..36b033d 100644
 --- a/fs/jfs/super.c
 +++ b/fs/jfs/super.c
-@@ -878,7 +878,7 @@ static int __init init_jfs_fs(void)
+@@ -882,7 +882,7 @@ static int __init init_jfs_fs(void)
  
  	jfs_inode_cachep =
  	    kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
@@ -57812,33 +57974,33 @@ index 788e0a9..8433098 100644
  	if (jfs_inode_cachep == NULL)
  		return -ENOMEM;
 diff --git a/fs/libfs.c b/fs/libfs.c
-index 916da8c..1588998 100644
+index 193e0c2..7404665 100644
 --- a/fs/libfs.c
 +++ b/fs/libfs.c
-@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
- 
- 			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
- 				struct dentry *next;
-+				char d_name[sizeof(next->d_iname)];
-+				const unsigned char *name;
-+
- 				next = list_entry(p, struct dentry, d_u.d_child);
- 				spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
- 				if (!simple_positive(next)) {
-@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
- 
- 				spin_unlock(&next->d_lock);
- 				spin_unlock(&dentry->d_lock);
--				if (filldir(dirent, next->d_name.name, 
-+				name = next->d_name.name;
-+				if (name == next->d_iname) {
-+					memcpy(d_name, name, next->d_name.len);
-+					name = d_name;
-+				}
-+				if (filldir(dirent, name, 
- 					    next->d_name.len, filp->f_pos, 
- 					    next->d_inode->i_ino, 
- 					    dt_type(next->d_inode)) < 0)
+@@ -150,6 +150,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
+ 
+ 	for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
+ 		struct dentry *next = list_entry(p, struct dentry, d_u.d_child);
++		char d_name[sizeof(next->d_iname)];
++		const unsigned char *name;
++
+ 		spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
+ 		if (!simple_positive(next)) {
+ 			spin_unlock(&next->d_lock);
+@@ -158,7 +161,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
+ 
+ 		spin_unlock(&next->d_lock);
+ 		spin_unlock(&dentry->d_lock);
+-		if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
++		name = next->d_name.name;
++		if (name == next->d_iname) {
++			memcpy(d_name, name, next->d_name.len);
++			name = d_name;
++		}
++		if (!dir_emit(ctx, name, next->d_name.len,
+ 			      next->d_inode->i_ino, dt_type(next->d_inode)))
+ 			return 0;
+ 		spin_lock(&dentry->d_lock);
 diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
 index acd3947..1f896e2 100644
 --- a/fs/lockd/clntproc.c
@@ -57857,24 +58019,11 @@ index acd3947..1f896e2 100644
  
  	memcpy(c->data, &cookie, 4);
  	c->len=4;
-diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
-index a2aa97d..10d6c41 100644
---- a/fs/lockd/svc.c
-+++ b/fs/lockd/svc.c
-@@ -305,7 +305,7 @@ static int lockd_start_svc(struct svc_serv *serv)
- 	svc_sock_update_bufs(serv);
- 	serv->sv_maxconn = nlm_max_connections;
- 
--	nlmsvc_task = kthread_run(lockd, nlmsvc_rqst, serv->sv_name);
-+	nlmsvc_task = kthread_run(lockd, nlmsvc_rqst, "%s", serv->sv_name);
- 	if (IS_ERR(nlmsvc_task)) {
- 		error = PTR_ERR(nlmsvc_task);
- 		printk(KERN_WARNING
 diff --git a/fs/locks.c b/fs/locks.c
-index cb424a4..850e4dd 100644
+index b27a300..4156d0b 100644
 --- a/fs/locks.c
 +++ b/fs/locks.c
-@@ -2064,16 +2064,16 @@ void locks_remove_flock(struct file *filp)
+@@ -2183,16 +2183,16 @@ void locks_remove_flock(struct file *filp)
  		return;
  
  	if (filp->f_op && filp->f_op->flock) {
@@ -57894,9 +58043,9 @@ index cb424a4..850e4dd 100644
 +			flock.fl_ops->fl_release_private(&flock);
  	}
  
- 	lock_flocks();
+ 	spin_lock(&inode->i_lock);
 diff --git a/fs/namei.c b/fs/namei.c
-index cccaf77..b28ec8a 100644
+index 23ac50f..c6757a5 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
 @@ -319,16 +319,32 @@ int generic_permission(struct inode *inode, int mask)
@@ -57950,7 +58099,7 @@ index cccaf77..b28ec8a 100644
  	return -EACCES;
  }
  
-@@ -820,7 +828,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
+@@ -821,7 +829,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
  {
  	struct dentry *dentry = link->dentry;
  	int error;
@@ -57959,7 +58108,7 @@ index cccaf77..b28ec8a 100644
  
  	BUG_ON(nd->flags & LOOKUP_RCU);
  
-@@ -841,6 +849,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
+@@ -842,6 +850,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
  	if (error)
  		goto out_put_nd_path;
  
@@ -57972,7 +58121,7 @@ index cccaf77..b28ec8a 100644
  	nd->last_type = LAST_BIND;
  	*p = dentry->d_inode->i_op->follow_link(dentry, nd);
  	error = PTR_ERR(*p);
-@@ -1588,6 +1602,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
+@@ -1602,6 +1616,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
  		if (res)
  			break;
  		res = walk_component(nd, path, LOOKUP_FOLLOW);
@@ -57981,7 +58130,7 @@ index cccaf77..b28ec8a 100644
  		put_link(nd, &link, cookie);
  	} while (res > 0);
  
-@@ -1686,7 +1702,7 @@ EXPORT_SYMBOL(full_name_hash);
+@@ -1700,7 +1716,7 @@ EXPORT_SYMBOL(full_name_hash);
  static inline unsigned long hash_name(const char *name, unsigned int *hashp)
  {
  	unsigned long a, b, adata, bdata, mask, hash, len;
@@ -57990,7 +58139,7 @@ index cccaf77..b28ec8a 100644
  
  	hash = a = 0;
  	len = -sizeof(unsigned long);
-@@ -1968,6 +1984,8 @@ static int path_lookupat(int dfd, const char *name,
+@@ -1981,6 +1997,8 @@ static int path_lookupat(int dfd, const char *name,
  			if (err)
  				break;
  			err = lookup_last(nd, &path);
@@ -57999,7 +58148,7 @@ index cccaf77..b28ec8a 100644
  			put_link(nd, &link, cookie);
  		}
  	}
-@@ -1975,6 +1993,13 @@ static int path_lookupat(int dfd, const char *name,
+@@ -1988,6 +2006,13 @@ static int path_lookupat(int dfd, const char *name,
  	if (!err)
  		err = complete_walk(nd);
  
@@ -58013,7 +58162,7 @@ index cccaf77..b28ec8a 100644
  	if (!err && nd->flags & LOOKUP_DIRECTORY) {
  		if (!can_lookup(nd->inode)) {
  			path_put(&nd->path);
-@@ -2002,8 +2027,15 @@ static int filename_lookup(int dfd, struct filename *name,
+@@ -2015,8 +2040,15 @@ static int filename_lookup(int dfd, struct filename *name,
  		retval = path_lookupat(dfd, name->name,
  						flags | LOOKUP_REVAL, nd);
  
@@ -58030,7 +58179,7 @@ index cccaf77..b28ec8a 100644
  	return retval;
  }
  
-@@ -2382,6 +2414,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
+@@ -2587,6 +2619,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
  	if (flag & O_NOATIME && !inode_owner_or_capable(inode))
  		return -EPERM;
  
@@ -58044,7 +58193,7 @@ index cccaf77..b28ec8a 100644
  	return 0;
  }
  
-@@ -2603,7 +2642,7 @@ looked_up:
+@@ -2818,7 +2857,7 @@ looked_up:
   * cleared otherwise prior to returning.
   */
  static int lookup_open(struct nameidata *nd, struct path *path,
@@ -58053,7 +58202,7 @@ index cccaf77..b28ec8a 100644
  			const struct open_flags *op,
  			bool got_write, int *opened)
  {
-@@ -2638,6 +2677,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+@@ -2853,6 +2892,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
  	/* Negative dentry, just create the file */
  	if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
  		umode_t mode = op->mode;
@@ -58071,7 +58220,7 @@ index cccaf77..b28ec8a 100644
  		if (!IS_POSIXACL(dir->d_inode))
  			mode &= ~current_umask();
  		/*
-@@ -2659,6 +2709,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+@@ -2874,6 +2924,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
  				   nd->flags & LOOKUP_EXCL);
  		if (error)
  			goto out_dput;
@@ -58080,7 +58229,7 @@ index cccaf77..b28ec8a 100644
  	}
  out_no_open:
  	path->dentry = dentry;
-@@ -2673,7 +2725,7 @@ out_dput:
+@@ -2888,7 +2940,7 @@ out_dput:
  /*
   * Handle the last step of open()
   */
@@ -58089,28 +58238,10 @@ index cccaf77..b28ec8a 100644
  		   struct file *file, const struct open_flags *op,
  		   int *opened, struct filename *name)
  {
-@@ -2702,16 +2754,32 @@ static int do_last(struct nameidata *nd, struct path *path,
- 		error = complete_walk(nd);
- 		if (error)
- 			return error;
-+		if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
-+			error = -ENOENT;
-+			goto out;
-+		}
- 		audit_inode(name, nd->path.dentry, 0);
- 		if (open_flag & O_CREAT) {
- 			error = -EISDIR;
- 			goto out;
- 		}
-+		if (link && gr_handle_symlink_owner(link, nd->inode)) {
-+			error = -EACCES;
-+			goto out;
-+		}
- 		goto finish_open;
- 	case LAST_BIND:
- 		error = complete_walk(nd);
+@@ -2938,6 +2990,15 @@ static int do_last(struct nameidata *nd, struct path *path,
  		if (error)
  			return error;
+ 
 +		if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
 +			error = -ENOENT;
 +			goto out;
@@ -58119,10 +58250,11 @@ index cccaf77..b28ec8a 100644
 +			error = -EACCES;
 +			goto out;
 +		}
- 		audit_inode(name, dir, 0);
- 		goto finish_open;
- 	}
-@@ -2760,7 +2828,7 @@ retry_lookup:
++
+ 		audit_inode(name, dir, LOOKUP_PARENT);
+ 		error = -EISDIR;
+ 		/* trailing slashes? */
+@@ -2957,7 +3018,7 @@ retry_lookup:
  		 */
  	}
  	mutex_lock(&dir->d_inode->i_mutex);
@@ -58131,7 +58263,7 @@ index cccaf77..b28ec8a 100644
  	mutex_unlock(&dir->d_inode->i_mutex);
  
  	if (error <= 0) {
-@@ -2784,11 +2852,28 @@ retry_lookup:
+@@ -2981,11 +3042,28 @@ retry_lookup:
  		goto finish_open_created;
  	}
  
@@ -58161,7 +58293,7 @@ index cccaf77..b28ec8a 100644
  
  	/*
  	 * If atomic_open() acquired write access it is dropped now due to
-@@ -2829,6 +2914,11 @@ finish_lookup:
+@@ -3026,6 +3104,11 @@ finish_lookup:
  			}
  		}
  		BUG_ON(inode != path->dentry->d_inode);
@@ -58173,7 +58305,7 @@ index cccaf77..b28ec8a 100644
  		return 1;
  	}
  
-@@ -2838,7 +2928,6 @@ finish_lookup:
+@@ -3035,7 +3118,6 @@ finish_lookup:
  		save_parent.dentry = nd->path.dentry;
  		save_parent.mnt = mntget(path->mnt);
  		nd->path.dentry = path->dentry;
@@ -58181,7 +58313,7 @@ index cccaf77..b28ec8a 100644
  	}
  	nd->inode = inode;
  	/* Why this, you ask?  _Now_ we might have grown LOOKUP_JUMPED... */
-@@ -2847,6 +2936,16 @@ finish_lookup:
+@@ -3045,7 +3127,18 @@ finish_open:
  		path_put(&save_parent);
  		return error;
  	}
@@ -58195,10 +58327,12 @@ index cccaf77..b28ec8a 100644
 +		goto out;
 +	}
 +
+ 	audit_inode(name, nd->path.dentry, 0);
++
  	error = -EISDIR;
  	if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
  		goto out;
-@@ -2945,7 +3044,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
+@@ -3208,7 +3301,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
  	if (unlikely(error))
  		goto out;
  
@@ -58207,7 +58341,7 @@ index cccaf77..b28ec8a 100644
  	while (unlikely(error > 0)) { /* trailing symlink */
  		struct path link = path;
  		void *cookie;
-@@ -2963,7 +3062,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
+@@ -3226,7 +3319,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
  		error = follow_link(&link, nd, &cookie);
  		if (unlikely(error))
  			break;
@@ -58216,7 +58350,7 @@ index cccaf77..b28ec8a 100644
  		put_link(nd, &link, cookie);
  	}
  out:
-@@ -3063,8 +3162,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
+@@ -3326,8 +3419,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
  		goto unlock;
  
  	error = -EEXIST;
@@ -58230,7 +58364,7 @@ index cccaf77..b28ec8a 100644
  	/*
  	 * Special case - lookup gave negative, but... we had foo/bar/
  	 * From the vfs_mknod() POV we just have a negative dentry -
-@@ -3116,6 +3219,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
+@@ -3379,6 +3476,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
  }
  EXPORT_SYMBOL(user_path_create);
  
@@ -58251,7 +58385,7 @@ index cccaf77..b28ec8a 100644
  int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
  {
  	int error = may_create(dir, dentry);
-@@ -3178,6 +3295,17 @@ retry:
+@@ -3441,6 +3552,17 @@ retry:
  
  	if (!IS_POSIXACL(path.dentry->d_inode))
  		mode &= ~current_umask();
@@ -58269,7 +58403,7 @@ index cccaf77..b28ec8a 100644
  	error = security_path_mknod(&path, dentry, mode, dev);
  	if (error)
  		goto out;
-@@ -3194,6 +3322,8 @@ retry:
+@@ -3457,6 +3579,8 @@ retry:
  			break;
  	}
  out:
@@ -58278,7 +58412,7 @@ index cccaf77..b28ec8a 100644
  	done_path_create(&path, dentry);
  	if (retry_estale(error, lookup_flags)) {
  		lookup_flags |= LOOKUP_REVAL;
-@@ -3246,9 +3376,16 @@ retry:
+@@ -3509,9 +3633,16 @@ retry:
  
  	if (!IS_POSIXACL(path.dentry->d_inode))
  		mode &= ~current_umask();
@@ -58295,7 +58429,7 @@ index cccaf77..b28ec8a 100644
  	done_path_create(&path, dentry);
  	if (retry_estale(error, lookup_flags)) {
  		lookup_flags |= LOOKUP_REVAL;
-@@ -3329,6 +3466,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
+@@ -3592,6 +3723,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
  	struct filename *name;
  	struct dentry *dentry;
  	struct nameidata nd;
@@ -58304,7 +58438,7 @@ index cccaf77..b28ec8a 100644
  	unsigned int lookup_flags = 0;
  retry:
  	name = user_path_parent(dfd, pathname, &nd, lookup_flags);
-@@ -3361,10 +3500,21 @@ retry:
+@@ -3624,10 +3757,21 @@ retry:
  		error = -ENOENT;
  		goto exit3;
  	}
@@ -58326,7 +58460,7 @@ index cccaf77..b28ec8a 100644
  exit3:
  	dput(dentry);
  exit2:
-@@ -3430,6 +3580,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
+@@ -3693,6 +3837,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
  	struct dentry *dentry;
  	struct nameidata nd;
  	struct inode *inode = NULL;
@@ -58335,7 +58469,7 @@ index cccaf77..b28ec8a 100644
  	unsigned int lookup_flags = 0;
  retry:
  	name = user_path_parent(dfd, pathname, &nd, lookup_flags);
-@@ -3456,10 +3608,22 @@ retry:
+@@ -3719,10 +3865,22 @@ retry:
  		if (!inode)
  			goto slashes;
  		ihold(inode);
@@ -58358,7 +58492,7 @@ index cccaf77..b28ec8a 100644
  exit2:
  		dput(dentry);
  	}
-@@ -3537,9 +3701,17 @@ retry:
+@@ -3800,9 +3958,17 @@ retry:
  	if (IS_ERR(dentry))
  		goto out_putname;
  
@@ -58376,7 +58510,7 @@ index cccaf77..b28ec8a 100644
  	done_path_create(&path, dentry);
  	if (retry_estale(error, lookup_flags)) {
  		lookup_flags |= LOOKUP_REVAL;
-@@ -3613,6 +3785,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+@@ -3882,6 +4048,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
  {
  	struct dentry *new_dentry;
  	struct path old_path, new_path;
@@ -58384,7 +58518,7 @@ index cccaf77..b28ec8a 100644
  	int how = 0;
  	int error;
  
-@@ -3636,7 +3809,7 @@ retry:
+@@ -3905,7 +4072,7 @@ retry:
  	if (error)
  		return error;
  
@@ -58393,7 +58527,7 @@ index cccaf77..b28ec8a 100644
  					(how & LOOKUP_REVAL));
  	error = PTR_ERR(new_dentry);
  	if (IS_ERR(new_dentry))
-@@ -3648,11 +3821,28 @@ retry:
+@@ -3917,11 +4084,28 @@ retry:
  	error = may_linkat(&old_path);
  	if (unlikely(error))
  		goto out_dput;
@@ -58422,7 +58556,7 @@ index cccaf77..b28ec8a 100644
  	done_path_create(&new_path, new_dentry);
  	if (retry_estale(error, how)) {
  		how |= LOOKUP_REVAL;
-@@ -3898,12 +4088,21 @@ retry:
+@@ -4167,12 +4351,21 @@ retry:
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -58444,7 +58578,7 @@ index cccaf77..b28ec8a 100644
  exit5:
  	dput(new_dentry);
  exit4:
-@@ -3935,6 +4134,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
+@@ -4204,6 +4397,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
  
  int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
  {
@@ -58453,7 +58587,7 @@ index cccaf77..b28ec8a 100644
  	int len;
  
  	len = PTR_ERR(link);
-@@ -3944,7 +4145,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
+@@ -4213,7 +4408,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
  	len = strlen(link);
  	if (len > (unsigned) buflen)
  		len = buflen;
@@ -58470,10 +58604,10 @@ index cccaf77..b28ec8a 100644
  out:
  	return len;
 diff --git a/fs/namespace.c b/fs/namespace.c
-index a45ba4f..44cfe66 100644
+index da5c494..a755a54 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1265,6 +1265,9 @@ static int do_umount(struct mount *mnt, int flags)
+@@ -1268,6 +1268,9 @@ static int do_umount(struct mount *mnt, int flags)
  		if (!(sb->s_flags & MS_RDONLY))
  			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
  		up_write(&sb->s_umount);
@@ -58483,7 +58617,7 @@ index a45ba4f..44cfe66 100644
  		return retval;
  	}
  
-@@ -1283,6 +1286,9 @@ static int do_umount(struct mount *mnt, int flags)
+@@ -1286,6 +1289,9 @@ static int do_umount(struct mount *mnt, int flags)
  	}
  	br_write_unlock(&vfsmount_lock);
  	namespace_unlock();
@@ -58493,7 +58627,7 @@ index a45ba4f..44cfe66 100644
  	return retval;
  }
  
-@@ -1302,7 +1308,7 @@ static inline bool may_mount(void)
+@@ -1305,7 +1311,7 @@ static inline bool may_mount(void)
   * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
   */
  
@@ -58502,7 +58636,7 @@ index a45ba4f..44cfe66 100644
  {
  	struct path path;
  	struct mount *mnt;
-@@ -1342,7 +1348,7 @@ out:
+@@ -1347,7 +1353,7 @@ out:
  /*
   *	The 2.0 compatible umount. No flags.
   */
@@ -58511,7 +58645,7 @@ index a45ba4f..44cfe66 100644
  {
  	return sys_umount(name, 0);
  }
-@@ -2313,6 +2319,16 @@ long do_mount(const char *dev_name, const char *dir_name,
+@@ -2358,6 +2364,16 @@ long do_mount(const char *dev_name, const char *dir_name,
  		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
  		   MS_STRICTATIME);
  
@@ -58528,7 +58662,7 @@ index a45ba4f..44cfe66 100644
  	if (flags & MS_REMOUNT)
  		retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
  				    data_page);
-@@ -2327,6 +2343,9 @@ long do_mount(const char *dev_name, const char *dir_name,
+@@ -2372,6 +2388,9 @@ long do_mount(const char *dev_name, const char *dir_name,
  				      dev_name, data_page);
  dput_out:
  	path_put(&path);
@@ -58538,7 +58672,7 @@ index a45ba4f..44cfe66 100644
  	return retval;
  }
  
-@@ -2344,7 +2363,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
+@@ -2389,7 +2408,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
   * number incrementing at 10Ghz will take 12,427 years to wrap which
   * is effectively never, so we can ignore the possibility.
   */
@@ -58547,7 +58681,7 @@ index a45ba4f..44cfe66 100644
  
  static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
  {
-@@ -2359,7 +2378,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
+@@ -2404,7 +2423,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
  		kfree(new_ns);
  		return ERR_PTR(ret);
  	}
@@ -58556,7 +58690,16 @@ index a45ba4f..44cfe66 100644
  	atomic_set(&new_ns->count, 1);
  	new_ns->root = NULL;
  	INIT_LIST_HEAD(&new_ns->list);
-@@ -2500,8 +2519,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
+@@ -2418,7 +2437,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
+  * Allocate a new namespace structure and populate it with contents
+  * copied from the namespace of the passed in task structure.
+  */
+-static struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
++static __latent_entropy struct mnt_namespace *dup_mnt_ns(struct mnt_namespace *mnt_ns,
+ 		struct user_namespace *user_ns, struct fs_struct *fs)
+ {
+ 	struct mnt_namespace *new_ns;
+@@ -2549,8 +2568,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
  }
  EXPORT_SYMBOL(mount_subtree);
  
@@ -58567,7 +58710,7 @@ index a45ba4f..44cfe66 100644
  {
  	int ret;
  	char *kernel_type;
-@@ -2614,6 +2633,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
+@@ -2663,6 +2682,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
  	if (error)
  		goto out2;
  
@@ -58579,8 +58722,8 @@ index a45ba4f..44cfe66 100644
  	get_fs_root(current->fs, &root);
  	old_mp = lock_mount(&old);
  	error = PTR_ERR(old_mp);
-@@ -2864,7 +2888,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
- 	    !nsown_capable(CAP_SYS_ADMIN))
+@@ -2932,7 +2956,7 @@ static int mntns_install(struct nsproxy *nsproxy, void *ns)
+ 	    !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
  		return -EPERM;
  
 -	if (fs->users != 1)
@@ -58588,32 +58731,8 @@ index a45ba4f..44cfe66 100644
  		return -EINVAL;
  
  	get_mnt_ns(mnt_ns);
-diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
-index cff089a..4c3d57a 100644
---- a/fs/nfs/callback.c
-+++ b/fs/nfs/callback.c
-@@ -211,7 +211,6 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt,
- 	struct svc_rqst *rqstp;
- 	int (*callback_svc)(void *vrqstp);
- 	struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
--	char svc_name[12];
- 	int ret;
- 
- 	nfs_callback_bc_serv(minorversion, xprt, serv);
-@@ -235,10 +234,9 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt,
- 
- 	svc_sock_update_bufs(serv);
- 
--	sprintf(svc_name, "nfsv4.%u-svc", minorversion);
- 	cb_info->serv = serv;
- 	cb_info->rqst = rqstp;
--	cb_info->task = kthread_run(callback_svc, cb_info->rqst, svc_name);
-+	cb_info->task = kthread_run(callback_svc, cb_info->rqst, "nfsv4.%u-svc", minorversion);
- 	if (IS_ERR(cb_info->task)) {
- 		ret = PTR_ERR(cb_info->task);
- 		svc_exit_thread(cb_info->rqst);
 diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
-index a35582c..ebbdcd5 100644
+index f4ccfe6..a5cf064 100644
 --- a/fs/nfs/callback_xdr.c
 +++ b/fs/nfs/callback_xdr.c
 @@ -51,7 +51,7 @@ struct callback_op {
@@ -58626,10 +58745,10 @@ index a35582c..ebbdcd5 100644
  static struct callback_op callback_ops[];
  
 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index c1c7a9d..7afa0b8 100644
+index eda8879..bfc6837 100644
 --- a/fs/nfs/inode.c
 +++ b/fs/nfs/inode.c
-@@ -1043,16 +1043,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
+@@ -1150,16 +1150,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);
  }
  
@@ -58649,24 +58768,11 @@ index c1c7a9d..7afa0b8 100644
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
-index 2c37442..9b9538b 100644
---- a/fs/nfs/nfs4state.c
-+++ b/fs/nfs/nfs4state.c
-@@ -1193,7 +1193,7 @@ void nfs4_schedule_state_manager(struct nfs_client *clp)
- 	snprintf(buf, sizeof(buf), "%s-manager",
- 			rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR));
- 	rcu_read_unlock();
--	task = kthread_run(nfs4_run_state_manager, clp, buf);
-+	task = kthread_run(nfs4_run_state_manager, clp, "%s", buf);
- 	if (IS_ERR(task)) {
- 		printk(KERN_ERR "%s: kthread_run: %ld\n",
- 			__func__, PTR_ERR(task));
 diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
-index 27d74a2..c4c2a73 100644
+index 419572f..5414a23 100644
 --- a/fs/nfsd/nfs4proc.c
 +++ b/fs/nfsd/nfs4proc.c
-@@ -1126,7 +1126,7 @@ struct nfsd4_operation {
+@@ -1168,7 +1168,7 @@ struct nfsd4_operation {
  	nfsd4op_rsize op_rsize_bop;
  	stateid_getter op_get_currentstateid;
  	stateid_setter op_set_currentstateid;
@@ -58676,10 +58782,10 @@ index 27d74a2..c4c2a73 100644
  static struct nfsd4_operation nfsd4_ops[];
  
 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index 582321a..0224663 100644
+index ecc735e..79b2d31 100644
 --- a/fs/nfsd/nfs4xdr.c
 +++ b/fs/nfsd/nfs4xdr.c
-@@ -1458,7 +1458,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
+@@ -1500,7 +1500,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
  
  typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
  
@@ -58688,7 +58794,7 @@ index 582321a..0224663 100644
  	[OP_ACCESS]		= (nfsd4_dec)nfsd4_decode_access,
  	[OP_CLOSE]		= (nfsd4_dec)nfsd4_decode_close,
  	[OP_COMMIT]		= (nfsd4_dec)nfsd4_decode_commit,
-@@ -1498,7 +1498,7 @@ static nfsd4_dec nfsd4_dec_ops[] = {
+@@ -1540,7 +1540,7 @@ static nfsd4_dec nfsd4_dec_ops[] = {
  	[OP_RELEASE_LOCKOWNER]	= (nfsd4_dec)nfsd4_decode_release_lockowner,
  };
  
@@ -58697,7 +58803,7 @@ index 582321a..0224663 100644
  	[OP_ACCESS]		= (nfsd4_dec)nfsd4_decode_access,
  	[OP_CLOSE]		= (nfsd4_dec)nfsd4_decode_close,
  	[OP_COMMIT]		= (nfsd4_dec)nfsd4_decode_commit,
-@@ -1560,7 +1560,7 @@ static nfsd4_dec nfsd41_dec_ops[] = {
+@@ -1602,7 +1602,7 @@ static nfsd4_dec nfsd41_dec_ops[] = {
  };
  
  struct nfsd4_minorversion_ops {
@@ -58707,10 +58813,10 @@ index 582321a..0224663 100644
  };
  
 diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
-index e76244e..9fe8f2f1 100644
+index 9186c7c..3fdde3e 100644
 --- a/fs/nfsd/nfscache.c
 +++ b/fs/nfsd/nfscache.c
-@@ -526,14 +526,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
+@@ -540,14 +540,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
  {
  	struct svc_cacherep *rp = rqstp->rq_cacherep;
  	struct kvec	*resv = &rqstp->rq_res.head[0], *cachv;
@@ -58732,10 +58838,10 @@ index e76244e..9fe8f2f1 100644
  	/* Don't cache excessive amounts of data and XDR failures */
  	if (!statp || len > (256 >> 2)) {
 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
-index 62fd661..e2a1eb7 100644
+index 72cb28e..5b5f87d 100644
 --- a/fs/nfsd/vfs.c
 +++ b/fs/nfsd/vfs.c
-@@ -965,7 +965,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
+@@ -993,7 +993,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
  	} else {
  		oldfs = get_fs();
  		set_fs(KERNEL_DS);
@@ -58744,7 +58850,7 @@ index 62fd661..e2a1eb7 100644
  		set_fs(oldfs);
  	}
  
-@@ -1052,7 +1052,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
+@@ -1080,7 +1080,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);
@@ -58753,7 +58859,7 @@ index 62fd661..e2a1eb7 100644
  	set_fs(oldfs);
  	if (host_err < 0)
  		goto out_nfserr;
-@@ -1598,7 +1598,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
+@@ -1626,7 +1626,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
  	 */
  
  	oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -58846,7 +58952,7 @@ index e7bc1d7..06bd4bb 100644
  	}
  
 diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
-index 77cc85d..a1e6299 100644
+index e44cb64..4807084 100644
 --- a/fs/notify/fanotify/fanotify_user.c
 +++ b/fs/notify/fanotify/fanotify_user.c
 @@ -253,8 +253,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
@@ -58883,10 +58989,10 @@ index 7b51b05..5ea5ef6 100644
  EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
  
 diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
-index aa411c3..c260a84 100644
+index 9e38daf..5727cae 100644
 --- a/fs/ntfs/dir.c
 +++ b/fs/ntfs/dir.c
-@@ -1329,7 +1329,7 @@ find_next_index_buffer:
+@@ -1310,7 +1310,7 @@ find_next_index_buffer:
  	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
  			~(s64)(ndir->itype.index.block_size - 1)));
  	/* Bounds checks. */
@@ -58896,7 +59002,7 @@ index aa411c3..c260a84 100644
  				"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 c5670b8..2b43d9b 100644
+index ea4ba9d..1e13d34 100644
 --- a/fs/ntfs/file.c
 +++ b/fs/ntfs/file.c
 @@ -1282,7 +1282,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
@@ -58908,15 +59014,6 @@ index c5670b8..2b43d9b 100644
  
  	do {
  		len = PAGE_CACHE_SIZE - ofs;
-@@ -2241,6 +2241,6 @@ const struct inode_operations ntfs_file_inode_ops = {
- #endif /* NTFS_RW */
- };
- 
--const struct file_operations ntfs_empty_file_ops = {};
-+const struct file_operations ntfs_empty_file_ops __read_only;
- 
--const struct inode_operations ntfs_empty_inode_ops = {};
-+const struct inode_operations ntfs_empty_inode_ops __read_only;
 diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
 index 82650d5..db37dcf 100644
 --- a/fs/ntfs/super.c
@@ -58948,52 +59045,8 @@ index 82650d5..db37dcf 100644
  	/* We failed. Cleanup and return. */
  	if (bh_primary)
  		brelse(bh_primary);
-diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
-index 20dfec7..e238cb7 100644
---- a/fs/ocfs2/aops.c
-+++ b/fs/ocfs2/aops.c
-@@ -1756,7 +1756,7 @@ try_again:
- 		goto out;
- 	} else if (ret == 1) {
- 		clusters_need = wc->w_clen;
--		ret = ocfs2_refcount_cow(inode, filp, di_bh,
-+		ret = ocfs2_refcount_cow(inode, di_bh,
- 					 wc->w_cpos, wc->w_clen, UINT_MAX);
- 		if (ret) {
- 			mlog_errno(ret);
-diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
-index ff54014..ff125fd 100644
---- a/fs/ocfs2/file.c
-+++ b/fs/ocfs2/file.c
-@@ -370,7 +370,7 @@ static int ocfs2_cow_file_pos(struct inode *inode,
- 	if (!(ext_flags & OCFS2_EXT_REFCOUNTED))
- 		goto out;
- 
--	return ocfs2_refcount_cow(inode, NULL, fe_bh, cpos, 1, cpos+1);
-+	return ocfs2_refcount_cow(inode, fe_bh, cpos, 1, cpos+1);
- 
- out:
- 	return status;
-@@ -899,7 +899,7 @@ static int ocfs2_zero_extend_get_range(struct inode *inode,
- 		zero_clusters = last_cpos - zero_cpos;
- 
- 	if (needs_cow) {
--		rc = ocfs2_refcount_cow(inode, NULL, di_bh, zero_cpos,
-+		rc = ocfs2_refcount_cow(inode, di_bh, zero_cpos,
- 					zero_clusters, UINT_MAX);
- 		if (rc) {
- 			mlog_errno(rc);
-@@ -2078,7 +2078,7 @@ static int ocfs2_prepare_inode_for_refcount(struct inode *inode,
- 
- 	*meta_level = 1;
- 
--	ret = ocfs2_refcount_cow(inode, file, di_bh, cpos, clusters, UINT_MAX);
-+	ret = ocfs2_refcount_cow(inode, di_bh, cpos, clusters, UINT_MAX);
- 	if (ret)
- 		mlog_errno(ret);
- out:
 diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
-index aebeacd..0dcdd26 100644
+index cd5496b..26a1055 100644
 --- a/fs/ocfs2/localalloc.c
 +++ b/fs/ocfs2/localalloc.c
 @@ -1278,7 +1278,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
@@ -59005,21 +59058,8 @@ index aebeacd..0dcdd26 100644
  
  bail:
  	if (handle)
-diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c
-index f1fc172..452068b 100644
---- a/fs/ocfs2/move_extents.c
-+++ b/fs/ocfs2/move_extents.c
-@@ -69,7 +69,7 @@ static int __ocfs2_move_extent(handle_t *handle,
- 	u64 ino = ocfs2_metadata_cache_owner(context->et.et_ci);
- 	u64 old_blkno = ocfs2_clusters_to_blocks(inode->i_sb, p_cpos);
- 
--	ret = ocfs2_duplicate_clusters_by_page(handle, context->file, cpos,
-+	ret = ocfs2_duplicate_clusters_by_page(handle, inode, cpos,
- 					       p_cpos, new_p_cpos, len);
- 	if (ret) {
- 		mlog_errno(ret);
 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
-index d355e6e..578d905 100644
+index 3a90347..c40bef8 100644
 --- a/fs/ocfs2/ocfs2.h
 +++ b/fs/ocfs2/ocfs2.h
 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
@@ -59039,190 +59079,8 @@ index d355e6e..578d905 100644
  };
  
  enum ocfs2_local_alloc_state
-diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
-index 998b17e..aefe414 100644
---- a/fs/ocfs2/refcounttree.c
-+++ b/fs/ocfs2/refcounttree.c
-@@ -49,7 +49,6 @@
- 
- struct ocfs2_cow_context {
- 	struct inode *inode;
--	struct file *file;
- 	u32 cow_start;
- 	u32 cow_len;
- 	struct ocfs2_extent_tree data_et;
-@@ -66,7 +65,7 @@ struct ocfs2_cow_context {
- 			    u32 *num_clusters,
- 			    unsigned int *extent_flags);
- 	int (*cow_duplicate_clusters)(handle_t *handle,
--				      struct file *file,
-+				      struct inode *inode,
- 				      u32 cpos, u32 old_cluster,
- 				      u32 new_cluster, u32 new_len);
- };
-@@ -2922,14 +2921,12 @@ static int ocfs2_clear_cow_buffer(handle_t *handle, struct buffer_head *bh)
- }
- 
- int ocfs2_duplicate_clusters_by_page(handle_t *handle,
--				     struct file *file,
-+				     struct inode *inode,
- 				     u32 cpos, u32 old_cluster,
- 				     u32 new_cluster, u32 new_len)
- {
- 	int ret = 0, partial;
--	struct inode *inode = file_inode(file);
--	struct ocfs2_caching_info *ci = INODE_CACHE(inode);
--	struct super_block *sb = ocfs2_metadata_cache_get_super(ci);
-+	struct super_block *sb = inode->i_sb;
- 	u64 new_block = ocfs2_clusters_to_blocks(sb, new_cluster);
- 	struct page *page;
- 	pgoff_t page_index;
-@@ -2973,13 +2970,6 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,
- 		if (PAGE_CACHE_SIZE <= OCFS2_SB(sb)->s_clustersize)
- 			BUG_ON(PageDirty(page));
- 
--		if (PageReadahead(page)) {
--			page_cache_async_readahead(mapping,
--						   &file->f_ra, file,
--						   page, page_index,
--						   readahead_pages);
--		}
--
- 		if (!PageUptodate(page)) {
- 			ret = block_read_full_page(page, ocfs2_get_block);
- 			if (ret) {
-@@ -2999,7 +2989,8 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle,
- 			}
- 		}
- 
--		ocfs2_map_and_dirty_page(inode, handle, from, to,
-+		ocfs2_map_and_dirty_page(inode,
-+					 handle, from, to,
- 					 page, 0, &new_block);
- 		mark_page_accessed(page);
- unlock:
-@@ -3015,12 +3006,11 @@ unlock:
- }
- 
- int ocfs2_duplicate_clusters_by_jbd(handle_t *handle,
--				    struct file *file,
-+				    struct inode *inode,
- 				    u32 cpos, u32 old_cluster,
- 				    u32 new_cluster, u32 new_len)
- {
- 	int ret = 0;
--	struct inode *inode = file_inode(file);
- 	struct super_block *sb = inode->i_sb;
- 	struct ocfs2_caching_info *ci = INODE_CACHE(inode);
- 	int i, blocks = ocfs2_clusters_to_blocks(sb, new_len);
-@@ -3145,7 +3135,7 @@ static int ocfs2_replace_clusters(handle_t *handle,
- 
- 	/*If the old clusters is unwritten, no need to duplicate. */
- 	if (!(ext_flags & OCFS2_EXT_UNWRITTEN)) {
--		ret = context->cow_duplicate_clusters(handle, context->file,
-+		ret = context->cow_duplicate_clusters(handle, context->inode,
- 						      cpos, old, new, len);
- 		if (ret) {
- 			mlog_errno(ret);
-@@ -3423,35 +3413,12 @@ static int ocfs2_replace_cow(struct ocfs2_cow_context *context)
- 	return ret;
- }
- 
--static void ocfs2_readahead_for_cow(struct inode *inode,
--				    struct file *file,
--				    u32 start, u32 len)
--{
--	struct address_space *mapping;
--	pgoff_t index;
--	unsigned long num_pages;
--	int cs_bits = OCFS2_SB(inode->i_sb)->s_clustersize_bits;
--
--	if (!file)
--		return;
--
--	mapping = file->f_mapping;
--	num_pages = (len << cs_bits) >> PAGE_CACHE_SHIFT;
--	if (!num_pages)
--		num_pages = 1;
--
--	index = ((loff_t)start << cs_bits) >> PAGE_CACHE_SHIFT;
--	page_cache_sync_readahead(mapping, &file->f_ra, file,
--				  index, num_pages);
--}
--
- /*
-  * Starting at cpos, try to CoW write_len clusters.  Don't CoW
-  * past max_cpos.  This will stop when it runs into a hole or an
-  * unrefcounted extent.
-  */
- static int ocfs2_refcount_cow_hunk(struct inode *inode,
--				   struct file *file,
- 				   struct buffer_head *di_bh,
- 				   u32 cpos, u32 write_len, u32 max_cpos)
- {
-@@ -3480,8 +3447,6 @@ static int ocfs2_refcount_cow_hunk(struct inode *inode,
- 
- 	BUG_ON(cow_len == 0);
- 
--	ocfs2_readahead_for_cow(inode, file, cow_start, cow_len);
--
- 	context = kzalloc(sizeof(struct ocfs2_cow_context), GFP_NOFS);
- 	if (!context) {
- 		ret = -ENOMEM;
-@@ -3503,7 +3468,6 @@ static int ocfs2_refcount_cow_hunk(struct inode *inode,
- 	context->ref_root_bh = ref_root_bh;
- 	context->cow_duplicate_clusters = ocfs2_duplicate_clusters_by_page;
- 	context->get_clusters = ocfs2_di_get_clusters;
--	context->file = file;
- 
- 	ocfs2_init_dinode_extent_tree(&context->data_et,
- 				      INODE_CACHE(inode), di_bh);
-@@ -3532,7 +3496,6 @@ out:
-  * clusters between cpos and cpos+write_len are safe to modify.
-  */
- int ocfs2_refcount_cow(struct inode *inode,
--		       struct file *file,
- 		       struct buffer_head *di_bh,
- 		       u32 cpos, u32 write_len, u32 max_cpos)
- {
-@@ -3552,7 +3515,7 @@ int ocfs2_refcount_cow(struct inode *inode,
- 			num_clusters = write_len;
- 
- 		if (ext_flags & OCFS2_EXT_REFCOUNTED) {
--			ret = ocfs2_refcount_cow_hunk(inode, file, di_bh, cpos,
-+			ret = ocfs2_refcount_cow_hunk(inode, di_bh, cpos,
- 						      num_clusters, max_cpos);
- 			if (ret) {
- 				mlog_errno(ret);
-diff --git a/fs/ocfs2/refcounttree.h b/fs/ocfs2/refcounttree.h
-index 7754608..6422bbc 100644
---- a/fs/ocfs2/refcounttree.h
-+++ b/fs/ocfs2/refcounttree.h
-@@ -53,7 +53,7 @@ int ocfs2_prepare_refcount_change_for_del(struct inode *inode,
- 					  int *credits,
- 					  int *ref_blocks);
- int ocfs2_refcount_cow(struct inode *inode,
--		       struct file *filep, struct buffer_head *di_bh,
-+		       struct buffer_head *di_bh,
- 		       u32 cpos, u32 write_len, u32 max_cpos);
- 
- typedef int (ocfs2_post_refcount_func)(struct inode *inode,
-@@ -85,11 +85,11 @@ int ocfs2_refcount_cow_xattr(struct inode *inode,
- 			     u32 cpos, u32 write_len,
- 			     struct ocfs2_post_refcount *post);
- int ocfs2_duplicate_clusters_by_page(handle_t *handle,
--				     struct file *file,
-+				     struct inode *inode,
- 				     u32 cpos, u32 old_cluster,
- 				     u32 new_cluster, u32 new_len);
- int ocfs2_duplicate_clusters_by_jbd(handle_t *handle,
--				    struct file *file,
-+				    struct inode *inode,
- 				    u32 cpos, u32 old_cluster,
- 				    u32 new_cluster, u32 new_len);
- int ocfs2_cow_sync_writeback(struct super_block *sb,
 diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
-index b7e74b5..19c6536 100644
+index 5397c07..54afc55 100644
 --- a/fs/ocfs2/suballoc.c
 +++ b/fs/ocfs2/suballoc.c
 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
@@ -59234,7 +59092,7 @@ index b7e74b5..19c6536 100644
  
  		/* You should never ask for this much metadata */
  		BUG_ON(bits_wanted >
-@@ -2007,7 +2007,7 @@ int ocfs2_claim_metadata(handle_t *handle,
+@@ -2000,7 +2000,7 @@ int ocfs2_claim_metadata(handle_t *handle,
  		mlog_errno(status);
  		goto bail;
  	}
@@ -59243,7 +59101,7 @@ index b7e74b5..19c6536 100644
  
  	*suballoc_loc = res.sr_bg_blkno;
  	*suballoc_bit_start = res.sr_bit_offset;
-@@ -2171,7 +2171,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
+@@ -2164,7 +2164,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
  	trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
  					   res->sr_bits);
  
@@ -59252,7 +59110,7 @@ index b7e74b5..19c6536 100644
  
  	BUG_ON(res->sr_bits != 1);
  
-@@ -2213,7 +2213,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
+@@ -2206,7 +2206,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
  		mlog_errno(status);
  		goto bail;
  	}
@@ -59261,7 +59119,7 @@ index b7e74b5..19c6536 100644
  
  	BUG_ON(res.sr_bits != 1);
  
-@@ -2317,7 +2317,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
+@@ -2310,7 +2310,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
  						      cluster_start,
  						      num_clusters);
  		if (!status)
@@ -59270,7 +59128,7 @@ index b7e74b5..19c6536 100644
  	} else {
  		if (min_clusters > (osb->bitmap_cpg - 1)) {
  			/* The only paths asking for contiguousness
-@@ -2343,7 +2343,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
+@@ -2336,7 +2336,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
  				ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
  								 res.sr_bg_blkno,
  								 res.sr_bit_offset);
@@ -59280,10 +59138,10 @@ index b7e74b5..19c6536 100644
  		}
  	}
 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
-index 01b8516..579c4df 100644
+index d4e81e4..ad89f5f 100644
 --- a/fs/ocfs2/super.c
 +++ b/fs/ocfs2/super.c
-@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
+@@ -300,11 +300,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",
@@ -59300,7 +59158,7 @@ index 01b8516..579c4df 100644
  
  	out += snprintf(buf + out, len - out,
  			"%10s => State: %u  Descriptor: %llu  Size: %u bits  "
-@@ -2122,11 +2122,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
+@@ -2121,11 +2121,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
  	spin_lock_init(&osb->osb_xattr_lock);
  	ocfs2_init_steal_slots(osb);
  
@@ -59318,7 +59176,7 @@ index 01b8516..579c4df 100644
  	/* Copy the blockcheck stats from the superblock probe */
  	osb->osb_ecc_stats = *stats;
 diff --git a/fs/open.c b/fs/open.c
-index 8c74100..4239c48 100644
+index d420331..2dbb3fd 100644
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -32,6 +32,8 @@
@@ -59412,7 +59270,7 @@ index 8c74100..4239c48 100644
  	error = security_path_chmod(path, mode);
  	if (error)
  		goto out_unlock;
-@@ -531,6 +565,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
+@@ -530,6 +564,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
  	uid = make_kuid(current_user_ns(), user);
  	gid = make_kgid(current_user_ns(), group);
  
@@ -59422,14 +59280,14 @@ index 8c74100..4239c48 100644
  	newattrs.ia_valid =  ATTR_CTIME;
  	if (user != (uid_t) -1) {
  		if (!uid_valid(uid))
-@@ -946,6 +983,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
- 			} else {
- 				fsnotify_open(f);
- 				fd_install(fd, f);
-+				trace_do_sys_open(tmp->name, flags, mode);
- 			}
+@@ -974,6 +1011,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
+ 		} else {
+ 			fsnotify_open(f);
+ 			fd_install(fd, f);
++			trace_do_sys_open(tmp->name, flags, mode);
  		}
- 		putname(tmp);
+ 	}
+ 	putname(tmp);
 diff --git a/fs/pipe.c b/fs/pipe.c
 index d2c45e1..009fe1c 100644
 --- a/fs/pipe.c
@@ -59831,7 +59689,7 @@ index cbd0f1b..adec3f0 100644
  static struct pid *
  get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index c3834da..b402b2b 100644
+index 1485e38..8ad4236 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
 @@ -113,6 +113,14 @@ struct pid_entry {
@@ -60140,7 +59998,7 @@ index c3834da..b402b2b 100644
  			rcu_read_unlock();
  		} else {
  			inode->i_uid = GLOBAL_ROOT_UID;
-@@ -2196,6 +2314,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
+@@ -2166,6 +2284,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
  	if (!task)
  		goto out_no_task;
  
@@ -60150,17 +60008,17 @@ index c3834da..b402b2b 100644
  	/*
  	 * Yes, it does not scale. And it should not. Don't add
  	 * new entries into /proc/<tgid>/ without very good reasons.
-@@ -2240,6 +2361,9 @@ static int proc_pident_readdir(struct file *filp,
+@@ -2196,6 +2317,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
  	if (!task)
- 		goto out_no_task;
+ 		return -ENOENT;
  
 +	if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
 +		goto out;
 +
- 	ret = 0;
- 	i = filp->f_pos;
- 	switch (i) {
-@@ -2653,7 +2777,7 @@ static const struct pid_entry tgid_base_stuff[] = {
+ 	if (!dir_emit_dots(file, ctx))
+ 		goto out;
+ 
+@@ -2585,7 +2709,7 @@ static const struct pid_entry tgid_base_stuff[] = {
  	REG("autogroup",  S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
  #endif
  	REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
@@ -60169,7 +60027,7 @@ index c3834da..b402b2b 100644
  	INF("syscall",    S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",    S_IRUGO, proc_pid_cmdline),
-@@ -2678,10 +2802,10 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2610,10 +2734,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
@@ -60182,7 +60040,7 @@ index c3834da..b402b2b 100644
  	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-@@ -2715,6 +2839,9 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2647,6 +2771,9 @@ static const struct pid_entry tgid_base_stuff[] = {
  #ifdef CONFIG_HARDWALL
  	INF("hardwall",   S_IRUGO, proc_pid_hardwall),
  #endif
@@ -60192,7 +60050,7 @@ index c3834da..b402b2b 100644
  #ifdef CONFIG_USER_NS
  	REG("uid_map",    S_IRUGO|S_IWUSR, proc_uid_map_operations),
  	REG("gid_map",    S_IRUGO|S_IWUSR, proc_gid_map_operations),
-@@ -2847,7 +2974,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
+@@ -2777,7 +2904,14 @@ static int proc_pid_instantiate(struct inode *dir,
  	if (!inode)
  		goto out;
  
@@ -60207,7 +60065,7 @@ index c3834da..b402b2b 100644
  	inode->i_op = &proc_tgid_base_inode_operations;
  	inode->i_fop = &proc_tgid_base_operations;
  	inode->i_flags|=S_IMMUTABLE;
-@@ -2885,7 +3019,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
+@@ -2815,7 +2949,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
  	if (!task)
  		goto out;
  
@@ -60218,17 +60076,8 @@ index c3834da..b402b2b 100644
 +out_put_task:
  	put_task_struct(task);
  out:
- 	return result;
-@@ -2948,6 +3086,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
- static int fake_filldir(void *buf, const char *name, int namelen,
- 			loff_t offset, u64 ino, unsigned d_type)
- {
-+	struct getdents_callback * __buf = (struct getdents_callback *) buf;
-+	__buf->error = -EINVAL;
- 	return 0;
- }
- 
-@@ -3007,7 +3147,7 @@ static const struct pid_entry tid_base_stuff[] = {
+ 	return ERR_PTR(result);
+@@ -2921,7 +3059,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),
@@ -60237,7 +60086,7 @@ index c3834da..b402b2b 100644
  	INF("syscall",   S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",   S_IRUGO, proc_pid_cmdline),
-@@ -3034,10 +3174,10 @@ static const struct pid_entry tid_base_stuff[] = {
+@@ -2948,10 +3086,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
@@ -60283,7 +60132,7 @@ index b143471..bb105e5 100644
  }
  module_init(proc_devices_init);
 diff --git a/fs/proc/fd.c b/fs/proc/fd.c
-index d7a4a28..0201742 100644
+index 985ea88..d118a0a 100644
 --- a/fs/proc/fd.c
 +++ b/fs/proc/fd.c
 @@ -25,7 +25,8 @@ static int seq_show(struct seq_file *m, void *v)
@@ -60296,7 +60145,7 @@ index d7a4a28..0201742 100644
  	put_task_struct(task);
  
  	if (files) {
-@@ -302,11 +303,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
+@@ -283,11 +284,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
   */
  int proc_fd_permission(struct inode *inode, int mask)
  {
@@ -60305,7 +60154,7 @@ index d7a4a28..0201742 100644
 -	if (rv == 0)
 -		return 0;
 +
- 	if (task_pid(current) == proc_pid(inode))
+ 	if (task_tgid(current) == proc_pid(inode))
  		rv = 0;
 +
 +	task = get_proc_task(inode);
@@ -60321,7 +60170,7 @@ index d7a4a28..0201742 100644
  }
  
 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
-index 073aea6..0630370 100644
+index 8eaa1ba..cc6ff42 100644
 --- a/fs/proc/inode.c
 +++ b/fs/proc/inode.c
 @@ -23,11 +23,17 @@
@@ -60356,7 +60205,7 @@ index 073aea6..0630370 100644
  }
  
  static struct kmem_cache * proc_inode_cachep;
-@@ -385,7 +398,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
+@@ -405,7 +418,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
  		if (de->mode) {
  			inode->i_mode = de->mode;
  			inode->i_uid = de->uid;
@@ -60369,7 +60218,7 @@ index 073aea6..0630370 100644
  		if (de->size)
  			inode->i_size = de->size;
 diff --git a/fs/proc/internal.h b/fs/proc/internal.h
-index d600fb0..3b495fe 100644
+index 651d09a..60c73ae 100644
 --- a/fs/proc/internal.h
 +++ b/fs/proc/internal.h
 @@ -155,6 +155,9 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
@@ -60383,7 +60232,7 @@ index d600fb0..3b495fe 100644
  /*
   * base.c
 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
-index 0a22194..a9fc8c1 100644
+index 06ea155..9a798c7 100644
 --- a/fs/proc/kcore.c
 +++ b/fs/proc/kcore.c
 @@ -484,9 +484,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
@@ -60404,7 +60253,9 @@ index 0a22194..a9fc8c1 100644
  		} else {
  			if (kern_addr_valid(start)) {
 -				unsigned long n;
--
++				char *elf_buf;
++				mm_segment_t oldfs;
+ 
 -				n = copy_to_user(buffer, (char *)start, tsz);
 -				/*
 -				 * We cannot distinguish between fault on source
@@ -60415,9 +60266,6 @@ index 0a22194..a9fc8c1 100644
 -				if (n) { 
 -					if (clear_user(buffer + tsz - n,
 -								n))
-+				char *elf_buf;
-+				mm_segment_t oldfs;
-+
 +				elf_buf = kmalloc(tsz, GFP_KERNEL);
 +				if (!elf_buf)
 +					return -ENOMEM;
@@ -60446,10 +60294,10 @@ index 0a22194..a9fc8c1 100644
  		return -EPERM;
  	if (kcore_need_update)
 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
-index 5aa847a..f77c8d4 100644
+index 59d85d6..ac6fc05 100644
 --- a/fs/proc/meminfo.c
 +++ b/fs/proc/meminfo.c
-@@ -159,7 +159,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
+@@ -153,7 +153,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
  		vmi.used >> 10,
  		vmi.largest_chunk >> 10
  #ifdef CONFIG_MEMORY_FAILURE
@@ -60472,7 +60320,7 @@ index ccfd99b..1b7e255 100644
  
  	seq_putc(m, '\n');
 diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
-index 986e832..6e8e859 100644
+index 4677bb7..408e936 100644
 --- a/fs/proc/proc_net.c
 +++ b/fs/proc/proc_net.c
 @@ -23,6 +23,7 @@
@@ -60502,11 +60350,17 @@ index 986e832..6e8e859 100644
  	rcu_read_lock();
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
-index ac05f33..1e6dc7e 100644
+index 7129046..6914844 100644
 --- a/fs/proc/proc_sysctl.c
 +++ b/fs/proc/proc_sysctl.c
-@@ -13,11 +13,15 @@
+@@ -11,13 +11,21 @@
+ #include <linux/namei.h>
+ #include <linux/mm.h>
  #include <linux/module.h>
++#include <linux/nsproxy.h>
++#ifdef CONFIG_GRKERNSEC
++#include <net/net_namespace.h>
++#endif
  #include "internal.h"
  
 +extern int gr_handle_chroot_sysctl(const int op);
@@ -60523,7 +60377,7 @@ index ac05f33..1e6dc7e 100644
  
  void proc_sys_poll_notify(struct ctl_table_poll *poll)
  {
-@@ -467,6 +471,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
+@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
  
  	err = NULL;
  	d_set_d_op(dentry, &proc_sys_dentry_operations);
@@ -60533,7 +60387,7 @@ index ac05f33..1e6dc7e 100644
  	d_add(dentry, inode);
  
  out:
-@@ -482,6 +489,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
+@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
  	struct inode *inode = file_inode(filp);
  	struct ctl_table_header *head = grab_header(inode);
  	struct ctl_table *table = PROC_I(inode)->sysctl_entry;
@@ -60541,7 +60395,7 @@ index ac05f33..1e6dc7e 100644
  	ssize_t error;
  	size_t res;
  
-@@ -493,7 +501,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
+@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
  	 * and won't be until we finish.
  	 */
  	error = -EPERM;
@@ -60550,7 +60404,7 @@ index ac05f33..1e6dc7e 100644
  		goto out;
  
  	/* if that can happen at all, it should be -EINVAL, not -EISDIR */
-@@ -501,6 +509,22 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
+@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
  	if (!table->proc_handler)
  		goto out;
  
@@ -60566,15 +60420,20 @@ index ac05f33..1e6dc7e 100644
 +	dput(filp->f_path.dentry);
 +	if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
 +		goto out;
-+	if (write && !capable(CAP_SYS_ADMIN))
-+		goto out;
++	if (write) {
++		if (current->nsproxy->net_ns != table->extra2) {
++			if (!capable(CAP_SYS_ADMIN))
++				goto out;
++		} else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
++			goto out;
++	}
 +#endif
 +
  	/* careful: calling conventions are nasty here */
  	res = count;
  	error = table->proc_handler(table, write, buf, &res, ppos);
-@@ -598,6 +622,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
- 				return -ENOMEM;
+@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
+ 				return false;
  			} else {
  				d_set_d_op(child, &proc_sys_dentry_operations);
 +
@@ -60583,17 +60442,17 @@ index ac05f33..1e6dc7e 100644
  				d_add(child, inode);
  			}
  		} else {
-@@ -641,6 +668,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
- 	if ((*pos)++ < file->f_pos)
- 		return 0;
+@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
+ 	if ((*pos)++ < ctx->pos)
+ 		return true;
  
 +	if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
 +		return 0;
 +
  	if (unlikely(S_ISLNK(table->mode)))
- 		res = proc_sys_link_fill_cache(file, dirent, filldir, head, table);
+ 		res = proc_sys_link_fill_cache(file, ctx, head, table);
  	else
-@@ -751,6 +781,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
+@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
  	if (IS_ERR(head))
  		return PTR_ERR(head);
  
@@ -60603,7 +60462,7 @@ index ac05f33..1e6dc7e 100644
  	generic_fillattr(inode, stat);
  	if (table)
  		stat->mode = (stat->mode & S_IFMT) | table->mode;
-@@ -773,13 +806,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
+@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
  	.llseek		= generic_file_llseek,
  };
  
@@ -60619,7 +60478,7 @@ index ac05f33..1e6dc7e 100644
  	.lookup		= proc_sys_lookup,
  	.permission	= proc_sys_permission,
  	.setattr	= proc_sys_setattr,
-@@ -855,7 +888,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
+@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
  static struct ctl_dir *new_dir(struct ctl_table_set *set,
  			       const char *name, int namelen)
  {
@@ -60628,7 +60487,7 @@ index ac05f33..1e6dc7e 100644
  	struct ctl_dir *new;
  	struct ctl_node *node;
  	char *new_name;
-@@ -867,7 +900,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
+@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
  		return NULL;
  
  	node = (struct ctl_node *)(new + 1);
@@ -60637,7 +60496,7 @@ index ac05f33..1e6dc7e 100644
  	new_name = (char *)(table + 2);
  	memcpy(new_name, name, namelen);
  	new_name[namelen] = '\0';
-@@ -1036,7 +1069,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
+@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
  static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
  	struct ctl_table_root *link_root)
  {
@@ -60647,7 +60506,7 @@ index ac05f33..1e6dc7e 100644
  	struct ctl_table_header *links;
  	struct ctl_node *node;
  	char *link_name;
-@@ -1059,7 +1093,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
+@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
  		return NULL;
  
  	node = (struct ctl_node *)(links + 1);
@@ -60656,7 +60515,7 @@ index ac05f33..1e6dc7e 100644
  	link_name = (char *)&link_table[nr_entries + 1];
  
  	for (link = link_table, entry = table; entry->procname; link++, entry++) {
-@@ -1307,8 +1341,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
+@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
  	struct ctl_table_header ***subheader, struct ctl_table_set *set,
  	struct ctl_table *table)
  {
@@ -60667,7 +60526,7 @@ index ac05f33..1e6dc7e 100644
  	int nr_files = 0;
  	int nr_dirs = 0;
  	int err = -ENOMEM;
-@@ -1320,10 +1354,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
+@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
  			nr_files++;
  	}
  
@@ -60679,7 +60538,7 @@ index ac05f33..1e6dc7e 100644
  		files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
  				GFP_KERNEL);
  		if (!files)
-@@ -1341,7 +1374,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
+@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
  	/* Register everything except a directory full of subdirectories */
  	if (nr_files || !nr_dirs) {
  		struct ctl_table_header *header;
@@ -60689,10 +60548,10 @@ index ac05f33..1e6dc7e 100644
  			kfree(ctl_table_arg);
  			goto out;
 diff --git a/fs/proc/root.c b/fs/proc/root.c
-index 04ec276..3b3b2ed 100644
+index 87dbcbe..55e1b4d 100644
 --- a/fs/proc/root.c
 +++ b/fs/proc/root.c
-@@ -183,7 +183,15 @@ void __init proc_root_init(void)
+@@ -186,7 +186,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
  	proc_device_tree_init();
  #endif
@@ -60722,13 +60581,13 @@ index 6b6a993..807cccc 100644
  		kfree(s);
  }
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 65fc60a..350cc48 100644
+index 390bdab..83c1e8a 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
-@@ -11,12 +11,19 @@
- #include <linux/rmap.h>
+@@ -12,12 +12,19 @@
  #include <linux/swap.h>
  #include <linux/swapops.h>
+ #include <linux/mmu_notifier.h>
 +#include <linux/grsecurity.h>
  
  #include <asm/elf.h>
@@ -60745,7 +60604,7 @@ index 65fc60a..350cc48 100644
  void task_mem(struct seq_file *m, struct mm_struct *mm)
  {
  	unsigned long data, text, lib, swap;
-@@ -52,8 +59,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
+@@ -53,8 +60,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"
@@ -60761,7 +60620,7 @@ index 65fc60a..350cc48 100644
  		total_vm << (PAGE_SHIFT-10),
  		mm->locked_vm << (PAGE_SHIFT-10),
  		mm->pinned_vm << (PAGE_SHIFT-10),
-@@ -62,7 +74,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
+@@ -63,7 +75,19 @@ 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,
@@ -60782,7 +60641,7 @@ index 65fc60a..350cc48 100644
  }
  
  unsigned long task_vsize(struct mm_struct *mm)
-@@ -277,13 +301,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -278,13 +302,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
  	}
  
@@ -60801,7 +60660,7 @@ index 65fc60a..350cc48 100644
  
  	seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
  			start,
-@@ -292,7 +316,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -293,7 +317,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
  			flags & VM_WRITE ? 'w' : '-',
  			flags & VM_EXEC ? 'x' : '-',
  			flags & VM_MAYSHARE ? 's' : 'p',
@@ -60813,7 +60672,7 @@ index 65fc60a..350cc48 100644
  			MAJOR(dev), MINOR(dev), ino, &len);
  
  	/*
-@@ -301,7 +329,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -302,7 +330,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
  	 */
  	if (file) {
  		pad_len_spaces(m, len);
@@ -60822,7 +60681,7 @@ index 65fc60a..350cc48 100644
  		goto done;
  	}
  
-@@ -327,8 +355,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -328,8 +356,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
  			 * Thread stack in /proc/PID/task/TID/maps or
  			 * the main process stack.
  			 */
@@ -60834,7 +60693,7 @@ index 65fc60a..350cc48 100644
  				name = "[stack]";
  			} else {
  				/* Thread stack in /proc/PID/maps */
-@@ -352,6 +381,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
+@@ -353,6 +382,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
  	struct proc_maps_private *priv = m->private;
  	struct task_struct *task = priv->task;
  
@@ -60848,7 +60707,7 @@ index 65fc60a..350cc48 100644
  	show_map_vma(m, vma, is_pid);
  
  	if (m->count < m->size)  /* vma is copied successfully */
-@@ -589,12 +625,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
+@@ -590,12 +626,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
  		.private = &mss,
  	};
  
@@ -60877,7 +60736,7 @@ index 65fc60a..350cc48 100644
  	show_map_vma(m, vma, is_pid);
  
  	seq_printf(m,
-@@ -612,7 +659,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
+@@ -613,7 +660,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
  		   "KernelPageSize: %8lu kB\n"
  		   "MMUPageSize:    %8lu kB\n"
  		   "Locked:         %8lu kB\n",
@@ -60889,7 +60748,7 @@ index 65fc60a..350cc48 100644
  		   mss.resident >> 10,
  		   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
  		   mss.shared_clean  >> 10,
-@@ -1264,6 +1315,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1390,6 +1441,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
  	int n;
  	char buffer[50];
  
@@ -60903,9 +60762,9 @@ index 65fc60a..350cc48 100644
  	if (!mm)
  		return 0;
  
-@@ -1281,11 +1339,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
- 	mpol_to_str(buffer, sizeof(buffer), pol);
- 	mpol_cond_put(pol);
+@@ -1409,11 +1467,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+ 	if (n < 0)
+ 		return n;
  
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
 +	seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
@@ -60943,10 +60802,10 @@ index 56123a6..5a2f6ec 100644
  		pid_t tid = vm_is_stack(priv->task, vma, is_pid);
  
 diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
-index 17f7e08..e4b1529 100644
+index 9100d69..f1f9fc9 100644
 --- a/fs/proc/vmcore.c
 +++ b/fs/proc/vmcore.c
-@@ -99,9 +99,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
+@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
  			nr_bytes = count;
  
  		/* If pfn is not ram, return zeros for sparse dump files */
@@ -60963,15 +60822,15 @@ index 17f7e08..e4b1529 100644
  			tmp = copy_oldmem_page(pfn, buf, nr_bytes,
  						offset, userbuf);
  			if (tmp < 0)
-@@ -186,7 +190,7 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer,
- 		if (tsz > nr_bytes)
- 			tsz = nr_bytes;
- 
--		tmp = read_from_oldmem(buffer, tsz, &start, 1);
-+		tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, 1);
- 		if (tmp < 0)
- 			return tmp;
- 		buflen -= tsz;
+@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
+ 		if (*fpos < m->offset + m->size) {
+ 			tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
+ 			start = m->paddr + *fpos - m->offset;
+-			tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
++			tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
+ 			if (tmp < 0)
+ 				return tmp;
+ 			buflen -= tsz;
 diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
 index b00fcc9..e0c6381 100644
 --- a/fs/qnx6/qnx6.h
@@ -61017,10 +60876,10 @@ index 16e8abb..2dcf914 100644
  	if (!msg_head) {
  		printk(KERN_ERR
 diff --git a/fs/read_write.c b/fs/read_write.c
-index 2cefa41..c7e2fe0 100644
+index e3cd280..a378473 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -411,7 +411,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
+@@ -438,7 +438,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
  
  	old_fs = get_fs();
  	set_fs(get_ds());
@@ -61030,7 +60889,7 @@ index 2cefa41..c7e2fe0 100644
  		count =  MAX_RW_COUNT;
  	if (file->f_op->write)
 diff --git a/fs/readdir.c b/fs/readdir.c
-index fee38e0..12fdf47 100644
+index 93d71e5..6a14be8 100644
 --- a/fs/readdir.c
 +++ b/fs/readdir.c
 @@ -17,6 +17,7 @@
@@ -61041,15 +60900,15 @@ index fee38e0..12fdf47 100644
  
  #include <asm/uaccess.h>
  
-@@ -67,6 +68,7 @@ struct old_linux_dirent {
- 
+@@ -69,6 +70,7 @@ struct old_linux_dirent {
  struct readdir_callback {
+ 	struct dir_context ctx;
  	struct old_linux_dirent __user * dirent;
 +	struct file * file;
  	int result;
  };
  
-@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
+@@ -86,6 +88,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
  		buf->result = -EOVERFLOW;
  		return -EOVERFLOW;
  	}
@@ -61060,23 +60919,23 @@ index fee38e0..12fdf47 100644
  	buf->result++;
  	dirent = buf->dirent;
  	if (!access_ok(VERIFY_WRITE, dirent,
-@@ -114,6 +120,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
+@@ -117,6 +123,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
+ 	if (!f.file)
+ 		return -EBADF;
  
- 	buf.result = 0;
- 	buf.dirent = dirent;
 +	buf.file = f.file;
- 
- 	error = vfs_readdir(f.file, fillonedir, &buf);
+ 	error = iterate_dir(f.file, &buf.ctx);
  	if (buf.result)
-@@ -139,6 +146,7 @@ struct linux_dirent {
- struct getdents_callback {
+ 		error = buf.result;
+@@ -142,6 +149,7 @@ struct getdents_callback {
+ 	struct dir_context ctx;
  	struct linux_dirent __user * current_dir;
  	struct linux_dirent __user * previous;
 +	struct file * file;
  	int count;
  	int error;
  };
-@@ -160,6 +168,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
+@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
  		buf->error = -EOVERFLOW;
  		return -EOVERFLOW;
  	}
@@ -61087,23 +60946,23 @@ index fee38e0..12fdf47 100644
  	dirent = buf->previous;
  	if (dirent) {
  		if (__put_user(offset, &dirent->d_off))
-@@ -205,6 +217,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
- 	buf.previous = NULL;
- 	buf.count = count;
- 	buf.error = 0;
-+	buf.file = f.file;
+@@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
+ 	if (!f.file)
+ 		return -EBADF;
  
- 	error = vfs_readdir(f.file, filldir, &buf);
++	buf.file = f.file;
+ 	error = iterate_dir(f.file, &buf.ctx);
  	if (error >= 0)
-@@ -223,6 +236,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
- struct getdents_callback64 {
+ 		error = buf.error;
+@@ -226,6 +239,7 @@ struct getdents_callback64 {
+ 	struct dir_context ctx;
  	struct linux_dirent64 __user * current_dir;
  	struct linux_dirent64 __user * previous;
 +	struct file *file;
  	int count;
  	int error;
  };
-@@ -238,6 +252,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
+@@ -241,6 +255,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;
@@ -61114,23 +60973,14 @@ index fee38e0..12fdf47 100644
  	dirent = buf->previous;
  	if (dirent) {
  		if (__put_user(offset, &dirent->d_off))
-@@ -283,6 +301,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
+@@ -288,6 +306,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
+ 	if (!f.file)
+ 		return -EBADF;
  
- 	buf.current_dir = dirent;
- 	buf.previous = NULL;
 +	buf.file = f.file;
- 	buf.count = count;
- 	buf.error = 0;
- 
-@@ -291,7 +310,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
+ 	error = iterate_dir(f.file, &buf.ctx);
+ 	if (error >= 0)
  		error = buf.error;
- 	lastdirent = buf.previous;
- 	if (lastdirent) {
--		typeof(lastdirent->d_off) d_off = f.file->f_pos;
-+		typeof(((struct linux_dirent64 *)0)->d_off) d_off = f.file->f_pos;
- 		if (__put_user(d_off, &lastdirent->d_off))
- 			error = -EFAULT;
- 		else
 diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
 index 2b7882b..1c5ef48 100644
 --- a/fs/reiserfs/do_balan.c
@@ -61145,7 +60995,7 @@ index 2b7882b..1c5ef48 100644
  
  	/* balance leaf returns 0 except if combining L R and S into
 diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
-index 1d48974..2f8f4e0 100644
+index a958444..42b2323 100644
 --- a/fs/reiserfs/procfs.c
 +++ b/fs/reiserfs/procfs.c
 @@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
@@ -61158,7 +61008,7 @@ index 1d48974..2f8f4e0 100644
  		   SF(s_do_balance), SF(s_unneeded_left_neighbor),
  		   SF(s_good_search_by_key_reada), SF(s_bmaps),
 diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
-index 157e474..65a6114 100644
+index f8adaee..0eeeeca 100644
 --- a/fs/reiserfs/reiserfs.h
 +++ b/fs/reiserfs/reiserfs.h
 @@ -453,7 +453,7 @@ struct reiserfs_sb_info {
@@ -61170,7 +61020,7 @@ index 157e474..65a6114 100644
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
-@@ -1978,7 +1978,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
+@@ -1982,7 +1982,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)
@@ -61180,7 +61030,7 @@ index 157e474..65a6114 100644
  #define __fs_changed(gen,s) (gen != get_generation (s))
  #define fs_changed(gen,s)		\
 diff --git a/fs/select.c b/fs/select.c
-index 8c1c96c..a0f9b6d 100644
+index dfd5cb1..1754d57 100644
 --- a/fs/select.c
 +++ b/fs/select.c
 @@ -20,6 +20,7 @@
@@ -61191,7 +61041,7 @@ index 8c1c96c..a0f9b6d 100644
  #include <linux/personality.h> /* for STICKY_TIMEOUTS */
  #include <linux/file.h>
  #include <linux/fdtable.h>
-@@ -827,6 +828,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
+@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
   	struct poll_list *walk = head;
   	unsigned long todo = nfds;
  
@@ -61200,7 +61050,7 @@ index 8c1c96c..a0f9b6d 100644
  		return -EINVAL;
  
 diff --git a/fs/seq_file.c b/fs/seq_file.c
-index 3dd44db..a7da2f2 100644
+index a290157..ec3211a 100644
 --- a/fs/seq_file.c
 +++ b/fs/seq_file.c
 @@ -10,6 +10,7 @@
@@ -61239,6 +61089,15 @@ index 3dd44db..a7da2f2 100644
  	return !m->buf ? -ENOMEM : -EAGAIN;
  }
  
+@@ -152,7 +156,7 @@ Eoverflow:
+ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
+ {
+ 	struct seq_file *m = file->private_data;
+-	size_t copied = 0;
++	ssize_t copied = 0;
+ 	loff_t pos;
+ 	size_t n;
+ 	void *p;
 @@ -191,7 +195,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
  
  	/* grab buffer if we didn't have one */
@@ -61267,7 +61126,7 @@ index 3dd44db..a7da2f2 100644
  
  	if (op) {
 diff --git a/fs/splice.c b/fs/splice.c
-index d37431d..09241b4 100644
+index 3b7ee65..87fc2e4 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -196,7 +196,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
@@ -61349,7 +61208,7 @@ index d37431d..09241b4 100644
  			return 0;
  
  		if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1193,7 +1193,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
+@@ -1179,7 +1179,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.
  		 */
@@ -61358,7 +61217,7 @@ index d37431d..09241b4 100644
  
  		current->splice_pipe = pipe;
  	}
-@@ -1467,6 +1467,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
+@@ -1475,6 +1475,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
  
  			partial[buffers].offset = off;
  			partial[buffers].len = plen;
@@ -61366,7 +61225,7 @@ index d37431d..09241b4 100644
  
  			off = 0;
  			len -= plen;
-@@ -1769,9 +1770,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1777,9 +1778,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -61378,7 +61237,7 @@ index d37431d..09241b4 100644
  			if (flags & SPLICE_F_NONBLOCK) {
  				ret = -EAGAIN;
  				break;
-@@ -1803,7 +1804,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1811,7 +1812,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
  	pipe_lock(pipe);
  
  	while (pipe->nrbufs >= pipe->buffers) {
@@ -61387,7 +61246,7 @@ index d37431d..09241b4 100644
  			send_sig(SIGPIPE, current, 0);
  			ret = -EPIPE;
  			break;
-@@ -1816,9 +1817,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1824,9 +1825,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -61399,7 +61258,7 @@ index d37431d..09241b4 100644
  	}
  
  	pipe_unlock(pipe);
-@@ -1854,14 +1855,14 @@ retry:
+@@ -1862,14 +1863,14 @@ retry:
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -61416,7 +61275,7 @@ index d37431d..09241b4 100644
  			break;
  
  		/*
-@@ -1958,7 +1959,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1966,7 +1967,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -61425,7 +61284,7 @@ index d37431d..09241b4 100644
  			send_sig(SIGPIPE, current, 0);
  			if (!ret)
  				ret = -EPIPE;
-@@ -2003,7 +2004,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -2011,7 +2012,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
  	 */
@@ -61435,7 +61294,7 @@ index d37431d..09241b4 100644
  
  	pipe_unlock(ipipe);
 diff --git a/fs/stat.c b/fs/stat.c
-index 04ce1ac..a13dd1e 100644
+index d0ea7ef..f463f9d 100644
 --- a/fs/stat.c
 +++ b/fs/stat.c
 @@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
@@ -61472,10 +61331,10 @@ index 04ce1ac..a13dd1e 100644
  	generic_fillattr(inode, stat);
  	return 0;
 diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
-index 15c68f9..36a8b3e 100644
+index c590cab..6dfd6fc 100644
 --- a/fs/sysfs/bin.c
 +++ b/fs/sysfs/bin.c
-@@ -235,13 +235,13 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+@@ -234,13 +234,13 @@ static int bin_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
  	return ret;
  }
  
@@ -61493,7 +61352,7 @@ index 15c68f9..36a8b3e 100644
  	if (!bb->vm_ops)
  		return -EINVAL;
 diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
-index e8e0e71..79c28ac5 100644
+index 4d83ced..049dc45 100644
 --- a/fs/sysfs/dir.c
 +++ b/fs/sysfs/dir.c
 @@ -40,7 +40,7 @@ static DEFINE_IDA(sysfs_ino_ida);
@@ -61505,7 +61364,7 @@ index e8e0e71..79c28ac5 100644
  {
  	unsigned long hash = init_name_hash();
  	unsigned int len = strlen(name);
-@@ -679,6 +679,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
+@@ -675,6 +675,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
  	struct sysfs_dirent *sd;
  	int rc;
  
@@ -61525,7 +61384,7 @@ index e8e0e71..79c28ac5 100644
  	sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
  	if (!sd)
 diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
-index 602f56d..6853db8 100644
+index 15ef5eb..e474372 100644
 --- a/fs/sysfs/file.c
 +++ b/fs/sysfs/file.c
 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
@@ -61537,7 +61396,7 @@ index 602f56d..6853db8 100644
  	wait_queue_head_t	poll;
  	struct list_head	buffers; /* goes through sysfs_buffer.list */
  };
-@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
+@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry *dentry, struct sysfs_buffer *buffer)
  	if (!sysfs_get_active(attr_sd))
  		return -ENODEV;
  
@@ -61546,7 +61405,7 @@ index 602f56d..6853db8 100644
  	count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
  
  	sysfs_put_active(attr_sd);
-@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
+@@ -284,7 +284,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
  		return -ENOMEM;
  
  	atomic_set(&new_od->refcnt, 0);
@@ -61555,7 +61414,7 @@ index 602f56d..6853db8 100644
  	init_waitqueue_head(&new_od->poll);
  	INIT_LIST_HEAD(&new_od->buffers);
  	goto retry;
-@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
+@@ -430,7 +430,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
  
  	sysfs_put_active(attr_sd);
  
@@ -61564,22 +61423,22 @@ index 602f56d..6853db8 100644
  		goto trigger;
  
  	return DEFAULT_POLLMASK;
-@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
- 
- 	od = sd->s_attr.open;
- 	if (od) {
--		atomic_inc(&od->event);
-+		atomic_inc_unchecked(&od->event);
- 		wake_up_interruptible(&od->poll);
+@@ -450,7 +450,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
+ 	if (!WARN_ON(sysfs_type(sd) != SYSFS_KOBJ_ATTR)) {
+ 		od = sd->s_attr.open;
+ 		if (od) {
+-			atomic_inc(&od->event);
++			atomic_inc_unchecked(&od->event);
+ 			wake_up_interruptible(&od->poll);
+ 		}
  	}
- 
 diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
-index 8c940df..25b733e 100644
+index 2dd4507..62a215a 100644
 --- a/fs/sysfs/symlink.c
 +++ b/fs/sysfs/symlink.c
-@@ -305,7 +305,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)
+@@ -308,7 +308,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)
  {
 -	char *page = nd_get_link(nd);
 +	const char *page = nd_get_link(nd);
@@ -61780,10 +61639,10 @@ index 9fbea87..6b19972 100644
  	struct posix_acl *acl;
  	struct posix_acl_entry *acl_e;
 diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
-index 8904284..ee0e14b 100644
+index f47e65c..e7125d9 100644
 --- a/fs/xfs/xfs_bmap.c
 +++ b/fs/xfs/xfs_bmap.c
-@@ -765,7 +765,7 @@ xfs_bmap_validate_ret(
+@@ -586,7 +586,7 @@ xfs_bmap_validate_ret(
  
  #else
  #define xfs_bmap_check_leaf_extents(cur, ip, whichfork)		do { } while (0)
@@ -61792,29 +61651,26 @@ index 8904284..ee0e14b 100644
  #endif /* DEBUG */
  
  /*
-diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
-index 6157424..ac98f6d 100644
---- a/fs/xfs/xfs_dir2_sf.c
-+++ b/fs/xfs/xfs_dir2_sf.c
-@@ -851,7 +851,15 @@ xfs_dir2_sf_getdents(
- 		}
- 
- 		ino = xfs_dir2_sfe_get_ino(sfp, sfep);
--		if (filldir(dirent, (char *)sfep->name, sfep->namelen,
+diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
+index 8f84153..7ce60d0 100644
+--- a/fs/xfs/xfs_dir2_readdir.c
++++ b/fs/xfs/xfs_dir2_readdir.c
+@@ -160,7 +160,12 @@ xfs_dir2_sf_getdents(
+ 		ino = xfs_dir3_sfe_get_ino(mp, sfp, sfep);
+ 		filetype = xfs_dir3_sfe_get_ftype(mp, sfp, sfep);
+ 		ctx->pos = off & 0x7fffffff;
+-		if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
 +		if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
 +			char name[sfep->namelen];
 +			memcpy(name, sfep->name, sfep->namelen);
-+			if (filldir(dirent, name, sfep->namelen,
-+			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
-+				*offset = off & 0x7fffffff;
++			if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(mp, filetype)))
 +				return 0;
-+			}
-+		} else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
- 			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
- 			*offset = off & 0x7fffffff;
++		} else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
+ 			    xfs_dir3_get_dtype(mp, filetype)))
  			return 0;
+ 		sfep = xfs_dir3_sf_nextentry(mp, sfp, sfep);
 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
-index ca01d83..86b14a7 100644
+index 2e1e6c3..689f742 100644
 --- a/fs/xfs/xfs_ioctl.c
 +++ b/fs/xfs/xfs_ioctl.c
 @@ -127,7 +127,7 @@ xfs_find_handle(
@@ -61826,11 +61682,35 @@ index ca01d83..86b14a7 100644
  	    copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
  		goto out_put;
  
+@@ -443,7 +443,8 @@ xfs_attrlist_by_handle(
+ 		return -XFS_ERROR(EPERM);
+ 	if (copy_from_user(&al_hreq, arg, sizeof(xfs_fsop_attrlist_handlereq_t)))
+ 		return -XFS_ERROR(EFAULT);
+-	if (al_hreq.buflen > XATTR_LIST_MAX)
++	if (al_hreq.buflen < sizeof(struct attrlist) ||
++	    al_hreq.buflen > XATTR_LIST_MAX)
+ 		return -XFS_ERROR(EINVAL);
+ 
+ 	/*
+diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c
+index f671f7e..53365c6 100644
+--- a/fs/xfs/xfs_ioctl32.c
++++ b/fs/xfs/xfs_ioctl32.c
+@@ -357,7 +357,8 @@ xfs_compat_attrlist_by_handle(
+ 	if (copy_from_user(&al_hreq, arg,
+ 			   sizeof(compat_xfs_fsop_attrlist_handlereq_t)))
+ 		return -XFS_ERROR(EFAULT);
+-	if (al_hreq.buflen > XATTR_LIST_MAX)
++	if (al_hreq.buflen < sizeof(struct attrlist) ||
++	    al_hreq.buflen > XATTR_LIST_MAX)
+ 		return -XFS_ERROR(EINVAL);
+ 
+ 	/*
 diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
-index ca9ecaa..60100c7 100644
+index 2b8952d..a60c6be 100644
 --- a/fs/xfs/xfs_iops.c
 +++ b/fs/xfs/xfs_iops.c
-@@ -395,7 +395,7 @@ xfs_vn_put_link(
+@@ -401,7 +401,7 @@ xfs_vn_put_link(
  	struct nameidata *nd,
  	void		*p)
  {
@@ -61841,10 +61721,10 @@ index ca9ecaa..60100c7 100644
  		kfree(s);
 diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
 new file mode 100644
-index 0000000..6fb5192
+index 0000000..a78d810
 --- /dev/null
 +++ b/grsecurity/Kconfig
-@@ -0,0 +1,1079 @@
+@@ -0,0 +1,1107 @@
 +#
 +# grecurity configuration
 +#
@@ -61858,21 +61738,15 @@ index 0000000..6fb5192
 +	help
 +	  If you say Y here, /dev/kmem and /dev/mem won't be allowed to
 +	  be written to or read from to modify or leak the contents of the running
-+	  kernel.  /dev/port will also not be allowed to be opened and support
-+	  for /dev/cpu/*/msr will be removed.  If you have module
-+	  support disabled, enabling this will close up five ways that are
-+	  currently used  to insert malicious code into the running kernel.
++	  kernel.  /dev/port will also not be allowed to be opened, and support
++	  for /dev/cpu/*/msr and kexec will be removed.  If you have module
++	  support disabled, enabling this will close up six ways that are
++	  currently used to insert malicious code into the running kernel.
 +
-+	  Even with all these features enabled, we still highly recommend that
++	  Even with this feature 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.
++	  modify the running kernel through other more obscure methods.
++
 +	  Enabling this feature will prevent the "cpupower" and "powertop" tools
 +	  from working.
 +
@@ -61908,10 +61782,11 @@ index 0000000..6fb5192
 +	  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.
++	  that hwclock operates correctly.
++
++	  If you're using XFree86 or a version of Xorg from 2012 or earlier,
++	  you may not be able to boot into a graphical environment with this
++	  option enabled.  In this case, you should use the RBAC system instead.
 +
 +config GRKERNSEC_JIT_HARDEN
 +	bool "Harden BPF JIT against spray attacks"
@@ -62081,6 +61956,20 @@ index 0000000..6fb5192
 +	  This deters repeated kernel exploitation/bruteforcing attempts
 +	  and is useful for later forensics.
 +
++config GRKERNSEC_OLD_ARM_USERLAND
++	bool "Old ARM userland compatibility"
++	depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
++	help
++	  If you say Y here, stubs of executable code to perform such operations
++	  as "compare-exchange" will be placed at fixed locations in the ARM vector
++	  table.  This is unfortunately needed for old ARM userland meant to run
++	  across a wide range of processors.  Without this option enabled,
++	  the get_tls and data memory barrier stubs will be emulated by the kernel,
++	  which is enough for Linaro userlands or other userlands designed for v6
++	  and newer ARM CPUs.  It's recommended that you try without this option enabled
++	  first, and only enable it if your userland does not boot (it will likely fail
++	  at init time).
++
 +endmenu
 +menu "Role Based Access Control Options"
 +depends on GRKERNSEC
@@ -62436,7 +62325,7 @@ index 0000000..6fb5192
 +config GRKERNSEC_CHROOT_INITRD
 +	bool "Exempt initrd tasks from restrictions"
 +	default y if GRKERNSEC_CONFIG_AUTO
-+	depends on GRKERNSEC_CHROOT && BLK_DEV_RAM
++	depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
 +	help
 +	  If you say Y here, tasks started prior to init will be exempted from
 +	  grsecurity's chroot restrictions.  This option is mainly meant to
@@ -62625,6 +62514,24 @@ index 0000000..6fb5192
 +	  running with root privileges.  If the sysctl option is enabled,
 +	  a sysctl option with name "consistent_setxid" is created.
 +
++config GRKERNSEC_HARDEN_IPC
++	bool "Disallow access to world-accessible IPC objects"
++	default y if GRKERNSEC_CONFIG_AUTO
++	depends on SYSVIPC
++	help
++	  If you say Y here, access to overly-permissive IPC (shared memory,
++	  message queues, and semaphores) will be denied for processes whose
++	  effective user or group would not grant them permission.  It's a
++	  common error to grant too much permission to these objects, with
++	  impact ranging from denial of service and information leaking to
++	  privilege escalation.  This feature was developed in response to
++	  research by Tim Brown:
++	  http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
++	  who found hundreds of such insecure usages.  Processes with
++	  CAP_IPC_OWNER are still permitted to access these IPC objects.
++	  If the sysctl option is enabled, a sysctl option with name
++	  "harden_ipc" is created.
++
 +config GRKERNSEC_TPE
 +	bool "Trusted Path Execution (TPE)"
 +	default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
@@ -62824,6 +62731,7 @@ index 0000000..6fb5192
 +config GRKERNSEC_DENYUSB
 +	bool "Deny new USB connections after toggle"
 +	default y if GRKERNSEC_CONFIG_AUTO
++	depends on SYSCTL && USB_SUPPORT
 +	help
 +	  If you say Y here, a new sysctl option with name "deny_new_usb"
 +	  will be created.  Setting its value to 1 will prevent any new
@@ -62839,7 +62747,7 @@ index 0000000..6fb5192
 +config GRKERNSEC_DENYUSB_FORCE
 +	bool "Reject all USB devices not connected at boot"
 +	select USB
-+	depends on SYSCTL && GRKERNSEC_DENYUSB
++	depends on GRKERNSEC_DENYUSB
 +	help
 +	  If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
 +	  that doesn't involve a sysctl entry.  This option should only be
@@ -62926,7 +62834,7 @@ index 0000000..6fb5192
 +endmenu
 diff --git a/grsecurity/Makefile b/grsecurity/Makefile
 new file mode 100644
-index 0000000..b0b77d5
+index 0000000..85beb79
 --- /dev/null
 +++ b/grsecurity/Makefile
 @@ -0,0 +1,43 @@
@@ -62943,11 +62851,11 @@ index 0000000..b0b77d5
 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
 +	grsec_mount.o grsec_sig.o grsec_sysctl.o \
 +	grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
-+	grsec_usb.o
++	grsec_usb.o grsec_ipc.o
 +
 +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
 +	gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
-+	gracl_learn.o grsec_log.o
++	gracl_learn.o grsec_log.o gracl_policy.o
 +ifdef CONFIG_COMPAT
 +obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
 +endif
@@ -62975,10 +62883,10 @@ index 0000000..b0b77d5
 +endif
 diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
 new file mode 100644
-index 0000000..c0793fd
+index 0000000..6affeea
 --- /dev/null
 +++ b/grsecurity/gracl.c
-@@ -0,0 +1,4178 @@
+@@ -0,0 +1,2679 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -63020,48 +62928,27 @@ index 0000000..c0793fd
 +#include <asm/errno.h>
 +#include <asm/mman.h>
 +
-+extern struct lglock vfsmount_lock;
-+
-+static struct acl_role_db acl_role_set;
-+static struct name_db name_set;
-+static struct inodev_db inodev_set;
-+
-+/* for keeping track of userspace pointers used for subjects, so we
-+   can share references in the kernel as well
-+*/
-+
-+static struct path real_root;
++#define FOR_EACH_ROLE_START(role) \
++	role = running_polstate.role_list; \
++	while (role) {
 +
-+static struct acl_subj_map_db subj_map_set;
++#define FOR_EACH_ROLE_END(role) \
++		role = role->prev; \
++	}
 +
-+static struct acl_role_label *default_role;
++extern struct lglock vfsmount_lock;
 +
-+static struct acl_role_label *role_list;
++extern struct path gr_real_root;
 +
-+static u16 acl_sp_role_value;
++static struct gr_policy_state running_polstate;
++struct gr_policy_state *polstate = &running_polstate;
++extern struct gr_alloc_state *current_alloc_state;
 +
 +extern char *gr_shared_page[4];
-+static DEFINE_MUTEX(gr_dev_mutex);
 +DEFINE_RWLOCK(gr_inode_lock);
 +
-+struct gr_arg *gr_usermode;
-+
 +static unsigned int gr_status __read_only = GR_STATUS_INIT;
 +
-+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
-+extern void gr_clear_learn_entries(void);
-+
-+unsigned char *gr_system_salt;
-+unsigned char *gr_system_sum;
-+
-+static struct sprole_pw **acl_special_roles = NULL;
-+static __u16 num_sprole_pws = 0;
-+
-+static struct acl_role_label *kernel_role = NULL;
-+
-+static unsigned int gr_auth_attempts = 0;
-+static unsigned long gr_auth_expires = 0UL;
-+
 +#ifdef CONFIG_NET
 +extern struct vfsmount *sock_mnt;
 +#endif
@@ -63073,156 +62960,29 @@ index 0000000..c0793fd
 +extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
 +#endif
 +
-+static struct acl_object_label *fakefs_obj_rw;
-+static struct acl_object_label *fakefs_obj_rwx;
++extern u16 acl_sp_role_value;
++extern struct acl_object_label *fakefs_obj_rw;
++extern struct acl_object_label *fakefs_obj_rwx;
 +
-+extern int gr_init_uidset(void);
-+extern void gr_free_uidset(void);
-+extern void gr_remove_uid(uid_t uid);
-+extern int gr_find_uid(uid_t uid);
-+
-+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
++int gr_acl_is_enabled(void)
 +{
-+	if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
-+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
-+{
-+	if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
-+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
-+{
-+	if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
-+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
-+{
-+	if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
-+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
-+{
-+	if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
-+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
-+{
-+	if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
-+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
-+{
-+	if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
-+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
-+{
-+	if (copy_from_user(trans, userp, sizeof(struct role_transition)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
-+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
-+{
-+	if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
-+		return -EFAULT;
-+
-+	return 0;
-+}
-+
-+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
-+{
-+	if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
-+		return -EFAULT;
-+
-+	if ((uwrap->version != GRSECURITY_VERSION) || (uwrap->size != sizeof(struct gr_arg)))
-+		return -EINVAL;
-+
-+	return 0;
++	return (gr_status & GR_READY);
 +}
 +
-+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
++void gr_enable_rbac_system(void)
 +{
-+	if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
-+		return -EFAULT;
-+
-+	return 0;
++	pax_open_kernel();
++	gr_status |= GR_READY;
++	pax_close_kernel();
 +}
 +
-+static size_t get_gr_arg_wrapper_size_normal(void)
++int gr_rbac_disable(void *unused)
 +{
-+	return sizeof(struct gr_arg_wrapper);
-+}
++        pax_open_kernel();
++        gr_status &= ~GR_READY;
++        pax_close_kernel();
 +
-+#ifdef CONFIG_COMPAT
-+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
-+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
-+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
-+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
-+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
-+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
-+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
-+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
-+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
-+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
-+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
-+extern size_t get_gr_arg_wrapper_size_compat(void);
-+
-+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
-+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
-+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
-+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
-+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
-+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
-+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
-+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
-+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
-+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
-+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
-+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
-+
-+#else
-+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
-+#define copy_gr_arg copy_gr_arg_normal
-+#define copy_gr_hash_struct copy_gr_hash_struct_normal
-+#define copy_acl_object_label copy_acl_object_label_normal
-+#define copy_acl_subject_label copy_acl_subject_label_normal
-+#define copy_acl_role_label copy_acl_role_label_normal
-+#define copy_acl_ip_label copy_acl_ip_label_normal
-+#define copy_pointer_from_array copy_pointer_from_array_normal
-+#define copy_sprole_pw copy_sprole_pw_normal
-+#define copy_role_transition copy_role_transition_normal
-+#define copy_role_allowed_ip copy_role_allowed_ip_normal
-+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
-+#endif
-+
-+__inline__ int
-+gr_acl_is_enabled(void)
-+{
-+	return (gr_status & GR_READY);
++        return 0;
 +}
 +
 +static inline dev_t __get_dev(const struct dentry *dentry)
@@ -63286,7 +63046,7 @@ index 0000000..c0793fd
 +	return 0;
 +}
 +
-+static int
++int
 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
 +{
 +	if (likely(lena != lenb))
@@ -63393,9 +63153,9 @@ index 0000000..c0793fd
 +	path.dentry = (struct dentry *)dentry;
 +	path.mnt = (struct vfsmount *)vfsmnt;
 +
-+	/* we can use real_root.dentry, real_root.mnt, because this is only called
++	/* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
 +	   by the RBAC system */
-+	res = gen_full_path(&path, &real_root, buf, buflen);
++	res = gen_full_path(&path, &gr_real_root, buf, buflen);
 +
 +	return res;
 +}
@@ -63412,7 +63172,7 @@ index 0000000..c0793fd
 +	path.dentry = (struct dentry *)dentry;
 +	path.mnt = (struct vfsmount *)vfsmnt;
 +
-+	/* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
++	/* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
 +	get_fs_root(reaper->fs, &root);
 +
 +	br_read_lock(&vfsmount_lock);
@@ -63425,7 +63185,7 @@ index 0000000..c0793fd
 +	return res;
 +}
 +
-+static char *
++char *
 +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
 +{
 +	char *ret;
@@ -63503,54 +63263,17 @@ index 0000000..c0793fd
 +	return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
 +}
 +
-+struct acl_subject_label *
-+lookup_subject_map(const struct acl_subject_label *userp)
-+{
-+	unsigned int index = gr_shash(userp, subj_map_set.s_size);
-+	struct subject_map *match;
-+
-+	match = subj_map_set.s_hash[index];
-+
-+	while (match && match->user != userp)
-+		match = match->next;
-+
-+	if (match != NULL)
-+		return match->kernel;
-+	else
-+		return NULL;
-+}
-+
-+static void
-+insert_subj_map_entry(struct subject_map *subjmap)
-+{
-+	unsigned int index = gr_shash(subjmap->user, subj_map_set.s_size);
-+	struct subject_map **curr;
-+
-+	subjmap->prev = NULL;
-+
-+	curr = &subj_map_set.s_hash[index];
-+	if (*curr != NULL)
-+		(*curr)->prev = subjmap;
-+
-+	subjmap->next = *curr;
-+	*curr = subjmap;
-+
-+	return;
-+}
-+
-+static struct acl_role_label *
-+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
++struct acl_role_label *
++__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
 +		      const gid_t gid)
 +{
-+	unsigned int index = gr_rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
++	unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
 +	struct acl_role_label *match;
 +	struct role_allowed_ip *ipp;
 +	unsigned int x;
-+	u32 curr_ip = task->signal->curr_ip;
++	u32 curr_ip = task->signal->saved_ip;
 +
-+	task->signal->saved_ip = curr_ip;
-+
-+	match = acl_role_set.r_hash[index];
++	match = state->acl_role_set.r_hash[index];
 +
 +	while (match) {
 +		if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
@@ -63565,8 +63288,8 @@ index 0000000..c0793fd
 +found:
 +	if (match == NULL) {
 +	      try_group:
-+		index = gr_rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
-+		match = acl_role_set.r_hash[index];
++		index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
++		match = state->acl_role_set.r_hash[index];
 +
 +		while (match) {
 +			if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
@@ -63580,7 +63303,7 @@ index 0000000..c0793fd
 +		}
 +found2:
 +		if (match == NULL)
-+			match = default_role;
++			match = state->default_role;
 +		if (match->allowed_ips == NULL)
 +			return match;
 +		else {
@@ -63590,7 +63313,7 @@ index 0000000..c0793fd
 +				     (ntohl(ipp->addr) & ipp->netmask)))
 +					return match;
 +			}
-+			match = default_role;
++			match = state->default_role;
 +		}
 +	} else if (match->allowed_ips == NULL) {
 +		return match;
@@ -63607,6 +63330,13 @@ index 0000000..c0793fd
 +	return match;
 +}
 +
++static struct acl_role_label *
++lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
++		      const gid_t gid)
++{
++	return __lookup_acl_role_label(&running_polstate, task, uid, gid);
++}
++
 +struct acl_subject_label *
 +lookup_acl_subj_label(const ino_t ino, const dev_t dev,
 +		      const struct acl_role_label *role)
@@ -63697,15 +63427,15 @@ index 0000000..c0793fd
 +		return NULL;
 +}
 +
-+static struct name_entry *
-+lookup_name_entry(const char *name)
++struct name_entry *
++__lookup_name_entry(const struct gr_policy_state *state, const char *name)
 +{
 +	unsigned int len = strlen(name);
 +	unsigned int key = full_name_hash(name, len);
-+	unsigned int index = key % name_set.n_size;
++	unsigned int index = key % state->name_set.n_size;
 +	struct name_entry *match;
 +
-+	match = name_set.n_hash[index];
++	match = state->name_set.n_hash[index];
 +
 +	while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
 +		match = match->next;
@@ -63714,14 +63444,20 @@ index 0000000..c0793fd
 +}
 +
 +static struct name_entry *
++lookup_name_entry(const char *name)
++{
++	return __lookup_name_entry(&running_polstate, name);
++}
++
++static struct name_entry *
 +lookup_name_entry_create(const char *name)
 +{
 +	unsigned int len = strlen(name);
 +	unsigned int key = full_name_hash(name, len);
-+	unsigned int index = key % name_set.n_size;
++	unsigned int index = key % running_polstate.name_set.n_size;
 +	struct name_entry *match;
 +
-+	match = name_set.n_hash[index];
++	match = running_polstate.name_set.n_hash[index];
 +
 +	while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
 +			 !match->deleted))
@@ -63730,7 +63466,7 @@ index 0000000..c0793fd
 +	if (match && match->deleted)
 +		return match;
 +
-+	match = name_set.n_hash[index];
++	match = running_polstate.name_set.n_hash[index];
 +
 +	while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
 +			 match->deleted))
@@ -63745,10 +63481,10 @@ index 0000000..c0793fd
 +static struct inodev_entry *
 +lookup_inodev_entry(const ino_t ino, const dev_t dev)
 +{
-+	unsigned int index = gr_fhash(ino, dev, inodev_set.i_size);
++	unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
 +	struct inodev_entry *match;
 +
-+	match = inodev_set.i_hash[index];
++	match = running_polstate.inodev_set.i_hash[index];
 +
 +	while (match && (match->nentry->inode != ino || match->nentry->device != dev))
 +		match = match->next;
@@ -63756,16 +63492,16 @@ index 0000000..c0793fd
 +	return match;
 +}
 +
-+static void
-+insert_inodev_entry(struct inodev_entry *entry)
++void
++__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
 +{
 +	unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
-+				    inodev_set.i_size);
++				    state->inodev_set.i_size);
 +	struct inodev_entry **curr;
 +
 +	entry->prev = NULL;
 +
-+	curr = &inodev_set.i_hash[index];
++	curr = &state->inodev_set.i_hash[index];
 +	if (*curr != NULL)
 +		(*curr)->prev = entry;
 +	
@@ -63776,138 +63512,12 @@ index 0000000..c0793fd
 +}
 +
 +static void
-+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
-+{
-+	unsigned int index =
-+	    gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
-+	struct acl_role_label **curr;
-+	struct acl_role_label *tmp, *tmp2;
-+
-+	curr = &acl_role_set.r_hash[index];
-+
-+	/* simple case, slot is empty, just set it to our role */
-+	if (*curr == NULL) {
-+		*curr = role;
-+	} else {
-+		/* example:
-+		   1 -> 2 -> 3 (adding 2 -> 3 to here)
-+		   2 -> 3
-+		*/
-+		/* first check to see if we can already be reached via this slot */
-+		tmp = *curr;
-+		while (tmp && tmp != role)
-+			tmp = tmp->next;
-+		if (tmp == role) {
-+			/* we don't need to add ourselves to this slot's chain */
-+			return;
-+		}
-+		/* we need to add ourselves to this chain, two cases */
-+		if (role->next == NULL) {
-+			/* simple case, append the current chain to our role */
-+			role->next = *curr;
-+			*curr = role;
-+		} else {
-+			/* 1 -> 2 -> 3 -> 4
-+			   2 -> 3 -> 4
-+			   3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
-+			*/			   
-+			/* trickier case: walk our role's chain until we find
-+			   the role for the start of the current slot's chain */
-+			tmp = role;
-+			tmp2 = *curr;
-+			while (tmp->next && tmp->next != tmp2)
-+				tmp = tmp->next;
-+			if (tmp->next == tmp2) {
-+				/* from example above, we found 3, so just
-+				   replace this slot's chain with ours */
-+				*curr = role;
-+			} else {
-+				/* we didn't find a subset of our role's chain
-+				   in the current slot's chain, so append their
-+				   chain to ours, and set us as the first role in
-+				   the slot's chain
-+
-+				   we could fold this case with the case above,
-+				   but making it explicit for clarity
-+				*/
-+				tmp->next = tmp2;
-+				*curr = role;
-+			}
-+		}
-+	}
-+
-+	return;
-+}
-+
-+static void
-+insert_acl_role_label(struct acl_role_label *role)
-+{
-+	int i;
-+
-+	if (role_list == NULL) {
-+		role_list = role;
-+		role->prev = NULL;
-+	} else {
-+		role->prev = role_list;
-+		role_list = role;
-+	}
-+	
-+	/* used for hash chains */
-+	role->next = NULL;
-+
-+	if (role->roletype & GR_ROLE_DOMAIN) {
-+		for (i = 0; i < role->domain_child_num; i++)
-+			__insert_acl_role_label(role, role->domain_children[i]);
-+	} else
-+		__insert_acl_role_label(role, role->uidgid);
-+}
-+					
-+static int
-+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
++insert_inodev_entry(struct inodev_entry *entry)
 +{
-+	struct name_entry **curr, *nentry;
-+	struct inodev_entry *ientry;
-+	unsigned int len = strlen(name);
-+	unsigned int key = full_name_hash(name, len);
-+	unsigned int index = key % name_set.n_size;
-+
-+	curr = &name_set.n_hash[index];
-+
-+	while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
-+		curr = &((*curr)->next);
-+
-+	if (*curr != NULL)
-+		return 1;
-+
-+	nentry = acl_alloc(sizeof (struct name_entry));
-+	if (nentry == NULL)
-+		return 0;
-+	ientry = acl_alloc(sizeof (struct inodev_entry));
-+	if (ientry == NULL)
-+		return 0;
-+	ientry->nentry = nentry;
-+
-+	nentry->key = key;
-+	nentry->name = name;
-+	nentry->inode = inode;
-+	nentry->device = device;
-+	nentry->len = len;
-+	nentry->deleted = deleted;
-+
-+	nentry->prev = NULL;
-+	curr = &name_set.n_hash[index];
-+	if (*curr != NULL)
-+		(*curr)->prev = nentry;
-+	nentry->next = *curr;
-+	*curr = nentry;
-+
-+	/* insert us into the table searchable by inode/dev */
-+	insert_inodev_entry(ientry);
-+
-+	return 1;
++	__insert_inodev_entry(&running_polstate, entry);
 +}
 +
-+static void
++void
 +insert_acl_obj_label(struct acl_object_label *obj,
 +		     struct acl_subject_label *subj)
 +{
@@ -63915,7 +63525,6 @@ index 0000000..c0793fd
 +	    gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
 +	struct acl_object_label **curr;
 +
-+	
 +	obj->prev = NULL;
 +
 +	curr = &subj->obj_hash[index];
@@ -63928,7 +63537,7 @@ index 0000000..c0793fd
 +	return;
 +}
 +
-+static void
++void
 +insert_acl_subj_label(struct acl_subject_label *obj,
 +		      struct acl_role_label *role)
 +{
@@ -63947,774 +63556,6 @@ index 0000000..c0793fd
 +	return;
 +}
 +
-+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
-+
-+static void *
-+create_table(__u32 * len, int elementsize)
-+{
-+	unsigned int table_sizes[] = {
-+		7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
-+		32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
-+		4194301, 8388593, 16777213, 33554393, 67108859
-+	};
-+	void *newtable = NULL;
-+	unsigned int pwr = 0;
-+
-+	while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
-+	       table_sizes[pwr] <= *len)
-+		pwr++;
-+
-+	if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
-+		return newtable;
-+
-+	if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
-+		newtable =
-+		    kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
-+	else
-+		newtable = vmalloc(table_sizes[pwr] * elementsize);
-+
-+	*len = table_sizes[pwr];
-+
-+	return newtable;
-+}
-+
-+static int
-+init_variables(const struct gr_arg *arg)
-+{
-+	struct task_struct *reaper = init_pid_ns.child_reaper;
-+	unsigned int stacksize;
-+
-+	subj_map_set.s_size = arg->role_db.num_subjects;
-+	acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
-+	name_set.n_size = arg->role_db.num_objects;
-+	inodev_set.i_size = arg->role_db.num_objects;
-+
-+	if (!subj_map_set.s_size || !acl_role_set.r_size ||
-+	    !name_set.n_size || !inodev_set.i_size)
-+		return 1;
-+
-+	if (!gr_init_uidset())
-+		return 1;
-+
-+	/* set up the stack that holds allocation info */
-+
-+	stacksize = arg->role_db.num_pointers + 5;
-+
-+	if (!acl_alloc_stack_init(stacksize))
-+		return 1;
-+
-+	/* grab reference for the real root dentry and vfsmount */
-+	get_fs_root(reaper->fs, &real_root);
-+	
-+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
-+	printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
-+#endif
-+
-+	fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
-+	if (fakefs_obj_rw == NULL)
-+		return 1;
-+	fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
-+
-+	fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
-+	if (fakefs_obj_rwx == NULL)
-+		return 1;
-+	fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
-+
-+	subj_map_set.s_hash =
-+	    (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
-+	acl_role_set.r_hash =
-+	    (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
-+	name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
-+	inodev_set.i_hash =
-+	    (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
-+
-+	if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
-+	    !name_set.n_hash || !inodev_set.i_hash)
-+		return 1;
-+
-+	memset(subj_map_set.s_hash, 0,
-+	       sizeof(struct subject_map *) * subj_map_set.s_size);
-+	memset(acl_role_set.r_hash, 0,
-+	       sizeof (struct acl_role_label *) * acl_role_set.r_size);
-+	memset(name_set.n_hash, 0,
-+	       sizeof (struct name_entry *) * name_set.n_size);
-+	memset(inodev_set.i_hash, 0,
-+	       sizeof (struct inodev_entry *) * inodev_set.i_size);
-+
-+	return 0;
-+}
-+
-+/* free information not needed after startup
-+   currently contains user->kernel pointer mappings for subjects
-+*/
-+
-+static void
-+free_init_variables(void)
-+{
-+	__u32 i;
-+
-+	if (subj_map_set.s_hash) {
-+		for (i = 0; i < subj_map_set.s_size; i++) {
-+			if (subj_map_set.s_hash[i]) {
-+				kfree(subj_map_set.s_hash[i]);
-+				subj_map_set.s_hash[i] = NULL;
-+			}
-+		}
-+
-+		if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
-+		    PAGE_SIZE)
-+			kfree(subj_map_set.s_hash);
-+		else
-+			vfree(subj_map_set.s_hash);
-+	}
-+
-+	return;
-+}
-+
-+static void
-+free_variables(void)
-+{
-+	struct acl_subject_label *s;
-+	struct acl_role_label *r;
-+	struct task_struct *task, *task2;
-+	unsigned int x;
-+
-+	gr_clear_learn_entries();
-+
-+	read_lock(&tasklist_lock);
-+	do_each_thread(task2, task) {
-+		task->acl_sp_role = 0;
-+		task->acl_role_id = 0;
-+		task->acl = NULL;
-+		task->role = NULL;
-+	} while_each_thread(task2, task);
-+	read_unlock(&tasklist_lock);
-+
-+	/* release the reference to the real root dentry and vfsmount */
-+	path_put(&real_root);
-+	memset(&real_root, 0, sizeof(real_root));
-+
-+	/* free all object hash tables */
-+
-+	FOR_EACH_ROLE_START(r)
-+		if (r->subj_hash == NULL)
-+			goto next_role;
-+		FOR_EACH_SUBJECT_START(r, s, x)
-+			if (s->obj_hash == NULL)
-+				break;
-+			if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
-+				kfree(s->obj_hash);
-+			else
-+				vfree(s->obj_hash);
-+		FOR_EACH_SUBJECT_END(s, x)
-+		FOR_EACH_NESTED_SUBJECT_START(r, s)
-+			if (s->obj_hash == NULL)
-+				break;
-+			if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
-+				kfree(s->obj_hash);
-+			else
-+				vfree(s->obj_hash);
-+		FOR_EACH_NESTED_SUBJECT_END(s)
-+		if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
-+			kfree(r->subj_hash);
-+		else
-+			vfree(r->subj_hash);
-+		r->subj_hash = NULL;
-+next_role:
-+	FOR_EACH_ROLE_END(r)
-+
-+	acl_free_all();
-+
-+	if (acl_role_set.r_hash) {
-+		if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
-+		    PAGE_SIZE)
-+			kfree(acl_role_set.r_hash);
-+		else
-+			vfree(acl_role_set.r_hash);
-+	}
-+	if (name_set.n_hash) {
-+		if ((name_set.n_size * sizeof (struct name_entry *)) <=
-+		    PAGE_SIZE)
-+			kfree(name_set.n_hash);
-+		else
-+			vfree(name_set.n_hash);
-+	}
-+
-+	if (inodev_set.i_hash) {
-+		if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
-+		    PAGE_SIZE)
-+			kfree(inodev_set.i_hash);
-+		else
-+			vfree(inodev_set.i_hash);
-+	}
-+
-+	gr_free_uidset();
-+
-+	memset(&name_set, 0, sizeof (struct name_db));
-+	memset(&inodev_set, 0, sizeof (struct inodev_db));
-+	memset(&acl_role_set, 0, sizeof (struct acl_role_db));
-+	memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
-+
-+	default_role = NULL;
-+	kernel_role = NULL;
-+	role_list = NULL;
-+
-+	return;
-+}
-+
-+static struct acl_subject_label *
-+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
-+
-+static int alloc_and_copy_string(char **name, unsigned int maxlen)
-+{
-+	unsigned int len = strnlen_user(*name, maxlen);
-+	char *tmp;
-+
-+	if (!len || len >= maxlen)
-+		return -EINVAL;
-+
-+	if ((tmp = (char *) acl_alloc(len)) == NULL)
-+		return -ENOMEM;
-+
-+	if (copy_from_user(tmp, *name, len))
-+		return -EFAULT;
-+
-+	tmp[len-1] = '\0';
-+	*name = tmp;
-+
-+	return 0;
-+}
-+
-+static int
-+copy_user_glob(struct acl_object_label *obj)
-+{
-+	struct acl_object_label *g_tmp, **guser;
-+	int error;
-+
-+	if (obj->globbed == NULL)
-+		return 0;
-+
-+	guser = &obj->globbed;
-+	while (*guser) {
-+		g_tmp = (struct acl_object_label *)
-+			acl_alloc(sizeof (struct acl_object_label));
-+		if (g_tmp == NULL)
-+			return -ENOMEM;
-+
-+		if (copy_acl_object_label(g_tmp, *guser))
-+			return -EFAULT;
-+
-+		error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
-+		if (error)
-+			return error;
-+
-+		*guser = g_tmp;
-+		guser = &(g_tmp->next);
-+	}
-+
-+	return 0;
-+}
-+
-+static int
-+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
-+	       struct acl_role_label *role)
-+{
-+	struct acl_object_label *o_tmp;
-+	int ret;
-+
-+	while (userp) {
-+		if ((o_tmp = (struct acl_object_label *)
-+		     acl_alloc(sizeof (struct acl_object_label))) == NULL)
-+			return -ENOMEM;
-+
-+		if (copy_acl_object_label(o_tmp, userp))
-+			return -EFAULT;
-+
-+		userp = o_tmp->prev;
-+
-+		ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
-+		if (ret)
-+			return ret;
-+
-+		insert_acl_obj_label(o_tmp, subj);
-+		if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
-+				       o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
-+			return -ENOMEM;
-+
-+		ret = copy_user_glob(o_tmp);
-+		if (ret)
-+			return ret;
-+
-+		if (o_tmp->nested) {
-+			int already_copied;
-+
-+			o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
-+			if (IS_ERR(o_tmp->nested))
-+				return PTR_ERR(o_tmp->nested);
-+
-+			/* insert into nested subject list if we haven't copied this one yet
-+			   to prevent duplicate entries */
-+			if (!already_copied) {
-+				o_tmp->nested->next = role->hash->first;
-+				role->hash->first = o_tmp->nested;
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static __u32
-+count_user_subjs(struct acl_subject_label *userp)
-+{
-+	struct acl_subject_label s_tmp;
-+	__u32 num = 0;
-+
-+	while (userp) {
-+		if (copy_acl_subject_label(&s_tmp, userp))
-+			break;
-+
-+		userp = s_tmp.prev;
-+	}
-+
-+	return num;
-+}
-+
-+static int
-+copy_user_allowedips(struct acl_role_label *rolep)
-+{
-+	struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
-+
-+	ruserip = rolep->allowed_ips;
-+
-+	while (ruserip) {
-+		rlast = rtmp;
-+
-+		if ((rtmp = (struct role_allowed_ip *)
-+		     acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
-+			return -ENOMEM;
-+
-+		if (copy_role_allowed_ip(rtmp, ruserip))
-+			return -EFAULT;
-+
-+		ruserip = rtmp->prev;
-+
-+		if (!rlast) {
-+			rtmp->prev = NULL;
-+			rolep->allowed_ips = rtmp;
-+		} else {
-+			rlast->next = rtmp;
-+			rtmp->prev = rlast;
-+		}
-+
-+		if (!ruserip)
-+			rtmp->next = NULL;
-+	}
-+
-+	return 0;
-+}
-+
-+static int
-+copy_user_transitions(struct acl_role_label *rolep)
-+{
-+	struct role_transition *rusertp, *rtmp = NULL, *rlast;
-+	int error;
-+
-+	rusertp = rolep->transitions;
-+
-+	while (rusertp) {
-+		rlast = rtmp;
-+
-+		if ((rtmp = (struct role_transition *)
-+		     acl_alloc(sizeof (struct role_transition))) == NULL)
-+			return -ENOMEM;
-+
-+		if (copy_role_transition(rtmp, rusertp))
-+			return -EFAULT;
-+
-+		rusertp = rtmp->prev;
-+
-+		error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
-+		if (error)
-+			return error;
-+
-+		if (!rlast) {
-+			rtmp->prev = NULL;
-+			rolep->transitions = rtmp;
-+		} else {
-+			rlast->next = rtmp;
-+			rtmp->prev = rlast;
-+		}
-+
-+		if (!rusertp)
-+			rtmp->next = NULL;
-+	}
-+
-+	return 0;
-+}
-+
-+static __u32 count_user_objs(const struct acl_object_label __user *userp)
-+{
-+	struct acl_object_label o_tmp;
-+	__u32 num = 0;
-+
-+	while (userp) {
-+		if (copy_acl_object_label(&o_tmp, userp))
-+			break;
-+
-+		userp = o_tmp.prev;
-+		num++;
-+	}
-+
-+	return num;
-+}
-+
-+static struct acl_subject_label *
-+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
-+{
-+	struct acl_subject_label *s_tmp = NULL, *s_tmp2;
-+	__u32 num_objs;
-+	struct acl_ip_label **i_tmp, *i_utmp2;
-+	struct gr_hash_struct ghash;
-+	struct subject_map *subjmap;
-+	unsigned int i_num;
-+	int err;
-+
-+	if (already_copied != NULL)
-+		*already_copied = 0;
-+
-+	s_tmp = lookup_subject_map(userp);
-+
-+	/* we've already copied this subject into the kernel, just return
-+	   the reference to it, and don't copy it over again
-+	*/
-+	if (s_tmp) {
-+		if (already_copied != NULL)
-+			*already_copied = 1;
-+		return(s_tmp);
-+	}
-+
-+	if ((s_tmp = (struct acl_subject_label *)
-+	    acl_alloc(sizeof (struct acl_subject_label))) == NULL)
-+		return ERR_PTR(-ENOMEM);
-+
-+	subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
-+	if (subjmap == NULL)
-+		return ERR_PTR(-ENOMEM);
-+
-+	subjmap->user = userp;
-+	subjmap->kernel = s_tmp;
-+	insert_subj_map_entry(subjmap);
-+
-+	if (copy_acl_subject_label(s_tmp, userp))
-+		return ERR_PTR(-EFAULT);
-+
-+	err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
-+	if (err)
-+		return ERR_PTR(err);
-+
-+	if (!strcmp(s_tmp->filename, "/"))
-+		role->root_label = s_tmp;
-+
-+	if (copy_gr_hash_struct(&ghash, s_tmp->hash))
-+		return ERR_PTR(-EFAULT);
-+
-+	/* copy user and group transition tables */
-+
-+	if (s_tmp->user_trans_num) {
-+		uid_t *uidlist;
-+
-+		uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
-+		if (uidlist == NULL)
-+			return ERR_PTR(-ENOMEM);
-+		if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
-+			return ERR_PTR(-EFAULT);
-+
-+		s_tmp->user_transitions = uidlist;
-+	}
-+
-+	if (s_tmp->group_trans_num) {
-+		gid_t *gidlist;
-+
-+		gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
-+		if (gidlist == NULL)
-+			return ERR_PTR(-ENOMEM);
-+		if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
-+			return ERR_PTR(-EFAULT);
-+
-+		s_tmp->group_transitions = gidlist;
-+	}
-+
-+	/* set up object hash table */
-+	num_objs = count_user_objs(ghash.first);
-+
-+	s_tmp->obj_hash_size = num_objs;
-+	s_tmp->obj_hash =
-+	    (struct acl_object_label **)
-+	    create_table(&(s_tmp->obj_hash_size), sizeof(void *));
-+
-+	if (!s_tmp->obj_hash)
-+		return ERR_PTR(-ENOMEM);
-+
-+	memset(s_tmp->obj_hash, 0,
-+	       s_tmp->obj_hash_size *
-+	       sizeof (struct acl_object_label *));
-+
-+	/* add in objects */
-+	err = copy_user_objs(ghash.first, s_tmp, role);
-+
-+	if (err)
-+		return ERR_PTR(err);
-+
-+	/* set pointer for parent subject */
-+	if (s_tmp->parent_subject) {
-+		s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
-+
-+		if (IS_ERR(s_tmp2))
-+			return s_tmp2;
-+
-+		s_tmp->parent_subject = s_tmp2;
-+	}
-+
-+	/* add in ip acls */
-+
-+	if (!s_tmp->ip_num) {
-+		s_tmp->ips = NULL;
-+		goto insert;
-+	}
-+
-+	i_tmp =
-+	    (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
-+					       sizeof (struct acl_ip_label *));
-+
-+	if (!i_tmp)
-+		return ERR_PTR(-ENOMEM);
-+
-+	for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
-+		*(i_tmp + i_num) =
-+		    (struct acl_ip_label *)
-+		    acl_alloc(sizeof (struct acl_ip_label));
-+		if (!*(i_tmp + i_num))
-+			return ERR_PTR(-ENOMEM);
-+
-+		if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
-+			return ERR_PTR(-EFAULT);
-+
-+		if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
-+			return ERR_PTR(-EFAULT);
-+		
-+		if ((*(i_tmp + i_num))->iface == NULL)
-+			continue;
-+
-+		err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
-+		if (err)
-+			return ERR_PTR(err);
-+	}
-+
-+	s_tmp->ips = i_tmp;
-+
-+insert:
-+	if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
-+			       s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
-+		return ERR_PTR(-ENOMEM);
-+
-+	return s_tmp;
-+}
-+
-+static int
-+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
-+{
-+	struct acl_subject_label s_pre;
-+	struct acl_subject_label * ret;
-+	int err;
-+
-+	while (userp) {
-+		if (copy_acl_subject_label(&s_pre, userp))
-+			return -EFAULT;
-+		
-+		ret = do_copy_user_subj(userp, role, NULL);
-+
-+		err = PTR_ERR(ret);
-+		if (IS_ERR(ret))
-+			return err;
-+
-+		insert_acl_subj_label(ret, role);
-+
-+		userp = s_pre.prev;
-+	}
-+
-+	return 0;
-+}
-+
-+static int
-+copy_user_acl(struct gr_arg *arg)
-+{
-+	struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
-+	struct acl_subject_label *subj_list;
-+	struct sprole_pw *sptmp;
-+	struct gr_hash_struct *ghash;
-+	uid_t *domainlist;
-+	unsigned int r_num;
-+	int err = 0;
-+	__u16 i;
-+	__u32 num_subjs;
-+
-+	/* we need a default and kernel role */
-+	if (arg->role_db.num_roles < 2)
-+		return -EINVAL;
-+
-+	/* copy special role authentication info from userspace */
-+
-+	num_sprole_pws = arg->num_sprole_pws;
-+	acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
-+
-+	if (!acl_special_roles && num_sprole_pws)
-+		return -ENOMEM;
-+
-+	for (i = 0; i < num_sprole_pws; i++) {
-+		sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
-+		if (!sptmp)
-+			return -ENOMEM;
-+		if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
-+			return -EFAULT;
-+
-+		err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
-+		if (err)
-+			return err;
-+
-+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
-+		printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
-+#endif
-+
-+		acl_special_roles[i] = sptmp;
-+	}
-+
-+	r_utmp = (struct acl_role_label **) arg->role_db.r_table;
-+
-+	for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
-+		r_tmp = acl_alloc(sizeof (struct acl_role_label));
-+
-+		if (!r_tmp)
-+			return -ENOMEM;
-+
-+		if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
-+			return -EFAULT;
-+
-+		if (copy_acl_role_label(r_tmp, r_utmp2))
-+			return -EFAULT;
-+
-+		err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
-+		if (err)
-+			return err;
-+
-+		if (!strcmp(r_tmp->rolename, "default")
-+		    && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
-+			default_role = r_tmp;
-+		} else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
-+			kernel_role = r_tmp;
-+		}
-+
-+		if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
-+			return -ENOMEM;
-+
-+		if (copy_gr_hash_struct(ghash, r_tmp->hash))
-+			return -EFAULT;
-+
-+		r_tmp->hash = ghash;
-+
-+		num_subjs = count_user_subjs(r_tmp->hash->first);
-+
-+		r_tmp->subj_hash_size = num_subjs;
-+		r_tmp->subj_hash =
-+		    (struct acl_subject_label **)
-+		    create_table(&(r_tmp->subj_hash_size), sizeof(void *));
-+
-+		if (!r_tmp->subj_hash)
-+			return -ENOMEM;
-+
-+		err = copy_user_allowedips(r_tmp);
-+		if (err)
-+			return err;
-+
-+		/* copy domain info */
-+		if (r_tmp->domain_children != NULL) {
-+			domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
-+			if (domainlist == NULL)
-+				return -ENOMEM;
-+
-+			if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
-+				return -EFAULT;
-+
-+			r_tmp->domain_children = domainlist;
-+		}
-+
-+		err = copy_user_transitions(r_tmp);
-+		if (err)
-+			return err;
-+
-+		memset(r_tmp->subj_hash, 0,
-+		       r_tmp->subj_hash_size *
-+		       sizeof (struct acl_subject_label *));
-+
-+		/* acquire the list of subjects, then NULL out
-+		   the list prior to parsing the subjects for this role,
-+		   as during this parsing the list is replaced with a list
-+		   of *nested* subjects for the role
-+		*/
-+		subj_list = r_tmp->hash->first;
-+
-+		/* set nested subject list to null */
-+		r_tmp->hash->first = NULL;
-+
-+		err = copy_user_subjs(subj_list, r_tmp);
-+
-+		if (err)
-+			return err;
-+
-+		insert_acl_role_label(r_tmp);
-+	}
-+
-+	if (default_role == NULL || kernel_role == NULL)
-+		return -EINVAL;
-+
-+	return err;
-+}
-+
-+static int
-+gracl_init(struct gr_arg *args)
-+{
-+	int error = 0;
-+
-+	memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
-+	memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
-+
-+	if (init_variables(args)) {
-+		gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
-+		error = -ENOMEM;
-+		free_variables();
-+		goto out;
-+	}
-+
-+	error = copy_user_acl(args);
-+	free_init_variables();
-+	if (error) {
-+		free_variables();
-+		goto out;
-+	}
-+
-+	if ((error = gr_set_acls(0))) {
-+		free_variables();
-+		goto out;
-+	}
-+
-+	pax_open_kernel();
-+	gr_status |= GR_READY;
-+	pax_close_kernel();
-+
-+      out:
-+	return error;
-+}
-+
 +/* derived from glibc fnmatch() 0: match, 1: no match*/
 +
 +static int
@@ -64954,7 +63795,7 @@ index 0000000..c0793fd
 +	}
 +
 +	for (;;) {
-+		if (dentry == real_root.dentry && mnt == real_root.mnt)
++		if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
 +			break;
 +
 +		if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
@@ -64981,9 +63822,9 @@ index 0000000..c0793fd
 +
 +	retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
 +
-+	/* real_root is pinned so we don't have to hold a reference */
++	/* gr_real_root is pinned so we don't have to hold a reference */
 +	if (retval == NULL)
-+		retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
++		retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
 +out:
 +	write_sequnlock(&rename_lock);
 +	br_read_unlock(&vfsmount_lock);
@@ -65016,7 +63857,7 @@ index 0000000..c0793fd
 +	return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
 +}
 +
-+static struct acl_subject_label *
++struct acl_subject_label *
 +chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
 +	       const struct acl_role_label *role)
 +{
@@ -65030,7 +63871,7 @@ index 0000000..c0793fd
 +	write_seqlock(&rename_lock);
 +
 +	for (;;) {
-+		if (dentry == real_root.dentry && mnt == real_root.mnt)
++		if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
 +			break;
 +		if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
 +			if (!mnt_has_parent(real_mnt))
@@ -65074,10 +63915,10 @@ index 0000000..c0793fd
 +	spin_unlock(&dentry->d_lock);
 +
 +	if (unlikely(retval == NULL)) {
-+		/* real_root is pinned, we don't need to hold a reference */
++		/* gr_real_root is pinned, we don't need to hold a reference */
 +		read_lock(&gr_inode_lock);
-+		retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
-+					  __get_dev(real_root.dentry), role);
++		retval = lookup_acl_subj_label(gr_real_root.dentry->d_inode->i_ino,
++					  __get_dev(gr_real_root.dentry), role);
 +		read_unlock(&gr_inode_lock);
 +	}
 +out:
@@ -65089,6 +63930,66 @@ index 0000000..c0793fd
 +	return retval;
 +}
 +
++void
++assign_special_role(const char *rolename)
++{
++	struct acl_object_label *obj;
++	struct acl_role_label *r;
++	struct acl_role_label *assigned = NULL;
++	struct task_struct *tsk;
++	struct file *filp;
++
++	FOR_EACH_ROLE_START(r)
++		if (!strcmp(rolename, r->rolename) &&
++		    (r->roletype & GR_ROLE_SPECIAL)) {
++			assigned = r;
++			break;
++		}
++	FOR_EACH_ROLE_END(r)
++
++	if (!assigned)
++		return;
++
++	read_lock(&tasklist_lock);
++	read_lock(&grsec_exec_file_lock);
++
++	tsk = current->real_parent;
++	if (tsk == NULL)
++		goto out_unlock;
++
++	filp = tsk->exec_file;
++	if (filp == NULL)
++		goto out_unlock;
++
++	tsk->is_writable = 0;
++	tsk->inherited = 0;
++
++	tsk->acl_sp_role = 1;
++	tsk->acl_role_id = ++acl_sp_role_value;
++	tsk->role = assigned;
++	tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
++
++	/* ignore additional mmap checks for processes that are writable
++	   by the default ACL */
++	obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
++	if (unlikely(obj->mode & GR_WRITE))
++		tsk->is_writable = 1;
++	obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
++	if (unlikely(obj->mode & GR_WRITE))
++		tsk->is_writable = 1;
++
++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
++	printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
++			tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
++#endif
++
++out_unlock:
++	read_unlock(&grsec_exec_file_lock);
++	read_unlock(&tasklist_lock);
++	return;
++}
++
++
 +static void
 +gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
 +{
@@ -65131,6 +64032,120 @@ index 0000000..c0793fd
 +	return;
 +}
 +
++static void
++gr_set_proc_res(struct task_struct *task)
++{
++	struct acl_subject_label *proc;
++	unsigned short i;
++
++	proc = task->acl;
++
++	if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
++		return;
++
++	for (i = 0; i < RLIM_NLIMITS; i++) {
++		if (!(proc->resmask & (1U << i)))
++			continue;
++
++		task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
++		task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
++
++		if (i == RLIMIT_CPU)
++			update_rlimit_cpu(task, proc->res[i].rlim_cur);
++	}
++
++	return;
++}
++
++/* both of the below must be called with
++	rcu_read_lock();
++	read_lock(&tasklist_lock);
++	read_lock(&grsec_exec_file_lock);
++*/
++
++struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename)
++{
++	char *tmpname;
++	struct acl_subject_label *tmpsubj;
++	struct file *filp;
++	struct name_entry *nmatch;
++
++	filp = task->exec_file;
++	if (filp == NULL)
++		return NULL;
++
++	/* the following is to apply the correct subject
++	   on binaries running when the RBAC system
++	   is enabled, when the binaries have been
++	   replaced or deleted since their execution
++	   -----
++	   when the RBAC system starts, the inode/dev
++	   from exec_file will be one the RBAC system
++	   is unaware of.  It only knows the inode/dev
++	   of the present file on disk, or the absence
++	   of it.
++	*/
++
++	if (filename)
++		nmatch = __lookup_name_entry(state, filename);
++	else {
++		preempt_disable();
++		tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
++
++		nmatch = __lookup_name_entry(state, tmpname);
++		preempt_enable();
++	}
++	tmpsubj = NULL;
++	if (nmatch) {
++		if (nmatch->deleted)
++			tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
++		else
++			tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
++	}
++	/* this also works for the reload case -- if we don't match a potentially inherited subject
++	   then we fall back to a normal lookup based on the binary's ino/dev
++	*/
++	if (tmpsubj == NULL)
++		tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
++
++	return tmpsubj;
++}
++
++static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename)
++{
++	return __gr_get_subject_for_task(&running_polstate, task, filename);
++}
++
++void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
++{
++	struct acl_object_label *obj;
++	struct file *filp;
++
++	filp = task->exec_file;
++
++	task->acl = subj;
++	task->is_writable = 0;
++	/* ignore additional mmap checks for processes that are writable 
++	   by the default ACL */
++	obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
++	if (unlikely(obj->mode & GR_WRITE))
++		task->is_writable = 1;
++	obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
++	if (unlikely(obj->mode & GR_WRITE))
++		task->is_writable = 1;
++
++	gr_set_proc_res(task);
++
++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
++	printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename);
++#endif
++}
++
++static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
++{
++	__gr_apply_subject_to_task(&running_polstate, task, subj);
++}
++
 +__u32
 +gr_search_file(const struct dentry * dentry, const __u32 mode,
 +	       const struct vfsmount * mnt)
@@ -65155,12 +64170,15 @@ index 0000000..c0793fd
 +		struct task_struct *task = init_pid_ns.child_reaper;
 +
 +		if (task->role != current->role) {
++			struct acl_subject_label *subj;
++
 +			task->acl_sp_role = 0;
 +			task->acl_role_id = current->acl_role_id;
 +			task->role = current->role;
 +			rcu_read_lock();
 +			read_lock(&grsec_exec_file_lock);
-+			gr_apply_subject_to_task(task);
++			subj = gr_get_subject_for_task(task, NULL);
++			gr_apply_subject_to_task(task, subj);
 +			read_unlock(&grsec_exec_file_lock);
 +			rcu_read_unlock();
 +			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
@@ -65355,45 +64373,23 @@ index 0000000..c0793fd
 +void
 +gr_copy_label(struct task_struct *tsk)
 +{
-+	tsk->signal->used_accept = 0;
-+	tsk->acl_sp_role = 0;
-+	tsk->acl_role_id = current->acl_role_id;
-+	tsk->acl = current->acl;
-+	tsk->role = current->role;
-+	tsk->signal->curr_ip = current->signal->curr_ip;
-+	tsk->signal->saved_ip = current->signal->saved_ip;
-+	if (current->exec_file)
-+		get_file(current->exec_file);
-+	tsk->exec_file = current->exec_file;
-+	tsk->is_writable = current->is_writable;
-+	if (unlikely(current->signal->used_accept)) {
-+		current->signal->curr_ip = 0;
-+		current->signal->saved_ip = 0;
-+	}
-+
-+	return;
-+}
-+
-+static void
-+gr_set_proc_res(struct task_struct *task)
-+{
-+	struct acl_subject_label *proc;
-+	unsigned short i;
-+
-+	proc = task->acl;
-+
-+	if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
-+		return;
-+
-+	for (i = 0; i < RLIM_NLIMITS; i++) {
-+		if (!(proc->resmask & (1U << i)))
-+			continue;
-+
-+		task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
-+		task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
++	struct task_struct *p = current;
 +
-+		if (i == RLIMIT_CPU)
-+			update_rlimit_cpu(task, proc->res[i].rlim_cur);
++	tsk->inherited = p->inherited;
++	tsk->acl_sp_role = 0;
++	tsk->acl_role_id = p->acl_role_id;
++	tsk->acl = p->acl;
++	tsk->role = p->role;
++	tsk->signal->used_accept = 0;
++	tsk->signal->curr_ip = p->signal->curr_ip;
++	tsk->signal->saved_ip = p->signal->saved_ip;
++	if (p->exec_file)
++		get_file(p->exec_file);
++	tsk->exec_file = p->exec_file;
++	tsk->is_writable = p->is_writable;
++	if (unlikely(p->signal->used_accept)) {
++		p->signal->curr_ip = 0;
++		p->signal->saved_ip = 0;
 +	}
 +
 +	return;
@@ -65607,11 +64603,15 @@ index 0000000..c0793fd
 +
 +	/* kernel process, we'll give them the kernel role */
 +	if (unlikely(!filp)) {
-+		task->role = kernel_role;
-+		task->acl = kernel_role->root_label;
++		task->role = running_polstate.kernel_role;
++		task->acl = running_polstate.kernel_role->root_label;
 +		return;
-+	} else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
++	} else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
++		/* save the current ip at time of role lookup so that the proper
++		   IP will be learned for role_allowed_ip */
++		task->signal->saved_ip = task->signal->curr_ip;
 +		role = lookup_acl_role_label(task, uid, gid);
++	}
 +
 +	/* don't change the role if we're not a privileged process */
 +	if (role && task->role != role &&
@@ -65634,13 +64634,15 @@ index 0000000..c0793fd
 +				   (subj == task->acl)))
 +		task->acl = subj;
 +
++	/* leave task->inherited unaffected */
++
 +	task->role = role;
 +
 +	task->is_writable = 0;
 +
 +	/* ignore additional mmap checks for processes that are writable 
 +	   by the default ACL */
-+	obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
++	obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
 +	if (unlikely(obj->mode & GR_WRITE))
 +		task->is_writable = 1;
 +	obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
@@ -65706,14 +64708,18 @@ index 0000000..c0793fd
 +			task->acl = obj->nested;
 +		else
 +			task->acl = newacl;
-+	} else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
-+		gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
++		task->inherited = 0;
++	} else {
++		task->inherited = 1;
++		if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
++			gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
++	}
 +
 +	task->is_writable = 0;
 +
 +	/* ignore additional mmap checks for processes that are writable 
 +	   by the default ACL */
-+	obj = chk_obj_label(dentry, mnt, default_role->root_label);
++	obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
 +	if (unlikely(obj->mode & GR_WRITE))
 +		task->is_writable = 1;
 +	obj = chk_obj_label(dentry, mnt, task->role->root_label);
@@ -65856,10 +64862,10 @@ index 0000000..c0793fd
 +update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
 +		    const ino_t newinode, const dev_t newdevice)
 +{
-+	unsigned int index = gr_fhash(oldinode, olddevice, inodev_set.i_size);
++	unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
 +	struct inodev_entry *match;
 +
-+	match = inodev_set.i_hash[index];
++	match = running_polstate.inodev_set.i_hash[index];
 +
 +	while (match && (match->nentry->inode != oldinode ||
 +	       match->nentry->device != olddevice || !match->nentry->deleted))
@@ -65869,7 +64875,7 @@ index 0000000..c0793fd
 +	    && (match->nentry->device == olddevice) &&
 +	    match->nentry->deleted) {
 +		if (match->prev == NULL) {
-+			inodev_set.i_hash[index] = match->next;
++			running_polstate.inodev_set.i_hash[index] = match->next;
 +			if (match->next != NULL)
 +				match->next->prev = NULL;
 +		} else {
@@ -66026,593 +65032,6 @@ index 0000000..c0793fd
 +	return;
 +}
 +
-+static int
-+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
-+			 unsigned char **sum)
-+{
-+	struct acl_role_label *r;
-+	struct role_allowed_ip *ipp;
-+	struct role_transition *trans;
-+	unsigned int i;
-+	int found = 0;
-+	u32 curr_ip = current->signal->curr_ip;
-+
-+	current->signal->saved_ip = curr_ip;
-+
-+	/* check transition table */
-+
-+	for (trans = current->role->transitions; trans; trans = trans->next) {
-+		if (!strcmp(rolename, trans->rolename)) {
-+			found = 1;
-+			break;
-+		}
-+	}
-+
-+	if (!found)
-+		return 0;
-+
-+	/* handle special roles that do not require authentication
-+	   and check ip */
-+
-+	FOR_EACH_ROLE_START(r)
-+		if (!strcmp(rolename, r->rolename) &&
-+		    (r->roletype & GR_ROLE_SPECIAL)) {
-+			found = 0;
-+			if (r->allowed_ips != NULL) {
-+				for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
-+					if ((ntohl(curr_ip) & ipp->netmask) ==
-+					     (ntohl(ipp->addr) & ipp->netmask))
-+						found = 1;
-+				}
-+			} else
-+				found = 2;
-+			if (!found)
-+				return 0;
-+
-+			if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
-+			    ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
-+				*salt = NULL;
-+				*sum = NULL;
-+				return 1;
-+			}
-+		}
-+	FOR_EACH_ROLE_END(r)
-+
-+	for (i = 0; i < num_sprole_pws; i++) {
-+		if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
-+			*salt = acl_special_roles[i]->salt;
-+			*sum = acl_special_roles[i]->sum;
-+			return 1;
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static void
-+assign_special_role(char *rolename)
-+{
-+	struct acl_object_label *obj;
-+	struct acl_role_label *r;
-+	struct acl_role_label *assigned = NULL;
-+	struct task_struct *tsk;
-+	struct file *filp;
-+
-+	FOR_EACH_ROLE_START(r)
-+		if (!strcmp(rolename, r->rolename) &&
-+		    (r->roletype & GR_ROLE_SPECIAL)) {
-+			assigned = r;
-+			break;
-+		}
-+	FOR_EACH_ROLE_END(r)
-+
-+	if (!assigned)
-+		return;
-+
-+	read_lock(&tasklist_lock);
-+	read_lock(&grsec_exec_file_lock);
-+
-+	tsk = current->real_parent;
-+	if (tsk == NULL)
-+		goto out_unlock;
-+
-+	filp = tsk->exec_file;
-+	if (filp == NULL)
-+		goto out_unlock;
-+
-+	tsk->is_writable = 0;
-+
-+	tsk->acl_sp_role = 1;
-+	tsk->acl_role_id = ++acl_sp_role_value;
-+	tsk->role = assigned;
-+	tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
-+
-+	/* ignore additional mmap checks for processes that are writable 
-+	   by the default ACL */
-+	obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
-+	if (unlikely(obj->mode & GR_WRITE))
-+		tsk->is_writable = 1;
-+	obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
-+	if (unlikely(obj->mode & GR_WRITE))
-+		tsk->is_writable = 1;
-+
-+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
-+	printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
-+#endif
-+
-+out_unlock:
-+	read_unlock(&grsec_exec_file_lock);
-+	read_unlock(&tasklist_lock);
-+	return;
-+}
-+
-+int gr_check_secure_terminal(struct task_struct *task)
-+{
-+	struct task_struct *p, *p2, *p3;
-+	struct files_struct *files;
-+	struct fdtable *fdt;
-+	struct file *our_file = NULL, *file;
-+	int i;
-+
-+	if (task->signal->tty == NULL)
-+		return 1;
-+
-+	files = get_files_struct(task);
-+	if (files != NULL) {
-+		rcu_read_lock();
-+		fdt = files_fdtable(files);
-+		for (i=0; i < fdt->max_fds; i++) {
-+			file = fcheck_files(files, i);
-+			if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
-+				get_file(file);
-+				our_file = file;
-+			}
-+		}
-+		rcu_read_unlock();
-+		put_files_struct(files);
-+	}
-+
-+	if (our_file == NULL)
-+		return 1;
-+
-+	read_lock(&tasklist_lock);
-+	do_each_thread(p2, p) {
-+		files = get_files_struct(p);
-+		if (files == NULL ||
-+		    (p->signal && p->signal->tty == task->signal->tty)) {
-+			if (files != NULL)
-+				put_files_struct(files);
-+			continue;
-+		}
-+		rcu_read_lock();
-+		fdt = files_fdtable(files);
-+		for (i=0; i < fdt->max_fds; i++) {
-+			file = fcheck_files(files, i);
-+			if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
-+			    file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
-+				p3 = task;
-+				while (task_pid_nr(p3) > 0) {
-+					if (p3 == p)
-+						break;
-+					p3 = p3->real_parent;
-+				}
-+				if (p3 == p)
-+					break;
-+				gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
-+				gr_handle_alertkill(p);
-+				rcu_read_unlock();
-+				put_files_struct(files);
-+				read_unlock(&tasklist_lock);
-+				fput(our_file);
-+				return 0;
-+			}
-+		}
-+		rcu_read_unlock();
-+		put_files_struct(files);
-+	} while_each_thread(p2, p);
-+	read_unlock(&tasklist_lock);
-+
-+	fput(our_file);
-+	return 1;
-+}
-+
-+static int gr_rbac_disable(void *unused)
-+{
-+	pax_open_kernel();
-+	gr_status &= ~GR_READY;
-+	pax_close_kernel();
-+
-+	return 0;
-+}
-+
-+ssize_t
-+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
-+{
-+	struct gr_arg_wrapper uwrap;
-+	unsigned char *sprole_salt = NULL;
-+	unsigned char *sprole_sum = NULL;
-+	int error = 0;
-+	int error2 = 0;
-+	size_t req_count = 0;
-+
-+	mutex_lock(&gr_dev_mutex);
-+
-+	if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
-+		error = -EPERM;
-+		goto out;
-+	}
-+
-+#ifdef CONFIG_COMPAT
-+	pax_open_kernel();
-+	if (is_compat_task()) {
-+		copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
-+		copy_gr_arg = &copy_gr_arg_compat;
-+		copy_acl_object_label = &copy_acl_object_label_compat;
-+		copy_acl_subject_label = &copy_acl_subject_label_compat;
-+		copy_acl_role_label = &copy_acl_role_label_compat;
-+		copy_acl_ip_label = &copy_acl_ip_label_compat;
-+		copy_role_allowed_ip = &copy_role_allowed_ip_compat;
-+		copy_role_transition = &copy_role_transition_compat;
-+		copy_sprole_pw = &copy_sprole_pw_compat;
-+		copy_gr_hash_struct = &copy_gr_hash_struct_compat;
-+		copy_pointer_from_array = &copy_pointer_from_array_compat;
-+		get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
-+	} else {
-+		copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
-+		copy_gr_arg = &copy_gr_arg_normal;
-+		copy_acl_object_label = &copy_acl_object_label_normal;
-+		copy_acl_subject_label = &copy_acl_subject_label_normal;
-+		copy_acl_role_label = &copy_acl_role_label_normal;
-+		copy_acl_ip_label = &copy_acl_ip_label_normal;
-+		copy_role_allowed_ip = &copy_role_allowed_ip_normal;
-+		copy_role_transition = &copy_role_transition_normal;
-+		copy_sprole_pw = &copy_sprole_pw_normal;
-+		copy_gr_hash_struct = &copy_gr_hash_struct_normal;
-+		copy_pointer_from_array = &copy_pointer_from_array_normal;
-+		get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
-+	}
-+	pax_close_kernel();
-+#endif
-+
-+	req_count = get_gr_arg_wrapper_size();
-+
-+	if (count != req_count) {
-+		gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
-+		error = -EINVAL;
-+		goto out;
-+	}
-+
-+	
-+	if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
-+		gr_auth_expires = 0;
-+		gr_auth_attempts = 0;
-+	}
-+
-+	error = copy_gr_arg_wrapper(buf, &uwrap);
-+	if (error)
-+		goto out;
-+
-+	error = copy_gr_arg(uwrap.arg, gr_usermode);
-+	if (error)
-+		goto out;
-+
-+	if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
-+	    gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
-+	    time_after(gr_auth_expires, get_seconds())) {
-+		error = -EBUSY;
-+		goto out;
-+	}
-+
-+	/* if non-root trying to do anything other than use a special role,
-+	   do not attempt authentication, do not count towards authentication
-+	   locking
-+	 */
-+
-+	if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
-+	    gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
-+	    gr_is_global_nonroot(current_uid())) {
-+		error = -EPERM;
-+		goto out;
-+	}
-+
-+	/* ensure pw and special role name are null terminated */
-+
-+	gr_usermode->pw[GR_PW_LEN - 1] = '\0';
-+	gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
-+
-+	/* Okay. 
-+	 * We have our enough of the argument structure..(we have yet
-+	 * to copy_from_user the tables themselves) . Copy the tables
-+	 * only if we need them, i.e. for loading operations. */
-+
-+	switch (gr_usermode->mode) {
-+	case GR_STATUS:
-+			if (gr_status & GR_READY) {
-+				error = 1;
-+				if (!gr_check_secure_terminal(current))
-+					error = 3;
-+			} else
-+				error = 2;
-+			goto out;
-+	case GR_SHUTDOWN:
-+		if ((gr_status & GR_READY)
-+		    && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
-+			stop_machine(gr_rbac_disable, NULL, NULL);
-+			free_variables();
-+			memset(gr_usermode, 0, sizeof (struct gr_arg));
-+			memset(gr_system_salt, 0, GR_SALT_LEN);
-+			memset(gr_system_sum, 0, GR_SHA_LEN);
-+			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
-+		} else if (gr_status & GR_READY) {
-+			gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
-+			error = -EPERM;
-+		} else {
-+			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
-+			error = -EAGAIN;
-+		}
-+		break;
-+	case GR_ENABLE:
-+		if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
-+			gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
-+		else {
-+			if (gr_status & GR_READY)
-+				error = -EAGAIN;
-+			else
-+				error = error2;
-+			gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
-+		}
-+		break;
-+	case GR_RELOAD:
-+		if (!(gr_status & GR_READY)) {
-+			gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
-+			error = -EAGAIN;
-+		} else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
-+			stop_machine(gr_rbac_disable, NULL, NULL);
-+			free_variables();
-+			error2 = gracl_init(gr_usermode);
-+			if (!error2)
-+				gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
-+			else {
-+				gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
-+				error = error2;
-+			}
-+		} else {
-+			gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
-+			error = -EPERM;
-+		}
-+		break;
-+	case GR_SEGVMOD:
-+		if (unlikely(!(gr_status & GR_READY))) {
-+			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
-+			error = -EAGAIN;
-+			break;
-+		}
-+
-+		if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
-+			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
-+			if (gr_usermode->segv_device && gr_usermode->segv_inode) {
-+				struct acl_subject_label *segvacl;
-+				segvacl =
-+				    lookup_acl_subj_label(gr_usermode->segv_inode,
-+							  gr_usermode->segv_device,
-+							  current->role);
-+				if (segvacl) {
-+					segvacl->crashes = 0;
-+					segvacl->expires = 0;
-+				}
-+			} else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
-+				gr_remove_uid(gr_usermode->segv_uid);
-+			}
-+		} else {
-+			gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
-+			error = -EPERM;
-+		}
-+		break;
-+	case GR_SPROLE:
-+	case GR_SPROLEPAM:
-+		if (unlikely(!(gr_status & GR_READY))) {
-+			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
-+			error = -EAGAIN;
-+			break;
-+		}
-+
-+		if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
-+			current->role->expires = 0;
-+			current->role->auth_attempts = 0;
-+		}
-+
-+		if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
-+		    time_after(current->role->expires, get_seconds())) {
-+			error = -EBUSY;
-+			goto out;
-+		}
-+
-+		if (lookup_special_role_auth
-+		    (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
-+		    && ((!sprole_salt && !sprole_sum)
-+			|| !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
-+			char *p = "";
-+			assign_special_role(gr_usermode->sp_role);
-+			read_lock(&tasklist_lock);
-+			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);
-+		} else {
-+			gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
-+			error = -EPERM;
-+			if(!(current->role->auth_attempts++))
-+				current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
-+
-+			goto out;
-+		}
-+		break;
-+	case GR_UNSPROLE:
-+		if (unlikely(!(gr_status & GR_READY))) {
-+			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
-+			error = -EAGAIN;
-+			break;
-+		}
-+
-+		if (current->role->roletype & GR_ROLE_SPECIAL) {
-+			char *p = "";
-+			int i = 0;
-+
-+			read_lock(&tasklist_lock);
-+			if (current->real_parent) {
-+				p = current->real_parent->role->rolename;
-+				i = current->real_parent->acl_role_id;
-+			}
-+			read_unlock(&tasklist_lock);
-+
-+			gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
-+			gr_set_acls(1);
-+		} else {
-+			error = -EPERM;
-+			goto out;
-+		}
-+		break;
-+	default:
-+		gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
-+		error = -EINVAL;
-+		break;
-+	}
-+
-+	if (error != -EPERM)
-+		goto out;
-+
-+	if(!(gr_auth_attempts++))
-+		gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
-+
-+      out:
-+	mutex_unlock(&gr_dev_mutex);
-+
-+	if (!error)
-+		error = req_count;
-+
-+	return error;
-+}
-+
-+/* must be called with
-+	rcu_read_lock();
-+	read_lock(&tasklist_lock);
-+	read_lock(&grsec_exec_file_lock);
-+*/
-+int gr_apply_subject_to_task(struct task_struct *task)
-+{
-+	struct acl_object_label *obj;
-+	char *tmpname;
-+	struct acl_subject_label *tmpsubj;
-+	struct file *filp;
-+	struct name_entry *nmatch;
-+
-+	filp = task->exec_file;
-+	if (filp == NULL)
-+		return 0;
-+
-+	/* the following is to apply the correct subject 
-+	   on binaries running when the RBAC system 
-+	   is enabled, when the binaries have been 
-+	   replaced or deleted since their execution
-+	   -----
-+	   when the RBAC system starts, the inode/dev
-+	   from exec_file will be one the RBAC system
-+	   is unaware of.  It only knows the inode/dev
-+	   of the present file on disk, or the absence
-+	   of it.
-+	*/
-+	preempt_disable();
-+	tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
-+			
-+	nmatch = lookup_name_entry(tmpname);
-+	preempt_enable();
-+	tmpsubj = NULL;
-+	if (nmatch) {
-+		if (nmatch->deleted)
-+			tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
-+		else
-+			tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
-+		if (tmpsubj != NULL)
-+			task->acl = tmpsubj;
-+	}
-+	if (tmpsubj == NULL)
-+		task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
-+					   task->role);
-+	if (task->acl) {
-+		task->is_writable = 0;
-+		/* ignore additional mmap checks for processes that are writable 
-+		   by the default ACL */
-+		obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
-+		if (unlikely(obj->mode & GR_WRITE))
-+			task->is_writable = 1;
-+		obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
-+		if (unlikely(obj->mode & GR_WRITE))
-+			task->is_writable = 1;
-+
-+		gr_set_proc_res(task);
-+
-+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
-+		printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task_pid_nr(task), task->role->rolename, task->acl->filename);
-+#endif
-+	} else {
-+		return 1;
-+	}
-+
-+	return 0;
-+}
-+
-+int
-+gr_set_acls(const int type)
-+{
-+	struct task_struct *task, *task2;
-+	struct acl_role_label *role = current->role;
-+	__u16 acl_role_id = current->acl_role_id;
-+	const struct cred *cred;
-+	int ret;
-+
-+	rcu_read_lock();
-+	read_lock(&tasklist_lock);
-+	read_lock(&grsec_exec_file_lock);
-+	do_each_thread(task2, task) {
-+		/* check to see if we're called from the exit handler,
-+		   if so, only replace ACLs that have inherited the admin
-+		   ACL */
-+
-+		if (type && (task->role != role ||
-+			     task->acl_role_id != acl_role_id))
-+			continue;
-+
-+		task->acl_role_id = 0;
-+		task->acl_sp_role = 0;
-+
-+		if (task->exec_file) {
-+			cred = __task_cred(task);
-+			task->role = lookup_acl_role_label(task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
-+			ret = gr_apply_subject_to_task(task);
-+			if (ret) {
-+				read_unlock(&grsec_exec_file_lock);
-+				read_unlock(&tasklist_lock);
-+				rcu_read_unlock();
-+				gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
-+				return ret;
-+			}
-+		} else {
-+			// it's a kernel process
-+			task->role = kernel_role;
-+			task->acl = kernel_role->root_label;
-+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
-+			task->acl->mode &= ~GR_PROCFIND;
-+#endif
-+		}
-+	} while_each_thread(task2, task);
-+	read_unlock(&grsec_exec_file_lock);
-+	read_unlock(&tasklist_lock);
-+	rcu_read_unlock();
-+
-+	return 0;
-+}
-+
 +#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
 +static const unsigned long res_learn_bumps[GR_NLIMITS] = {
 +	[RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
@@ -66875,7 +65294,7 @@ index 0000000..c0793fd
 +
 +	if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
 +	    !task->is_writable && S_ISREG(filp->f_path.dentry->d_inode->i_mode) && (filp->f_path.mnt != shm_mnt || (filp->f_path.dentry->d_inode->i_nlink > 0))) {
-+		obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
++		obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
 +		obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
 +				     task->role->root_label);
 +		if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
@@ -66989,15 +65408,6 @@ index 0000000..c0793fd
 +	return;
 +}
 +
-+void gr_set_kernel_label(struct task_struct *task)
-+{
-+	if (gr_status & GR_READY) {
-+		task->role = kernel_role;
-+		task->acl = kernel_role->root_label;
-+	}
-+	return;
-+}
-+
 +#ifdef CONFIG_TASKSTATS
 +int gr_is_taskstats_denied(int pid)
 +{
@@ -67151,7 +65561,6 @@ index 0000000..c0793fd
 +#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
 +EXPORT_SYMBOL(gr_acl_is_enabled);
 +#endif
-+EXPORT_SYMBOL(gr_set_kernel_label);
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
@@ -67159,7 +65568,7 @@ index 0000000..c0793fd
 +
 diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
 new file mode 100644
-index 0000000..34fefda
+index 0000000..18ffbbd
 --- /dev/null
 +++ b/grsecurity/gracl_alloc.c
 @@ -0,0 +1,105 @@
@@ -67170,19 +65579,18 @@ index 0000000..34fefda
 +#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 struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
++struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
 +
 +static __inline__ int
 +alloc_pop(void)
 +{
-+	if (alloc_stack_next == 1)
++	if (current_alloc_state->alloc_stack_next == 1)
 +		return 0;
 +
-+	kfree(alloc_stack[alloc_stack_next - 2]);
++	kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
 +
-+	alloc_stack_next--;
++	current_alloc_state->alloc_stack_next--;
 +
 +	return 1;
 +}
@@ -67190,12 +65598,12 @@ index 0000000..34fefda
 +static __inline__ int
 +alloc_push(void *buf)
 +{
-+	if (alloc_stack_next >= alloc_stack_size)
++	if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
 +		return 1;
 +
-+	alloc_stack[alloc_stack_next - 1] = buf;
++	current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
 +
-+	alloc_stack_next++;
++	current_alloc_state->alloc_stack_next++;
 +
 +	return 0;
 +}
@@ -67233,21 +65641,21 @@ index 0000000..34fefda
 +void
 +acl_free_all(void)
 +{
-+	if (gr_acl_is_enabled() || !alloc_stack)
++	if (!current_alloc_state->alloc_stack)
 +		return;
 +
 +	while (alloc_pop()) ;
 +
-+	if (alloc_stack) {
-+		if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
-+			kfree(alloc_stack);
++	if (current_alloc_state->alloc_stack) {
++		if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
++			kfree(current_alloc_state->alloc_stack);
 +		else
-+			vfree(alloc_stack);
++			vfree(current_alloc_state->alloc_stack);
 +	}
 +
-+	alloc_stack = NULL;
-+	alloc_stack_size = 1;
-+	alloc_stack_next = 1;
++	current_alloc_state->alloc_stack = NULL;
++	current_alloc_state->alloc_stack_size = 1;
++	current_alloc_state->alloc_stack_next = 1;
 +
 +	return;
 +}
@@ -67256,14 +65664,15 @@ index 0000000..34fefda
 +acl_alloc_stack_init(unsigned long size)
 +{
 +	if ((size * sizeof (void *)) <= PAGE_SIZE)
-+		alloc_stack =
++		current_alloc_state->alloc_stack =
 +		    (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
 +	else
-+		alloc_stack = (void **) vmalloc(size * sizeof (void *));
++		current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
 +
-+	alloc_stack_size = size;
++	current_alloc_state->alloc_stack_size = size;
++	current_alloc_state->alloc_stack_next = 1;
 +
-+	if (!alloc_stack)
++	if (!current_alloc_state->alloc_stack)
 +		return 0;
 +	else
 +		return 1;
@@ -67386,10 +65795,10 @@ index 0000000..bdd51ea
 +
 diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
 new file mode 100644
-index 0000000..a43dd06
+index 0000000..ca25605
 --- /dev/null
 +++ b/grsecurity/gracl_compat.c
-@@ -0,0 +1,269 @@
+@@ -0,0 +1,270 @@
 +#include <linux/kernel.h>
 +#include <linux/gracl.h>
 +#include <linux/compat.h>
@@ -67404,7 +65813,8 @@ index 0000000..a43dd06
 +        if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
 +                return -EFAULT;
 +
-+        if ((uwrapcompat.version != GRSECURITY_VERSION) ||
++        if (((uwrapcompat.version != GRSECURITY_VERSION) &&
++	     (uwrapcompat.version != 0x2901)) ||
 +	    (uwrapcompat.size != sizeof(struct gr_arg_compat)))  
 +                return -EINVAL;
 +
@@ -68098,10 +66508,10 @@ index 0000000..a340c17
 +}
 diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
 new file mode 100644
-index 0000000..8132048
+index 0000000..f056b81
 --- /dev/null
 +++ b/grsecurity/gracl_ip.c
-@@ -0,0 +1,387 @@
+@@ -0,0 +1,386 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
 +#include <asm/errno.h>
@@ -68193,6 +66603,8 @@ index 0000000..8132048
 +	return gr_sockfamilies[family];
 +}
 +
++extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
++
 +int
 +gr_search_socket(const int domain, const int type, const int protocol)
 +{
@@ -68272,10 +66684,7 @@ index 0000000..8132048
 +	if (domain == PF_INET)
 +		gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain), 
 +			    gr_socktype_to_name(type), gr_proto_to_name(protocol));
-+	else
-+#ifndef CONFIG_IPV6
-+		if (domain != PF_INET6)
-+#endif
++	else if (rcu_access_pointer(net_families[domain]) != NULL)
 +		gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain), 
 +			    gr_socktype_to_name(type), protocol);
 +
@@ -68702,6 +67111,1789 @@ index 0000000..25f54ef
 +	.release	= close_learn,
 +	.poll		= poll_learn,
 +};
+diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
+new file mode 100644
+index 0000000..36e293f
+--- /dev/null
++++ b/grsecurity/gracl_policy.c
+@@ -0,0 +1,1777 @@
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/sched.h>
++#include <linux/mm.h>
++#include <linux/file.h>
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/mount.h>
++#include <linux/tty.h>
++#include <linux/proc_fs.h>
++#include <linux/lglock.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/types.h>
++#include <linux/sysctl.h>
++#include <linux/netdevice.h>
++#include <linux/ptrace.h>
++#include <linux/gracl.h>
++#include <linux/gralloc.h>
++#include <linux/security.h>
++#include <linux/grinternal.h>
++#include <linux/pid_namespace.h>
++#include <linux/stop_machine.h>
++#include <linux/fdtable.h>
++#include <linux/percpu.h>
++#include <linux/lglock.h>
++#include <linux/hugetlb.h>
++#include <linux/posix-timers.h>
++#include "../fs/mount.h"
++
++#include <asm/uaccess.h>
++#include <asm/errno.h>
++#include <asm/mman.h>
++
++extern struct gr_policy_state *polstate;
++
++#define FOR_EACH_ROLE_START(role) \
++	role = polstate->role_list; \
++	while (role) {
++
++#define FOR_EACH_ROLE_END(role) \
++		role = role->prev; \
++	}
++
++struct path gr_real_root;
++
++extern struct gr_alloc_state *current_alloc_state;
++
++u16 acl_sp_role_value;
++
++static DEFINE_MUTEX(gr_dev_mutex);
++
++extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
++extern void gr_clear_learn_entries(void);
++
++static struct gr_arg gr_usermode;
++static unsigned char gr_system_salt[GR_SALT_LEN];
++static unsigned char gr_system_sum[GR_SHA_LEN];
++
++static unsigned int gr_auth_attempts = 0;
++static unsigned long gr_auth_expires = 0UL;
++
++struct acl_object_label *fakefs_obj_rw;
++struct acl_object_label *fakefs_obj_rwx;
++
++extern int gr_init_uidset(void);
++extern void gr_free_uidset(void);
++extern void gr_remove_uid(uid_t uid);
++extern int gr_find_uid(uid_t uid);
++
++extern struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename);
++extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
++extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
++extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
++extern struct acl_role_label *__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid, const gid_t gid);
++extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
++extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
++extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
++extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
++extern struct acl_subject_label *lookup_acl_subj_label(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
++extern struct acl_subject_label *lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev, const struct acl_role_label *role);
++extern void assign_special_role(const char *rolename);
++extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
++extern int gr_rbac_disable(void *unused);
++extern void gr_enable_rbac_system(void);
++
++static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
++{
++	if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
++{
++	if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
++{
++	if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
++{
++	if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
++{
++	if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
++{
++	if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
++{
++	if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
++{
++	if (copy_from_user(trans, userp, sizeof(struct role_transition)))
++		return -EFAULT;
++
++	return 0;
++}
++
++int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
++{
++	if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
++		return -EFAULT;
++
++	return 0;
++}
++
++static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
++{
++	if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
++		return -EFAULT;
++
++	if (((uwrap->version != GRSECURITY_VERSION) &&
++	     (uwrap->version != 0x2901)) ||
++	    (uwrap->size != sizeof(struct gr_arg)))
++		return -EINVAL;
++
++	return 0;
++}
++
++static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
++{
++	if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
++		return -EFAULT;
++
++	return 0;
++}
++
++static size_t get_gr_arg_wrapper_size_normal(void)
++{
++	return sizeof(struct gr_arg_wrapper);
++}
++
++#ifdef CONFIG_COMPAT
++extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
++extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
++extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
++extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
++extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
++extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
++extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
++extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
++extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
++extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
++extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
++extern size_t get_gr_arg_wrapper_size_compat(void);
++
++int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
++int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
++int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
++int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
++int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
++int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
++int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
++int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
++int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
++int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
++int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
++size_t (* get_gr_arg_wrapper_size)(void) __read_only;
++
++#else
++#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
++#define copy_gr_arg copy_gr_arg_normal
++#define copy_gr_hash_struct copy_gr_hash_struct_normal
++#define copy_acl_object_label copy_acl_object_label_normal
++#define copy_acl_subject_label copy_acl_subject_label_normal
++#define copy_acl_role_label copy_acl_role_label_normal
++#define copy_acl_ip_label copy_acl_ip_label_normal
++#define copy_pointer_from_array copy_pointer_from_array_normal
++#define copy_sprole_pw copy_sprole_pw_normal
++#define copy_role_transition copy_role_transition_normal
++#define copy_role_allowed_ip copy_role_allowed_ip_normal
++#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
++#endif
++
++static struct acl_subject_label *
++lookup_subject_map(const struct acl_subject_label *userp)
++{
++	unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
++	struct subject_map *match;
++
++	match = polstate->subj_map_set.s_hash[index];
++
++	while (match && match->user != userp)
++		match = match->next;
++
++	if (match != NULL)
++		return match->kernel;
++	else
++		return NULL;
++}
++
++static void
++insert_subj_map_entry(struct subject_map *subjmap)
++{
++	unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
++	struct subject_map **curr;
++
++	subjmap->prev = NULL;
++
++	curr = &polstate->subj_map_set.s_hash[index];
++	if (*curr != NULL)
++		(*curr)->prev = subjmap;
++
++	subjmap->next = *curr;
++	*curr = subjmap;
++
++	return;
++}
++
++static void
++__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
++{
++	unsigned int index =
++	    gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
++	struct acl_role_label **curr;
++	struct acl_role_label *tmp, *tmp2;
++
++	curr = &polstate->acl_role_set.r_hash[index];
++
++	/* simple case, slot is empty, just set it to our role */
++	if (*curr == NULL) {
++		*curr = role;
++	} else {
++		/* example:
++		   1 -> 2 -> 3 (adding 2 -> 3 to here)
++		   2 -> 3
++		*/
++		/* first check to see if we can already be reached via this slot */
++		tmp = *curr;
++		while (tmp && tmp != role)
++			tmp = tmp->next;
++		if (tmp == role) {
++			/* we don't need to add ourselves to this slot's chain */
++			return;
++		}
++		/* we need to add ourselves to this chain, two cases */
++		if (role->next == NULL) {
++			/* simple case, append the current chain to our role */
++			role->next = *curr;
++			*curr = role;
++		} else {
++			/* 1 -> 2 -> 3 -> 4
++			   2 -> 3 -> 4
++			   3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
++			*/			   
++			/* trickier case: walk our role's chain until we find
++			   the role for the start of the current slot's chain */
++			tmp = role;
++			tmp2 = *curr;
++			while (tmp->next && tmp->next != tmp2)
++				tmp = tmp->next;
++			if (tmp->next == tmp2) {
++				/* from example above, we found 3, so just
++				   replace this slot's chain with ours */
++				*curr = role;
++			} else {
++				/* we didn't find a subset of our role's chain
++				   in the current slot's chain, so append their
++				   chain to ours, and set us as the first role in
++				   the slot's chain
++
++				   we could fold this case with the case above,
++				   but making it explicit for clarity
++				*/
++				tmp->next = tmp2;
++				*curr = role;
++			}
++		}
++	}
++
++	return;
++}
++
++static void
++insert_acl_role_label(struct acl_role_label *role)
++{
++	int i;
++
++	if (polstate->role_list == NULL) {
++		polstate->role_list = role;
++		role->prev = NULL;
++	} else {
++		role->prev = polstate->role_list;
++		polstate->role_list = role;
++	}
++	
++	/* used for hash chains */
++	role->next = NULL;
++
++	if (role->roletype & GR_ROLE_DOMAIN) {
++		for (i = 0; i < role->domain_child_num; i++)
++			__insert_acl_role_label(role, role->domain_children[i]);
++	} else
++		__insert_acl_role_label(role, role->uidgid);
++}
++					
++static int
++insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
++{
++	struct name_entry **curr, *nentry;
++	struct inodev_entry *ientry;
++	unsigned int len = strlen(name);
++	unsigned int key = full_name_hash(name, len);
++	unsigned int index = key % polstate->name_set.n_size;
++
++	curr = &polstate->name_set.n_hash[index];
++
++	while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
++		curr = &((*curr)->next);
++
++	if (*curr != NULL)
++		return 1;
++
++	nentry = acl_alloc(sizeof (struct name_entry));
++	if (nentry == NULL)
++		return 0;
++	ientry = acl_alloc(sizeof (struct inodev_entry));
++	if (ientry == NULL)
++		return 0;
++	ientry->nentry = nentry;
++
++	nentry->key = key;
++	nentry->name = name;
++	nentry->inode = inode;
++	nentry->device = device;
++	nentry->len = len;
++	nentry->deleted = deleted;
++
++	nentry->prev = NULL;
++	curr = &polstate->name_set.n_hash[index];
++	if (*curr != NULL)
++		(*curr)->prev = nentry;
++	nentry->next = *curr;
++	*curr = nentry;
++
++	/* insert us into the table searchable by inode/dev */
++	__insert_inodev_entry(polstate, ientry);
++
++	return 1;
++}
++
++/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
++
++static void *
++create_table(__u32 * len, int elementsize)
++{
++	unsigned int table_sizes[] = {
++		7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
++		32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
++		4194301, 8388593, 16777213, 33554393, 67108859
++	};
++	void *newtable = NULL;
++	unsigned int pwr = 0;
++
++	while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
++	       table_sizes[pwr] <= *len)
++		pwr++;
++
++	if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
++		return newtable;
++
++	if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
++		newtable =
++		    kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
++	else
++		newtable = vmalloc(table_sizes[pwr] * elementsize);
++
++	*len = table_sizes[pwr];
++
++	return newtable;
++}
++
++static int
++init_variables(const struct gr_arg *arg, bool reload)
++{
++	struct task_struct *reaper = init_pid_ns.child_reaper;
++	unsigned int stacksize;
++
++	polstate->subj_map_set.s_size = arg->role_db.num_subjects;
++	polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
++	polstate->name_set.n_size = arg->role_db.num_objects;
++	polstate->inodev_set.i_size = arg->role_db.num_objects;
++
++	if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
++	    !polstate->name_set.n_size || !polstate->inodev_set.i_size)
++		return 1;
++
++	if (!reload) {
++		if (!gr_init_uidset())
++			return 1;
++	}
++
++	/* set up the stack that holds allocation info */
++
++	stacksize = arg->role_db.num_pointers + 5;
++
++	if (!acl_alloc_stack_init(stacksize))
++		return 1;
++
++	if (!reload) {
++		/* grab reference for the real root dentry and vfsmount */
++		get_fs_root(reaper->fs, &gr_real_root);
++	
++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
++	printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(gr_real_root.dentry), gr_real_root.dentry->d_inode->i_ino);
++#endif
++
++		fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
++		if (fakefs_obj_rw == NULL)
++			return 1;
++		fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
++	
++		fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
++		if (fakefs_obj_rwx == NULL)
++			return 1;
++		fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
++	}
++
++	polstate->subj_map_set.s_hash =
++	    (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
++	polstate->acl_role_set.r_hash =
++	    (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
++	polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
++	polstate->inodev_set.i_hash =
++	    (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
++
++	if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
++	    !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
++		return 1;
++
++	memset(polstate->subj_map_set.s_hash, 0,
++	       sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
++	memset(polstate->acl_role_set.r_hash, 0,
++	       sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
++	memset(polstate->name_set.n_hash, 0,
++	       sizeof (struct name_entry *) * polstate->name_set.n_size);
++	memset(polstate->inodev_set.i_hash, 0,
++	       sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
++
++	return 0;
++}
++
++/* free information not needed after startup
++   currently contains user->kernel pointer mappings for subjects
++*/
++
++static void
++free_init_variables(void)
++{
++	__u32 i;
++
++	if (polstate->subj_map_set.s_hash) {
++		for (i = 0; i < polstate->subj_map_set.s_size; i++) {
++			if (polstate->subj_map_set.s_hash[i]) {
++				kfree(polstate->subj_map_set.s_hash[i]);
++				polstate->subj_map_set.s_hash[i] = NULL;
++			}
++		}
++
++		if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
++		    PAGE_SIZE)
++			kfree(polstate->subj_map_set.s_hash);
++		else
++			vfree(polstate->subj_map_set.s_hash);
++	}
++
++	return;
++}
++
++static void
++free_variables(bool reload)
++{
++	struct acl_subject_label *s;
++	struct acl_role_label *r;
++	struct task_struct *task, *task2;
++	unsigned int x;
++
++	if (!reload) {
++		gr_clear_learn_entries();
++
++		read_lock(&tasklist_lock);
++		do_each_thread(task2, task) {
++			task->acl_sp_role = 0;
++			task->acl_role_id = 0;
++			task->inherited = 0;
++			task->acl = NULL;
++			task->role = NULL;
++		} while_each_thread(task2, task);
++		read_unlock(&tasklist_lock);
++
++		/* release the reference to the real root dentry and vfsmount */
++		path_put(&gr_real_root);
++		memset(&gr_real_root, 0, sizeof(gr_real_root));
++	}
++
++	/* free all object hash tables */
++
++	FOR_EACH_ROLE_START(r)
++		if (r->subj_hash == NULL)
++			goto next_role;
++		FOR_EACH_SUBJECT_START(r, s, x)
++			if (s->obj_hash == NULL)
++				break;
++			if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
++				kfree(s->obj_hash);
++			else
++				vfree(s->obj_hash);
++		FOR_EACH_SUBJECT_END(s, x)
++		FOR_EACH_NESTED_SUBJECT_START(r, s)
++			if (s->obj_hash == NULL)
++				break;
++			if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
++				kfree(s->obj_hash);
++			else
++				vfree(s->obj_hash);
++		FOR_EACH_NESTED_SUBJECT_END(s)
++		if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
++			kfree(r->subj_hash);
++		else
++			vfree(r->subj_hash);
++		r->subj_hash = NULL;
++next_role:
++	FOR_EACH_ROLE_END(r)
++
++	acl_free_all();
++
++	if (polstate->acl_role_set.r_hash) {
++		if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
++		    PAGE_SIZE)
++			kfree(polstate->acl_role_set.r_hash);
++		else
++			vfree(polstate->acl_role_set.r_hash);
++	}
++	if (polstate->name_set.n_hash) {
++		if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
++		    PAGE_SIZE)
++			kfree(polstate->name_set.n_hash);
++		else
++			vfree(polstate->name_set.n_hash);
++	}
++
++	if (polstate->inodev_set.i_hash) {
++		if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
++		    PAGE_SIZE)
++			kfree(polstate->inodev_set.i_hash);
++		else
++			vfree(polstate->inodev_set.i_hash);
++	}
++
++	if (!reload)
++		gr_free_uidset();
++
++	memset(&polstate->name_set, 0, sizeof (struct name_db));
++	memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
++	memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
++	memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
++
++	polstate->default_role = NULL;
++	polstate->kernel_role = NULL;
++	polstate->role_list = NULL;
++
++	return;
++}
++
++static struct acl_subject_label *
++do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
++
++static int alloc_and_copy_string(char **name, unsigned int maxlen)
++{
++	unsigned int len = strnlen_user(*name, maxlen);
++	char *tmp;
++
++	if (!len || len >= maxlen)
++		return -EINVAL;
++
++	if ((tmp = (char *) acl_alloc(len)) == NULL)
++		return -ENOMEM;
++
++	if (copy_from_user(tmp, *name, len))
++		return -EFAULT;
++
++	tmp[len-1] = '\0';
++	*name = tmp;
++
++	return 0;
++}
++
++static int
++copy_user_glob(struct acl_object_label *obj)
++{
++	struct acl_object_label *g_tmp, **guser;
++	int error;
++
++	if (obj->globbed == NULL)
++		return 0;
++
++	guser = &obj->globbed;
++	while (*guser) {
++		g_tmp = (struct acl_object_label *)
++			acl_alloc(sizeof (struct acl_object_label));
++		if (g_tmp == NULL)
++			return -ENOMEM;
++
++		if (copy_acl_object_label(g_tmp, *guser))
++			return -EFAULT;
++
++		error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
++		if (error)
++			return error;
++
++		*guser = g_tmp;
++		guser = &(g_tmp->next);
++	}
++
++	return 0;
++}
++
++static int
++copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
++	       struct acl_role_label *role)
++{
++	struct acl_object_label *o_tmp;
++	int ret;
++
++	while (userp) {
++		if ((o_tmp = (struct acl_object_label *)
++		     acl_alloc(sizeof (struct acl_object_label))) == NULL)
++			return -ENOMEM;
++
++		if (copy_acl_object_label(o_tmp, userp))
++			return -EFAULT;
++
++		userp = o_tmp->prev;
++
++		ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
++		if (ret)
++			return ret;
++
++		insert_acl_obj_label(o_tmp, subj);
++		if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
++				       o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
++			return -ENOMEM;
++
++		ret = copy_user_glob(o_tmp);
++		if (ret)
++			return ret;
++
++		if (o_tmp->nested) {
++			int already_copied;
++
++			o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
++			if (IS_ERR(o_tmp->nested))
++				return PTR_ERR(o_tmp->nested);
++
++			/* insert into nested subject list if we haven't copied this one yet
++			   to prevent duplicate entries */
++			if (!already_copied) {
++				o_tmp->nested->next = role->hash->first;
++				role->hash->first = o_tmp->nested;
++			}
++		}
++	}
++
++	return 0;
++}
++
++static __u32
++count_user_subjs(struct acl_subject_label *userp)
++{
++	struct acl_subject_label s_tmp;
++	__u32 num = 0;
++
++	while (userp) {
++		if (copy_acl_subject_label(&s_tmp, userp))
++			break;
++
++		userp = s_tmp.prev;
++	}
++
++	return num;
++}
++
++static int
++copy_user_allowedips(struct acl_role_label *rolep)
++{
++	struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
++
++	ruserip = rolep->allowed_ips;
++
++	while (ruserip) {
++		rlast = rtmp;
++
++		if ((rtmp = (struct role_allowed_ip *)
++		     acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
++			return -ENOMEM;
++
++		if (copy_role_allowed_ip(rtmp, ruserip))
++			return -EFAULT;
++
++		ruserip = rtmp->prev;
++
++		if (!rlast) {
++			rtmp->prev = NULL;
++			rolep->allowed_ips = rtmp;
++		} else {
++			rlast->next = rtmp;
++			rtmp->prev = rlast;
++		}
++
++		if (!ruserip)
++			rtmp->next = NULL;
++	}
++
++	return 0;
++}
++
++static int
++copy_user_transitions(struct acl_role_label *rolep)
++{
++	struct role_transition *rusertp, *rtmp = NULL, *rlast;
++	int error;
++
++	rusertp = rolep->transitions;
++
++	while (rusertp) {
++		rlast = rtmp;
++
++		if ((rtmp = (struct role_transition *)
++		     acl_alloc(sizeof (struct role_transition))) == NULL)
++			return -ENOMEM;
++
++		if (copy_role_transition(rtmp, rusertp))
++			return -EFAULT;
++
++		rusertp = rtmp->prev;
++
++		error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
++		if (error)
++			return error;
++
++		if (!rlast) {
++			rtmp->prev = NULL;
++			rolep->transitions = rtmp;
++		} else {
++			rlast->next = rtmp;
++			rtmp->prev = rlast;
++		}
++
++		if (!rusertp)
++			rtmp->next = NULL;
++	}
++
++	return 0;
++}
++
++static __u32 count_user_objs(const struct acl_object_label __user *userp)
++{
++	struct acl_object_label o_tmp;
++	__u32 num = 0;
++
++	while (userp) {
++		if (copy_acl_object_label(&o_tmp, userp))
++			break;
++
++		userp = o_tmp.prev;
++		num++;
++	}
++
++	return num;
++}
++
++static struct acl_subject_label *
++do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
++{
++	struct acl_subject_label *s_tmp = NULL, *s_tmp2;
++	__u32 num_objs;
++	struct acl_ip_label **i_tmp, *i_utmp2;
++	struct gr_hash_struct ghash;
++	struct subject_map *subjmap;
++	unsigned int i_num;
++	int err;
++
++	if (already_copied != NULL)
++		*already_copied = 0;
++
++	s_tmp = lookup_subject_map(userp);
++
++	/* we've already copied this subject into the kernel, just return
++	   the reference to it, and don't copy it over again
++	*/
++	if (s_tmp) {
++		if (already_copied != NULL)
++			*already_copied = 1;
++		return(s_tmp);
++	}
++
++	if ((s_tmp = (struct acl_subject_label *)
++	    acl_alloc(sizeof (struct acl_subject_label))) == NULL)
++		return ERR_PTR(-ENOMEM);
++
++	subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
++	if (subjmap == NULL)
++		return ERR_PTR(-ENOMEM);
++
++	subjmap->user = userp;
++	subjmap->kernel = s_tmp;
++	insert_subj_map_entry(subjmap);
++
++	if (copy_acl_subject_label(s_tmp, userp))
++		return ERR_PTR(-EFAULT);
++
++	err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
++	if (err)
++		return ERR_PTR(err);
++
++	if (!strcmp(s_tmp->filename, "/"))
++		role->root_label = s_tmp;
++
++	if (copy_gr_hash_struct(&ghash, s_tmp->hash))
++		return ERR_PTR(-EFAULT);
++
++	/* copy user and group transition tables */
++
++	if (s_tmp->user_trans_num) {
++		uid_t *uidlist;
++
++		uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
++		if (uidlist == NULL)
++			return ERR_PTR(-ENOMEM);
++		if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
++			return ERR_PTR(-EFAULT);
++
++		s_tmp->user_transitions = uidlist;
++	}
++
++	if (s_tmp->group_trans_num) {
++		gid_t *gidlist;
++
++		gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
++		if (gidlist == NULL)
++			return ERR_PTR(-ENOMEM);
++		if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
++			return ERR_PTR(-EFAULT);
++
++		s_tmp->group_transitions = gidlist;
++	}
++
++	/* set up object hash table */
++	num_objs = count_user_objs(ghash.first);
++
++	s_tmp->obj_hash_size = num_objs;
++	s_tmp->obj_hash =
++	    (struct acl_object_label **)
++	    create_table(&(s_tmp->obj_hash_size), sizeof(void *));
++
++	if (!s_tmp->obj_hash)
++		return ERR_PTR(-ENOMEM);
++
++	memset(s_tmp->obj_hash, 0,
++	       s_tmp->obj_hash_size *
++	       sizeof (struct acl_object_label *));
++
++	/* add in objects */
++	err = copy_user_objs(ghash.first, s_tmp, role);
++
++	if (err)
++		return ERR_PTR(err);
++
++	/* set pointer for parent subject */
++	if (s_tmp->parent_subject) {
++		s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
++
++		if (IS_ERR(s_tmp2))
++			return s_tmp2;
++
++		s_tmp->parent_subject = s_tmp2;
++	}
++
++	/* add in ip acls */
++
++	if (!s_tmp->ip_num) {
++		s_tmp->ips = NULL;
++		goto insert;
++	}
++
++	i_tmp =
++	    (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
++					       sizeof (struct acl_ip_label *));
++
++	if (!i_tmp)
++		return ERR_PTR(-ENOMEM);
++
++	for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
++		*(i_tmp + i_num) =
++		    (struct acl_ip_label *)
++		    acl_alloc(sizeof (struct acl_ip_label));
++		if (!*(i_tmp + i_num))
++			return ERR_PTR(-ENOMEM);
++
++		if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
++			return ERR_PTR(-EFAULT);
++
++		if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
++			return ERR_PTR(-EFAULT);
++		
++		if ((*(i_tmp + i_num))->iface == NULL)
++			continue;
++
++		err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
++		if (err)
++			return ERR_PTR(err);
++	}
++
++	s_tmp->ips = i_tmp;
++
++insert:
++	if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
++			       s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
++		return ERR_PTR(-ENOMEM);
++
++	return s_tmp;
++}
++
++static int
++copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
++{
++	struct acl_subject_label s_pre;
++	struct acl_subject_label * ret;
++	int err;
++
++	while (userp) {
++		if (copy_acl_subject_label(&s_pre, userp))
++			return -EFAULT;
++		
++		ret = do_copy_user_subj(userp, role, NULL);
++
++		err = PTR_ERR(ret);
++		if (IS_ERR(ret))
++			return err;
++
++		insert_acl_subj_label(ret, role);
++
++		userp = s_pre.prev;
++	}
++
++	return 0;
++}
++
++static int
++copy_user_acl(struct gr_arg *arg)
++{
++	struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
++	struct acl_subject_label *subj_list;
++	struct sprole_pw *sptmp;
++	struct gr_hash_struct *ghash;
++	uid_t *domainlist;
++	unsigned int r_num;
++	int err = 0;
++	__u16 i;
++	__u32 num_subjs;
++
++	/* we need a default and kernel role */
++	if (arg->role_db.num_roles < 2)
++		return -EINVAL;
++
++	/* copy special role authentication info from userspace */
++
++	polstate->num_sprole_pws = arg->num_sprole_pws;
++	polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
++
++	if (!polstate->acl_special_roles && polstate->num_sprole_pws)
++		return -ENOMEM;
++
++	for (i = 0; i < polstate->num_sprole_pws; i++) {
++		sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
++		if (!sptmp)
++			return -ENOMEM;
++		if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
++			return -EFAULT;
++
++		err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
++		if (err)
++			return err;
++
++#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
++		printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
++#endif
++
++		polstate->acl_special_roles[i] = sptmp;
++	}
++
++	r_utmp = (struct acl_role_label **) arg->role_db.r_table;
++
++	for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
++		r_tmp = acl_alloc(sizeof (struct acl_role_label));
++
++		if (!r_tmp)
++			return -ENOMEM;
++
++		if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
++			return -EFAULT;
++
++		if (copy_acl_role_label(r_tmp, r_utmp2))
++			return -EFAULT;
++
++		err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
++		if (err)
++			return err;
++
++		if (!strcmp(r_tmp->rolename, "default")
++		    && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
++			polstate->default_role = r_tmp;
++		} else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
++			polstate->kernel_role = r_tmp;
++		}
++
++		if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
++			return -ENOMEM;
++
++		if (copy_gr_hash_struct(ghash, r_tmp->hash))
++			return -EFAULT;
++
++		r_tmp->hash = ghash;
++
++		num_subjs = count_user_subjs(r_tmp->hash->first);
++
++		r_tmp->subj_hash_size = num_subjs;
++		r_tmp->subj_hash =
++		    (struct acl_subject_label **)
++		    create_table(&(r_tmp->subj_hash_size), sizeof(void *));
++
++		if (!r_tmp->subj_hash)
++			return -ENOMEM;
++
++		err = copy_user_allowedips(r_tmp);
++		if (err)
++			return err;
++
++		/* copy domain info */
++		if (r_tmp->domain_children != NULL) {
++			domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
++			if (domainlist == NULL)
++				return -ENOMEM;
++
++			if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
++				return -EFAULT;
++
++			r_tmp->domain_children = domainlist;
++		}
++
++		err = copy_user_transitions(r_tmp);
++		if (err)
++			return err;
++
++		memset(r_tmp->subj_hash, 0,
++		       r_tmp->subj_hash_size *
++		       sizeof (struct acl_subject_label *));
++
++		/* acquire the list of subjects, then NULL out
++		   the list prior to parsing the subjects for this role,
++		   as during this parsing the list is replaced with a list
++		   of *nested* subjects for the role
++		*/
++		subj_list = r_tmp->hash->first;
++
++		/* set nested subject list to null */
++		r_tmp->hash->first = NULL;
++
++		err = copy_user_subjs(subj_list, r_tmp);
++
++		if (err)
++			return err;
++
++		insert_acl_role_label(r_tmp);
++	}
++
++	if (polstate->default_role == NULL || polstate->kernel_role == NULL)
++		return -EINVAL;
++
++	return err;
++}
++
++static int gracl_reload_apply_policies(void *reload)
++{
++	struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
++	struct task_struct *task, *task2;
++	struct acl_role_label *role, *rtmp;
++	struct acl_subject_label *subj;
++	const struct cred *cred;
++	int role_applied;
++	int ret = 0;
++
++	memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
++	memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
++
++	/* first make sure we'll be able to apply the new policy cleanly */
++	do_each_thread(task2, task) {
++		if (task->exec_file == NULL)
++			continue;
++		role_applied = 0;
++		if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
++			/* preserve special roles */
++			FOR_EACH_ROLE_START(role)
++				if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
++					rtmp = task->role;
++					task->role = role;
++					role_applied = 1;
++					break;
++				}
++			FOR_EACH_ROLE_END(role)
++		}
++		if (!role_applied) {
++			cred = __task_cred(task);
++			rtmp = task->role;
++			task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
++		}
++		/* this handles non-nested inherited subjects, nested subjects will still
++		   be dropped currently */
++		subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
++		task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL);
++		/* change the role back so that we've made no modifications to the policy */
++		task->role = rtmp;
++
++		if (subj == NULL || task->tmpacl == NULL) {
++			ret = -EINVAL;
++			goto out;
++		}
++	} while_each_thread(task2, task);
++
++	/* now actually apply the policy */
++
++	do_each_thread(task2, task) {
++		if (task->exec_file) {
++			role_applied = 0;
++			if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
++				/* preserve special roles */
++				FOR_EACH_ROLE_START(role)
++					if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
++						task->role = role;
++						role_applied = 1;
++						break;
++					}
++				FOR_EACH_ROLE_END(role)
++			}
++			if (!role_applied) {
++				cred = __task_cred(task);
++				task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
++			}
++			/* this handles non-nested inherited subjects, nested subjects will still
++			   be dropped currently */
++			if (!reload_state->oldmode && task->inherited)
++				subj = __gr_get_subject_for_task(polstate, task, task->acl->filename);
++			else {
++				/* looked up and tagged to the task previously */
++				subj = task->tmpacl;
++			}
++			/* subj will be non-null */
++			__gr_apply_subject_to_task(polstate, task, subj);
++			if (reload_state->oldmode) {
++				task->acl_role_id = 0;
++				task->acl_sp_role = 0;
++				task->inherited = 0;
++			}
++		} else {
++			// it's a kernel process
++			task->role = polstate->kernel_role;
++			task->acl = polstate->kernel_role->root_label;
++#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
++			task->acl->mode &= ~GR_PROCFIND;
++#endif
++		}
++	} while_each_thread(task2, task);
++
++	memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
++	memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
++
++out:
++
++	return ret;
++}
++
++static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
++{
++	struct gr_reload_state new_reload_state = { };
++	int err;
++
++	new_reload_state.oldpolicy_ptr = polstate;
++	new_reload_state.oldalloc_ptr = current_alloc_state;
++	new_reload_state.oldmode = oldmode;
++
++	current_alloc_state = &new_reload_state.newalloc;
++	polstate = &new_reload_state.newpolicy;
++
++	/* everything relevant is now saved off, copy in the new policy */
++	if (init_variables(args, true)) {
++		gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
++		err = -ENOMEM;
++		goto error;
++	}
++
++	err = copy_user_acl(args);
++	free_init_variables();
++	if (err)
++		goto error;
++	/* the new policy is copied in, with the old policy available via saved_state
++	   first go through applying roles, making sure to preserve special roles
++	   then apply new subjects, making sure to preserve inherited and nested subjects,
++	   though currently only inherited subjects will be preserved
++	*/
++	err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
++	if (err)
++		goto error;
++
++	/* we've now applied the new policy, so restore the old policy state to free it */
++	polstate = &new_reload_state.oldpolicy;
++	current_alloc_state = &new_reload_state.oldalloc;
++	free_variables(true);
++
++	/* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
++	   to running_polstate/current_alloc_state inside stop_machine
++	*/
++	err = 0;
++	goto out;
++error:
++	/* on error of loading the new policy, we'll just keep the previous
++	   policy set around
++	*/
++	free_variables(true);
++
++	/* doesn't affect runtime, but maintains consistent state */
++out:
++	polstate = new_reload_state.oldpolicy_ptr;
++	current_alloc_state = new_reload_state.oldalloc_ptr;
++
++	return err;
++}
++
++static int
++gracl_init(struct gr_arg *args)
++{
++	int error = 0;
++
++	memcpy(&gr_system_salt, args->salt, sizeof(gr_system_salt));
++	memcpy(&gr_system_sum, args->sum, sizeof(gr_system_sum));
++
++	if (init_variables(args, false)) {
++		gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
++		error = -ENOMEM;
++		goto out;
++	}
++
++	error = copy_user_acl(args);
++	free_init_variables();
++	if (error)
++		goto out;
++
++	error = gr_set_acls(0);
++	if (error)
++		goto out;
++
++	gr_enable_rbac_system();
++
++	return 0;
++
++out:
++	free_variables(false);
++	return error;
++}
++
++static int
++lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
++			 unsigned char **sum)
++{
++	struct acl_role_label *r;
++	struct role_allowed_ip *ipp;
++	struct role_transition *trans;
++	unsigned int i;
++	int found = 0;
++	u32 curr_ip = current->signal->curr_ip;
++
++	current->signal->saved_ip = curr_ip;
++
++	/* check transition table */
++
++	for (trans = current->role->transitions; trans; trans = trans->next) {
++		if (!strcmp(rolename, trans->rolename)) {
++			found = 1;
++			break;
++		}
++	}
++
++	if (!found)
++		return 0;
++
++	/* handle special roles that do not require authentication
++	   and check ip */
++
++	FOR_EACH_ROLE_START(r)
++		if (!strcmp(rolename, r->rolename) &&
++		    (r->roletype & GR_ROLE_SPECIAL)) {
++			found = 0;
++			if (r->allowed_ips != NULL) {
++				for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
++					if ((ntohl(curr_ip) & ipp->netmask) ==
++					     (ntohl(ipp->addr) & ipp->netmask))
++						found = 1;
++				}
++			} else
++				found = 2;
++			if (!found)
++				return 0;
++
++			if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
++			    ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
++				*salt = NULL;
++				*sum = NULL;
++				return 1;
++			}
++		}
++	FOR_EACH_ROLE_END(r)
++
++	for (i = 0; i < polstate->num_sprole_pws; i++) {
++		if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
++			*salt = polstate->acl_special_roles[i]->salt;
++			*sum = polstate->acl_special_roles[i]->sum;
++			return 1;
++		}
++	}
++
++	return 0;
++}
++
++int gr_check_secure_terminal(struct task_struct *task)
++{
++	struct task_struct *p, *p2, *p3;
++	struct files_struct *files;
++	struct fdtable *fdt;
++	struct file *our_file = NULL, *file;
++	int i;
++
++	if (task->signal->tty == NULL)
++		return 1;
++
++	files = get_files_struct(task);
++	if (files != NULL) {
++		rcu_read_lock();
++		fdt = files_fdtable(files);
++		for (i=0; i < fdt->max_fds; i++) {
++			file = fcheck_files(files, i);
++			if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
++				get_file(file);
++				our_file = file;
++			}
++		}
++		rcu_read_unlock();
++		put_files_struct(files);
++	}
++
++	if (our_file == NULL)
++		return 1;
++
++	read_lock(&tasklist_lock);
++	do_each_thread(p2, p) {
++		files = get_files_struct(p);
++		if (files == NULL ||
++		    (p->signal && p->signal->tty == task->signal->tty)) {
++			if (files != NULL)
++				put_files_struct(files);
++			continue;
++		}
++		rcu_read_lock();
++		fdt = files_fdtable(files);
++		for (i=0; i < fdt->max_fds; i++) {
++			file = fcheck_files(files, i);
++			if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
++			    file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
++				p3 = task;
++				while (task_pid_nr(p3) > 0) {
++					if (p3 == p)
++						break;
++					p3 = p3->real_parent;
++				}
++				if (p3 == p)
++					break;
++				gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
++				gr_handle_alertkill(p);
++				rcu_read_unlock();
++				put_files_struct(files);
++				read_unlock(&tasklist_lock);
++				fput(our_file);
++				return 0;
++			}
++		}
++		rcu_read_unlock();
++		put_files_struct(files);
++	} while_each_thread(p2, p);
++	read_unlock(&tasklist_lock);
++
++	fput(our_file);
++	return 1;
++}
++
++ssize_t
++write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
++{
++	struct gr_arg_wrapper uwrap;
++	unsigned char *sprole_salt = NULL;
++	unsigned char *sprole_sum = NULL;
++	int error = 0;
++	int error2 = 0;
++	size_t req_count = 0;
++	unsigned char oldmode = 0;
++
++	mutex_lock(&gr_dev_mutex);
++
++	if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
++		error = -EPERM;
++		goto out;
++	}
++
++#ifdef CONFIG_COMPAT
++	pax_open_kernel();
++	if (is_compat_task()) {
++		copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
++		copy_gr_arg = &copy_gr_arg_compat;
++		copy_acl_object_label = &copy_acl_object_label_compat;
++		copy_acl_subject_label = &copy_acl_subject_label_compat;
++		copy_acl_role_label = &copy_acl_role_label_compat;
++		copy_acl_ip_label = &copy_acl_ip_label_compat;
++		copy_role_allowed_ip = &copy_role_allowed_ip_compat;
++		copy_role_transition = &copy_role_transition_compat;
++		copy_sprole_pw = &copy_sprole_pw_compat;
++		copy_gr_hash_struct = &copy_gr_hash_struct_compat;
++		copy_pointer_from_array = &copy_pointer_from_array_compat;
++		get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
++	} else {
++		copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
++		copy_gr_arg = &copy_gr_arg_normal;
++		copy_acl_object_label = &copy_acl_object_label_normal;
++		copy_acl_subject_label = &copy_acl_subject_label_normal;
++		copy_acl_role_label = &copy_acl_role_label_normal;
++		copy_acl_ip_label = &copy_acl_ip_label_normal;
++		copy_role_allowed_ip = &copy_role_allowed_ip_normal;
++		copy_role_transition = &copy_role_transition_normal;
++		copy_sprole_pw = &copy_sprole_pw_normal;
++		copy_gr_hash_struct = &copy_gr_hash_struct_normal;
++		copy_pointer_from_array = &copy_pointer_from_array_normal;
++		get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
++	}
++	pax_close_kernel();
++#endif
++
++	req_count = get_gr_arg_wrapper_size();
++
++	if (count != req_count) {
++		gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
++		error = -EINVAL;
++		goto out;
++	}
++
++	
++	if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
++		gr_auth_expires = 0;
++		gr_auth_attempts = 0;
++	}
++
++	error = copy_gr_arg_wrapper(buf, &uwrap);
++	if (error)
++		goto out;
++
++	error = copy_gr_arg(uwrap.arg, &gr_usermode);
++	if (error)
++		goto out;
++
++	if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_SPROLEPAM &&
++	    gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
++	    time_after(gr_auth_expires, get_seconds())) {
++		error = -EBUSY;
++		goto out;
++	}
++
++	/* if non-root trying to do anything other than use a special role,
++	   do not attempt authentication, do not count towards authentication
++	   locking
++	 */
++
++	if (gr_usermode.mode != GR_SPROLE && gr_usermode.mode != GR_STATUS &&
++	    gr_usermode.mode != GR_UNSPROLE && gr_usermode.mode != GR_SPROLEPAM &&
++	    gr_is_global_nonroot(current_uid())) {
++		error = -EPERM;
++		goto out;
++	}
++
++	/* ensure pw and special role name are null terminated */
++
++	gr_usermode.pw[GR_PW_LEN - 1] = '\0';
++	gr_usermode.sp_role[GR_SPROLE_LEN - 1] = '\0';
++
++	/* Okay. 
++	 * We have our enough of the argument structure..(we have yet
++	 * to copy_from_user the tables themselves) . Copy the tables
++	 * only if we need them, i.e. for loading operations. */
++
++	switch (gr_usermode.mode) {
++	case GR_STATUS:
++			if (gr_acl_is_enabled()) {
++				error = 1;
++				if (!gr_check_secure_terminal(current))
++					error = 3;
++			} else
++				error = 2;
++			goto out;
++	case GR_SHUTDOWN:
++		if (gr_acl_is_enabled() && !(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
++			stop_machine(gr_rbac_disable, NULL, NULL);
++			free_variables(false);
++			memset(&gr_usermode, 0, sizeof(gr_usermode));
++			memset(&gr_system_salt, 0, sizeof(gr_system_salt));
++			memset(&gr_system_sum, 0, sizeof(gr_system_sum));
++			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
++		} else if (gr_acl_is_enabled()) {
++			gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
++			error = -EPERM;
++		} else {
++			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
++			error = -EAGAIN;
++		}
++		break;
++	case GR_ENABLE:
++		if (!gr_acl_is_enabled() && !(error2 = gracl_init(&gr_usermode)))
++			gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
++		else {
++			if (gr_acl_is_enabled())
++				error = -EAGAIN;
++			else
++				error = error2;
++			gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
++		}
++		break;
++	case GR_OLDRELOAD:
++		oldmode = 1;
++	case GR_RELOAD:
++		if (!gr_acl_is_enabled()) {
++			gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
++			error = -EAGAIN;
++		} else if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
++			error2 = gracl_reload(&gr_usermode, oldmode);
++			if (!error2)
++				gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
++			else {
++				gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
++				error = error2;
++			}
++		} else {
++			gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
++			error = -EPERM;
++		}
++		break;
++	case GR_SEGVMOD:
++		if (unlikely(!gr_acl_is_enabled())) {
++			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
++			error = -EAGAIN;
++			break;
++		}
++
++		if (!(chkpw(&gr_usermode, (unsigned char *)&gr_system_salt, (unsigned char *)&gr_system_sum))) {
++			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
++			if (gr_usermode.segv_device && gr_usermode.segv_inode) {
++				struct acl_subject_label *segvacl;
++				segvacl =
++				    lookup_acl_subj_label(gr_usermode.segv_inode,
++							  gr_usermode.segv_device,
++							  current->role);
++				if (segvacl) {
++					segvacl->crashes = 0;
++					segvacl->expires = 0;
++				}
++			} else if (gr_find_uid(gr_usermode.segv_uid) >= 0) {
++				gr_remove_uid(gr_usermode.segv_uid);
++			}
++		} else {
++			gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
++			error = -EPERM;
++		}
++		break;
++	case GR_SPROLE:
++	case GR_SPROLEPAM:
++		if (unlikely(!gr_acl_is_enabled())) {
++			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
++			error = -EAGAIN;
++			break;
++		}
++
++		if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
++			current->role->expires = 0;
++			current->role->auth_attempts = 0;
++		}
++
++		if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
++		    time_after(current->role->expires, get_seconds())) {
++			error = -EBUSY;
++			goto out;
++		}
++
++		if (lookup_special_role_auth
++		    (gr_usermode.mode, gr_usermode.sp_role, &sprole_salt, &sprole_sum)
++		    && ((!sprole_salt && !sprole_sum)
++			|| !(chkpw(&gr_usermode, sprole_salt, sprole_sum)))) {
++			char *p = "";
++			assign_special_role(gr_usermode.sp_role);
++			read_lock(&tasklist_lock);
++			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);
++		} else {
++			gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode.sp_role);
++			error = -EPERM;
++			if(!(current->role->auth_attempts++))
++				current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
++
++			goto out;
++		}
++		break;
++	case GR_UNSPROLE:
++		if (unlikely(!gr_acl_is_enabled())) {
++			gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
++			error = -EAGAIN;
++			break;
++		}
++
++		if (current->role->roletype & GR_ROLE_SPECIAL) {
++			char *p = "";
++			int i = 0;
++
++			read_lock(&tasklist_lock);
++			if (current->real_parent) {
++				p = current->real_parent->role->rolename;
++				i = current->real_parent->acl_role_id;
++			}
++			read_unlock(&tasklist_lock);
++
++			gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
++			gr_set_acls(1);
++		} else {
++			error = -EPERM;
++			goto out;
++		}
++		break;
++	default:
++		gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode.mode);
++		error = -EINVAL;
++		break;
++	}
++
++	if (error != -EPERM)
++		goto out;
++
++	if(!(gr_auth_attempts++))
++		gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
++
++      out:
++	mutex_unlock(&gr_dev_mutex);
++
++	if (!error)
++		error = req_count;
++
++	return error;
++}
++
++int
++gr_set_acls(const int type)
++{
++	struct task_struct *task, *task2;
++	struct acl_role_label *role = current->role;
++	struct acl_subject_label *subj;
++	__u16 acl_role_id = current->acl_role_id;
++	const struct cred *cred;
++	int ret;
++
++	rcu_read_lock();
++	read_lock(&tasklist_lock);
++	read_lock(&grsec_exec_file_lock);
++	do_each_thread(task2, task) {
++		/* check to see if we're called from the exit handler,
++		   if so, only replace ACLs that have inherited the admin
++		   ACL */
++
++		if (type && (task->role != role ||
++			     task->acl_role_id != acl_role_id))
++			continue;
++
++		task->acl_role_id = 0;
++		task->acl_sp_role = 0;
++		task->inherited = 0;
++
++		if (task->exec_file) {
++			cred = __task_cred(task);
++			task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
++			subj = __gr_get_subject_for_task(polstate, task, NULL);
++			if (subj == NULL) {
++				ret = -EINVAL;
++				read_unlock(&grsec_exec_file_lock);
++				read_unlock(&tasklist_lock);
++				rcu_read_unlock();
++				gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
++				return ret;
++			}
++			__gr_apply_subject_to_task(polstate, task, subj);
++		} else {
++			// it's a kernel process
++			task->role = polstate->kernel_role;
++			task->acl = polstate->kernel_role->root_label;
++#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
++			task->acl->mode &= ~GR_PROCFIND;
++#endif
++		}
++	} while_each_thread(task2, task);
++	read_unlock(&grsec_exec_file_lock);
++	read_unlock(&tasklist_lock);
++	rcu_read_unlock();
++
++	return 0;
++}
 diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
 new file mode 100644
 index 0000000..39645c9
@@ -68778,10 +68970,10 @@ index 0000000..39645c9
 +}
 diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
 new file mode 100644
-index 0000000..3c38bfe
+index 0000000..2040e61
 --- /dev/null
 +++ b/grsecurity/gracl_segv.c
-@@ -0,0 +1,305 @@
+@@ -0,0 +1,313 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
 +#include <asm/uaccess.h>
@@ -68838,8 +69030,16 @@ index 0000000..3c38bfe
 +void
 +gr_free_uidset(void)
 +{
-+	if (uid_set)
-+		kfree(uid_set);
++	if (uid_set) {
++		struct crash_uid *tmpset;
++		spin_lock(&gr_uid_lock);
++		tmpset = uid_set;
++		uid_set = NULL;
++		uid_used = 0;
++		spin_unlock(&gr_uid_lock);
++		if (tmpset)
++			kfree(tmpset);
++	}
 +
 +	return;
 +}
@@ -69160,7 +69360,7 @@ index 0000000..bc0be01
 +}
 diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
 new file mode 100644
-index 0000000..bd6e105
+index 0000000..e10b319
 --- /dev/null
 +++ b/grsecurity/grsec_chroot.c
 @@ -0,0 +1,370 @@
@@ -69176,7 +69376,7 @@ index 0000000..bd6e105
 +#include <linux/grinternal.h>
 +
 +#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
-+static int gr_init_ran;
++int gr_init_ran;
 +#endif
 +
 +void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
@@ -69536,10 +69736,10 @@ index 0000000..bd6e105
 +}
 diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
 new file mode 100644
-index 0000000..ce65ceb
+index 0000000..0866ab2
 --- /dev/null
 +++ b/grsecurity/grsec_disabled.c
-@@ -0,0 +1,434 @@
+@@ -0,0 +1,427 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -69936,12 +70136,6 @@ index 0000000..ce65ceb
 +	return 0;
 +}
 +
-+void
-+gr_set_kernel_label(struct task_struct *task)
-+{
-+	return;
-+}
-+
 +int
 +gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
 +{
@@ -69969,7 +70163,6 @@ index 0000000..ce65ceb
 +	return;
 +}
 +
-+EXPORT_SYMBOL(gr_set_kernel_label);
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
@@ -70228,10 +70421,10 @@ index 0000000..8ca18bf
 +}
 diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
 new file mode 100644
-index 0000000..99a0cb9
+index 0000000..a88e901
 --- /dev/null
 +++ b/grsecurity/grsec_init.c
-@@ -0,0 +1,283 @@
+@@ -0,0 +1,272 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/mm.h>
@@ -70249,6 +70442,7 @@ index 0000000..99a0cb9
 +int grsec_enable_link;
 +int grsec_enable_dmesg;
 +int grsec_enable_harden_ptrace;
++int grsec_enable_harden_ipc;
 +int grsec_enable_fifo;
 +int grsec_enable_execlog;
 +int grsec_enable_signal;
@@ -70310,10 +70504,6 @@ index 0000000..99a0cb9
 +char *gr_alert_log_buf;
 +char *gr_audit_log_buf;
 +
-+extern struct gr_arg *gr_usermode;
-+extern unsigned char *gr_system_salt;
-+extern unsigned char *gr_system_sum;
-+
 +void __init
 +grsecurity_init(void)
 +{
@@ -70354,17 +70544,6 @@ index 0000000..99a0cb9
 +		return;
 +	}
 +
-+	/* allocate memory for authentication structure */
-+	gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
-+	gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
-+	gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
-+
-+	if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
-+		panic("Unable to allocate grsecurity authentication structure");
-+		return;
-+	}
-+
-+
 +#ifdef CONFIG_GRKERNSEC_IO
 +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
 +	grsec_disable_privio = 1;
@@ -70403,6 +70582,9 @@ index 0000000..99a0cb9
 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
 +	grsec_enable_harden_ptrace = 1;
 +#endif
++#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
++	grsec_enable_harden_ipc = 1;
++#endif
 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
 +	grsec_enable_mount = 1;
 +#endif
@@ -70515,6 +70697,34 @@ index 0000000..99a0cb9
 +
 +	return;
 +}
+diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
+new file mode 100644
+index 0000000..f365de0
+--- /dev/null
++++ b/grsecurity/grsec_ipc.c
+@@ -0,0 +1,22 @@
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/sched.h>
++#include <linux/file.h>
++#include <linux/ipc.h>
++#include <linux/ipc_namespace.h>
++#include <linux/grsecurity.h>
++#include <linux/grinternal.h>
++
++int
++gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
++{
++#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
++	int write = (requested_mode & 00002);
++
++	if (grsec_enable_harden_ipc && !(requested_mode & ~granted_mode & 0007) && !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
++		gr_log_str2_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", write ? "writ" : "read", GR_GLOBAL_UID(ipcp->cuid));
++		return 0;
++	}
++#endif
++	return 1;
++}
 diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
 new file mode 100644
 index 0000000..5e05e20
@@ -71129,10 +71339,10 @@ index 0000000..f7f29aa
 +}
 diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
 new file mode 100644
-index 0000000..4e29cc7
+index 0000000..3860c7e
 --- /dev/null
 +++ b/grsecurity/grsec_sig.c
-@@ -0,0 +1,246 @@
+@@ -0,0 +1,236 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/fs.h>
@@ -71209,20 +71419,10 @@ index 0000000..4e29cc7
 +}
 +#endif
 +
-+#ifdef CONFIG_GRKERNSEC_BRUTE
 +#define GR_USER_BAN_TIME (15 * 60)
 +#define GR_DAEMON_BRUTE_TIME (30 * 60)
 +
-+static int __get_dumpable(unsigned long mm_flags)
-+{
-+	int ret;
-+
-+	ret = mm_flags & MMF_DUMPABLE_MASK;
-+	return (ret >= 2) ? 2 : ret;
-+}
-+#endif
-+
-+void gr_handle_brute_attach(unsigned long mm_flags)
++void gr_handle_brute_attach(int dumpable)
 +{
 +#ifdef CONFIG_GRKERNSEC_BRUTE
 +	struct task_struct *p = current;
@@ -71243,7 +71443,7 @@ index 0000000..4e29cc7
 +		const struct cred *cred = __task_cred(p), *cred2;
 +		struct task_struct *tsk, *tsk2;
 +
-+		if (!__get_dumpable(mm_flags) && gr_is_global_nonroot(cred->uid)) {
++		if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
 +			struct user_struct *user;
 +
 +			uid = cred->uid;
@@ -71631,10 +71831,10 @@ index 0000000..4030d57
 +}
 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
 new file mode 100644
-index 0000000..a147ae7
+index 0000000..8159888
 --- /dev/null
 +++ b/grsecurity/grsec_sysctl.c
-@@ -0,0 +1,470 @@
+@@ -0,0 +1,479 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/sysctl.h>
@@ -72074,6 +72274,15 @@ index 0000000..a147ae7
 +		.proc_handler	= &proc_dointvec,
 +	},
 +#endif
++#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
++	{
++		.procname	= "harden_ipc",
++		.data		= &grsec_enable_harden_ipc,
++		.maxlen		= sizeof(int),
++		.mode		= 0600,
++		.proc_handler	= &proc_dointvec,
++	},
++#endif
 +	{
 +		.procname	= "grsec_lock",
 +		.data		= &grsec_lock,
@@ -72695,6 +72904,54 @@ index b18ce4f..2ee2843 100644
 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
 +
  #endif  /*  _ASM_GENERIC_ATOMIC64_H  */
+diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
+index a60a7cc..0fe12f2 100644
+--- a/include/asm-generic/bitops/__fls.h
++++ b/include/asm-generic/bitops/__fls.h
+@@ -9,7 +9,7 @@
+  *
+  * Undefined if no set bit exists, so code should check against 0 first.
+  */
+-static __always_inline unsigned long __fls(unsigned long word)
++static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
+ {
+ 	int num = BITS_PER_LONG - 1;
+ 
+diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
+index 0576d1f..dad6c71 100644
+--- a/include/asm-generic/bitops/fls.h
++++ b/include/asm-generic/bitops/fls.h
+@@ -9,7 +9,7 @@
+  * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
+  */
+ 
+-static __always_inline int fls(int x)
++static __always_inline int __intentional_overflow(-1) fls(int x)
+ {
+ 	int r = 32;
+ 
+diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
+index b097cf8..3d40e14 100644
+--- a/include/asm-generic/bitops/fls64.h
++++ b/include/asm-generic/bitops/fls64.h
+@@ -15,7 +15,7 @@
+  * at position 64.
+  */
+ #if BITS_PER_LONG == 32
+-static __always_inline int fls64(__u64 x)
++static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
+ {
+ 	__u32 h = x >> 32;
+ 	if (h)
+@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
+ 	return fls(x);
+ }
+ #elif BITS_PER_LONG == 64
+-static __always_inline int fls64(__u64 x)
++static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
+ {
+ 	if (x == 0)
+ 		return 0;
 diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
 index 1bfcfe5..e04c5c9 100644
 --- a/include/asm-generic/cache.h
@@ -72863,46 +73120,62 @@ index 810431d..0ec4804f 100644
   * (puds are folded into pgds so this doesn't get actually called,
   * but the define is needed for a generic inline function.)
 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
-index a59ff51..2594a70 100644
+index f330d28..83ce28f 100644
 --- a/include/asm-generic/pgtable.h
 +++ b/include/asm-generic/pgtable.h
-@@ -688,6 +688,14 @@ static inline pmd_t pmd_mknuma(pmd_t pmd)
+@@ -737,6 +737,22 @@ static inline pmd_t pmd_mknuma(pmd_t pmd)
  }
  #endif /* CONFIG_NUMA_BALANCING */
  
 +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
++#ifdef CONFIG_PAX_KERNEXEC
++#error KERNEXEC requires pax_open_kernel
++#else
 +static inline unsigned long pax_open_kernel(void) { return 0; }
 +#endif
++#endif
 +
 +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
++#ifdef CONFIG_PAX_KERNEXEC
++#error KERNEXEC requires pax_close_kernel
++#else
 +static inline unsigned long pax_close_kernel(void) { return 0; }
 +#endif
++#endif
 +
  #endif /* CONFIG_MMU */
  
  #endif /* !__ASSEMBLY__ */
 diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
-index c184aa8..d049942 100644
+index dc1269c..48a4f51 100644
 --- a/include/asm-generic/uaccess.h
 +++ b/include/asm-generic/uaccess.h
-@@ -343,4 +343,12 @@ clear_user(void __user *to, unsigned long n)
+@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
  	return __clear_user(to, n);
  }
  
 +#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
-+//static inline unsigned long pax_open_userland(void) { return 0; }
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++#error UDEREF requires pax_open_userland
++#else
++static inline unsigned long pax_open_userland(void) { return 0; }
++#endif
 +#endif
 +
 +#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
-+//static inline unsigned long pax_close_userland(void) { return 0; }
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++#error UDEREF requires pax_close_userland
++#else
++static inline unsigned long pax_close_userland(void) { return 0; }
++#endif
 +#endif
 +
  #endif /* __ASM_GENERIC_UACCESS_H */
 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
-index eb58d2d..df131bf 100644
+index 83e2c31..eeb4a04 100644
 --- a/include/asm-generic/vmlinux.lds.h
 +++ b/include/asm-generic/vmlinux.lds.h
-@@ -239,6 +239,7 @@
+@@ -232,6 +232,7 @@
  	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\
  		VMLINUX_SYMBOL(__start_rodata) = .;			\
  		*(.rodata) *(.rodata.*)					\
@@ -72910,7 +73183,7 @@ index eb58d2d..df131bf 100644
  		*(__vermagic)		/* Kernel version magic */	\
  		. = ALIGN(8);						\
  		VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .;		\
-@@ -749,17 +750,18 @@
+@@ -715,17 +716,18 @@
   * section in the linker script will go there too.  @phdr should have
   * a leading colon.
   *
@@ -72947,18 +73220,18 @@ index 418d270..bfd2794 100644
  struct crypto_instance {
  	struct crypto_alg alg;
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 63d17ee..716de2b 100644
+index b46fb45..b30d6d5 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
-@@ -72,6 +72,7 @@
+@@ -66,6 +66,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
  #include <asm/pgalloc.h>
 +#include <asm/local.h>
  #include <drm/drm.h>
  #include <drm/drm_sarea.h>
- 
-@@ -296,10 +297,12 @@ do {										\
+ #include <drm/drm_vma_manager.h>
+@@ -277,10 +278,12 @@ do {										\
   * \param cmd command.
   * \param arg argument.
   */
@@ -72973,7 +73246,7 @@ index 63d17ee..716de2b 100644
  			       unsigned long arg);
  
  #define DRM_IOCTL_NR(n)                _IOC_NR(n)
-@@ -314,10 +317,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
+@@ -296,10 +299,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
  struct drm_ioctl_desc {
  	unsigned int cmd;
  	int flags;
@@ -72986,7 +73259,7 @@ index 63d17ee..716de2b 100644
  
  /**
   * Creates a driver or general drm_ioctl_desc array entry for the given
-@@ -1015,7 +1018,7 @@ struct drm_info_list {
+@@ -1027,7 +1030,7 @@ struct drm_info_list {
  	int (*show)(struct seq_file*, void*); /** show callback */
  	u32 driver_features; /**< Required driver features for this entry */
  	void *data;
@@ -72995,7 +73268,7 @@ index 63d17ee..716de2b 100644
  
  /**
   * debugfs node structure. This structure represents a debugfs file.
-@@ -1088,7 +1091,7 @@ struct drm_device {
+@@ -1098,7 +1101,7 @@ struct drm_device {
  
  	/** \name Usage Counters */
  	/*@{ */
@@ -73004,7 +73277,7 @@ index 63d17ee..716de2b 100644
  	atomic_t ioctl_count;		/**< Outstanding IOCTLs pending */
  	atomic_t vma_count;		/**< Outstanding vma areas open */
  	int buf_use;			/**< Buffers in use -- cannot alloc */
-@@ -1099,7 +1102,7 @@ struct drm_device {
+@@ -1109,7 +1112,7 @@ struct drm_device {
  	/*@{ */
  	unsigned long counters;
  	enum drm_stat_type types[15];
@@ -73026,6 +73299,19 @@ index f43d556..94d9343 100644
  
  /**
   * drm_connector_helper_funcs - helper operations for connectors
+diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
+index 8a10f5c..5de7f5c 100644
+--- a/include/drm/i915_pciids.h
++++ b/include/drm/i915_pciids.h
+@@ -37,7 +37,7 @@
+  */
+ #define INTEL_VGA_DEVICE(id, info) {		\
+ 	0x8086,	id,				\
+-	~0, ~0,					\
++	PCI_ANY_ID, PCI_ANY_ID,			\
+ 	0x030000, 0xff0000,			\
+ 	(unsigned long) info }
+ 
 diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
 index 72dcbe8..8db58d7 100644
 --- a/include/drm/ttm/ttm_memory.h
@@ -73074,8 +73360,21 @@ index c1da539..1dcec55 100644
  
  struct atmphy_ops {
  	int (*start)(struct atm_dev *dev);
+diff --git a/include/linux/audit.h b/include/linux/audit.h
+index 729a4d1..9b304ae 100644
+--- a/include/linux/audit.h
++++ b/include/linux/audit.h
+@@ -193,7 +193,7 @@ static inline void audit_ptrace(struct task_struct *t)
+ extern unsigned int audit_serial(void);
+ extern int auditsc_get_stamp(struct audit_context *ctx,
+ 			      struct timespec *t, unsigned int *serial);
+-extern int audit_set_loginuid(kuid_t loginuid);
++extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
+ 
+ static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
+ {
 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
-index df97ca4..c4d4aa6 100644
+index 7554fd4..0f86379 100644
 --- a/include/linux/binfmts.h
 +++ b/include/linux/binfmts.h
 @@ -73,8 +73,10 @@ struct linux_binfmt {
@@ -73090,11 +73389,42 @@ index df97ca4..c4d4aa6 100644
  
  extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
  
+diff --git a/include/linux/bitops.h b/include/linux/bitops.h
+index a3b6b82..2a7d758 100644
+--- a/include/linux/bitops.h
++++ b/include/linux/bitops.h
+@@ -91,7 +91,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
+  * @word: value to rotate
+  * @shift: bits to roll
+  */
+-static inline __u32 rol32(__u32 word, unsigned int shift)
++static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
+ {
+ 	return (word << shift) | (word >> (32 - shift));
+ }
+@@ -101,7 +101,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
+  * @word: value to rotate
+  * @shift: bits to roll
+  */
+-static inline __u32 ror32(__u32 word, unsigned int shift)
++static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
+ {
+ 	return (word >> shift) | (word << (32 - shift));
+ }
+@@ -157,7 +157,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
+ 	return (__s32)(value << shift) >> shift;
+ }
+ 
+-static inline unsigned fls_long(unsigned long l)
++static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
+ {
+ 	if (sizeof(l) == 4)
+ 		return fls(l);
 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index 2fdb4a4..54aad7e 100644
+index 0e6f765..885bb2b 100644
 --- a/include/linux/blkdev.h
 +++ b/include/linux/blkdev.h
-@@ -1526,7 +1526,7 @@ struct block_device_operations {
+@@ -1537,7 +1537,7 @@ struct block_device_operations {
  	/* this callback is with swap_lock and sometimes page table lock held */
  	void (*swap_slot_free_notify) (struct block_device *, unsigned long);
  	struct module *owner;
@@ -73117,26 +73447,30 @@ index 7c2e030..b72475d 100644
  
  extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
 diff --git a/include/linux/cache.h b/include/linux/cache.h
-index 4c57065..4307975 100644
+index 4c57065..40346da 100644
 --- a/include/linux/cache.h
 +++ b/include/linux/cache.h
-@@ -16,6 +16,10 @@
+@@ -16,6 +16,14 @@
  #define __read_mostly
  #endif
  
 +#ifndef __read_only
++#ifdef CONFIG_PAX_KERNEXEC
++#error KERNEXEC requires __read_only
++#else
 +#define __read_only __read_mostly
 +#endif
++#endif
 +
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
 diff --git a/include/linux/capability.h b/include/linux/capability.h
-index d9a4f7f4..19f77d6 100644
+index a6ee1f9..e1ca49d 100644
 --- a/include/linux/capability.h
 +++ b/include/linux/capability.h
-@@ -213,8 +213,13 @@ extern bool ns_capable(struct user_namespace *ns, int cap);
- extern bool nsown_capable(int cap);
+@@ -212,8 +212,13 @@ extern bool capable(int cap);
+ extern bool ns_capable(struct user_namespace *ns, int cap);
  extern bool inode_capable(const struct inode *inode, int cap);
  extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
 +extern bool capable_nolog(int cap);
@@ -73175,10 +73509,10 @@ index 4ce9056..86caac6 100644
  extern struct cleancache_ops *
  	cleancache_register_ops(struct cleancache_ops *ops);
 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
-index 1186098..f87e53d 100644
+index 73bdb69..d66d47a 100644
 --- a/include/linux/clk-provider.h
 +++ b/include/linux/clk-provider.h
-@@ -132,6 +132,7 @@ struct clk_ops {
+@@ -141,6 +141,7 @@ struct clk_ops {
  				    unsigned long);
  	void		(*init)(struct clk_hw *hw);
  };
@@ -73187,10 +73521,10 @@ index 1186098..f87e53d 100644
  /**
   * struct clk_init_data - holds init data that's common to all clocks and is
 diff --git a/include/linux/compat.h b/include/linux/compat.h
-index ec1aee4..1077986 100644
+index 345da00..b6eff26 100644
 --- a/include/linux/compat.h
 +++ b/include/linux/compat.h
-@@ -312,7 +312,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
+@@ -313,7 +313,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
  			   compat_size_t __user *len_ptr);
  
  asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
@@ -73199,7 +73533,7 @@ index ec1aee4..1077986 100644
  asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
  asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
  		compat_ssize_t msgsz, int msgflg);
-@@ -419,7 +419,7 @@ extern int compat_ptrace_request(struct task_struct *child,
+@@ -420,7 +420,7 @@ extern int compat_ptrace_request(struct task_struct *child,
  extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
  			       compat_ulong_t addr, compat_ulong_t data);
  asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
@@ -73372,19 +73706,23 @@ index 92669cd..1771a15 100644
  /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
  #ifdef CONFIG_KPROBES
 diff --git a/include/linux/completion.h b/include/linux/completion.h
-index 33f0280..35c6568 100644
+index 3cd574d..240dcb0 100644
 --- a/include/linux/completion.h
 +++ b/include/linux/completion.h
-@@ -79,15 +79,15 @@ static inline void init_completion(struct completion *x)
+@@ -78,16 +78,16 @@ static inline void init_completion(struct completion *x)
+ 
  extern void wait_for_completion(struct completion *);
  extern void wait_for_completion_io(struct completion *);
- extern int wait_for_completion_interruptible(struct completion *x);
+-extern int wait_for_completion_interruptible(struct completion *x);
 -extern int wait_for_completion_killable(struct completion *x);
++extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
 +extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
  extern unsigned long wait_for_completion_timeout(struct completion *x,
- 						   unsigned long timeout);
+-						   unsigned long timeout);
++						   unsigned long timeout) __intentional_overflow(-1);
  extern unsigned long wait_for_completion_io_timeout(struct completion *x,
- 						    unsigned long timeout);
+-						    unsigned long timeout);
++						    unsigned long timeout) __intentional_overflow(-1);
  extern long wait_for_completion_interruptible_timeout(
 -	struct completion *x, unsigned long timeout);
 +	struct completion *x, unsigned long timeout) __intentional_overflow(-1);
@@ -73407,33 +73745,11 @@ index 34025df..d94bbbc 100644
  
  /*
   * Users often need to create attribute structures for their configurable
-diff --git a/include/linux/cpu.h b/include/linux/cpu.h
-index 9f3c7e8..a18c7b6 100644
---- a/include/linux/cpu.h
-+++ b/include/linux/cpu.h
-@@ -115,7 +115,7 @@ enum {
- /* Need to know about CPUs going up/down? */
- #if defined(CONFIG_HOTPLUG_CPU) || !defined(MODULE)
- #define cpu_notifier(fn, pri) {					\
--	static struct notifier_block fn##_nb __cpuinitdata =	\
-+	static struct notifier_block fn##_nb =			\
- 		{ .notifier_call = fn, .priority = pri };	\
- 	register_cpu_notifier(&fn##_nb);			\
- }
 diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
-index 037d36a..ca5fe6e 100644
+index fcabc42..cba5d93 100644
 --- a/include/linux/cpufreq.h
 +++ b/include/linux/cpufreq.h
-@@ -262,7 +262,7 @@ struct cpufreq_driver {
- 	int	(*suspend)	(struct cpufreq_policy *policy);
- 	int	(*resume)	(struct cpufreq_policy *policy);
- 	struct freq_attr	**attr;
--};
-+} __do_const;
- 
- /* flags */
- 
-@@ -321,6 +321,7 @@ struct global_attr {
+@@ -167,6 +167,7 @@ struct global_attr {
  	ssize_t (*store)(struct kobject *a, struct attribute *b,
  			 const char *c, size_t count);
  };
@@ -73441,11 +73757,20 @@ index 037d36a..ca5fe6e 100644
  
  #define define_one_global_ro(_name)		\
  static struct global_attr _name =		\
+@@ -208,7 +209,7 @@ struct cpufreq_driver {
+ 	int	(*suspend)	(struct cpufreq_policy *policy);
+ 	int	(*resume)	(struct cpufreq_policy *policy);
+ 	struct freq_attr	**attr;
+-};
++} __do_const;
+ 
+ /* flags */
+ #define CPUFREQ_STICKY		0x01	/* the driver isn't removed even if
 diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
-index 8f04062..900239a 100644
+index 781addc..d1e1fe6 100644
 --- a/include/linux/cpuidle.h
 +++ b/include/linux/cpuidle.h
-@@ -52,7 +52,8 @@ struct cpuidle_state {
+@@ -50,7 +50,8 @@ struct cpuidle_state {
  			int index);
  
  	int (*enter_dead) (struct cpuidle_device *dev, int index);
@@ -73455,7 +73780,7 @@ index 8f04062..900239a 100644
  
  /* Idle State Flags */
  #define CPUIDLE_FLAG_TIME_VALID	(0x01) /* is residency time measurable? */
-@@ -191,7 +192,7 @@ struct cpuidle_governor {
+@@ -192,7 +193,7 @@ struct cpuidle_governor {
  	void (*reflect)		(struct cpuidle_device *dev, int index);
  
  	struct module 		*owner;
@@ -73586,7 +73911,7 @@ index 7925bf0..d5143d2 100644
  
  #define large_malloc(a) vmalloc(a)
 diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
-index fe8c447..bdc1f33 100644
+index 5f1ab92..39c35ae 100644
 --- a/include/linux/devfreq.h
 +++ b/include/linux/devfreq.h
 @@ -114,7 +114,7 @@ struct devfreq_governor {
@@ -73599,10 +73924,10 @@ index fe8c447..bdc1f33 100644
  /**
   * struct devfreq - Device devfreq structure
 diff --git a/include/linux/device.h b/include/linux/device.h
-index c0a1261..dba7569 100644
+index 2a9d6ed..d14551e3 100644
 --- a/include/linux/device.h
 +++ b/include/linux/device.h
-@@ -290,7 +290,7 @@ struct subsys_interface {
+@@ -313,7 +313,7 @@ struct subsys_interface {
  	struct list_head node;
  	int (*add_dev)(struct device *dev, struct subsys_interface *sif);
  	int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
@@ -73611,7 +73936,7 @@ index c0a1261..dba7569 100644
  
  int subsys_interface_register(struct subsys_interface *sif);
  void subsys_interface_unregister(struct subsys_interface *sif);
-@@ -473,7 +473,7 @@ struct device_type {
+@@ -501,7 +501,7 @@ struct device_type {
  	void (*release)(struct device *dev);
  
  	const struct dev_pm_ops *pm;
@@ -73620,7 +73945,7 @@ index c0a1261..dba7569 100644
  
  /* interface for exporting device attributes */
  struct device_attribute {
-@@ -483,11 +483,12 @@ struct device_attribute {
+@@ -511,11 +511,12 @@ struct device_attribute {
  	ssize_t (*store)(struct device *dev, struct device_attribute *attr,
  			 const char *buf, size_t count);
  };
@@ -73635,7 +73960,7 @@ index c0a1261..dba7569 100644
  ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
  			  char *buf);
 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index 94af418..b1ca7a2 100644
+index 3a8d0a2..c762be2 100644
 --- a/include/linux/dma-mapping.h
 +++ b/include/linux/dma-mapping.h
 @@ -54,7 +54,7 @@ struct dma_map_ops {
@@ -73648,10 +73973,10 @@ index 94af418..b1ca7a2 100644
  #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
  
 diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
-index 96d3e4a..dc36433 100644
+index 0bc7275..4ccbf11 100644
 --- a/include/linux/dmaengine.h
 +++ b/include/linux/dmaengine.h
-@@ -1035,9 +1035,9 @@ struct dma_pinned_list {
+@@ -1078,9 +1078,9 @@ struct dma_pinned_list {
  struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
  void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
  
@@ -73664,7 +73989,7 @@ index 96d3e4a..dc36433 100644
  	unsigned int offset, size_t len);
  
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 2bc0ad7..3f7b006 100644
+index 5f8f176..62a0556 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
 @@ -745,6 +745,7 @@ struct efivar_operations {
@@ -73696,7 +74021,7 @@ index 40a3c0e..4c45a38 100644
  #endif
  
 diff --git a/include/linux/err.h b/include/linux/err.h
-index f2edce2..cc2082c 100644
+index 15f92e0..e825a8e 100644
 --- a/include/linux/err.h
 +++ b/include/linux/err.h
 @@ -19,12 +19,12 @@
@@ -73709,8 +74034,8 @@ index f2edce2..cc2082c 100644
  	return (void *) error;
  }
  
--static inline long __must_check PTR_ERR(const void *ptr)
-+static inline long __must_check __intentional_overflow(-1) PTR_ERR(const void *ptr)
+-static inline long __must_check PTR_ERR(__force const void *ptr)
++static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
  {
  	return (long) ptr;
  }
@@ -73728,7 +74053,7 @@ index fcb51c8..bdafcf6 100644
  
  /**
 diff --git a/include/linux/fb.h b/include/linux/fb.h
-index d49c60f..2834fbe 100644
+index ffac70a..ca3e711 100644
 --- a/include/linux/fb.h
 +++ b/include/linux/fb.h
 @@ -304,7 +304,7 @@ struct fb_ops {
@@ -73740,28 +74065,19 @@ index d49c60f..2834fbe 100644
  
  #ifdef CONFIG_FB_TILEBLITTING
  #define FB_TILE_CURSOR_NONE        0
-diff --git a/include/linux/filter.h b/include/linux/filter.h
-index f65f5a6..2f4f93a 100644
---- a/include/linux/filter.h
-+++ b/include/linux/filter.h
-@@ -20,6 +20,7 @@ struct compat_sock_fprog {
- 
- struct sk_buff;
- struct sock;
-+struct bpf_jit_work;
- 
- struct sk_filter
- {
-@@ -27,6 +28,9 @@ struct sk_filter
- 	unsigned int         	len;	/* Number of filter blocks */
- 	unsigned int		(*bpf_func)(const struct sk_buff *skb,
- 					    const struct sock_filter *filter);
-+#ifdef CONFIG_BPF_JIT
-+	struct bpf_jit_work	*work;
-+#endif
- 	struct rcu_head		rcu;
- 	struct sock_filter     	insns[0];
- };
+diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
+index 085197b..0fa6f0b 100644
+--- a/include/linux/fdtable.h
++++ b/include/linux/fdtable.h
+@@ -95,7 +95,7 @@ struct files_struct *get_files_struct(struct task_struct *);
+ void put_files_struct(struct files_struct *fs);
+ void reset_files_struct(struct files_struct *);
+ int unshare_files(struct files_struct **);
+-struct files_struct *dup_fd(struct files_struct *, int *);
++struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
+ void do_close_on_exec(struct files_struct *);
+ int iterate_fd(struct files_struct *, unsigned,
+ 		int (*)(const void *, struct file *, unsigned),
 diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
 index 8293262..2b3b8bd 100644
 --- a/include/linux/frontswap.h
@@ -73776,10 +74092,10 @@ index 8293262..2b3b8bd 100644
  extern bool frontswap_enabled;
  extern struct frontswap_ops *
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 65c2be2..4c53f6e 100644
+index fefa7b0..5e04a8b 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1543,7 +1543,8 @@ struct file_operations {
+@@ -1552,7 +1552,8 @@ struct file_operations {
  	long (*fallocate)(struct file *file, int mode, loff_t offset,
  			  loff_t len);
  	int (*show_fdinfo)(struct seq_file *m, struct file *f);
@@ -73789,8 +74105,8 @@ index 65c2be2..4c53f6e 100644
  
  struct inode_operations {
  	struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
-@@ -2688,4 +2689,14 @@ static inline void inode_has_no_xattr(struct inode *inode)
- 		inode->i_flags |= S_NOSEC;
+@@ -2746,4 +2747,14 @@ static inline bool dir_relax(struct inode *inode)
+ 	return !IS_DEADDIR(inode);
  }
  
 +static inline bool is_sidechannel_device(const struct inode *inode)
@@ -73805,7 +74121,7 @@ index 65c2be2..4c53f6e 100644
 +
  #endif /* _LINUX_FS_H */
 diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
-index 2b93a9a..855d94a 100644
+index 0efc3e6..e0e1e5f 100644
 --- a/include/linux/fs_struct.h
 +++ b/include/linux/fs_struct.h
 @@ -6,7 +6,7 @@
@@ -73818,10 +74134,10 @@ index 2b93a9a..855d94a 100644
  	seqcount_t seq;
  	int umask;
 diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
-index 5dfa0aa..6acf322 100644
+index 7823e9e..56b6f2f 100644
 --- a/include/linux/fscache-cache.h
 +++ b/include/linux/fscache-cache.h
-@@ -112,7 +112,7 @@ struct fscache_operation {
+@@ -113,7 +113,7 @@ struct fscache_operation {
  	fscache_operation_release_t release;
  };
  
@@ -73830,7 +74146,7 @@ index 5dfa0aa..6acf322 100644
  extern void fscache_op_work_func(struct work_struct *work);
  
  extern void fscache_enqueue_operation(struct fscache_operation *);
-@@ -134,7 +134,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
+@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
  	INIT_WORK(&op->work, fscache_op_work_func);
  	atomic_set(&op->usage, 1);
  	op->state = FSCACHE_OP_ST_INITIALISED;
@@ -73840,7 +74156,7 @@ index 5dfa0aa..6acf322 100644
  	op->release = release;
  	INIT_LIST_HEAD(&op->pend_link);
 diff --git a/include/linux/fscache.h b/include/linux/fscache.h
-index 7a08623..4c07b0f 100644
+index 19b4645..3b73dfc 100644
 --- a/include/linux/fscache.h
 +++ b/include/linux/fscache.h
 @@ -152,7 +152,7 @@ struct fscache_cookie_def {
@@ -73853,11 +74169,11 @@ index 7a08623..4c07b0f 100644
  /*
   * fscache cached network filesystem type
 diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
-index a78680a..87bd73e 100644
+index 1c804b0..1432c2b 100644
 --- a/include/linux/fsnotify.h
 +++ b/include/linux/fsnotify.h
 @@ -195,6 +195,9 @@ static inline void fsnotify_access(struct file *file)
- 	struct inode *inode = path->dentry->d_inode;
+ 	struct inode *inode = file_inode(file);
  	__u32 mask = FS_ACCESS;
  
 +	if (is_sidechannel_device(inode))
@@ -73867,7 +74183,7 @@ index a78680a..87bd73e 100644
  		mask |= FS_ISDIR;
  
 @@ -213,6 +216,9 @@ static inline void fsnotify_modify(struct file *file)
- 	struct inode *inode = path->dentry->d_inode;
+ 	struct inode *inode = file_inode(file);
  	__u32 mask = FS_MODIFY;
  
 +	if (is_sidechannel_device(inode))
@@ -73886,7 +74202,7 @@ index a78680a..87bd73e 100644
  
  /*
 diff --git a/include/linux/genhd.h b/include/linux/genhd.h
-index 9f3c275..911b591 100644
+index 9f3c275..8bdff5d 100644
 --- a/include/linux/genhd.h
 +++ b/include/linux/genhd.h
 @@ -194,7 +194,7 @@ struct gendisk {
@@ -73898,6 +74214,15 @@ index 9f3c275..911b591 100644
  	struct disk_events *ev;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
  	struct blk_integrity *integrity;
+@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
+ extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
+ 
+ /* drivers/char/random.c */
+-extern void add_disk_randomness(struct gendisk *disk);
++extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
+ extern void rand_initialize_disk(struct gendisk *disk);
+ 
+ static inline sector_t get_start_sect(struct block_device *bdev)
 diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
 index 023bc34..b02b46a 100644
 --- a/include/linux/genl_magic_func.h
@@ -73912,7 +74237,7 @@ index 023bc34..b02b46a 100644
  };
  
 diff --git a/include/linux/gfp.h b/include/linux/gfp.h
-index 0f615eb..5c3832f 100644
+index 9b4dd49..61fd41d 100644
 --- a/include/linux/gfp.h
 +++ b/include/linux/gfp.h
 @@ -35,6 +35,13 @@ struct vm_area_struct;
@@ -73957,10 +74282,10 @@ index 0f615eb..5c3832f 100644
  {
 diff --git a/include/linux/gracl.h b/include/linux/gracl.h
 new file mode 100644
-index 0000000..ebe6d72
+index 0000000..edb2cb6
 --- /dev/null
 +++ b/include/linux/gracl.h
-@@ -0,0 +1,319 @@
+@@ -0,0 +1,340 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
 +
@@ -73972,19 +74297,20 @@ index 0000000..ebe6d72
 +
 +/* Major status information */
 +
-+#define GR_VERSION  "grsecurity 2.9.1"
-+#define GRSECURITY_VERSION 0x2901
++#define GR_VERSION  "grsecurity 3.0"
++#define GRSECURITY_VERSION 0x3000
 +
 +enum {
 +	GR_SHUTDOWN = 0,
 +	GR_ENABLE = 1,
 +	GR_SPROLE = 2,
-+	GR_RELOAD = 3,
++	GR_OLDRELOAD = 3,
 +	GR_SEGVMOD = 4,
 +	GR_STATUS = 5,
 +	GR_UNSPROLE = 6,
 +	GR_PASSSET = 7,
 +	GR_SPROLEPAM = 8,
++	GR_RELOAD = 9,
 +};
 +
 +/* Password setup definitions
@@ -74213,6 +74539,34 @@ index 0000000..ebe6d72
 +	__u32 s_size;
 +};
 +
++struct gr_policy_state {
++	struct sprole_pw **acl_special_roles;
++	__u16 num_sprole_pws;
++	struct acl_role_label *kernel_role;
++	struct acl_role_label *role_list;
++	struct acl_role_label *default_role;
++	struct acl_role_db acl_role_set;
++	struct acl_subj_map_db subj_map_set;
++	struct name_db name_set;
++	struct inodev_db inodev_set;
++};
++
++struct gr_alloc_state {
++	unsigned long alloc_stack_next;
++	unsigned long alloc_stack_size;
++	void **alloc_stack;
++};
++
++struct gr_reload_state {
++	struct gr_policy_state oldpolicy;
++	struct gr_alloc_state oldalloc;
++	struct gr_policy_state newpolicy;
++	struct gr_alloc_state newalloc;
++	struct gr_policy_state *oldpolicy_ptr;
++	struct gr_alloc_state *oldalloc_ptr;
++	unsigned char oldmode;
++};
++
 +/* End Data Structures Section */
 +
 +/* Hash functions generated by empirical testing by Brad Spengler
@@ -74244,14 +74598,6 @@ index 0000000..ebe6d72
 +	return full_name_hash((const unsigned char *)name, len) % sz;
 +}
 +
-+#define FOR_EACH_ROLE_START(role) \
-+	role = role_list; \
-+	while (role) {
-+
-+#define FOR_EACH_ROLE_END(role) \
-+		role = role->prev; \
-+	}
-+
 +#define FOR_EACH_SUBJECT_START(role,subj,iter) \
 +	subj = NULL; \
 +	iter = 0; \
@@ -74605,7 +74951,7 @@ index 0000000..be66033
 +#endif
 diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
 new file mode 100644
-index 0000000..e337683
+index 0000000..d25522e
 --- /dev/null
 +++ b/include/linux/grinternal.h
 @@ -0,0 +1,229 @@
@@ -74631,7 +74977,6 @@ index 0000000..e337683
 +int gr_check_protected_task(const struct task_struct *task);
 +__u32 to_gr_audit(const __u32 reqmode);
 +int gr_set_acls(const int type);
-+int gr_apply_subject_to_task(struct task_struct *task);
 +int gr_acl_is_enabled(void);
 +char gr_roletype_to_char(void);
 +
@@ -74692,6 +75037,7 @@ index 0000000..e337683
 +extern int grsec_enable_blackhole;
 +extern int grsec_lastack_retries;
 +extern int grsec_enable_brute;
++extern int grsec_enable_harden_ipc;
 +extern int grsec_lock;
 +
 +extern spinlock_t grsec_alert_lock;
@@ -74840,10 +75186,10 @@ index 0000000..e337683
 +#endif
 diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
 new file mode 100644
-index 0000000..a4396b5
+index 0000000..378a81a
 --- /dev/null
 +++ b/include/linux/grmsg.h
-@@ -0,0 +1,113 @@
+@@ -0,0 +1,114 @@
 +#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 "
@@ -74957,12 +75303,13 @@ index 0000000..a4396b5
 +#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
 +#define GR_BRUTE_DAEMON_MSG "bruteforce prevention initiated for the next 30 minutes or until service restarted, stalling each fork 30 seconds.  Please investigate the crash report for "
 +#define GR_BRUTE_SUID_MSG "bruteforce prevention initiated due to crash of %.950s against uid %u, banning suid/sgid execs for %u minutes.  Please investigate the crash report for "
++#define GR_IPC_DENIED_MSG "denied %s of globally-%sable IPC with creator uid %u by "
 diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
 new file mode 100644
-index 0000000..d6f5a21
+index 0000000..134860c
 --- /dev/null
 +++ b/include/linux/grsecurity.h
-@@ -0,0 +1,244 @@
+@@ -0,0 +1,243 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
@@ -74986,7 +75333,7 @@ index 0000000..d6f5a21
 +
 +int gr_handle_new_usb(void);
 +
-+void gr_handle_brute_attach(unsigned long mm_flags);
++void gr_handle_brute_attach(int dumpable);
 +void gr_handle_brute_check(void);
 +void gr_handle_kernel_exploit(void);
 +
@@ -75093,7 +75440,6 @@ index 0000000..d6f5a21
 +				  const struct vfsmount *mnt);
 +int gr_check_crash_exec(const struct file *filp);
 +int gr_acl_is_enabled(void);
-+void gr_set_kernel_label(struct task_struct *task);
 +void gr_set_role_label(struct task_struct *task, const kuid_t uid,
 +			      const kgid_t gid);
 +int gr_set_proc_label(const struct dentry *dentry,
@@ -75256,7 +75602,7 @@ index 7fb31da..08b5114 100644
  	unsigned start1, unsigned end1,
  	unsigned start2, unsigned end2)
 diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
-index 1c7b89a..7f52502 100644
+index 1c7b89a..7dda400 100644
 --- a/include/linux/hwmon-sysfs.h
 +++ b/include/linux/hwmon-sysfs.h
 @@ -25,7 +25,8 @@
@@ -75269,17 +75615,18 @@ index 1c7b89a..7f52502 100644
  #define to_sensor_dev_attr(_dev_attr) \
  	container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
  
-@@ -41,7 +42,7 @@ struct sensor_device_attribute_2 {
+@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
  	struct device_attribute dev_attr;
  	u8 index;
  	u8 nr;
 -};
 +} __do_const;
++typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
  #define to_sensor_dev_attr_2(_dev_attr) \
  	container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
  
 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
-index e988fa9..ff9f17e 100644
+index 2ab11dc..663a3f2 100644
 --- a/include/linux/i2c.h
 +++ b/include/linux/i2c.h
 @@ -366,6 +366,7 @@ struct i2c_algorithm {
@@ -75317,39 +75664,20 @@ index aff7ad8..3942bbd 100644
  extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
  extern void unregister_pppox_proto(int proto_num);
 diff --git a/include/linux/init.h b/include/linux/init.h
-index 8618147..0821126 100644
+index f1c27a71..7d6010e 100644
 --- a/include/linux/init.h
 +++ b/include/linux/init.h
-@@ -39,9 +39,36 @@
+@@ -39,9 +39,17 @@
   * Also note, that this data cannot be "const".
   */
  
-+#ifdef MODULE
-+#define add_init_latent_entropy
-+#define add_devinit_latent_entropy
-+#define add_cpuinit_latent_entropy
-+#define add_meminit_latent_entropy
-+#else
 +#define add_init_latent_entropy __latent_entropy
 +
-+#ifdef CONFIG_HOTPLUG
-+#define add_devinit_latent_entropy
-+#else
-+#define add_devinit_latent_entropy __latent_entropy
-+#endif
-+
-+#ifdef CONFIG_HOTPLUG_CPU
-+#define add_cpuinit_latent_entropy
-+#else
-+#define add_cpuinit_latent_entropy __latent_entropy
-+#endif
-+
 +#ifdef CONFIG_MEMORY_HOTPLUG
 +#define add_meminit_latent_entropy
 +#else
 +#define add_meminit_latent_entropy __latent_entropy
 +#endif
-+#endif
 +
  /* These are for everybody (although not all archs will actually
     discard it in modules) */
@@ -75358,17 +75686,8 @@ index 8618147..0821126 100644
  #define __initdata	__section(.init.data)
  #define __initconst	__constsection(.init.rodata)
  #define __exitdata	__section(.exit.data)
-@@ -94,7 +121,7 @@
- #define __exit          __section(.exit.text) __exitused __cold notrace
- 
- /* Used for HOTPLUG_CPU */
--#define __cpuinit        __section(.cpuinit.text) __cold notrace
-+#define __cpuinit        __section(.cpuinit.text) __cold notrace add_cpuinit_latent_entropy
- #define __cpuinitdata    __section(.cpuinit.data)
- #define __cpuinitconst   __constsection(.cpuinit.rodata)
- #define __cpuexit        __section(.cpuexit.text) __exitused __cold notrace
-@@ -102,7 +129,7 @@
- #define __cpuexitconst   __constsection(.cpuexit.rodata)
+@@ -102,7 +110,7 @@
+ #define __cpuexitconst
  
  /* Used for MEMORY_HOTPLUG */
 -#define __meminit        __section(.meminit.text) __cold notrace
@@ -75402,10 +75721,10 @@ index 5cd0f09..c9f67cc 100644
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index 5fa5afe..ac55b25 100644
+index 5e865b5..71bd258 100644
 --- a/include/linux/interrupt.h
 +++ b/include/linux/interrupt.h
-@@ -430,7 +430,7 @@ enum
+@@ -361,7 +361,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
   */
@@ -75414,7 +75733,7 @@ index 5fa5afe..ac55b25 100644
  
  /* softirq mask and active fields moved to irq_cpustat_t in
   * asm/hardirq.h to get better cache usage.  KAO
-@@ -438,12 +438,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
+@@ -369,12 +369,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
  
  struct softirq_action
  {
@@ -75431,10 +75750,10 @@ index 5fa5afe..ac55b25 100644
  extern void __raise_softirq_irqoff(unsigned int nr);
  
 diff --git a/include/linux/iommu.h b/include/linux/iommu.h
-index 3aeb730..2177f39 100644
+index 7ea319e..f9e971d 100644
 --- a/include/linux/iommu.h
 +++ b/include/linux/iommu.h
-@@ -113,7 +113,7 @@ struct iommu_ops {
+@@ -129,7 +129,7 @@ struct iommu_ops {
  	u32 (*domain_get_windows)(struct iommu_domain *domain);
  
  	unsigned long pgsize_bitmap;
@@ -75457,10 +75776,10 @@ index 89b7c24..382af74 100644
  	return res->end - res->start + 1;
  }
 diff --git a/include/linux/irq.h b/include/linux/irq.h
-index bc4e066..50468a9 100644
+index 56bb0dc..8ae94d62 100644
 --- a/include/linux/irq.h
 +++ b/include/linux/irq.h
-@@ -328,7 +328,8 @@ struct irq_chip {
+@@ -333,7 +333,8 @@ struct irq_chip {
  	void		(*irq_print_chip)(struct irq_data *data, struct seq_file *p);
  
  	unsigned long	flags;
@@ -75471,7 +75790,7 @@ index bc4e066..50468a9 100644
  /*
   * irq_chip specific flags
 diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
-index 3e203eb..3fe68d0 100644
+index 0e5d9ec..46acb3a 100644
 --- a/include/linux/irqchip/arm-gic.h
 +++ b/include/linux/irqchip/arm-gic.h
 @@ -59,9 +59,11 @@
@@ -75487,6 +75806,31 @@ index 3e203eb..3fe68d0 100644
  
  void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
  		    u32 offset, struct device_node *);
+diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
+index d235e88..8ccbe74 100644
+--- a/include/linux/jiffies.h
++++ b/include/linux/jiffies.h
+@@ -292,14 +292,14 @@ extern unsigned long preset_lpj;
+ /*
+  * Convert various time units to each other:
+  */
+-extern unsigned int jiffies_to_msecs(const unsigned long j);
+-extern unsigned int jiffies_to_usecs(const unsigned long j);
+-extern unsigned long msecs_to_jiffies(const unsigned int m);
+-extern unsigned long usecs_to_jiffies(const unsigned int u);
+-extern unsigned long timespec_to_jiffies(const struct timespec *value);
++extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
++extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
++extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
++extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
++extern unsigned long timespec_to_jiffies(const struct timespec *value) __intentional_overflow(-1);
+ extern void jiffies_to_timespec(const unsigned long jiffies,
+ 				struct timespec *value);
+-extern unsigned long timeval_to_jiffies(const struct timeval *value);
++extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
+ extern void jiffies_to_timeval(const unsigned long jiffies,
+ 			       struct timeval *value);
+ 
 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
 index 6883e19..e854fcb 100644
 --- a/include/linux/kallsyms.h
@@ -75568,7 +75912,7 @@ index c6e091b..a940adf 100644
  extern struct kgdb_arch		arch_kgdb_ops;
  
 diff --git a/include/linux/kmod.h b/include/linux/kmod.h
-index 0555cc6..b16a7a4 100644
+index 0555cc6..40116ce 100644
 --- a/include/linux/kmod.h
 +++ b/include/linux/kmod.h
 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
@@ -75580,11 +75924,21 @@ index 0555cc6..b16a7a4 100644
  #define request_module(mod...) __request_module(true, mod)
  #define request_module_nowait(mod...) __request_module(false, mod)
  #define try_then_request_module(x, mod...) \
+@@ -57,6 +59,9 @@ struct subprocess_info {
+ 	struct work_struct work;
+ 	struct completion *complete;
+ 	char *path;
++#ifdef CONFIG_GRKERNSEC
++	char *origpath;
++#endif
+ 	char **argv;
+ 	char **envp;
+ 	int wait;
 diff --git a/include/linux/kobject.h b/include/linux/kobject.h
-index 939b112..ed6ed51 100644
+index de6dcbcc..4735f88 100644
 --- a/include/linux/kobject.h
 +++ b/include/linux/kobject.h
-@@ -111,7 +111,7 @@ struct kobj_type {
+@@ -115,7 +115,7 @@ struct kobj_type {
  	struct attribute **default_attrs;
  	const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
  	const void *(*namespace)(struct kobject *kobj);
@@ -75593,7 +75947,7 @@ index 939b112..ed6ed51 100644
  
  struct kobj_uevent_env {
  	char *envp[UEVENT_NUM_ENVP];
-@@ -134,6 +134,7 @@ struct kobj_attribute {
+@@ -138,6 +138,7 @@ struct kobj_attribute {
  	ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
  			 const char *buf, size_t count);
  };
@@ -75602,10 +75956,10 @@ index 939b112..ed6ed51 100644
  extern const struct sysfs_ops kobj_sysfs_ops;
  
 diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
-index f66b065..c2c29b4 100644
+index df32d25..fb52e27 100644
 --- a/include/linux/kobject_ns.h
 +++ b/include/linux/kobject_ns.h
-@@ -43,7 +43,7 @@ struct kobj_ns_type_operations {
+@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
  	const void *(*netlink_ns)(struct sock *sk);
  	const void *(*initial_ns)(void);
  	void (*drop_ns)(void *);
@@ -75628,10 +75982,10 @@ index 484604d..0f6c5b6 100644
  	if (atomic_sub_and_test((int) count, &kref->refcount)) {
  		release(kref);
 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
-index 8db53cf..c21121d 100644
+index 0fbbc7a..db081e3 100644
 --- a/include/linux/kvm_host.h
 +++ b/include/linux/kvm_host.h
-@@ -444,7 +444,7 @@ static inline void kvm_irqfd_exit(void)
+@@ -458,7 +458,7 @@ static inline void kvm_irqfd_exit(void)
  {
  }
  #endif
@@ -75640,7 +75994,7 @@ index 8db53cf..c21121d 100644
  		  struct module *module);
  void kvm_exit(void);
  
-@@ -616,7 +616,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
+@@ -632,7 +632,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);
  
@@ -75650,10 +76004,10 @@ index 8db53cf..c21121d 100644
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
 diff --git a/include/linux/libata.h b/include/linux/libata.h
-index eae7a05..2cdd875 100644
+index 0e23c26..6ad8c33 100644
 --- a/include/linux/libata.h
 +++ b/include/linux/libata.h
-@@ -919,7 +919,7 @@ struct ata_port_operations {
+@@ -972,7 +972,7 @@ struct ata_port_operations {
  	 * fields must be pointers.
  	 */
  	const struct ata_port_operations	*inherits;
@@ -75662,8 +76016,20 @@ index eae7a05..2cdd875 100644
  
  struct ata_port_info {
  	unsigned long		flags;
+diff --git a/include/linux/linkage.h b/include/linux/linkage.h
+index d3e8ad2..a949f68 100644
+--- a/include/linux/linkage.h
++++ b/include/linux/linkage.h
+@@ -31,6 +31,7 @@
+ #endif
+ 
+ #define __page_aligned_data	__section(.data..page_aligned) __aligned(PAGE_SIZE)
++#define __page_aligned_rodata	__read_only __aligned(PAGE_SIZE)
+ #define __page_aligned_bss	__section(.bss..page_aligned) __aligned(PAGE_SIZE)
+ 
+ /*
 diff --git a/include/linux/list.h b/include/linux/list.h
-index b83e565..baa6c1d 100644
+index f4d8a2f..38e6e46 100644
 --- a/include/linux/list.h
 +++ b/include/linux/list.h
 @@ -112,6 +112,19 @@ extern void __list_del_entry(struct list_head *entry);
@@ -75696,7 +76062,7 @@ index b83e565..baa6c1d 100644
   * list_move - delete from one list and add as another's head
   * @list: the entry to move
 diff --git a/include/linux/math64.h b/include/linux/math64.h
-index 2913b86..8dcbb1e 100644
+index 69ed5f5..243ed51 100644
 --- a/include/linux/math64.h
 +++ b/include/linux/math64.h
 @@ -15,7 +15,7 @@
@@ -75708,16 +76074,16 @@ index 2913b86..8dcbb1e 100644
  {
  	*remainder = dividend % divisor;
  	return dividend / divisor;
-@@ -33,7 +33,7 @@ static inline s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
+@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
  /**
   * div64_u64 - unsigned 64bit divide with 64bit divisor
   */
 -static inline u64 div64_u64(u64 dividend, u64 divisor)
-+static inline u64 __intentional_overflow(0) div64_u64(u64 dividend, u64 divisor)
++static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
  {
  	return dividend / divisor;
  }
-@@ -52,7 +52,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
+@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
  #define div64_ul(x, y)   div_u64((x), (y))
  
  #ifndef div_u64_rem
@@ -75726,7 +76092,16 @@ index 2913b86..8dcbb1e 100644
  {
  	*remainder = do_div(dividend, divisor);
  	return dividend;
-@@ -81,7 +81,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
+@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
+ #endif
+ 
+ #ifndef div64_u64
+-extern u64 div64_u64(u64 dividend, u64 divisor);
++extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
+ #endif
+ 
+ #ifndef div64_s64
+@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
   * divide.
   */
  #ifndef div_u64
@@ -75735,11 +76110,36 @@ index 2913b86..8dcbb1e 100644
  {
  	u32 remainder;
  	return div_u64_rem(dividend, divisor, &remainder);
+diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
+index da6716b..2e31db3 100644
+--- a/include/linux/mempolicy.h
++++ b/include/linux/mempolicy.h
+@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
+ }
+ 
+ #define vma_policy(vma) ((vma)->vm_policy)
++static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
++{
++	vma->vm_policy = pol;
++}
+ 
+ static inline void mpol_get(struct mempolicy *pol)
+ {
+@@ -240,6 +244,9 @@ mpol_shared_policy_lookup(struct shared_policy *sp, unsigned long idx)
+ }
+ 
+ #define vma_policy(vma) NULL
++static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
++{
++}
+ 
+ static inline int
+ vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index e0c8528..bcf0c29 100644
+index 8b6e55e..c4edf39 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -104,6 +104,11 @@ extern unsigned int kobjsize(const void *objp);
+@@ -113,6 +113,11 @@ extern unsigned int kobjsize(const void *objp);
  #define VM_HUGETLB	0x00400000	/* Huge TLB Page VM */
  #define VM_NONLINEAR	0x00800000	/* Is non-linear (remap_file_pages) */
  #define VM_ARCH_1	0x01000000	/* Architecture-specific flag */
@@ -75750,8 +76150,8 @@ index e0c8528..bcf0c29 100644
 +
  #define VM_DONTDUMP	0x04000000	/* Do not include in the core dump */
  
- #define VM_MIXEDMAP	0x10000000	/* Can contain "struct page" and pure PFN pages */
-@@ -205,8 +210,8 @@ struct vm_operations_struct {
+ #ifdef CONFIG_MEM_SOFT_DIRTY
+@@ -215,8 +220,8 @@ struct vm_operations_struct {
  	/* called by access_process_vm when get_user_pages() fails, typically
  	 * for use by special VMAs that can switch between memory and hardware
  	 */
@@ -75762,7 +76162,7 @@ index e0c8528..bcf0c29 100644
  #ifdef CONFIG_NUMA
  	/*
  	 * set_policy() op must add a reference to any non-NULL @new mempolicy
-@@ -236,6 +241,7 @@ struct vm_operations_struct {
+@@ -246,6 +251,7 @@ struct vm_operations_struct {
  	int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
  			   unsigned long size, pgoff_t pgoff);
  };
@@ -75770,7 +76170,7 @@ index e0c8528..bcf0c29 100644
  
  struct mmu_gather;
  struct inode;
-@@ -980,8 +986,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
+@@ -977,8 +983,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
  	unsigned long *pfn);
  int follow_phys(struct vm_area_struct *vma, unsigned long address,
  		unsigned int flags, unsigned long *prot, resource_size_t *phys);
@@ -75781,7 +76181,7 @@ index e0c8528..bcf0c29 100644
  
  static inline void unmap_shared_mapping_range(struct address_space *mapping,
  		loff_t const holebegin, loff_t const holelen)
-@@ -1020,9 +1026,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1017,9 +1023,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
  }
  #endif
  
@@ -75794,7 +76194,7 @@ index e0c8528..bcf0c29 100644
  
  long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
  		      unsigned long start, unsigned long nr_pages,
-@@ -1053,34 +1059,6 @@ int set_page_dirty(struct page *page);
+@@ -1051,34 +1057,6 @@ int set_page_dirty(struct page *page);
  int set_page_dirty_lock(struct page *page);
  int clear_page_dirty_for_io(struct page *page);
  
@@ -75829,7 +76229,7 @@ index e0c8528..bcf0c29 100644
  extern pid_t
  vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
  
-@@ -1180,6 +1158,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
+@@ -1178,6 +1156,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
  }
  #endif
  
@@ -75845,7 +76245,7 @@ index e0c8528..bcf0c29 100644
  int vma_wants_writenotify(struct vm_area_struct *vma);
  
  extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
-@@ -1198,8 +1185,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
+@@ -1196,8 +1183,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
  {
  	return 0;
  }
@@ -75861,7 +76261,7 @@ index e0c8528..bcf0c29 100644
  #endif
  
  #ifdef __PAGETABLE_PMD_FOLDED
-@@ -1208,8 +1202,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
+@@ -1206,8 +1200,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
  {
  	return 0;
  }
@@ -75877,7 +76277,7 @@ index e0c8528..bcf0c29 100644
  #endif
  
  int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
-@@ -1227,11 +1228,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
+@@ -1225,11 +1226,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
  		NULL: pud_offset(pgd, address);
  }
  
@@ -75901,7 +76301,16 @@ index e0c8528..bcf0c29 100644
  #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
  
  #if USE_SPLIT_PTLOCKS
-@@ -1517,6 +1530,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1517,7 +1530,7 @@ extern int install_special_mapping(struct mm_struct *mm,
+ 				   unsigned long addr, unsigned long len,
+ 				   unsigned long flags, struct page **pages);
+ 
+-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
++extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
+ 
+ extern unsigned long mmap_region(struct file *file, unsigned long addr,
+ 	unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
+@@ -1525,6 +1538,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  	unsigned long len, unsigned long prot, unsigned long flags,
  	unsigned long pgoff, unsigned long *populate);
  extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -75909,7 +76318,7 @@ index e0c8528..bcf0c29 100644
  
  #ifdef CONFIG_MMU
  extern int __mm_populate(unsigned long addr, unsigned long len,
-@@ -1545,10 +1559,11 @@ struct vm_unmapped_area_info {
+@@ -1553,10 +1567,11 @@ struct vm_unmapped_area_info {
  	unsigned long high_limit;
  	unsigned long align_mask;
  	unsigned long align_offset;
@@ -75923,7 +76332,7 @@ index e0c8528..bcf0c29 100644
  
  /*
   * Search for an unmapped address range.
-@@ -1560,7 +1575,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
+@@ -1568,7 +1583,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
   * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
   */
  static inline unsigned long
@@ -75932,7 +76341,7 @@ index e0c8528..bcf0c29 100644
  {
  	if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
  		return unmapped_area(info);
-@@ -1623,6 +1638,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
+@@ -1631,6 +1646,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);
  
@@ -75943,7 +76352,7 @@ index e0c8528..bcf0c29 100644
  /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
     NULL if none.  Assume start_addr < end_addr. */
  static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
-@@ -1651,15 +1670,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
+@@ -1659,15 +1678,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
  	return vma;
  }
  
@@ -75959,7 +76368,7 @@ index e0c8528..bcf0c29 100644
  #ifdef CONFIG_ARCH_USES_NUMA_PROT_NONE
  unsigned long change_prot_numa(struct vm_area_struct *vma,
  			unsigned long start, unsigned long end);
-@@ -1711,6 +1721,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
+@@ -1719,6 +1729,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
  static inline void vm_stat_account(struct mm_struct *mm,
  			unsigned long flags, struct file *file, long pages)
  {
@@ -75971,7 +76380,7 @@ index e0c8528..bcf0c29 100644
  	mm->total_vm += pages;
  }
  #endif /* CONFIG_PROC_FS */
-@@ -1791,7 +1806,7 @@ extern int unpoison_memory(unsigned long pfn);
+@@ -1800,7 +1815,7 @@ 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);
@@ -75980,7 +76389,7 @@ index e0c8528..bcf0c29 100644
  extern int soft_offline_page(struct page *page, int flags);
  
  extern void dump_page(struct page *page);
-@@ -1828,5 +1843,11 @@ void __init setup_nr_node_ids(void);
+@@ -1837,5 +1852,11 @@ void __init setup_nr_node_ids(void);
  static inline void setup_nr_node_ids(void) {}
  #endif
  
@@ -75993,7 +76402,7 @@ index e0c8528..bcf0c29 100644
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 4a189ba..04101d6 100644
+index d9851ee..619492d 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
 @@ -289,6 +289,8 @@ struct vm_area_struct {
@@ -76005,7 +76414,7 @@ index 4a189ba..04101d6 100644
  };
  
  struct core_thread {
-@@ -438,6 +440,24 @@ struct mm_struct {
+@@ -436,6 +438,24 @@ struct mm_struct {
  	int first_nid;
  #endif
  	struct uprobes_state uprobes_state;
@@ -76053,7 +76462,7 @@ index c5d5278..f0b68c8 100644
  }
  
 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
-index 5c76737..61f518e 100644
+index bd791e4..8617c34f 100644
 --- a/include/linux/mmzone.h
 +++ b/include/linux/mmzone.h
 @@ -396,7 +396,7 @@ struct zone {
@@ -76066,7 +76475,7 @@ index 5c76737..61f518e 100644
  	/*
  	 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
-index b3bd7e7..010fa12 100644
+index 45e9214..a7227d6 100644
 --- a/include/linux/mod_devicetable.h
 +++ b/include/linux/mod_devicetable.h
 @@ -13,7 +13,7 @@
@@ -76087,7 +76496,7 @@ index b3bd7e7..010fa12 100644
  #define HID_BUS_ANY				0xffff
  #define HID_GROUP_ANY				0x0000
  
-@@ -466,7 +466,7 @@ struct dmi_system_id {
+@@ -467,7 +467,7 @@ struct dmi_system_id {
  	const char *ident;
  	struct dmi_strmatch matches[4];
  	void *driver_data;
@@ -76097,7 +76506,7 @@ index b3bd7e7..010fa12 100644
   * struct dmi_device_id appears during expansion of
   * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
 diff --git a/include/linux/module.h b/include/linux/module.h
-index 46f1ea0..a34ca37 100644
+index 05f2447..2aee07c 100644
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
 @@ -17,9 +17,11 @@
@@ -76112,7 +76521,7 @@ index 46f1ea0..a34ca37 100644
  
  /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
  #define MODULE_SIG_STRING "~Module signature appended~\n"
-@@ -54,12 +56,13 @@ struct module_attribute {
+@@ -55,12 +57,13 @@ struct module_attribute {
  	int (*test)(struct module *);
  	void (*free)(struct module *);
  };
@@ -76127,7 +76536,7 @@ index 46f1ea0..a34ca37 100644
  
  extern ssize_t __modver_version_show(struct module_attribute *,
  				     struct module_kobject *, char *);
-@@ -232,7 +235,7 @@ struct module
+@@ -238,7 +241,7 @@ struct module
  
  	/* Sysfs stuff. */
  	struct module_kobject mkobj;
@@ -76136,7 +76545,7 @@ index 46f1ea0..a34ca37 100644
  	const char *version;
  	const char *srcversion;
  	struct kobject *holders_dir;
-@@ -281,19 +284,16 @@ struct module
+@@ -287,19 +290,16 @@ struct module
  	int (*init)(void);
  
  	/* If this is non-NULL, vfree after init() returns */
@@ -76160,7 +76569,7 @@ index 46f1ea0..a34ca37 100644
  
  	/* Arch-specific module values */
  	struct mod_arch_specific arch;
-@@ -349,6 +349,10 @@ struct module
+@@ -355,6 +355,10 @@ struct module
  #ifdef CONFIG_EVENT_TRACING
  	struct ftrace_event_call **trace_events;
  	unsigned int num_trace_events;
@@ -76171,7 +76580,7 @@ index 46f1ea0..a34ca37 100644
  #endif
  #ifdef CONFIG_FTRACE_MCOUNT_RECORD
  	unsigned int num_ftrace_callsites;
-@@ -396,16 +400,46 @@ bool is_module_address(unsigned long addr);
+@@ -402,16 +406,46 @@ bool is_module_address(unsigned long addr);
  bool is_module_percpu_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
  
@@ -76269,10 +76678,10 @@ index 560ca53..ef621ef 100644
  }
  #endif
 diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
-index 137b419..fe663ec 100644
+index c3eb102..073c4a6 100644
 --- a/include/linux/moduleparam.h
 +++ b/include/linux/moduleparam.h
-@@ -284,7 +284,7 @@ static inline void __kernel_param_unlock(void)
+@@ -295,7 +295,7 @@ static inline void __kernel_param_unlock(void)
   * @len is usually just sizeof(string).
   */
  #define module_param_string(name, string, len, perm)			\
@@ -76281,7 +76690,7 @@ index 137b419..fe663ec 100644
  		= { len, string };					\
  	__module_param_call(MODULE_PARAM_PREFIX, name,			\
  			    &param_ops_string,				\
-@@ -423,7 +423,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
+@@ -434,7 +434,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
   */
  #define module_param_array_named(name, array, type, nump, perm)		\
  	param_check_##type(name, &(array)[0]);				\
@@ -76291,7 +76700,7 @@ index 137b419..fe663ec 100644
  	    .ops = &param_ops_##type,					\
  	    .elemsize = sizeof(array[0]), .elem = array };		\
 diff --git a/include/linux/namei.h b/include/linux/namei.h
-index 5a5ff57..5ae5070 100644
+index 8e47bc7..c70fd73 100644
 --- a/include/linux/namei.h
 +++ b/include/linux/namei.h
 @@ -19,7 +19,7 @@ struct nameidata {
@@ -76303,7 +76712,7 @@ index 5a5ff57..5ae5070 100644
  };
  
  /*
-@@ -84,12 +84,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
+@@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
  
  extern void nd_jump_link(struct nameidata *nd, struct path *path);
  
@@ -76319,7 +76728,7 @@ index 5a5ff57..5ae5070 100644
  	return nd->saved_names[nd->depth];
  }
 diff --git a/include/linux/net.h b/include/linux/net.h
-index 0c4ae5d..87874be 100644
+index 8bd9d92..08b1c20 100644
 --- a/include/linux/net.h
 +++ b/include/linux/net.h
 @@ -191,7 +191,7 @@ struct net_proto_family {
@@ -76332,18 +76741,18 @@ index 0c4ae5d..87874be 100644
  struct iovec;
  struct kvec;
 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 96e4c21..9cc8278 100644
+index 25f5d2d1..5cf2120 100644
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -1026,6 +1026,7 @@ struct net_device_ops {
- 	int			(*ndo_change_carrier)(struct net_device *dev,
- 						      bool new_carrier);
+@@ -1098,6 +1098,7 @@ struct net_device_ops {
+ 						      sa_family_t sa_family,
+ 						      __be16 port);
  };
 +typedef struct net_device_ops __no_const net_device_ops_no_const;
  
  /*
   *	The DEVICE structure.
-@@ -1094,7 +1095,7 @@ struct net_device {
+@@ -1169,7 +1170,7 @@ struct net_device {
  	int			iflink;
  
  	struct net_device_stats	stats;
@@ -76353,7 +76762,7 @@ index 96e4c21..9cc8278 100644
  					     */
  
 diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
-index 0060fde..481c6ae 100644
+index 708fe72ab9..77084a3 100644
 --- a/include/linux/netfilter.h
 +++ b/include/linux/netfilter.h
 @@ -82,7 +82,7 @@ struct nf_sockopt_ops {
@@ -76365,19 +76774,6 @@ index 0060fde..481c6ae 100644
  
  /* Function to register/unregister hook points. */
  int nf_register_hook(struct nf_hook_ops *reg);
-diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
-index d80e275..c3510b8 100644
---- a/include/linux/netfilter/ipset/ip_set.h
-+++ b/include/linux/netfilter/ipset/ip_set.h
-@@ -124,7 +124,7 @@ struct ip_set_type_variant {
- 	/* Return true if "b" set is the same as "a"
- 	 * according to the create set parameters */
- 	bool (*same_set)(const struct ip_set *a, const struct ip_set *b);
--};
-+} __do_const;
- 
- /* The core set type structure */
- struct ip_set_type {
 diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
 index cadb740..d7c37c0 100644
 --- a/include/linux/netfilter/nfnetlink.h
@@ -76434,29 +76830,29 @@ index d14a4c3..a078786 100644
  struct atomic_notifier_head {
  	spinlock_t lock;
 diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
-index a4c5624..79d6d88 100644
+index b2a0f15..4d7da32 100644
 --- a/include/linux/oprofile.h
 +++ b/include/linux/oprofile.h
-@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
- int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
+@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
+ int oprofilefs_create_ro_ulong(struct dentry * root,
  	char const * name, ulong * val);
   
 -/** Create a file for read-only access to an atomic_t. */
 +/** Create a file for read-only access to an atomic_unchecked_t. */
- int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
+ int oprofilefs_create_ro_atomic(struct dentry * root,
 -	char const * name, atomic_t * val);
 +	char const * name, atomic_unchecked_t * val);
   
  /** create a directory */
- struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
+ struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
 diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
-index 8db71dc..a76bf2c 100644
+index 430dd96..544e26e 100644
 --- a/include/linux/pci_hotplug.h
 +++ b/include/linux/pci_hotplug.h
-@@ -80,7 +80,8 @@ struct hotplug_slot_ops {
- 	int (*get_attention_status)	(struct hotplug_slot *slot, u8 *value);
+@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
  	int (*get_latch_status)		(struct hotplug_slot *slot, u8 *value);
  	int (*get_adapter_status)	(struct hotplug_slot *slot, u8 *value);
+ 	int (*reset_slot)		(struct hotplug_slot *slot, int probe);
 -};
 +} __do_const;
 +typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
@@ -76464,10 +76860,10 @@ index 8db71dc..a76bf2c 100644
  /**
   * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
-index c5b6dbf..b124155 100644
+index c8ba627..24bdfa8 100644
 --- a/include/linux/perf_event.h
 +++ b/include/linux/perf_event.h
-@@ -318,8 +318,8 @@ struct perf_event {
+@@ -327,8 +327,8 @@ struct perf_event {
  
  	enum perf_event_active_state	state;
  	unsigned int			attach_state;
@@ -76478,7 +76874,7 @@ index c5b6dbf..b124155 100644
  
  	/*
  	 * These are the total time in nanoseconds that the event
-@@ -370,8 +370,8 @@ struct perf_event {
+@@ -379,8 +379,8 @@ struct perf_event {
  	 * These accumulate total time (in nanoseconds) that children
  	 * events have been enabled and running, respectively.
  	 */
@@ -76489,7 +76885,7 @@ index c5b6dbf..b124155 100644
  
  	/*
  	 * Protect attach/detach and child_list:
-@@ -692,7 +692,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
+@@ -702,7 +702,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
  		entry->ip[entry->nr++] = ip;
  }
  
@@ -76497,11 +76893,11 @@ index c5b6dbf..b124155 100644
 +extern int sysctl_perf_event_legitimately_concerned;
  extern int sysctl_perf_event_mlock;
  extern int sysctl_perf_event_sample_rate;
- 
-@@ -700,19 +700,24 @@ extern int perf_proc_update_handler(struct ctl_table *table, int write,
- 		void __user *buffer, size_t *lenp,
+ extern int sysctl_perf_cpu_time_max_percent;
+@@ -717,19 +717,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
  		loff_t *ppos);
  
+ 
 +static inline bool perf_paranoid_any(void)
 +{
 +	return sysctl_perf_event_legitimately_concerned > 2;
@@ -76526,16 +76922,7 @@ index c5b6dbf..b124155 100644
  }
  
  extern void perf_event_init(void);
-@@ -806,7 +811,7 @@ static inline void perf_restore_debug_store(void)			{ }
-  */
- #define perf_cpu_notifier(fn)						\
- do {									\
--	static struct notifier_block fn##_nb __cpuinitdata =		\
-+	static struct notifier_block fn##_nb =				\
- 		{ .notifier_call = fn, .priority = CPU_PRI_PERF };	\
- 	unsigned long cpu = smp_processor_id();				\
- 	unsigned long flags;						\
-@@ -826,7 +831,7 @@ struct perf_pmu_events_attr {
+@@ -845,7 +850,7 @@ struct perf_pmu_events_attr {
  	struct device_attribute attr;
  	u64 id;
  	const char *event_str;
@@ -76589,6 +76976,18 @@ index c256c59..8ea94c7 100644
  
  extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd);
  
+diff --git a/include/linux/pm.h b/include/linux/pm.h
+index a224c7f..92d8a97 100644
+--- a/include/linux/pm.h
++++ b/include/linux/pm.h
+@@ -576,6 +576,7 @@ extern int dev_pm_put_subsys_data(struct device *dev);
+ struct dev_pm_domain {
+ 	struct dev_pm_ops	ops;
+ };
++typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
+ 
+ /*
+  * The PM_EVENT_ messages are also used by drivers implementing the legacy
 diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
 index 7c1d252..c5c773e 100644
 --- a/include/linux/pm_domain.h
@@ -76603,10 +77002,10 @@ index 7c1d252..c5c773e 100644
  
  struct generic_pm_domain {
 diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
-index 7d7e09e..8671ef8 100644
+index 6fa7cea..7bf6415 100644
 --- a/include/linux/pm_runtime.h
 +++ b/include/linux/pm_runtime.h
-@@ -104,7 +104,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
+@@ -103,7 +103,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
  
  static inline void pm_runtime_mark_last_busy(struct device *dev)
  {
@@ -76644,7 +77043,7 @@ index 2110a81..13a11bb 100644
  /********** include/linux/timer.h **********/
  /*
 diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
-index c0f44c2..1572583 100644
+index d8b187c3..9a9257a 100644
 --- a/include/linux/power/smartreflex.h
 +++ b/include/linux/power/smartreflex.h
 @@ -238,7 +238,7 @@ struct omap_sr_class_data {
@@ -76725,7 +77124,7 @@ index f5d4723..a6ea2fa 100644
  
  #define preempt_disable_notrace()		barrier()
 diff --git a/include/linux/printk.h b/include/linux/printk.h
-index 22c7052..ad3fa0a 100644
+index e6131a78..8e9fb61 100644
 --- a/include/linux/printk.h
 +++ b/include/linux/printk.h
 @@ -106,6 +106,8 @@ static inline __printf(1, 2) __cold
@@ -76782,11 +77181,46 @@ index 34a1e10..03a6d03 100644
  
  struct proc_ns {
  	void *ns;
+diff --git a/include/linux/quota.h b/include/linux/quota.h
+index cc7494a..1e27036 100644
+--- a/include/linux/quota.h
++++ b/include/linux/quota.h
+@@ -70,7 +70,7 @@ struct kqid {			/* Type in which we store the quota identifier */
+ 
+ extern bool qid_eq(struct kqid left, struct kqid right);
+ extern bool qid_lt(struct kqid left, struct kqid right);
+-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
++extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
+ extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
+ extern bool qid_valid(struct kqid qid);
+ 
 diff --git a/include/linux/random.h b/include/linux/random.h
-index bf9085e..57fbf6c 100644
+index bf9085e..128eade 100644
 --- a/include/linux/random.h
 +++ b/include/linux/random.h
-@@ -33,6 +33,11 @@ void prandom_seed(u32 seed);
+@@ -10,9 +10,19 @@
+ 
+ 
+ extern void add_device_randomness(const void *, unsigned int);
++
++static inline void add_latent_entropy(void)
++{
++
++#ifdef LATENT_ENTROPY_PLUGIN
++	add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
++#endif
++
++}
++
+ extern void add_input_randomness(unsigned int type, unsigned int code,
+-				 unsigned int value);
+-extern void add_interrupt_randomness(int irq, int irq_flags);
++				 unsigned int value) __latent_entropy;
++extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
+ 
+ extern void get_random_bytes(void *buf, int nbytes);
+ extern void get_random_bytes_arch(void *buf, int nbytes);
+@@ -33,6 +43,11 @@ void prandom_seed(u32 seed);
  u32 prandom_u32_state(struct rnd_state *);
  void prandom_bytes_state(struct rnd_state *state, void *buf, int nbytes);
  
@@ -76847,10 +77281,10 @@ index 4106721..132d42c 100644
   * hlist_del_init_rcu - deletes entry from hash list with re-initialization
   * @n: the element to delete from the hash list.
 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
-index 23b3630..e1bc12b 100644
+index 8e00f9f..9449b55 100644
 --- a/include/linux/reboot.h
 +++ b/include/linux/reboot.h
-@@ -18,9 +18,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
+@@ -43,9 +43,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
   * Architecture-specific implementations of sys_reboot commands.
   */
  
@@ -76863,7 +77297,7 @@ index 23b3630..e1bc12b 100644
  
  extern void machine_shutdown(void);
  struct pt_regs;
-@@ -31,9 +31,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
+@@ -56,9 +56,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
   */
  
  extern void kernel_restart_prepare(char *cmd);
@@ -76876,7 +77310,7 @@ index 23b3630..e1bc12b 100644
  
  extern int C_A_D; /* for sysctl */
  void ctrl_alt_del(void);
-@@ -47,7 +47,7 @@ extern int orderly_poweroff(bool force);
+@@ -72,7 +72,7 @@ extern int orderly_poweroff(bool force);
   * Emergency restart, callable from an interrupt handler.
   */
  
@@ -76913,10 +77347,10 @@ index d7c8359..818daf5 100644
  /*
   * CONFIG_RELAY kernel API, kernel/relay.c
 diff --git a/include/linux/rio.h b/include/linux/rio.h
-index 18e0993..8ab5b21 100644
+index b71d573..2f940bd 100644
 --- a/include/linux/rio.h
 +++ b/include/linux/rio.h
-@@ -345,7 +345,7 @@ struct rio_ops {
+@@ -355,7 +355,7 @@ struct rio_ops {
  	int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
  			u64 rstart, u32 size, u32 flags);
  	void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
@@ -76941,7 +77375,7 @@ index 6dacb93..6174423 100644
  static inline void anon_vma_merge(struct vm_area_struct *vma,
  				  struct vm_area_struct *next)
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 597c8ab..a4ef49a 100644
+index b1e963e..114b8fd 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -62,6 +62,7 @@ struct bio_list;
@@ -76952,7 +77386,7 @@ index 597c8ab..a4ef49a 100644
  
  /*
   * List of flags we want to share for kernel threads,
-@@ -303,7 +304,7 @@ extern char __sched_text_start[], __sched_text_end[];
+@@ -295,7 +296,7 @@ extern char __sched_text_start[], __sched_text_end[];
  extern int in_sched_functions(unsigned long addr);
  
  #define	MAX_SCHEDULE_TIMEOUT	LONG_MAX
@@ -76961,7 +77395,7 @@ index 597c8ab..a4ef49a 100644
  extern signed long schedule_timeout_interruptible(signed long timeout);
  extern signed long schedule_timeout_killable(signed long timeout);
  extern signed long schedule_timeout_uninterruptible(signed long timeout);
-@@ -314,6 +315,18 @@ struct nsproxy;
+@@ -306,6 +307,19 @@ struct nsproxy;
  struct user_namespace;
  
  #ifdef CONFIG_MMU
@@ -76977,10 +77411,11 @@ index 597c8ab..a4ef49a 100644
 +
 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
++
  extern void arch_pick_mmap_layout(struct mm_struct *mm);
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
-@@ -595,6 +608,17 @@ struct signal_struct {
+@@ -585,6 +599,17 @@ struct signal_struct {
  #ifdef CONFIG_TASKSTATS
  	struct taskstats *stats;
  #endif
@@ -76998,7 +77433,7 @@ index 597c8ab..a4ef49a 100644
  #ifdef CONFIG_AUDIT
  	unsigned audit_tty;
  	unsigned audit_tty_log_passwd;
-@@ -675,6 +699,14 @@ struct user_struct {
+@@ -665,6 +690,14 @@ struct user_struct {
  	struct key *session_keyring;	/* UID's default session keyring */
  #endif
  
@@ -77013,7 +77448,7 @@ index 597c8ab..a4ef49a 100644
  	/* Hash table maintenance information */
  	struct hlist_node uidhash_node;
  	kuid_t uid;
-@@ -1162,8 +1194,8 @@ struct task_struct {
+@@ -1150,8 +1183,8 @@ struct task_struct {
  	struct list_head thread_group;
  
  	struct completion *vfork_done;		/* for vfork() */
@@ -77024,7 +77459,7 @@ index 597c8ab..a4ef49a 100644
  
  	cputime_t utime, stime, utimescaled, stimescaled;
  	cputime_t gtime;
-@@ -1188,11 +1220,6 @@ struct task_struct {
+@@ -1176,11 +1209,6 @@ struct task_struct {
  	struct task_cputime cputime_expires;
  	struct list_head cpu_timers[3];
  
@@ -77036,7 +77471,7 @@ index 597c8ab..a4ef49a 100644
  	char comm[TASK_COMM_LEN]; /* executable name excluding path
  				     - access with [gs]et_task_comm (which lock
  				       it with task_lock())
-@@ -1209,6 +1236,10 @@ struct task_struct {
+@@ -1197,6 +1225,10 @@ struct task_struct {
  #endif
  /* CPU-specific state of this task */
  	struct thread_struct thread;
@@ -77047,7 +77482,7 @@ index 597c8ab..a4ef49a 100644
  /* filesystem information */
  	struct fs_struct *fs;
  /* open file information */
-@@ -1282,6 +1313,10 @@ struct task_struct {
+@@ -1270,6 +1302,10 @@ struct task_struct {
  	gfp_t lockdep_reclaim_gfp;
  #endif
  
@@ -77058,7 +77493,7 @@ index 597c8ab..a4ef49a 100644
  /* journalling filesystem info */
  	void *journal_info;
  
-@@ -1320,6 +1355,10 @@ struct task_struct {
+@@ -1308,6 +1344,10 @@ struct task_struct {
  	/* cg_list protected by css_set_lock and tsk->alloc_lock */
  	struct list_head cg_list;
  #endif
@@ -77069,7 +77504,7 @@ index 597c8ab..a4ef49a 100644
  #ifdef CONFIG_FUTEX
  	struct robust_list_head __user *robust_list;
  #ifdef CONFIG_COMPAT
-@@ -1420,8 +1459,76 @@ struct task_struct {
+@@ -1411,8 +1451,78 @@ struct task_struct {
  	unsigned int	sequential_io;
  	unsigned int	sequential_io_avg;
  #endif
@@ -77084,10 +77519,12 @@ index 597c8ab..a4ef49a 100644
 +#endif
 +	struct dentry *gr_chroot_dentry;
 +	struct acl_subject_label *acl;
++	struct acl_subject_label *tmpacl;
 +	struct acl_role_label *role;
 +	struct file *exec_file;
 +	unsigned long brute_expires;
 +	u16 acl_role_id;
++	u8 inherited;
 +	/* is this the task that authenticated to the special role */
 +	u8 acl_sp_role;
 +	u8 is_writable;
@@ -77146,7 +77583,7 @@ index 597c8ab..a4ef49a 100644
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  
-@@ -1480,7 +1587,7 @@ struct pid_namespace;
+@@ -1471,7 +1581,7 @@ struct pid_namespace;
  pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
  			struct pid_namespace *ns);
  
@@ -77155,7 +77592,7 @@ index 597c8ab..a4ef49a 100644
  {
  	return tsk->pid;
  }
-@@ -1923,7 +2030,9 @@ void yield(void);
+@@ -1921,7 +2031,9 @@ void yield(void);
  extern struct exec_domain	default_exec_domain;
  
  union thread_union {
@@ -77165,7 +77602,7 @@ index 597c8ab..a4ef49a 100644
  	unsigned long stack[THREAD_SIZE/sizeof(long)];
  };
  
-@@ -1956,6 +2065,7 @@ extern struct pid_namespace init_pid_ns;
+@@ -1954,6 +2066,7 @@ extern struct pid_namespace init_pid_ns;
   */
  
  extern struct task_struct *find_task_by_vpid(pid_t nr);
@@ -77173,7 +77610,7 @@ index 597c8ab..a4ef49a 100644
  extern struct task_struct *find_task_by_pid_ns(pid_t nr,
  		struct pid_namespace *ns);
  
-@@ -2122,7 +2232,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
+@@ -2118,7 +2231,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -77182,7 +77619,7 @@ index 597c8ab..a4ef49a 100644
  
  extern int allow_signal(int);
  extern int disallow_signal(int);
-@@ -2313,9 +2423,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
+@@ -2309,9 +2422,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
  
  #endif
  
@@ -77207,19 +77644,41 @@ index bf8086b..962b035 100644
  extern unsigned int sysctl_sched_latency;
  extern unsigned int sysctl_sched_min_granularity;
 diff --git a/include/linux/security.h b/include/linux/security.h
-index 4686491..2bd210e 100644
+index 9d37e2b..43368e4 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
-@@ -26,6 +26,7 @@
- #include <linux/capability.h>
+@@ -27,6 +27,7 @@
  #include <linux/slab.h>
  #include <linux/err.h>
+ #include <linux/string.h>
 +#include <linux/grsecurity.h>
  
  struct linux_binprm;
  struct cred;
+@@ -116,8 +117,6 @@ struct seq_file;
+ 
+ extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
+ 
+-void reset_security_ops(void);
+-
+ #ifdef CONFIG_MMU
+ extern unsigned long mmap_min_addr;
+ extern unsigned long dac_mmap_min_addr;
+diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
+index dc368b8..e895209 100644
+--- a/include/linux/semaphore.h
++++ b/include/linux/semaphore.h
+@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
+ }
+ 
+ extern void down(struct semaphore *sem);
+-extern int __must_check down_interruptible(struct semaphore *sem);
++extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
+ extern int __must_check down_killable(struct semaphore *sem);
+ extern int __must_check down_trylock(struct semaphore *sem);
+ extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
 diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
-index 2da29ac..aac448ec 100644
+index 4e32edc..f8f2d18 100644
 --- a/include/linux/seq_file.h
 +++ b/include/linux/seq_file.h
 @@ -26,6 +26,9 @@ struct seq_file {
@@ -77255,23 +77714,11 @@ index 429c199..4d42e38 100644
  };
  
  /* shm_mode upper byte flags */
-diff --git a/include/linux/signal.h b/include/linux/signal.h
-index 2ac423b..237c72e 100644
---- a/include/linux/signal.h
-+++ b/include/linux/signal.h
-@@ -433,6 +433,7 @@ void signals_init(void);
- 
- int restore_altstack(const stack_t __user *);
- int __save_altstack(stack_t __user *, unsigned long);
-+void __save_altstack_ex(stack_t __user *, unsigned long);
- 
- #define save_altstack_ex(uss, sp) do { \
- 	stack_t __user *__uss = uss; \
 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index 74db47e..c42c51d 100644
+index f66f346..2e304d5 100644
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -631,7 +631,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
+@@ -639,7 +639,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
  extern struct sk_buff *__alloc_skb(unsigned int size,
  				   gfp_t priority, int flags, int node);
  extern struct sk_buff *build_skb(void *data, unsigned int frag_size);
@@ -77280,7 +77727,7 @@ index 74db47e..c42c51d 100644
  					gfp_t priority)
  {
  	return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
-@@ -747,7 +747,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
+@@ -755,7 +755,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
   */
  static inline int skb_queue_empty(const struct sk_buff_head *list)
  {
@@ -77289,7 +77736,7 @@ index 74db47e..c42c51d 100644
  }
  
  /**
-@@ -760,7 +760,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
+@@ -768,7 +768,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
  static inline bool skb_queue_is_last(const struct sk_buff_head *list,
  				     const struct sk_buff *skb)
  {
@@ -77298,7 +77745,7 @@ index 74db47e..c42c51d 100644
  }
  
  /**
-@@ -773,7 +773,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
+@@ -781,7 +781,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
  static inline bool skb_queue_is_first(const struct sk_buff_head *list,
  				      const struct sk_buff *skb)
  {
@@ -77307,7 +77754,7 @@ index 74db47e..c42c51d 100644
  }
  
  /**
-@@ -1844,7 +1844,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
+@@ -1741,7 +1741,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD
@@ -77316,7 +77763,7 @@ index 74db47e..c42c51d 100644
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-@@ -2439,7 +2439,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
+@@ -2339,7 +2339,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
  					 int noblock, int *err);
  extern unsigned int    datagram_poll(struct file *file, struct socket *sock,
  				     struct poll_table_struct *wait);
@@ -77325,7 +77772,7 @@ index 74db47e..c42c51d 100644
  					       int offset, struct iovec *to,
  					       int size);
  extern int	       skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
-@@ -2713,6 +2713,9 @@ static inline void nf_reset(struct sk_buff *skb)
+@@ -2618,6 +2618,9 @@ static inline void nf_reset(struct sk_buff *skb)
  	nf_bridge_put(skb->nf_bridge);
  	skb->nf_bridge = NULL;
  #endif
@@ -77336,10 +77783,10 @@ index 74db47e..c42c51d 100644
  
  static inline void nf_reset_trace(struct sk_buff *skb)
 diff --git a/include/linux/slab.h b/include/linux/slab.h
-index 0c62175..f016ac1 100644
+index 74f1058..914b7da 100644
 --- a/include/linux/slab.h
 +++ b/include/linux/slab.h
-@@ -12,15 +12,29 @@
+@@ -14,15 +14,29 @@
  #include <linux/gfp.h>
  #include <linux/types.h>
  #include <linux/workqueue.h>
@@ -77370,7 +77817,7 @@ index 0c62175..f016ac1 100644
  #define SLAB_HWCACHE_ALIGN	0x00002000UL	/* Align objs on cache lines */
  #define SLAB_CACHE_DMA		0x00004000UL	/* Use GFP_DMA memory */
  #define SLAB_STORE_USER		0x00010000UL	/* DEBUG: Store the last owner for bug hunting */
-@@ -89,10 +103,13 @@
+@@ -91,10 +105,13 @@
   * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
   * Both make kfree a no-op.
   */
@@ -77385,9 +77832,9 @@ index 0c62175..f016ac1 100644
 -				(unsigned long)ZERO_SIZE_PTR)
 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
  
+ #include <linux/kmemleak.h>
  
- struct mem_cgroup;
-@@ -132,6 +149,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
+@@ -135,6 +152,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
  void kfree(const void *);
  void kzfree(const void *);
  size_t ksize(const void *);
@@ -77396,7 +77843,7 @@ index 0c62175..f016ac1 100644
  
  /*
   * Some archs want to perform DMA into kmalloc caches and need a guaranteed
-@@ -164,7 +183,7 @@ struct kmem_cache {
+@@ -167,7 +186,7 @@ struct kmem_cache {
  	unsigned int align;	/* Alignment as calculated */
  	unsigned long flags;	/* Active flags on the slab */
  	const char *name;	/* Slab name for sysfs */
@@ -77405,7 +77852,7 @@ index 0c62175..f016ac1 100644
  	void (*ctor)(void *);	/* Called on object slot creation */
  	struct list_head list;	/* List of all slab caches on the system */
  };
-@@ -226,6 +245,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
+@@ -241,6 +260,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
  extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
  #endif
  
@@ -77416,7 +77863,7 @@ index 0c62175..f016ac1 100644
  /*
   * Figure out which kmalloc slab an allocation of a certain size
   * belongs to.
-@@ -234,7 +257,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
+@@ -249,7 +272,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
   * 2 = 120 .. 192 bytes
   * n = 2^(n-1) .. 2^n -1
   */
@@ -77425,37 +77872,25 @@ index 0c62175..f016ac1 100644
  {
  	if (!size)
  		return 0;
-@@ -406,6 +429,7 @@ void print_slabinfo_header(struct seq_file *m);
-  * for general use, and so are not documented here. For a full list of
-  * potential flags, always refer to linux/gfp.h.
-  */
-+
- static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
- {
- 	if (size != 0 && n > SIZE_MAX / size)
-@@ -465,7 +489,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
- #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
- 	(defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \
- 	(defined(CONFIG_SLOB) && defined(CONFIG_TRACING))
--extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
-+extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1);
- #define kmalloc_track_caller(size, flags) \
- 	__kmalloc_track_caller(size, flags, _RET_IP_)
+@@ -292,11 +315,11 @@ static __always_inline int kmalloc_index(size_t size)
+ }
+ #endif /* !CONFIG_SLOB */
+ 
+-void *__kmalloc(size_t size, gfp_t flags);
++void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
+ void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
+ 
+ #ifdef CONFIG_NUMA
+-void *__kmalloc_node(size_t size, gfp_t flags, int node);
++void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1);
+ void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
  #else
-@@ -485,7 +509,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
- #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
- 	(defined(CONFIG_SLAB) && defined(CONFIG_TRACING)) || \
- 	(defined(CONFIG_SLOB) && defined(CONFIG_TRACING))
--extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
-+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1);
- #define kmalloc_node_track_caller(size, flags, node) \
- 	__kmalloc_node_track_caller(size, flags, node, \
- 			_RET_IP_)
+ static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
-index cd40158..4e2f7af 100644
+index e9346b4..1494959 100644
 --- a/include/linux/slab_def.h
 +++ b/include/linux/slab_def.h
-@@ -50,7 +50,7 @@ struct kmem_cache {
+@@ -36,7 +36,7 @@ struct kmem_cache {
  /* 4) cache creation/removal */
  	const char *name;
  	struct list_head list;
@@ -77464,7 +77899,7 @@ index cd40158..4e2f7af 100644
  	int object_size;
  	int align;
  
-@@ -66,10 +66,14 @@ struct kmem_cache {
+@@ -52,10 +52,14 @@ struct kmem_cache {
  	unsigned long node_allocs;
  	unsigned long node_frees;
  	unsigned long node_overflow;
@@ -77483,79 +77918,11 @@ index cd40158..4e2f7af 100644
  
  	/*
  	 * If debugging is enabled, then the allocator can add additional
-@@ -103,7 +107,7 @@ struct kmem_cache {
- };
- 
- void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
--void *__kmalloc(size_t size, gfp_t flags);
-+void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
- 
- #ifdef CONFIG_TRACING
- extern void *kmem_cache_alloc_trace(struct kmem_cache *, gfp_t, size_t);
-@@ -136,6 +140,13 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
- 			cachep = kmalloc_dma_caches[i];
- 		else
- #endif
-+
-+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+		if (flags & GFP_USERCOPY)
-+			cachep = kmalloc_usercopy_caches[i];
-+		else
-+#endif
-+
- 			cachep = kmalloc_caches[i];
- 
- 		ret = kmem_cache_alloc_trace(cachep, flags, size);
-@@ -146,7 +157,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
- }
- 
- #ifdef CONFIG_NUMA
--extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
-+extern void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
- extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
- 
- #ifdef CONFIG_TRACING
-@@ -185,6 +196,13 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
- 			cachep = kmalloc_dma_caches[i];
- 		else
- #endif
-+
-+#ifdef CONFIG_PAX_USERCOPY_SLABS
-+		if (flags & GFP_USERCOPY)
-+			cachep = kmalloc_usercopy_caches[i];
-+		else
-+#endif
-+
- 			cachep = kmalloc_caches[i];
- 
- 		return kmem_cache_alloc_node_trace(cachep, flags, node, size);
-diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
-index f28e14a..7831211 100644
---- a/include/linux/slob_def.h
-+++ b/include/linux/slob_def.h
-@@ -11,7 +11,7 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
- 	return kmem_cache_alloc_node(cachep, flags, NUMA_NO_NODE);
- }
- 
--void *__kmalloc_node(size_t size, gfp_t flags, int node);
-+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
- 
- static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
- {
-@@ -31,7 +31,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
- 	return __kmalloc_node(size, flags, NUMA_NO_NODE);
- }
- 
--static __always_inline void *__kmalloc(size_t size, gfp_t flags)
-+static __always_inline __size_overflow(1) void *__kmalloc(size_t size, gfp_t flags)
- {
- 	return kmalloc(size, flags);
- }
 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
-index 027276f..092bfe8 100644
+index cc0b67e..a0329b1 100644
 --- a/include/linux/slub_def.h
 +++ b/include/linux/slub_def.h
-@@ -80,7 +80,7 @@ struct kmem_cache {
+@@ -74,7 +74,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 */
@@ -77564,38 +77931,11 @@ index 027276f..092bfe8 100644
  	void (*ctor)(void *);
  	int inuse;		/* Offset to metadata */
  	int align;		/* Alignment */
-@@ -105,7 +105,7 @@ struct kmem_cache {
- };
- 
- void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
--void *__kmalloc(size_t size, gfp_t flags);
-+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
- 
- static __always_inline void *
- kmalloc_order(size_t size, gfp_t flags, unsigned int order)
-@@ -149,7 +149,7 @@ kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
- }
- #endif
- 
--static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
-+static __always_inline __size_overflow(1) void *kmalloc_large(size_t size, gfp_t flags)
- {
- 	unsigned int order = get_order(size);
- 	return kmalloc_order_trace(size, flags, order);
-@@ -175,7 +175,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
- }
- 
- #ifdef CONFIG_NUMA
--void *__kmalloc_node(size_t size, gfp_t flags, int node);
-+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
- void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
- 
- #ifdef CONFIG_TRACING
 diff --git a/include/linux/smp.h b/include/linux/smp.h
-index c848876..11e8a84 100644
+index 731f523..3340268 100644
 --- a/include/linux/smp.h
 +++ b/include/linux/smp.h
-@@ -221,7 +221,9 @@ static inline void kick_all_cpus_sync(void) {  }
+@@ -186,7 +186,9 @@ static inline void __smp_call_function_single(int cpuid,
  #endif
  
  #define get_cpu()		({ preempt_disable(); smp_processor_id(); })
@@ -77666,7 +78006,7 @@ index 07d8e53..dc934c9 100644
  
  #endif /* _LINUX_SUNRPC_ADDR_H */
 diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
-index bfe11be..12bc8c4 100644
+index 6740801..c535f27 100644
 --- a/include/linux/sunrpc/clnt.h
 +++ b/include/linux/sunrpc/clnt.h
 @@ -96,7 +96,7 @@ struct rpc_procinfo {
@@ -77679,10 +78019,10 @@ index bfe11be..12bc8c4 100644
  #ifdef __KERNEL__
  
 diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
-index 1f0216b..6a4fa50 100644
+index 6eecfc2..7ada79d 100644
 --- a/include/linux/sunrpc/svc.h
 +++ b/include/linux/sunrpc/svc.h
-@@ -411,7 +411,7 @@ struct svc_procedure {
+@@ -410,7 +410,7 @@ struct svc_procedure {
  	unsigned int		pc_count;	/* call count */
  	unsigned int		pc_cachetype;	/* cache info (NFS) */
  	unsigned int		pc_xdrressize;	/* maximum size of XDR reply */
@@ -77721,10 +78061,10 @@ index 0b8e3e6..33e0a01 100644
  #define RPCRDMA_VERSION 1
  
 diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
-index ff374ab..7fd2ecb 100644
+index 8d71d65..f79586e 100644
 --- a/include/linux/sunrpc/svcauth.h
 +++ b/include/linux/sunrpc/svcauth.h
-@@ -109,7 +109,7 @@ struct auth_ops {
+@@ -120,7 +120,7 @@ struct auth_ops {
  	int	(*release)(struct svc_rqst *rq);
  	void	(*domain_release)(struct auth_domain *);
  	int	(*set_client)(struct svc_rqst *rq);
@@ -77748,7 +78088,7 @@ index a5ffd32..0935dea 100644
  extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
  				   unsigned long offset, size_t size,
 diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
-index 84662ec..5271947 100644
+index 7fac04e..de57300 100644
 --- a/include/linux/syscalls.h
 +++ b/include/linux/syscalls.h
 @@ -97,8 +97,14 @@ struct sigaltstack;
@@ -77767,7 +78107,7 @@ index 84662ec..5271947 100644
  #define __SC_CAST(t, a)	(t) a
  #define __SC_ARGS(t, a)	a
  #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
-@@ -362,11 +368,11 @@ asmlinkage long sys_sync(void);
+@@ -363,11 +369,11 @@ asmlinkage long sys_sync(void);
  asmlinkage long sys_fsync(unsigned int fd);
  asmlinkage long sys_fdatasync(unsigned int fd);
  asmlinkage long sys_bdflush(int func, long data);
@@ -77783,7 +78123,7 @@ index 84662ec..5271947 100644
  asmlinkage long sys_truncate(const char __user *path, long length);
  asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
  asmlinkage long sys_stat(const char __user *filename,
-@@ -578,7 +584,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
+@@ -579,7 +585,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
  asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
  asmlinkage long sys_send(int, void __user *, size_t, unsigned);
  asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
@@ -77837,10 +78177,10 @@ index 14a8ff2..af52bad 100644
  struct ctl_node {
  	struct rb_node node;
 diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
-index e2cee22..3ddb921 100644
+index 11baec7..706f99f 100644
 --- a/include/linux/sysfs.h
 +++ b/include/linux/sysfs.h
-@@ -31,7 +31,8 @@ struct attribute {
+@@ -33,7 +33,8 @@ struct attribute {
  	struct lock_class_key	*key;
  	struct lock_class_key	skey;
  #endif
@@ -77850,18 +78190,17 @@ index e2cee22..3ddb921 100644
  
  /**
   *	sysfs_attr_init - initialize a dynamically allocated sysfs attribute
-@@ -59,8 +60,8 @@ struct attribute_group {
- 	umode_t			(*is_visible)(struct kobject *,
+@@ -62,7 +63,8 @@ struct attribute_group {
  					      struct attribute *, int);
  	struct attribute	**attrs;
+ 	struct bin_attribute	**bin_attrs;
 -};
--
 +} __do_const;
 +typedef struct attribute_group __no_const attribute_group_no_const;
  
- 
  /**
-@@ -107,7 +108,8 @@ struct bin_attribute {
+  * Use these macros to make defining attributes easier. See include/linux/device.h
+@@ -126,7 +128,8 @@ struct bin_attribute {
  			 char *, loff_t, size_t);
  	int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
  		    struct vm_area_struct *vma);
@@ -77913,10 +78252,10 @@ index 4ae6f32..425d3e1 100644
  
  #endif /* _LINUX_THREAD_INFO_H */
 diff --git a/include/linux/tty.h b/include/linux/tty.h
-index 8780bd2..d1ae08b 100644
+index 64f8646..1515fc7 100644
 --- a/include/linux/tty.h
 +++ b/include/linux/tty.h
-@@ -194,7 +194,7 @@ struct tty_port {
+@@ -197,7 +197,7 @@ struct tty_port {
  	const struct tty_port_operations *ops;	/* Port operations */
  	spinlock_t		lock;		/* Lock protecting tty field */
  	int			blocked_open;	/* Waiting to open */
@@ -77925,7 +78264,7 @@ index 8780bd2..d1ae08b 100644
  	wait_queue_head_t	open_wait;	/* Open waiters */
  	wait_queue_head_t	close_wait;	/* Close waiters */
  	wait_queue_head_t	delta_msr_wait;	/* Modem status change */
-@@ -550,7 +550,7 @@ extern int tty_port_open(struct tty_port *port,
+@@ -546,7 +546,7 @@ extern int tty_port_open(struct tty_port *port,
  				struct tty_struct *tty, struct file *filp);
  static inline int tty_port_users(struct tty_port *port)
  {
@@ -77948,10 +78287,10 @@ index 756a609..b302dd6 100644
  struct tty_driver {
  	int	magic;		/* magic number for this structure */
 diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
-index 58390c7..95e214c 100644
+index f15c898..207b7d1 100644
 --- a/include/linux/tty_ldisc.h
 +++ b/include/linux/tty_ldisc.h
-@@ -146,7 +146,7 @@ struct tty_ldisc_ops {
+@@ -211,7 +211,7 @@ struct tty_ldisc_ops {
  
  	struct  module *owner;
  
@@ -78076,10 +78415,10 @@ index 99c1b4d..562e6f3 100644
  
  static inline void put_unaligned_le16(u16 val, void *p)
 diff --git a/include/linux/usb.h b/include/linux/usb.h
-index a0bee5a..5533a52 100644
+index 39cfa0a..d45fa38 100644
 --- a/include/linux/usb.h
 +++ b/include/linux/usb.h
-@@ -552,7 +552,7 @@ struct usb_device {
+@@ -563,7 +563,7 @@ struct usb_device {
  	int maxchild;
  
  	u32 quirks;
@@ -78088,7 +78427,7 @@ index a0bee5a..5533a52 100644
  
  	unsigned long active_duration;
  
-@@ -1607,7 +1607,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
+@@ -1637,7 +1637,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
  
  extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
  	__u8 request, __u8 requesttype, __u16 value, __u16 index,
@@ -78151,44 +78490,59 @@ index 6f8fbcf..8259001 100644
 +	MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
 +	MODULE_GRSEC
  
+diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
+index 502073a..a7de024 100644
+--- a/include/linux/vga_switcheroo.h
++++ b/include/linux/vga_switcheroo.h
+@@ -63,8 +63,8 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
+ 
+ void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
+ 
+-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
+-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
++int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
++int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
+ #else
+ 
+ static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
+@@ -81,8 +81,8 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
+ 
+ static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
+ 
+-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
+-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
++static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
++static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
+ 
+ #endif
+ #endif /* _LINUX_VGA_SWITCHEROO_H_ */
 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
-index 7d5773a..541c01c 100644
+index 4b8a891..cb8df6e 100644
 --- a/include/linux/vmalloc.h
 +++ b/include/linux/vmalloc.h
 @@ -16,6 +16,11 @@ struct vm_area_struct;		/* vma defining user mapping in mm_types.h */
- #define VM_USERMAP	0x00000008	/* suitable for remap_vmalloc_range */
- #define VM_VPAGES	0x00000010	/* buffer for pages was vmalloc'ed */
- #define VM_UNLIST	0x00000020	/* vm_struct is not listed in vmlist */
+ #define VM_USERMAP		0x00000008	/* suitable for remap_vmalloc_range */
+ #define VM_VPAGES		0x00000010	/* buffer for pages was vmalloc'ed */
+ #define VM_UNINITIALIZED	0x00000020	/* vm_struct is not fully initialized */
 +
 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
-+#define VM_KERNEXEC	0x00000040	/* allocate from executable kernel memory range */
++#define VM_KERNEXEC		0x00000040	/* allocate from executable kernel memory range */
 +#endif
 +
  /* bits [20..32] reserved for arch specific ioremap internals */
  
  /*
-@@ -75,7 +80,7 @@ extern void *vmalloc_32_user(unsigned long size);
- extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
- extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
- 			unsigned long start, unsigned long end, gfp_t gfp_mask,
--			pgprot_t prot, int node, const void *caller);
-+			pgprot_t prot, int node, const void *caller) __size_overflow(1);
- extern void vfree(const void *addr);
- 
- extern void *vmap(struct page **pages, unsigned int count,
-@@ -137,8 +142,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes);
- extern void free_vm_area(struct vm_struct *area);
+@@ -142,7 +147,7 @@ extern void free_vm_area(struct vm_struct *area);
  
  /* for /dev/kmem */
--extern long vread(char *buf, char *addr, unsigned long count);
+ extern long vread(char *buf, char *addr, unsigned long count);
 -extern long vwrite(char *buf, char *addr, unsigned long count);
-+extern long vread(char *buf, char *addr, unsigned long count) __size_overflow(3);
 +extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
  
  /*
   *	Internals.  Dont't use..
 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
-index c586679..f06b389 100644
+index e4b9480..5a5f65a 100644
 --- a/include/linux/vmstat.h
 +++ b/include/linux/vmstat.h
 @@ -90,18 +90,18 @@ static inline void vm_events_fold_cpu(int cpu)
@@ -78207,15 +78561,20 @@ index c586679..f06b389 100644
 +	atomic_long_add_unchecked(x, &vm_stat[item]);
  }
  
- static inline unsigned long global_page_state(enum zone_stat_item item)
+-static inline unsigned long global_page_state(enum zone_stat_item item)
++static inline unsigned long __intentional_overflow(-1) 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;
-@@ -112,7 +112,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
- static inline unsigned long zone_page_state(struct zone *zone,
+@@ -109,10 +109,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
+ 	return x;
+ }
+ 
+-static inline unsigned long zone_page_state(struct zone *zone,
++static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
  					enum zone_stat_item item)
  {
 -	long x = atomic_long_read(&zone->vm_stat[item]);
@@ -78232,7 +78591,7 @@ index c586679..f06b389 100644
  
  #ifdef CONFIG_SMP
  	int cpu;
-@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
+@@ -220,8 +220,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)
  {
@@ -78243,7 +78602,7 @@ index c586679..f06b389 100644
  }
  
  static inline void __inc_zone_page_state(struct page *page,
-@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page,
+@@ -232,8 +232,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)
  {
@@ -78254,27 +78613,8 @@ index c586679..f06b389 100644
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
-index 623488f..44b5742 100644
---- a/include/linux/workqueue.h
-+++ b/include/linux/workqueue.h
-@@ -410,11 +410,11 @@ __alloc_workqueue_key(const char *fmt, unsigned int flags, int max_active,
- 	alloc_workqueue(fmt, WQ_UNBOUND | __WQ_ORDERED | (flags), 1, ##args)
- 
- #define create_workqueue(name)						\
--	alloc_workqueue((name), WQ_MEM_RECLAIM, 1)
-+	alloc_workqueue("%s", WQ_MEM_RECLAIM, 1, (name))
- #define create_freezable_workqueue(name)				\
--	alloc_workqueue((name), WQ_FREEZABLE | WQ_UNBOUND | WQ_MEM_RECLAIM, 1)
-+	alloc_workqueue("%s", WQ_FREEZABLE | WQ_UNBOUND | WQ_MEM_RECLAIM, 1, (name))
- #define create_singlethread_workqueue(name)				\
--	alloc_workqueue((name), WQ_UNBOUND | WQ_MEM_RECLAIM, 1)
-+	alloc_workqueue("%s", WQ_UNBOUND | WQ_MEM_RECLAIM, 1, (name))
- 
- extern void destroy_workqueue(struct workqueue_struct *wq);
- 
 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
-index fdbafc6..49dfe4f 100644
+index 91b0a68..0e9adf6 100644
 --- a/include/linux/xattr.h
 +++ b/include/linux/xattr.h
 @@ -28,7 +28,7 @@ struct xattr_handler {
@@ -78285,7 +78625,7 @@ index fdbafc6..49dfe4f 100644
 +} __do_const;
  
  struct xattr {
- 	char *name;
+ 	const char *name;
 @@ -37,6 +37,9 @@ struct xattr {
  };
  
@@ -78318,7 +78658,7 @@ index 9c5a6b4..09c9438 100644
     Returns the number of bytes that needs to be allocated for a per-
     stream workspace with the specified parameters.  A pointer to this
 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
-index 95d1c91..6798cca 100644
+index c768c9f..bdcaa5a 100644
 --- a/include/media/v4l2-dev.h
 +++ b/include/media/v4l2-dev.h
 @@ -76,7 +76,7 @@ struct v4l2_file_operations {
@@ -78344,10 +78684,10 @@ index c9b1593..a572459 100644
  /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
     Since the parent disappears this ensures that v4l2_dev doesn't have an
 diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
-index adcbb20..62c2559 100644
+index 9a36d92..0aafe2a 100644
 --- a/include/net/9p/transport.h
 +++ b/include/net/9p/transport.h
-@@ -57,7 +57,7 @@ struct p9_trans_module {
+@@ -60,7 +60,7 @@ struct p9_trans_module {
  	int (*cancel) (struct p9_client *, struct p9_req_t *req);
  	int (*zc_request)(struct p9_client *, struct p9_req_t *,
  			  char *, char *, int , int, int, int);
@@ -78357,7 +78697,7 @@ index adcbb20..62c2559 100644
  void v9fs_register_trans(struct p9_trans_module *m);
  void v9fs_unregister_trans(struct p9_trans_module *m);
 diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
-index fb94cf1..7c0c987 100644
+index 1a966af..2767cf6 100644
 --- a/include/net/bluetooth/l2cap.h
 +++ b/include/net/bluetooth/l2cap.h
 @@ -551,7 +551,7 @@ struct l2cap_ops {
@@ -78482,10 +78822,10 @@ index 53f464d..0bd0b49 100644
  
  #endif /* _NET_INETPEER_H */
 diff --git a/include/net/ip.h b/include/net/ip.h
-index 788f1d8..64d3e27 100644
+index 301f10c..b52cdaf 100644
 --- a/include/net/ip.h
 +++ b/include/net/ip.h
-@@ -202,7 +202,7 @@ extern struct local_ports {
+@@ -212,7 +212,7 @@ extern struct local_ports {
  } sysctl_local_ports;
  extern void inet_get_local_port_range(int *low, int *high);
  
@@ -78495,10 +78835,10 @@ index 788f1d8..64d3e27 100644
  {
  	return test_bit(port, sysctl_local_reserved_ports);
 diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
-index e49db91..76a81de 100644
+index cbf2be3..3683f6d 100644
 --- a/include/net/ip_fib.h
 +++ b/include/net/ip_fib.h
-@@ -167,7 +167,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
+@@ -169,7 +169,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
  
  #define FIB_RES_SADDR(net, res)				\
  	((FIB_RES_NH(res).nh_saddr_genid ==		\
@@ -78508,10 +78848,10 @@ index e49db91..76a81de 100644
  	 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
  #define FIB_RES_GW(res)			(FIB_RES_NH(res).nh_gw)
 diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
-index f0c13a3..f41f6d86 100644
+index 772252d..1e69799 100644
 --- a/include/net/ip_vs.h
 +++ b/include/net/ip_vs.h
-@@ -582,7 +582,7 @@ struct ip_vs_conn {
+@@ -558,7 +558,7 @@ struct ip_vs_conn {
  	struct ip_vs_conn       *control;       /* Master control connection */
  	atomic_t                n_control;      /* Number of controlled ones */
  	struct ip_vs_dest       *dest;          /* real server */
@@ -78520,7 +78860,7 @@ index f0c13a3..f41f6d86 100644
  
  	/* packet transmitter for different forwarding methods.  If it
  	   mangles the packet, it must return NF_DROP or better NF_STOLEN,
-@@ -731,7 +731,7 @@ struct ip_vs_dest {
+@@ -705,7 +705,7 @@ struct ip_vs_dest {
  	__be16			port;		/* port number of the server */
  	union nf_inet_addr	addr;		/* IP address of the server */
  	volatile unsigned int	flags;		/* dest status flags */
@@ -78529,7 +78869,7 @@ index f0c13a3..f41f6d86 100644
  	atomic_t		weight;		/* server weight */
  
  	atomic_t		refcnt;		/* reference counter */
-@@ -983,11 +983,11 @@ struct netns_ipvs {
+@@ -960,11 +960,11 @@ struct netns_ipvs {
  	/* ip_vs_lblc */
  	int			sysctl_lblc_expiration;
  	struct ctl_table_header	*lblc_ctl_header;
@@ -78636,10 +78976,10 @@ index 567c681..cd73ac0 100644
  struct llc_sap_state {
  	u8			   curr_state;
 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 4e50d36..c7585a7 100644
+index cc6035f..a8406fc 100644
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -4206,7 +4206,7 @@ struct rate_control_ops {
+@@ -4361,7 +4361,7 @@ struct rate_control_ops {
  	void (*add_sta_debugfs)(void *priv, void *priv_sta,
  				struct dentry *dir);
  	void (*remove_sta_debugfs)(void *priv, void *priv_sta);
@@ -78649,7 +78989,7 @@ index 4e50d36..c7585a7 100644
  static inline int rate_supported(struct ieee80211_sta *sta,
  				 enum ieee80211_band band,
 diff --git a/include/net/neighbour.h b/include/net/neighbour.h
-index 7e748ad..5c6229b 100644
+index 536501a..7c6193c 100644
 --- a/include/net/neighbour.h
 +++ b/include/net/neighbour.h
 @@ -123,7 +123,7 @@ struct neigh_ops {
@@ -78662,19 +79002,19 @@ index 7e748ad..5c6229b 100644
  struct pneigh_entry {
  	struct pneigh_entry	*next;
 diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
-index b176978..ea169f4 100644
+index 9d22f08..980fbf8 100644
 --- a/include/net/net_namespace.h
 +++ b/include/net/net_namespace.h
-@@ -117,7 +117,7 @@ struct net {
- #endif
+@@ -120,7 +120,7 @@ struct net {
  	struct netns_ipvs	*ipvs;
+ #endif
  	struct sock		*diag_nlsk;
--	atomic_t		rt_genid;
-+	atomic_unchecked_t	rt_genid;
+-	atomic_t		fnhe_genid;
++	atomic_unchecked_t	fnhe_genid;
  };
  
  /*
-@@ -274,7 +274,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
+@@ -277,7 +277,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
  #define __net_init	__init
  #define __net_exit	__exit_refok
  #define __net_initdata	__initdata
@@ -78686,7 +79026,7 @@ index b176978..ea169f4 100644
  #endif
  
  struct pernet_operations {
-@@ -284,7 +288,7 @@ struct pernet_operations {
+@@ -287,7 +291,7 @@ struct pernet_operations {
  	void (*exit_batch)(struct list_head *net_exit_list);
  	int *id;
  	size_t size;
@@ -78695,18 +79035,46 @@ index b176978..ea169f4 100644
  
  /*
   * Use these carefully.  If you implement a network device and it
-@@ -332,12 +336,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
+@@ -335,23 +339,23 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
+ 
+ static inline int rt_genid_ipv4(struct net *net)
+ {
+-	return atomic_read(&net->ipv4.rt_genid);
++	return atomic_read_unchecked(&net->ipv4.rt_genid);
+ }
+ 
+ static inline void rt_genid_bump_ipv4(struct net *net)
+ {
+-	atomic_inc(&net->ipv4.rt_genid);
++	atomic_inc_unchecked(&net->ipv4.rt_genid);
+ }
  
- static inline int rt_genid(struct net *net)
+ #if IS_ENABLED(CONFIG_IPV6)
+ static inline int rt_genid_ipv6(struct net *net)
+ {
+-	return atomic_read(&net->ipv6.rt_genid);
++	return atomic_read_unchecked(&net->ipv6.rt_genid);
+ }
+ 
+ static inline void rt_genid_bump_ipv6(struct net *net)
+ {
+-	atomic_inc(&net->ipv6.rt_genid);
++	atomic_inc_unchecked(&net->ipv6.rt_genid);
+ }
+ #else
+ static inline int rt_genid_ipv6(struct net *net)
+@@ -373,12 +377,12 @@ static inline void rt_genid_bump_all(struct net *net)
+ 
+ static inline int fnhe_genid(struct net *net)
  {
--	return atomic_read(&net->rt_genid);
-+	return atomic_read_unchecked(&net->rt_genid);
+-	return atomic_read(&net->fnhe_genid);
++	return atomic_read_unchecked(&net->fnhe_genid);
  }
  
- static inline void rt_genid_bump(struct net *net)
+ static inline void fnhe_genid_bump(struct net *net)
  {
--	atomic_inc(&net->rt_genid);
-+	atomic_inc_unchecked(&net->rt_genid);
+-	atomic_inc(&net->fnhe_genid);
++	atomic_inc_unchecked(&net->fnhe_genid);
  }
  
  #endif /* __NET_NET_NAMESPACE_H */
@@ -78763,7 +79131,7 @@ index c9c0c53..53f24c3 100644
  };
  
 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
-index 2ba9de8..47bd6c7 100644
+index bf2ec22..5e7f9d9 100644
 --- a/include/net/netns/ipv4.h
 +++ b/include/net/netns/ipv4.h
 @@ -67,7 +67,7 @@ struct netns_ipv4 {
@@ -78775,19 +79143,42 @@ index 2ba9de8..47bd6c7 100644
  
  #ifdef CONFIG_IP_MROUTE
  #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
+@@ -77,6 +77,6 @@ struct netns_ipv4 {
+ 	struct fib_rules_ops	*mr_rules_ops;
+ #endif
+ #endif
+-	atomic_t	rt_genid;
++	atomic_unchecked_t	rt_genid;
+ };
+ #endif
 diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
-index 005e2c2..023d340 100644
+index 0fb2401..477d81c 100644
 --- a/include/net/netns/ipv6.h
 +++ b/include/net/netns/ipv6.h
-@@ -71,7 +71,7 @@ struct netns_ipv6 {
+@@ -71,8 +71,8 @@ struct netns_ipv6 {
  	struct fib_rules_ops	*mr6_rules_ops;
  #endif
  #endif
 -	atomic_t		dev_addr_genid;
+-	atomic_t		rt_genid;
 +	atomic_unchecked_t	dev_addr_genid;
++	atomic_unchecked_t	rt_genid;
  };
  
  #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
+diff --git a/include/net/ping.h b/include/net/ping.h
+index 2b496e9..935fd8d 100644
+--- a/include/net/ping.h
++++ b/include/net/ping.h
+@@ -56,7 +56,7 @@ struct ping_iter_state {
+ extern struct proto ping_prot;
+ extern struct ping_table ping_table;
+ #if IS_ENABLED(CONFIG_IPV6)
+-extern struct pingv6_ops pingv6_ops;
++extern struct pingv6_ops *pingv6_ops;
+ #endif
+ 
+ struct pingfakehdr {
 diff --git a/include/net/protocol.h b/include/net/protocol.h
 index 047c047..b9dad15 100644
 --- a/include/net/protocol.h
@@ -78823,28 +79214,11 @@ index 7026648..584cc8c 100644
  
  extern int	__rtnl_link_register(struct rtnl_link_ops *ops);
  extern void	__rtnl_link_unregister(struct rtnl_link_ops *ops);
-diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
-index cd89510..d67810f 100644
---- a/include/net/sctp/sctp.h
-+++ b/include/net/sctp/sctp.h
-@@ -330,9 +330,9 @@ do {									\
- 
- #else	/* SCTP_DEBUG */
- 
--#define SCTP_DEBUG_PRINTK(whatever...)
--#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
--#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
-+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
-+#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
-+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
- #define SCTP_ENABLE_DEBUG
- #define SCTP_DISABLE_DEBUG
- #define SCTP_ASSERT(expr, str, func)
 diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
-index 2a82d13..62a31c2 100644
+index 4ef75af..5aa073a 100644
 --- a/include/net/sctp/sm.h
 +++ b/include/net/sctp/sm.h
-@@ -87,7 +87,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
+@@ -81,7 +81,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
  typedef struct {
  	sctp_state_fn_t *fn;
  	const char *name;
@@ -78853,7 +79227,7 @@ index 2a82d13..62a31c2 100644
  
  /* A naming convention of "sctp_sf_xxx" applies to all the state functions
   * currently in use.
-@@ -299,7 +299,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
+@@ -293,7 +293,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
  __u32 sctp_generate_tsn(const struct sctp_endpoint *);
  
  /* Extern declarations for major data structures.  */
@@ -78863,10 +79237,10 @@ index 2a82d13..62a31c2 100644
  
  /* Get the size of a DATA chunk payload. */
 diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
-index 1bd4c41..9250b5b 100644
+index 2174d8d..71d5257 100644
 --- a/include/net/sctp/structs.h
 +++ b/include/net/sctp/structs.h
-@@ -516,7 +516,7 @@ struct sctp_pf {
+@@ -508,7 +508,7 @@ struct sctp_pf {
  					  struct sctp_association *asoc);
  	void (*addr_v4map) (struct sctp_sock *, union sctp_addr *);
  	struct sctp_af *af;
@@ -78876,19 +79250,28 @@ index 1bd4c41..9250b5b 100644
  
  /* Structure to track chunk fragments that have been acked, but peer
 diff --git a/include/net/sock.h b/include/net/sock.h
-index cec4c72..66ba735 100644
+index 808cbc2..8617e9c 100644
 --- a/include/net/sock.h
 +++ b/include/net/sock.h
-@@ -326,7 +326,7 @@ struct sock {
- #ifdef CONFIG_RPS
- 	__u32			sk_rxhash;
+@@ -332,7 +332,7 @@ struct sock {
+ 	unsigned int		sk_napi_id;
+ 	unsigned int		sk_ll_usec;
  #endif
 -	atomic_t		sk_drops;
 +	atomic_unchecked_t	sk_drops;
  	int			sk_rcvbuf;
  
  	struct sk_filter __rcu	*sk_filter;
-@@ -1799,7 +1799,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
+@@ -1194,7 +1194,7 @@ static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
+ 	return ret >> PAGE_SHIFT;
+ }
+ 
+-static inline long
++static inline long __intentional_overflow(-1)
+ sk_memory_allocated(const struct sock *sk)
+ {
+ 	struct proto *prot = sk->sk_prot;
+@@ -1821,7 +1821,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
  }
  
  static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
@@ -78897,7 +79280,7 @@ index cec4c72..66ba735 100644
  					   int copy, int offset)
  {
  	if (skb->ip_summed == CHECKSUM_NONE) {
-@@ -2058,7 +2058,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
+@@ -2083,7 +2083,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
  	}
  }
  
@@ -78907,10 +79290,10 @@ index cec4c72..66ba735 100644
  /**
   * sk_page_frag - return an appropriate page_frag
 diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 3fc77e9..a20155c 100644
+index b1aa324..b8530ea 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -525,7 +525,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
+@@ -527,7 +527,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
  extern void tcp_xmit_retransmit_queue(struct sock *);
  extern void tcp_simple_retransmit(struct sock *);
  extern int tcp_trim_head(struct sock *, struct sk_buff *, u32);
@@ -78919,7 +79302,7 @@ index 3fc77e9..a20155c 100644
  
  extern void tcp_send_probe0(struct sock *);
  extern void tcp_send_partial(struct sock *);
-@@ -698,8 +698,8 @@ struct tcp_skb_cb {
+@@ -699,8 +699,8 @@ struct tcp_skb_cb {
  		struct inet6_skb_parm	h6;
  #endif
  	} header;	/* For incoming frames		*/
@@ -78930,7 +79313,7 @@ index 3fc77e9..a20155c 100644
  	__u32		when;		/* used to compute rtt's	*/
  	__u8		tcp_flags;	/* TCP header flags. (tcp[13])	*/
  
-@@ -713,7 +713,7 @@ struct tcp_skb_cb {
+@@ -714,7 +714,7 @@ struct tcp_skb_cb {
  
  	__u8		ip_dsfield;	/* IPv4 tos or IPv6 dsfield	*/
  	/* 1 byte hole */
@@ -78940,10 +79323,18 @@ index 3fc77e9..a20155c 100644
  
  #define TCP_SKB_CB(__skb)	((struct tcp_skb_cb *)&((__skb)->cb[0]))
 diff --git a/include/net/xfrm.h b/include/net/xfrm.h
-index 94ce082..62b278d 100644
+index e253bf0..2278b4b 100644
 --- a/include/net/xfrm.h
 +++ b/include/net/xfrm.h
-@@ -305,7 +305,7 @@ struct xfrm_policy_afinfo {
+@@ -287,7 +287,6 @@ struct xfrm_dst;
+ struct xfrm_policy_afinfo {
+ 	unsigned short		family;
+ 	struct dst_ops		*dst_ops;
+-	void			(*garbage_collect)(struct net *net);
+ 	struct dst_entry	*(*dst_lookup)(struct net *net, int tos,
+ 					       const xfrm_address_t *saddr,
+ 					       const xfrm_address_t *daddr);
+@@ -305,7 +304,7 @@ struct xfrm_policy_afinfo {
  					    struct net_device *dev,
  					    const struct flowi *fl);
  	struct dst_entry	*(*blackhole_route)(struct net *net, struct dst_entry *orig);
@@ -78952,16 +79343,16 @@ index 94ce082..62b278d 100644
  
  extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
  extern int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
-@@ -341,7 +341,7 @@ struct xfrm_state_afinfo {
- 						  struct sk_buff *skb);
+@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
  	int			(*transport_finish)(struct sk_buff *skb,
  						    int async);
+ 	void			(*local_error)(struct sk_buff *skb, u32 mtu);
 -};
 +} __do_const;
  
  extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
  extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
-@@ -424,7 +424,7 @@ struct xfrm_mode {
+@@ -427,7 +426,7 @@ struct xfrm_mode {
  	struct module *owner;
  	unsigned int encap;
  	int flags;
@@ -78970,7 +79361,7 @@ index 94ce082..62b278d 100644
  
  /* Flags for xfrm_mode. */
  enum {
-@@ -521,7 +521,7 @@ struct xfrm_policy {
+@@ -524,7 +523,7 @@ struct xfrm_policy {
  	struct timer_list	timer;
  
  	struct flow_cache_object flo;
@@ -78979,8 +79370,26 @@ index 94ce082..62b278d 100644
  	u32			priority;
  	u32			index;
  	struct xfrm_mark	mark;
+@@ -1164,6 +1163,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
+ }
+ 
+ extern void xfrm_garbage_collect(struct net *net);
++extern void xfrm_garbage_collect_deferred(struct net *net);
+ 
+ #else
+ 
+@@ -1202,6 +1202,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
+ static inline void xfrm_garbage_collect(struct net *net)
+ {
+ }
++static inline void xfrm_garbage_collect_deferred(struct net *net)
++{
++}
+ #endif
+ 
+ static __inline__
 diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
-index 1a046b1..ee0bef0 100644
+index 1017e0b..227aa4d 100644
 --- a/include/rdma/iw_cm.h
 +++ b/include/rdma/iw_cm.h
 @@ -122,7 +122,7 @@ struct iw_cm_verbs {
@@ -79014,10 +79423,10 @@ index e1379b4..67eafbe 100644
  	u8			       qfull;
  	enum fc_lport_state	       state;
 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
-index cc64587..608f523 100644
+index d65fbec..f80fef2 100644
 --- a/include/scsi/scsi_device.h
 +++ b/include/scsi/scsi_device.h
-@@ -171,9 +171,9 @@ struct scsi_device {
+@@ -180,9 +180,9 @@ struct scsi_device {
  	unsigned int max_device_blocked; /* what device_blocked counts down from  */
  #define SCSI_DEFAULT_DEVICE_BLOCKED	3
  
@@ -79058,10 +79467,10 @@ index ae6c3b8..fd748ac 100644
  /**
   * struct snd_compr: Compressed device
 diff --git a/include/sound/soc.h b/include/sound/soc.h
-index 85c1522..f44bad1 100644
+index d22cb0a..c6ba150 100644
 --- a/include/sound/soc.h
 +++ b/include/sound/soc.h
-@@ -781,7 +781,7 @@ struct snd_soc_codec_driver {
+@@ -780,7 +780,7 @@ struct snd_soc_codec_driver {
  	/* probe ordering - for components with runtime dependencies */
  	int probe_order;
  	int remove_order;
@@ -79070,7 +79479,7 @@ index 85c1522..f44bad1 100644
  
  /* SoC platform interface */
  struct snd_soc_platform_driver {
-@@ -827,7 +827,7 @@ struct snd_soc_platform_driver {
+@@ -826,7 +826,7 @@ struct snd_soc_platform_driver {
  	unsigned int (*read)(struct snd_soc_platform *, unsigned int);
  	int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
  	int (*bespoke_trigger)(struct snd_pcm_substream *, int);
@@ -79080,10 +79489,10 @@ index 85c1522..f44bad1 100644
  struct snd_soc_platform {
  	const char *name;
 diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
-index 4ea4f98..a63629b 100644
+index 5bdb8b7..bb1096c 100644
 --- a/include/target/target_core_base.h
 +++ b/include/target/target_core_base.h
-@@ -653,7 +653,7 @@ struct se_device {
+@@ -663,7 +663,7 @@ struct se_device {
  	spinlock_t		stats_lock;
  	/* Active commands on this virtual SE device */
  	atomic_t		simple_cmds;
@@ -79430,7 +79839,7 @@ index f9466fa..f4e2b81 100644
  
  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
-index 1a91850..28573f8 100644
+index 30f5362..8ed8ac9 100644
 --- a/include/video/uvesafb.h
 +++ b/include/video/uvesafb.h
 @@ -122,6 +122,7 @@ struct uvesafb_par {
@@ -79442,10 +79851,10 @@ index 1a91850..28573f8 100644
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
 diff --git a/init/Kconfig b/init/Kconfig
-index 2d9b831..ae4c8ac 100644
+index 3ecd8a1..627843f 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1029,6 +1029,7 @@ endif # CGROUPS
+@@ -1086,6 +1086,7 @@ endif # CGROUPS
  
  config CHECKPOINT_RESTORE
  	bool "Checkpoint/restore support" if EXPERT
@@ -79453,7 +79862,7 @@ index 2d9b831..ae4c8ac 100644
  	default n
  	help
  	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1516,7 +1517,7 @@ config SLUB_DEBUG
+@@ -1557,7 +1558,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
  	bool "Disable heap randomization"
@@ -79462,7 +79871,7 @@ index 2d9b831..ae4c8ac 100644
  	help
  	  Randomizing heap placement makes heap exploits harder, but it
  	  also breaks ancient binaries (including anything libc5 based).
-@@ -1779,7 +1780,7 @@ config INIT_ALL_POSSIBLE
+@@ -1832,7 +1833,7 @@ config INIT_ALL_POSSIBLE
  config STOP_MACHINE
  	bool
  	default y
@@ -79486,10 +79895,10 @@ index 7bc47ee..6da2dc7 100644
  ifneq ($(CONFIG_BLK_DEV_INITRD),y)
  obj-y                          += noinitramfs.o
 diff --git a/init/do_mounts.c b/init/do_mounts.c
-index a2b49f2..03a0e17c 100644
+index a51cddc..25c2768 100644
 --- a/init/do_mounts.c
 +++ b/init/do_mounts.c
-@@ -355,11 +355,11 @@ static void __init get_fs_names(char *page)
+@@ -357,11 +357,11 @@ static void __init get_fs_names(char *page)
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
  {
  	struct super_block *s;
@@ -79503,7 +79912,7 @@ index a2b49f2..03a0e17c 100644
  	s = current->fs->pwd.dentry->d_sb;
  	ROOT_DEV = s->s_dev;
  	printk(KERN_INFO
-@@ -480,18 +480,18 @@ void __init change_floppy(char *fmt, ...)
+@@ -482,18 +482,18 @@ void __init change_floppy(char *fmt, ...)
  	va_start(args, fmt);
  	vsprintf(buf, fmt, args);
  	va_end(args);
@@ -79525,7 +79934,7 @@ index a2b49f2..03a0e17c 100644
  		termios.c_lflag |= ICANON;
  		sys_ioctl(fd, TCSETSF, (long)&termios);
  		sys_close(fd);
-@@ -585,6 +585,6 @@ void __init prepare_namespace(void)
+@@ -587,8 +587,8 @@ void __init prepare_namespace(void)
  	mount_root();
  out:
  	devtmpfs_mount("dev");
@@ -79534,6 +79943,8 @@ index a2b49f2..03a0e17c 100644
 +	sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
 +	sys_chroot((const char __force_user *)".");
  }
+ 
+ static bool is_tmpfs;
 diff --git a/init/do_mounts.h b/init/do_mounts.h
 index f5b978a..69dbfe8 100644
 --- a/init/do_mounts.h
@@ -79819,10 +80230,10 @@ index a67ef9d..2d17ed9 100644
  #ifdef CONFIG_BLK_DEV_RAM
  		int fd;
 diff --git a/init/main.c b/init/main.c
-index e83ac04..ddd6ed5 100644
+index 63d3e8f..50bd5f8 100644
 --- a/init/main.c
 +++ b/init/main.c
-@@ -101,6 +101,8 @@ static inline void mark_rodata_ro(void) { }
+@@ -103,6 +103,8 @@ static inline void mark_rodata_ro(void) { }
  extern void tc_init(void);
  #endif
  
@@ -79831,7 +80242,7 @@ index e83ac04..ddd6ed5 100644
  /*
   * Debug helper: via this flag we know that we are in 'early bootup code'
   * where only the boot processor is running with IRQ disabled.  This means
-@@ -154,6 +156,74 @@ static int __init set_reset_devices(char *str)
+@@ -156,6 +158,75 @@ static int __init set_reset_devices(char *str)
  
  __setup("reset_devices", set_reset_devices);
  
@@ -79875,6 +80286,7 @@ index e83ac04..ddd6ed5 100644
 +	clone_pgd_mask = ~(pgdval_t)0UL;
 +	pax_user_shadow_base = 0UL;
 +	setup_clear_cpu_cap(X86_FEATURE_PCID);
++	setup_clear_cpu_cap(X86_FEATURE_INVPCID);
 +#endif
 +
 +	return 0;
@@ -79906,19 +80318,11 @@ index e83ac04..ddd6ed5 100644
  static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
  const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
  static const char *panic_later, *panic_param;
-@@ -656,8 +726,6 @@ static void __init do_ctors(void)
- bool initcall_debug;
- core_param(initcall_debug, initcall_debug, bool, 0644);
- 
--static char msgbuf[64];
--
- static int __init_or_module do_one_initcall_debug(initcall_t fn)
- {
- 	ktime_t calltime, delta, rettime;
-@@ -680,23 +748,22 @@ int __init_or_module do_one_initcall(initcall_t fn)
+@@ -682,25 +753,24 @@ int __init_or_module do_one_initcall(initcall_t fn)
  {
  	int count = preempt_count();
  	int ret;
+-	char msgbuf[64];
 +	const char *msg1 = "", *msg2 = "";
  
  	if (initcall_debug)
@@ -79941,41 +80345,11 @@ index e83ac04..ddd6ed5 100644
 -	WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
 +	WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
  
++	add_latent_entropy();
  	return ret;
  }
-@@ -749,8 +816,14 @@ static void __init do_initcall_level(int level)
- 		   level, level,
- 		   &repair_env_string);
- 
--	for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
-+	for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++) {
- 		do_one_initcall(*fn);
-+
-+#ifdef LATENT_ENTROPY_PLUGIN
-+		add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
-+#endif
-+
-+	}
- }
  
- static void __init do_initcalls(void)
-@@ -785,8 +858,14 @@ static void __init do_pre_smp_initcalls(void)
- {
- 	initcall_t *fn;
- 
--	for (fn = __initcall_start; fn < __initcall0_start; fn++)
-+	for (fn = __initcall_start; fn < __initcall0_start; fn++) {
- 		do_one_initcall(*fn);
-+
-+#ifdef LATENT_ENTROPY_PLUGIN
-+		add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
-+#endif
-+
-+	}
- }
- 
- /*
-@@ -804,8 +883,8 @@ static int run_init_process(const char *init_filename)
+@@ -807,10 +877,14 @@ static int run_init_process(const char *init_filename)
  {
  	argv_init[0] = init_filename;
  	return do_execve(init_filename,
@@ -79985,8 +80359,26 @@ index e83ac04..ddd6ed5 100644
 +		(const char __user *const __force_user *)envp_init);
  }
  
++#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
++extern int gr_init_ran;
++#endif
++
  static noinline void __init kernel_init_freeable(void);
-@@ -882,7 +961,7 @@ static noinline void __init kernel_init_freeable(void)
+ 
+ static int __ref kernel_init(void *unused)
+@@ -831,6 +905,11 @@ static int __ref kernel_init(void *unused)
+ 		pr_err("Failed to execute %s\n", ramdisk_execute_command);
+ 	}
+ 
++#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
++	/* if no initrd was used, be extra sure we enforce chroot restrictions */
++	gr_init_ran = 1;
++#endif
++
+ 	/*
+ 	 * We try each of these until one succeeds.
+ 	 *
+@@ -885,7 +964,7 @@ static noinline void __init kernel_init_freeable(void)
  	do_basic_setup();
  
  	/* Open the /dev/console on the rootfs, this should never fail */
@@ -79995,7 +80387,7 @@ index e83ac04..ddd6ed5 100644
  		pr_err("Warning: unable to open an initial console.\n");
  
  	(void) sys_dup(0);
-@@ -895,11 +974,13 @@ static noinline void __init kernel_init_freeable(void)
+@@ -898,11 +977,13 @@ static noinline void __init kernel_init_freeable(void)
  	if (!ramdisk_execute_command)
  		ramdisk_execute_command = "/init";
  
@@ -80146,7 +80538,7 @@ index db9d241..bc8427c 100644
  	sem_params.flg = semflg;
  	sem_params.u.nsems = nsems;
 diff --git a/ipc/shm.c b/ipc/shm.c
-index 6dc55af..30a00cf 100644
+index 7a51443..3a257d8 100644
 --- a/ipc/shm.c
 +++ b/ipc/shm.c
 @@ -72,6 +72,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
@@ -80243,6 +80635,29 @@ index 6dc55af..30a00cf 100644
  	size = i_size_read(path.dentry->d_inode);
  	ipc_unlock_object(&shp->shm_perm);
  	rcu_read_unlock();
+diff --git a/ipc/util.c b/ipc/util.c
+index 7684f41..f7da711 100644
+--- a/ipc/util.c
++++ b/ipc/util.c
+@@ -71,6 +71,8 @@ struct ipc_proc_iface {
+ 	int (*show)(struct seq_file *, void *);
+ };
+ 
++extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
++
+ static void ipc_memory_notifier(struct work_struct *work)
+ {
+ 	ipcns_notify(IPCNS_MEMCHANGED);
+@@ -560,6 +562,9 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
+ 		granted_mode >>= 6;
+ 	else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
+ 		granted_mode >>= 3;
++	else if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
++		return -1;
++
+ 	/* is there some bit set in requested_mode but not in granted_mode? */
+ 	if ((requested_mode & ~granted_mode & 0007) && 
+ 	    !ns_capable(ns->user_ns, CAP_IPC_OWNER))
 diff --git a/kernel/acct.c b/kernel/acct.c
 index 8d6e145..33e0b1e 100644
 --- a/kernel/acct.c
@@ -80257,7 +80672,7 @@ index 8d6e145..33e0b1e 100644
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
  	set_fs(fs);
 diff --git a/kernel/audit.c b/kernel/audit.c
-index 7ddfd8a..c97daf0 100644
+index 7ddfd8a..49766eb 100644
 --- a/kernel/audit.c
 +++ b/kernel/audit.c
 @@ -118,7 +118,7 @@ u32		audit_sig_sid = 0;
@@ -80296,19 +80711,15 @@ index 7ddfd8a..c97daf0 100644
  		status_set.backlog	 = skb_queue_len(&audit_skb_queue);
  		audit_send_reply(NETLINK_CB(skb).portid, seq, AUDIT_GET, 0, 0,
  				 &status_set, sizeof(status_set));
-diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
-index 6bd4a90..0ee9eff 100644
---- a/kernel/auditfilter.c
-+++ b/kernel/auditfilter.c
-@@ -423,7 +423,7 @@ static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data,
- 		f->lsm_rule = NULL;
- 
- 		/* Support legacy tests for a valid loginuid */
--		if ((f->type == AUDIT_LOGINUID) && (f->val == 4294967295)) {
-+		if ((f->type == AUDIT_LOGINUID) && (f->val == 4294967295U)) {
- 			f->type = AUDIT_LOGINUID_SET;
- 			f->val = 0;
- 		}
+@@ -1252,7 +1252,7 @@ void audit_log_n_hex(struct audit_buffer *ab, const unsigned char *buf,
+ 	int i, avail, new_len;
+ 	unsigned char *ptr;
+ 	struct sk_buff *skb;
+-	static const unsigned char *hex = "0123456789ABCDEF";
++	static const unsigned char hex[] = "0123456789ABCDEF";
+ 
+ 	if (!ab)
+ 		return;
 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
 index 9845cb3..3ec9369 100644
 --- a/kernel/auditsc.c
@@ -80332,7 +80743,7 @@ index 9845cb3..3ec9369 100644
  		struct audit_buffer *ab;
  
 diff --git a/kernel/capability.c b/kernel/capability.c
-index f6c2ce5..982c0f9 100644
+index 4e66bf9..cdccecf 100644
 --- a/kernel/capability.c
 +++ b/kernel/capability.c
 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
@@ -80414,12 +80825,12 @@ index f6c2ce5..982c0f9 100644
 +EXPORT_SYMBOL(capable_nolog);
 +
  /**
-  * nsown_capable - Check superior capability to one's own user_ns
-  * @cap: The capability in question
-@@ -464,3 +489,10 @@ bool inode_capable(const struct inode *inode, int cap)
- 
+  * inode_capable - Check superior capability over inode
+  * @inode: The inode in question
+@@ -453,3 +478,11 @@ bool inode_capable(const struct inode *inode, int cap)
  	return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
  }
+ EXPORT_SYMBOL(inode_capable);
 +
 +bool inode_capable_nolog(const struct inode *inode, int cap)
 +{
@@ -80427,17 +80838,18 @@ index f6c2ce5..982c0f9 100644
 +
 +	return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
 +}
++EXPORT_SYMBOL(inode_capable_nolog);
 diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index d0def7f..ff3a63e 100644
+index 5c9127d..f871169 100644
 --- a/kernel/cgroup.c
 +++ b/kernel/cgroup.c
-@@ -5422,7 +5422,7 @@ static int cgroup_css_links_read(struct cgroup *cont,
- 		struct css_set *cg = link->cg;
+@@ -5844,7 +5844,7 @@ static int cgroup_css_links_read(struct cgroup_subsys_state *css,
+ 		struct css_set *cset = link->cset;
  		struct task_struct *task;
  		int count = 0;
--		seq_printf(seq, "css_set %p\n", cg);
-+		seq_printf(seq, "css_set %pK\n", cg);
- 		list_for_each_entry(task, &cg->tasks, cg_list) {
+-		seq_printf(seq, "css_set %p\n", cset);
++		seq_printf(seq, "css_set %pK\n", cset);
+ 		list_for_each_entry(task, &cset->tasks, cg_list) {
  			if (count++ > MAX_TASKS_SHOWN_PER_CSS) {
  				seq_puts(seq, "  ...\n");
 diff --git a/kernel/compat.c b/kernel/compat.c
@@ -80842,10 +81254,10 @@ index 00eb8f7..d7e3244 100644
  #ifdef CONFIG_MODULE_UNLOAD
  		{
 diff --git a/kernel/events/core.c b/kernel/events/core.c
-index e76e495..cbfe63a 100644
+index 953c143..5646bb1 100644
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
-@@ -156,8 +156,15 @@ static struct srcu_struct pmus_srcu;
+@@ -157,8 +157,15 @@ static struct srcu_struct pmus_srcu;
   *   0 - disallow raw tracepoint access for unpriv
   *   1 - disallow cpu events for unpriv
   *   2 - disallow kernel profiling for unpriv
@@ -80862,8 +81274,8 @@ index e76e495..cbfe63a 100644
  
  /* Minimum for 512 kiB + 1 user control page */
  int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
-@@ -184,7 +191,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
- 	return 0;
+@@ -271,7 +278,7 @@ void perf_sample_event_took(u64 sample_len_ns)
+ 	update_perf_cpu_limits();
  }
  
 -static atomic64_t perf_event_id;
@@ -80871,7 +81283,7 @@ index e76e495..cbfe63a 100644
  
  static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
  			      enum event_type_t event_type);
-@@ -2747,7 +2754,7 @@ static void __perf_event_read(void *info)
+@@ -2940,7 +2947,7 @@ static void __perf_event_read(void *info)
  
  static inline u64 perf_event_count(struct perf_event *event)
  {
@@ -80880,7 +81292,7 @@ index e76e495..cbfe63a 100644
  }
  
  static u64 perf_event_read(struct perf_event *event)
-@@ -3093,9 +3100,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
+@@ -3308,9 +3315,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
  	mutex_lock(&event->child_mutex);
  	total += perf_event_read(event);
  	*enabled += event->total_time_enabled +
@@ -80892,7 +81304,7 @@ index e76e495..cbfe63a 100644
  
  	list_for_each_entry(child, &event->child_list, child_list) {
  		total += perf_event_read(child);
-@@ -3481,10 +3488,10 @@ void perf_event_update_userpage(struct perf_event *event)
+@@ -3725,10 +3732,10 @@ void perf_event_update_userpage(struct perf_event *event)
  		userpg->offset -= local64_read(&event->hw.prev_count);
  
  	userpg->time_enabled = enabled +
@@ -80905,7 +81317,7 @@ index e76e495..cbfe63a 100644
  
  	arch_perf_update_userpage(userpg, now);
  
-@@ -4034,7 +4041,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
+@@ -4279,7 +4286,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
  
  		/* Data. */
  		sp = perf_user_stack_pointer(regs);
@@ -80914,7 +81326,7 @@ index e76e495..cbfe63a 100644
  		dyn_size = dump_size - rem;
  
  		perf_output_skip(handle, rem);
-@@ -4122,11 +4129,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
+@@ -4370,11 +4377,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
  	values[n++] = perf_event_count(event);
  	if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
  		values[n++] = enabled +
@@ -80928,7 +81340,7 @@ index e76e495..cbfe63a 100644
  	}
  	if (read_format & PERF_FORMAT_ID)
  		values[n++] = primary_event_id(event);
-@@ -4835,12 +4842,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
+@@ -5112,12 +5119,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
  		 * need to add enough zero bytes after the string to handle
  		 * the 64bit alignment we do later.
  		 */
@@ -80943,7 +81355,7 @@ index e76e495..cbfe63a 100644
  		if (IS_ERR(name)) {
  			name = strncpy(tmp, "//toolong", sizeof(tmp));
  			goto got_name;
-@@ -6262,7 +6269,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
+@@ -6639,7 +6646,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
  	event->parent		= parent_event;
  
  	event->ns		= get_pid_ns(task_active_pid_ns(current));
@@ -80952,7 +81364,7 @@ index e76e495..cbfe63a 100644
  
  	event->state		= PERF_EVENT_STATE_INACTIVE;
  
-@@ -6572,6 +6579,11 @@ SYSCALL_DEFINE5(perf_event_open,
+@@ -6938,6 +6945,11 @@ SYSCALL_DEFINE5(perf_event_open,
  	if (flags & ~PERF_FLAG_ALL)
  		return -EINVAL;
  
@@ -80964,7 +81376,7 @@ index e76e495..cbfe63a 100644
  	err = perf_copy_attr(attr_uptr, &attr);
  	if (err)
  		return err;
-@@ -6904,10 +6916,10 @@ static void sync_child_event(struct perf_event *child_event,
+@@ -7271,10 +7283,10 @@ static void sync_child_event(struct perf_event *child_event,
  	/*
  	 * Add back the child's count to the parent's count:
  	 */
@@ -81031,7 +81443,7 @@ index ad8e1bd..fed7ba9 100644
  	pagefault_disable();
  	result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
 diff --git a/kernel/exit.c b/kernel/exit.c
-index 7bb73f9..d7978ed 100644
+index a949819..a5f127d 100644
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
 @@ -172,6 +172,10 @@ void release_task(struct task_struct * p)
@@ -81045,7 +81457,7 @@ index 7bb73f9..d7978ed 100644
  	/* don't need to get the RCU readlock here - the process is dead and
  	 * can't be modifying its own credentials. But shut RCU-lockdep up */
  	rcu_read_lock();
-@@ -340,7 +344,7 @@ int allow_signal(int sig)
+@@ -329,7 +333,7 @@ int allow_signal(int sig)
  	 * know it'll be handled, so that they don't get converted to
  	 * SIGKILL or just silently dropped.
  	 */
@@ -81054,7 +81466,7 @@ index 7bb73f9..d7978ed 100644
  	recalc_sigpending();
  	spin_unlock_irq(&current->sighand->siglock);
  	return 0;
-@@ -709,6 +713,8 @@ void do_exit(long code)
+@@ -698,6 +702,8 @@ void do_exit(long code)
  	struct task_struct *tsk = current;
  	int group_dead;
  
@@ -81063,7 +81475,7 @@ index 7bb73f9..d7978ed 100644
  	profile_task_exit(tsk);
  
  	WARN_ON(blk_needs_flush_plug(tsk));
-@@ -725,7 +731,6 @@ void do_exit(long code)
+@@ -714,7 +720,6 @@ void do_exit(long code)
  	 * mm_release()->clear_child_tid() from writing to a user-controlled
  	 * kernel address.
  	 */
@@ -81071,7 +81483,7 @@ index 7bb73f9..d7978ed 100644
  
  	ptrace_event(PTRACE_EVENT_EXIT, code);
  
-@@ -784,6 +789,9 @@ void do_exit(long code)
+@@ -773,6 +778,9 @@ void do_exit(long code)
  	tsk->exit_code = code;
  	taskstats_exit(tsk, group_dead);
  
@@ -81081,7 +81493,7 @@ index 7bb73f9..d7978ed 100644
  	exit_mm(tsk);
  
  	if (group_dead)
-@@ -905,7 +913,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
+@@ -894,7 +902,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
   * Take down every thread in the group.  This is called by fatal signals
   * as well as by sys_exit_group (below).
   */
@@ -81091,7 +81503,7 @@ index 7bb73f9..d7978ed 100644
  {
  	struct signal_struct *sig = current->signal;
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 80d92e9..c9ab9de 100644
+index 086fe73..72c1122 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -319,7 +319,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
@@ -81103,16 +81515,17 @@ index 80d92e9..c9ab9de 100644
  #endif
  
  	/*
-@@ -345,13 +345,81 @@ free_tsk:
+@@ -345,12 +345,80 @@ free_tsk:
  }
  
  #ifdef CONFIG_MMU
+-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
 +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
 +{
 +	struct vm_area_struct *tmp;
 +	unsigned long charge;
-+	struct mempolicy *pol;
 +	struct file *file;
++	int retval;
 +
 +	charge = 0;
 +	if (mpnt->vm_flags & VM_ACCOUNT) {
@@ -81128,10 +81541,9 @@ index 80d92e9..c9ab9de 100644
 +	*tmp = *mpnt;
 +	tmp->vm_mm = mm;
 +	INIT_LIST_HEAD(&tmp->anon_vma_chain);
-+	pol = mpol_dup(vma_policy(mpnt));
-+	if (IS_ERR(pol))
++	retval = vma_dup_policy(mpnt, tmp);
++	if (retval)
 +		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;
@@ -81169,7 +81581,7 @@ index 80d92e9..c9ab9de 100644
 +	return tmp;
 +
 +fail_nomem_anon_vma_fork:
-+	mpol_put(pol);
++	mpol_put(vma_policy(tmp));
 +fail_nomem_policy:
 +	kmem_cache_free(vm_area_cachep, tmp);
 +fail_nomem:
@@ -81177,28 +81589,16 @@ index 80d92e9..c9ab9de 100644
 +	return NULL;
 +}
 +
- static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
++static __latent_entropy 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;
  
  	uprobe_start_dup_mmap();
  	down_write(&oldmm->mmap_sem);
-@@ -365,8 +433,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
- 	mm->locked_vm = 0;
- 	mm->mmap = NULL;
- 	mm->mmap_cache = NULL;
--	mm->free_area_cache = oldmm->mmap_base;
--	mm->cached_hole_size = ~0UL;
-+	mm->free_area_cache = oldmm->free_area_cache;
-+	mm->cached_hole_size = oldmm->cached_hole_size;
- 	mm->map_count = 0;
- 	cpumask_clear(mm_cpumask(mm));
- 	mm->mm_rb = RB_ROOT;
-@@ -382,57 +450,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -379,55 +447,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
  
  	prev = NULL;
  	for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
@@ -81222,11 +81622,9 @@ index 80d92e9..c9ab9de 100644
 -			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))
+-		retval = vma_dup_policy(mpnt, tmp);
+-		if (retval)
 -			goto fail_nomem_policy;
--		vma_set_policy(tmp, pol);
 -		tmp->vm_mm = mm;
 -		if (anon_vma_fork(tmp, mpnt))
 -			goto fail_nomem_anon_vma_fork;
@@ -81260,7 +81658,7 @@ index 80d92e9..c9ab9de 100644
  		}
  
  		/*
-@@ -464,6 +490,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -459,6 +487,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
  		if (retval)
  			goto out;
  	}
@@ -81292,12 +81690,12 @@ index 80d92e9..c9ab9de 100644
  	/* a new mm has just been created */
  	arch_dup_mmap(oldmm, mm);
  	retval = 0;
-@@ -473,14 +524,6 @@ out:
+@@ -468,14 +521,6 @@ out:
  	up_write(&oldmm->mmap_sem);
  	uprobe_end_dup_mmap();
  	return retval;
 -fail_nomem_anon_vma_fork:
--	mpol_put(pol);
+-	mpol_put(vma_policy(tmp));
 -fail_nomem_policy:
 -	kmem_cache_free(vm_area_cachep, tmp);
 -fail_nomem:
@@ -81307,7 +81705,7 @@ index 80d92e9..c9ab9de 100644
  }
  
  static inline int mm_alloc_pgd(struct mm_struct *mm)
-@@ -695,8 +738,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
+@@ -688,8 +733,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
  		return ERR_PTR(err);
  
  	mm = get_task_mm(task);
@@ -81318,7 +81716,7 @@ index 80d92e9..c9ab9de 100644
  		mmput(mm);
  		mm = ERR_PTR(-EACCES);
  	}
-@@ -918,13 +961,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
+@@ -911,13 +956,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
  			spin_unlock(&fs->lock);
  			return -EAGAIN;
  		}
@@ -81340,7 +81738,16 @@ index 80d92e9..c9ab9de 100644
  	return 0;
  }
  
-@@ -1198,10 +1248,13 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1128,7 +1180,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
+  * parts of the process environment (as per the clone
+  * flags). The actual kick-off is left to the caller.
+  */
+-static struct task_struct *copy_process(unsigned long clone_flags,
++static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
+ 					unsigned long stack_start,
+ 					unsigned long stack_size,
+ 					int __user *child_tidptr,
+@@ -1200,6 +1252,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
  	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
  #endif
  	retval = -EAGAIN;
@@ -81349,14 +81756,8 @@ index 80d92e9..c9ab9de 100644
 +
  	if (atomic_read(&p->real_cred->user->processes) >=
  			task_rlimit(p, RLIMIT_NPROC)) {
--		if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
--		    p->real_cred->user != INIT_USER)
-+		if (p->real_cred->user != INIT_USER &&
-+		    !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN))
- 			goto bad_fork_free;
- 	}
- 	current->flags &= ~PF_NPROC_EXCEEDED;
-@@ -1447,6 +1500,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+ 		if (p->real_cred->user != INIT_USER &&
+@@ -1449,6 +1504,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
  		goto bad_fork_free_pid;
  	}
  
@@ -81365,10 +81766,10 @@ index 80d92e9..c9ab9de 100644
 +	*/
 +	gr_copy_label(p);
 +
- 	if (clone_flags & CLONE_THREAD) {
- 		current->signal->nr_threads++;
- 		atomic_inc(&current->signal->live);
-@@ -1530,6 +1588,8 @@ bad_fork_cleanup_count:
+ 	if (likely(p->pid)) {
+ 		ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
+ 
+@@ -1534,6 +1594,8 @@ bad_fork_cleanup_count:
  bad_fork_free:
  	free_task(p);
  fork_out:
@@ -81377,7 +81778,15 @@ index 80d92e9..c9ab9de 100644
  	return ERR_PTR(retval);
  }
  
-@@ -1614,6 +1674,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1595,6 +1657,7 @@ long do_fork(unsigned long clone_flags,
+ 
+ 	p = copy_process(clone_flags, stack_start, stack_size,
+ 			 child_tidptr, NULL, trace);
++	add_latent_entropy();
+ 	/*
+ 	 * Do this prior waking up the new thread - the thread pointer
+ 	 * might get invalid after that point, if the thread exits quickly.
+@@ -1609,6 +1672,8 @@ long do_fork(unsigned long clone_flags,
  		if (clone_flags & CLONE_PARENT_SETTID)
  			put_user(nr, parent_tidptr);
  
@@ -81386,7 +81795,7 @@ index 80d92e9..c9ab9de 100644
  		if (clone_flags & CLONE_VFORK) {
  			p->vfork_done = &vfork;
  			init_completion(&vfork);
-@@ -1730,7 +1792,7 @@ void __init proc_caches_init(void)
+@@ -1725,7 +1790,7 @@ void __init proc_caches_init(void)
  	mm_cachep = kmem_cache_create("mm_struct",
  			sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
  			SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
@@ -81395,7 +81804,7 @@ index 80d92e9..c9ab9de 100644
  	mmap_init();
  	nsproxy_cache_init();
  }
-@@ -1770,7 +1832,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
+@@ -1765,7 +1830,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 */
@@ -81404,7 +81813,7 @@ index 80d92e9..c9ab9de 100644
  		return 0;
  
  	*new_fsp = copy_fs_struct(fs);
-@@ -1882,7 +1944,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
+@@ -1872,7 +1937,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
  			fs = current->fs;
  			spin_lock(&fs->lock);
  			current->fs = new_fs;
@@ -81415,7 +81824,7 @@ index 80d92e9..c9ab9de 100644
  			else
  				new_fs = fs;
 diff --git a/kernel/futex.c b/kernel/futex.c
-index 49dacfb..2ac4526 100644
+index c3a1a55..e32b4a98 100644
 --- a/kernel/futex.c
 +++ b/kernel/futex.c
 @@ -54,6 +54,7 @@
@@ -81426,7 +81835,7 @@ index 49dacfb..2ac4526 100644
  #include <linux/signal.h>
  #include <linux/export.h>
  #include <linux/magic.h>
-@@ -242,6 +243,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
+@@ -243,6 +244,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
  	struct page *page, *page_head;
  	int err, ro = 0;
  
@@ -81438,7 +81847,7 @@ index 49dacfb..2ac4526 100644
  	/*
  	 * The futex address must be "naturally" aligned.
  	 */
-@@ -440,7 +446,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
+@@ -441,7 +447,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
  
  static int get_futex_value_locked(u32 *dest, u32 __user *from)
  {
@@ -81447,7 +81856,7 @@ index 49dacfb..2ac4526 100644
  
  	pagefault_disable();
  	ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
-@@ -2733,6 +2739,7 @@ static int __init futex_init(void)
+@@ -2734,6 +2740,7 @@ static int __init futex_init(void)
  {
  	u32 curval;
  	int i;
@@ -81455,7 +81864,7 @@ index 49dacfb..2ac4526 100644
  
  	/*
  	 * This will fail and we want it. Some arch implementations do
-@@ -2744,8 +2751,11 @@ static int __init futex_init(void)
+@@ -2745,8 +2752,11 @@ static int __init futex_init(void)
  	 * implementation, the non-functional ones will return
  	 * -ENOSYS.
  	 */
@@ -81506,27 +81915,18 @@ index 9b22d03..6295b62 100644
  				prev->next = info->next;
  			else
 diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
-index 2288fbd..0f3941f 100644
+index 383319b..56ebb13 100644
 --- a/kernel/hrtimer.c
 +++ b/kernel/hrtimer.c
-@@ -1435,7 +1435,7 @@ void hrtimer_peek_ahead_timers(void)
+@@ -1438,7 +1438,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
  
 -static void run_hrtimer_softirq(struct softirq_action *h)
-+static void run_hrtimer_softirq(void)
++static __latent_entropy void run_hrtimer_softirq(void)
  {
  	hrtimer_peek_ahead_timers();
  }
-@@ -1770,7 +1770,7 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata hrtimers_nb = {
-+static struct notifier_block hrtimers_nb = {
- 	.notifier_call = hrtimer_cpu_notify,
- };
- 
 diff --git a/kernel/irq_work.c b/kernel/irq_work.c
 index 55fcce6..0e4cf34 100644
 --- a/kernel/irq_work.c
@@ -81549,18 +81949,18 @@ index 55fcce6..0e4cf34 100644
  	return 0;
  }
 diff --git a/kernel/jump_label.c b/kernel/jump_label.c
-index 60f48fa..7f3a770 100644
+index 297a924..7290070 100644
 --- a/kernel/jump_label.c
 +++ b/kernel/jump_label.c
-@@ -13,6 +13,7 @@
- #include <linux/sort.h>
+@@ -14,6 +14,7 @@
  #include <linux/err.h>
  #include <linux/static_key.h>
+ #include <linux/jump_label_ratelimit.h>
 +#include <linux/mm.h>
  
  #ifdef HAVE_JUMP_LABEL
  
-@@ -50,7 +51,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
+@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
  
  	size = (((unsigned long)stop - (unsigned long)start)
  					/ sizeof(struct jump_entry));
@@ -81570,7 +81970,7 @@ index 60f48fa..7f3a770 100644
  }
  
  static void jump_label_update(struct static_key *key, int enable);
-@@ -357,10 +360,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
+@@ -358,10 +361,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
  	struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
  	struct jump_entry *iter;
  
@@ -81713,7 +82113,7 @@ index e30ac0f..3528cac 100644
  
  	/*
 diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 59f7b55..4022f65 100644
+index 2a74f30..d139351 100644
 --- a/kernel/kexec.c
 +++ b/kernel/kexec.c
 @@ -1041,7 +1041,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
@@ -81727,7 +82127,7 @@ index 59f7b55..4022f65 100644
  
  	/* Don't allow clients that don't understand the native
 diff --git a/kernel/kmod.c b/kernel/kmod.c
-index 8241906..d625f2c 100644
+index b086006..6d2e579 100644
 --- a/kernel/kmod.c
 +++ b/kernel/kmod.c
 @@ -75,7 +75,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
@@ -81769,9 +82169,9 @@ index 8241906..d625f2c 100644
  	char module_name[MODULE_NAME_LEN];
  	unsigned int max_modprobes;
  	int ret;
-@@ -147,9 +147,7 @@ int __request_module(bool wait, const char *fmt, ...)
- 	 */
- 	WARN_ON_ONCE(wait && current_is_async());
+@@ -150,9 +150,7 @@ int __request_module(bool wait, const char *fmt, ...)
+ 	if (!modprobe_path[0])
+ 		return 0;
  
 -	va_start(args, fmt);
 -	ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
@@ -81780,7 +82180,7 @@ index 8241906..d625f2c 100644
  	if (ret >= MODULE_NAME_LEN)
  		return -ENAMETOOLONG;
  
-@@ -157,6 +155,20 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -160,6 +158,20 @@ int __request_module(bool wait, const char *fmt, ...)
  	if (ret)
  		return ret;
  
@@ -81801,7 +82201,7 @@ index 8241906..d625f2c 100644
  	/* If modprobe needs a service that is in a module, we get a recursive
  	 * loop.  Limit the number of running kmod threads to max_threads/2 or
  	 * MAX_KMOD_CONCURRENT, whichever is the smaller.  A cleaner method
-@@ -185,11 +197,52 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -188,11 +200,52 @@ int __request_module(bool wait, const char *fmt, ...)
  
  	trace_module_request(module_name, wait, _RET_IP_);
  
@@ -81855,7 +82255,38 @@ index 8241906..d625f2c 100644
  EXPORT_SYMBOL(__request_module);
  #endif /* CONFIG_MODULES */
  
-@@ -300,7 +353,7 @@ static int wait_for_helper(void *data)
+@@ -218,6 +271,19 @@ static int ____call_usermodehelper(void *data)
+ 	 */
+ 	set_user_nice(current, 0);
+ 
++#ifdef CONFIG_GRKERNSEC
++	/* this is race-free as far as userland is concerned as we copied
++	   out the path to be used prior to this point and are now operating
++	   on that copy
++	*/
++	if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
++	     strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7)) || strstr(sub_info->path, "..")) {
++		printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
++		retval = -EPERM;
++		goto fail;
++	}
++#endif
++
+ 	retval = -ENOMEM;
+ 	new = prepare_kernel_cred(current);
+ 	if (!new)
+@@ -260,6 +326,10 @@ static int call_helper(void *data)
+ 
+ static void call_usermodehelper_freeinfo(struct subprocess_info *info)
+ {
++#ifdef CONFIG_GRKERNSEC
++	kfree(info->path);
++	info->path = info->origpath;
++#endif
+ 	if (info->cleanup)
+ 		(*info->cleanup)(info);
+ 	kfree(info);
+@@ -303,7 +373,7 @@ static int wait_for_helper(void *data)
  		 *
  		 * Thus the __user pointer cast is valid here.
  		 */
@@ -81864,7 +82295,20 @@ index 8241906..d625f2c 100644
  
  		/*
  		 * If ret is 0, either ____call_usermodehelper failed and the
-@@ -651,7 +704,7 @@ EXPORT_SYMBOL(call_usermodehelper);
+@@ -542,7 +612,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
+ 		goto out;
+ 
+ 	INIT_WORK(&sub_info->work, __call_usermodehelper);
++#ifdef CONFIG_GRKERNSEC
++	sub_info->origpath = path;
++	sub_info->path = kstrdup(path, gfp_mask);
++#else
+ 	sub_info->path = path;
++#endif
+ 	sub_info->argv = argv;
+ 	sub_info->envp = envp;
+ 
+@@ -650,7 +725,7 @@ EXPORT_SYMBOL(call_usermodehelper);
  static int proc_cap_handler(struct ctl_table *table, int write,
  			 void __user *buffer, size_t *lenp, loff_t *ppos)
  {
@@ -81874,7 +82318,7 @@ index 8241906..d625f2c 100644
  	kernel_cap_t new_cap;
  	int err, i;
 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
-index bddf3b2..233bf40 100644
+index a0d367a..11c18b6 100644
 --- a/kernel/kprobes.c
 +++ b/kernel/kprobes.c
 @@ -31,6 +31,9 @@
@@ -81887,25 +82331,22 @@ index bddf3b2..233bf40 100644
  #include <linux/kprobes.h>
  #include <linux/hash.h>
  #include <linux/init.h>
-@@ -185,7 +188,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.
- 	 */
--	kip->insns = module_alloc(PAGE_SIZE);
-+	kip->insns = module_alloc_exec(PAGE_SIZE);
- 	if (!kip->insns) {
- 		kfree(kip);
- 		return NULL;
-@@ -225,7 +228,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
- 		 */
- 		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;
-@@ -2083,7 +2086,7 @@ static int __init init_kprobes(void)
+@@ -135,12 +138,12 @@ enum kprobe_slot_state {
+ 
+ static void *alloc_insn_page(void)
+ {
+-	return module_alloc(PAGE_SIZE);
++	return module_alloc_exec(PAGE_SIZE);
+ }
+ 
+ static void free_insn_page(void *page)
+ {
+-	module_free(NULL, page);
++	module_free_exec(NULL, page);
+ }
+ 
+ struct kprobe_insn_cache kprobe_insn_slots = {
+@@ -2066,7 +2069,7 @@ static int __init init_kprobes(void)
  {
  	int i, err = 0;
  	unsigned long offset = 0, size = 0;
@@ -81914,7 +82355,7 @@ index bddf3b2..233bf40 100644
  	const char *symbol_name;
  	void *addr;
  	struct kprobe_blackpoint *kb;
-@@ -2168,11 +2171,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
+@@ -2151,11 +2154,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
  		kprobe_type = "k";
  
  	if (sym)
@@ -81928,7 +82369,7 @@ index bddf3b2..233bf40 100644
  			p->addr, kprobe_type, p->addr);
  
  	if (!pp)
-@@ -2209,7 +2212,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
+@@ -2192,7 +2195,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;
@@ -81938,7 +82379,7 @@ index bddf3b2..233bf40 100644
  	head = &kprobe_table[i];
  	preempt_disable();
 diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
-index 6ada93c..dce7d5d 100644
+index 9659d38..bffd520 100644
 --- a/kernel/ksysfs.c
 +++ b/kernel/ksysfs.c
 @@ -46,6 +46,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
@@ -81960,7 +82401,7 @@ index 6ada93c..dce7d5d 100644
  		.name = "notes",
  		.mode = S_IRUGO,
 diff --git a/kernel/lockdep.c b/kernel/lockdep.c
-index 1f3186b..bb7dbc6 100644
+index e16c45b..6f49c48 100644
 --- a/kernel/lockdep.c
 +++ b/kernel/lockdep.c
 @@ -596,6 +596,10 @@ static int static_obj(void *obj)
@@ -82041,7 +82482,7 @@ index b2c71c5..7b88d63 100644
  		seq_printf(m, "%40s %14lu %29s %pS\n",
  			   name, stats->contending_point[i],
 diff --git a/kernel/module.c b/kernel/module.c
-index fa53db8..6f17200 100644
+index dc58274..3ddfa55 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
 @@ -61,6 +61,7 @@
@@ -82052,7 +82493,7 @@ index fa53db8..6f17200 100644
  #include <uapi/linux/module.h>
  #include "module-internal.h"
  
-@@ -156,7 +157,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
+@@ -157,7 +158,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
  
  /* Bounds of module allocation, for speeding __module_address.
   * Protected by module_mutex. */
@@ -82062,7 +82503,7 @@ index fa53db8..6f17200 100644
  
  int register_module_notifier(struct notifier_block * nb)
  {
-@@ -323,7 +325,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
+@@ -324,7 +326,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
  		return true;
  
  	list_for_each_entry_rcu(mod, &modules, list) {
@@ -82071,7 +82512,7 @@ index fa53db8..6f17200 100644
  			{ mod->syms, mod->syms + mod->num_syms, mod->crcs,
  			  NOT_GPL_ONLY, false },
  			{ mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
-@@ -348,7 +350,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
+@@ -349,7 +351,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
  		if (mod->state == MODULE_STATE_UNFORMED)
  			continue;
  
@@ -82080,16 +82521,16 @@ index fa53db8..6f17200 100644
  			return true;
  	}
  	return false;
-@@ -485,7 +487,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
- static int percpu_modalloc(struct module *mod,
- 			   unsigned long size, unsigned long align)
- {
+@@ -491,7 +493,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
+ 	if (!pcpusec->sh_size)
+ 		return 0;
+ 
 -	if (align > PAGE_SIZE) {
 +	if (align-1 >= PAGE_SIZE) {
  		printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
  		       mod->name, align, PAGE_SIZE);
  		align = PAGE_SIZE;
-@@ -1089,7 +1091,7 @@ struct module_attribute module_uevent =
+@@ -1097,7 +1099,7 @@ struct module_attribute module_uevent =
  static ssize_t show_coresize(struct module_attribute *mattr,
  			     struct module_kobject *mk, char *buffer)
  {
@@ -82098,7 +82539,7 @@ index fa53db8..6f17200 100644
  }
  
  static struct module_attribute modinfo_coresize =
-@@ -1098,7 +1100,7 @@ static struct module_attribute modinfo_coresize =
+@@ -1106,7 +1108,7 @@ static struct module_attribute modinfo_coresize =
  static ssize_t show_initsize(struct module_attribute *mattr,
  			     struct module_kobject *mk, char *buffer)
  {
@@ -82107,7 +82548,7 @@ index fa53db8..6f17200 100644
  }
  
  static struct module_attribute modinfo_initsize =
-@@ -1313,7 +1315,7 @@ resolve_symbol_wait(struct module *mod,
+@@ -1321,7 +1323,7 @@ resolve_symbol_wait(struct module *mod,
   */
  #ifdef CONFIG_SYSFS
  
@@ -82116,7 +82557,7 @@ index fa53db8..6f17200 100644
  static inline bool sect_empty(const Elf_Shdr *sect)
  {
  	return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
-@@ -1453,7 +1455,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
+@@ -1461,7 +1463,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
  {
  	unsigned int notes, loaded, i;
  	struct module_notes_attrs *notes_attrs;
@@ -82125,7 +82566,7 @@ index fa53db8..6f17200 100644
  
  	/* failed to create section attributes, so can't create notes */
  	if (!mod->sect_attrs)
-@@ -1565,7 +1567,7 @@ static void del_usage_links(struct module *mod)
+@@ -1573,7 +1575,7 @@ static void del_usage_links(struct module *mod)
  static int module_add_modinfo_attrs(struct module *mod)
  {
  	struct module_attribute *attr;
@@ -82134,7 +82575,7 @@ index fa53db8..6f17200 100644
  	int error = 0;
  	int i;
  
-@@ -1779,21 +1781,21 @@ static void set_section_ro_nx(void *base,
+@@ -1795,21 +1797,21 @@ static void set_section_ro_nx(void *base,
  
  static void unset_module_core_ro_nx(struct module *mod)
  {
@@ -82164,7 +82605,7 @@ index fa53db8..6f17200 100644
  		set_memory_rw);
  }
  
-@@ -1806,14 +1808,14 @@ void set_all_modules_text_rw(void)
+@@ -1822,14 +1824,14 @@ void set_all_modules_text_rw(void)
  	list_for_each_entry_rcu(mod, &modules, list) {
  		if (mod->state == MODULE_STATE_UNFORMED)
  			continue;
@@ -82185,7 +82626,7 @@ index fa53db8..6f17200 100644
  						set_memory_rw);
  		}
  	}
-@@ -1829,14 +1831,14 @@ void set_all_modules_text_ro(void)
+@@ -1845,14 +1847,14 @@ void set_all_modules_text_ro(void)
  	list_for_each_entry_rcu(mod, &modules, list) {
  		if (mod->state == MODULE_STATE_UNFORMED)
  			continue;
@@ -82206,7 +82647,7 @@ index fa53db8..6f17200 100644
  						set_memory_ro);
  		}
  	}
-@@ -1887,16 +1889,19 @@ static void free_module(struct module *mod)
+@@ -1903,16 +1905,19 @@ static void free_module(struct module *mod)
  
  	/* This may be NULL, but that's OK */
  	unset_module_init_ro_nx(mod);
@@ -82229,7 +82670,7 @@ index fa53db8..6f17200 100644
  
  #ifdef CONFIG_MPU
  	update_protections(current->mm);
-@@ -1966,9 +1971,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1982,9 +1987,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
  	int ret = 0;
  	const struct kernel_symbol *ksym;
  
@@ -82261,7 +82702,7 @@ index fa53db8..6f17200 100644
  		switch (sym[i].st_shndx) {
  		case SHN_COMMON:
  			/* We compiled with -fno-common.  These are not
-@@ -1989,7 +2016,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -2005,7 +2032,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
  			ksym = resolve_symbol_wait(mod, info, name);
  			/* Ok if resolved.  */
  			if (ksym && !IS_ERR(ksym)) {
@@ -82271,7 +82712,7 @@ index fa53db8..6f17200 100644
  				break;
  			}
  
-@@ -2008,11 +2037,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -2024,11 +2053,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
  				secbase = (unsigned long)mod_percpu(mod);
  			else
  				secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
@@ -82292,7 +82733,7 @@ index fa53db8..6f17200 100644
  	return ret;
  }
  
-@@ -2096,22 +2134,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -2112,22 +2150,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
  			    || s->sh_entsize != ~0UL
  			    || strstarts(sname, ".init"))
  				continue;
@@ -82319,7 +82760,7 @@ index fa53db8..6f17200 100644
  	}
  
  	pr_debug("Init section allocation order:\n");
-@@ -2125,23 +2153,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -2141,23 +2169,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
  			    || s->sh_entsize != ~0UL
  			    || !strstarts(sname, ".init"))
  				continue;
@@ -82348,7 +82789,7 @@ index fa53db8..6f17200 100644
  	}
  }
  
-@@ -2314,7 +2332,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2330,7 +2348,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
  
  	/* Put symbol section at end of init part of module. */
  	symsect->sh_flags |= SHF_ALLOC;
@@ -82357,7 +82798,7 @@ index fa53db8..6f17200 100644
  					 info->index.sym) | INIT_OFFSET_MASK;
  	pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
  
-@@ -2331,13 +2349,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2347,13 +2365,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
  	}
  
  	/* Append room for core symbols at end of core part. */
@@ -82375,7 +82816,7 @@ index fa53db8..6f17200 100644
  					 info->index.str) | INIT_OFFSET_MASK;
  	pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
  }
-@@ -2355,12 +2373,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+@@ -2371,12 +2389,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
  	/* Make sure we get permanent strtab: don't use info->strtab. */
  	mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
  
@@ -82392,7 +82833,7 @@ index fa53db8..6f17200 100644
  	src = mod->symtab;
  	for (ndst = i = 0; i < mod->num_symtab; i++) {
  		if (i == 0 ||
-@@ -2372,6 +2392,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+@@ -2388,6 +2408,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
  		}
  	}
  	mod->core_num_syms = ndst;
@@ -82401,7 +82842,7 @@ index fa53db8..6f17200 100644
  }
  #else
  static inline void layout_symtab(struct module *mod, struct load_info *info)
-@@ -2405,17 +2427,33 @@ void * __weak module_alloc(unsigned long size)
+@@ -2421,17 +2443,33 @@ void * __weak module_alloc(unsigned long size)
  	return vmalloc_exec(size);
  }
  
@@ -82440,7 +82881,7 @@ index fa53db8..6f17200 100644
  		mutex_unlock(&module_mutex);
  	}
  	return ret;
-@@ -2691,8 +2729,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
+@@ -2706,8 +2744,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
  static int check_modinfo(struct module *mod, struct load_info *info, int flags)
  {
  	const char *modmagic = get_modinfo(info, "vermagic");
@@ -82455,7 +82896,7 @@ index fa53db8..6f17200 100644
  	if (flags & MODULE_INIT_IGNORE_VERMAGIC)
  		modmagic = NULL;
  
-@@ -2718,7 +2762,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
+@@ -2733,7 +2777,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
  	}
  
  	/* Set up license info based on the info section */
@@ -82464,7 +82905,7 @@ index fa53db8..6f17200 100644
  
  	return 0;
  }
-@@ -2799,7 +2843,7 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2814,7 +2858,7 @@ static int move_module(struct module *mod, struct load_info *info)
  	void *ptr;
  
  	/* Do the allocs. */
@@ -82473,7 +82914,7 @@ index fa53db8..6f17200 100644
  	/*
  	 * The pointer to this block is stored in the module structure
  	 * which is inside the block. Just mark it as not being a
-@@ -2809,11 +2853,11 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2824,11 +2868,11 @@ static int move_module(struct module *mod, struct load_info *info)
  	if (!ptr)
  		return -ENOMEM;
  
@@ -82489,17 +82930,20 @@ index fa53db8..6f17200 100644
  		/*
  		 * The pointer to this block is stored in the module structure
  		 * which is inside the block. This block doesn't need to be
-@@ -2822,13 +2866,45 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2837,13 +2881,45 @@ static int move_module(struct module *mod, struct load_info *info)
  		 */
  		kmemleak_ignore(ptr);
  		if (!ptr) {
 -			module_free(mod, mod->module_core);
 +			module_free(mod, mod->module_core_rw);
-+			return -ENOMEM;
-+		}
+ 			return -ENOMEM;
+ 		}
+-		memset(ptr, 0, mod->init_size);
+-		mod->module_init = ptr;
 +		memset(ptr, 0, mod->init_size_rw);
 +		mod->module_init_rw = ptr;
-+	} else
+ 	} else
+-		mod->module_init = NULL;
 +		mod->module_init_rw = NULL;
 +
 +	ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
@@ -82524,22 +82968,19 @@ index fa53db8..6f17200 100644
 +			if (mod->module_init_rw)
 +				module_free(mod, mod->module_init_rw);
 +			module_free(mod, mod->module_core_rw);
- 			return -ENOMEM;
- 		}
--		memset(ptr, 0, mod->init_size);
--		mod->module_init = ptr;
++			return -ENOMEM;
++		}
 +
 +		pax_open_kernel();
 +		memset(ptr, 0, mod->init_size_rx);
 +		pax_close_kernel();
 +		mod->module_init_rx = ptr;
- 	} else
--		mod->module_init = NULL;
++	} else
 +		mod->module_init_rx = NULL;
  
  	/* Transfer each section which specifies SHF_ALLOC */
  	pr_debug("final section addresses:\n");
-@@ -2839,16 +2915,45 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2854,16 +2930,45 @@ static int move_module(struct module *mod, struct load_info *info)
  		if (!(shdr->sh_flags & SHF_ALLOC))
  			continue;
  
@@ -82592,7 +83033,7 @@ index fa53db8..6f17200 100644
  		pr_debug("\t0x%lx %s\n",
  			 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
  	}
-@@ -2905,12 +3010,12 @@ static void flush_module_icache(const struct module *mod)
+@@ -2920,12 +3025,12 @@ static void flush_module_icache(const struct module *mod)
  	 * Do it before processing of module parameters, so the module
  	 * can provide parameter accessor functions of its own.
  	 */
@@ -82611,7 +83052,7 @@ index fa53db8..6f17200 100644
  
  	set_fs(old_fs);
  }
-@@ -2977,8 +3082,10 @@ static int alloc_module_percpu(struct module *mod, struct load_info *info)
+@@ -2982,8 +3087,10 @@ static struct module *layout_and_allocate(struct load_info *info, int flags)
  static void module_deallocate(struct module *mod, struct load_info *info)
  {
  	percpu_modfree(mod);
@@ -82624,7 +83065,7 @@ index fa53db8..6f17200 100644
  }
  
  int __weak module_finalize(const Elf_Ehdr *hdr,
-@@ -2991,7 +3098,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
+@@ -2996,7 +3103,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
  static int post_relocation(struct module *mod, const struct load_info *info)
  {
  	/* Sort exception table now relocations are done. */
@@ -82634,7 +83075,7 @@ index fa53db8..6f17200 100644
  
  	/* Copy relocated percpu area over. */
  	percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
-@@ -3045,16 +3154,16 @@ static int do_init_module(struct module *mod)
+@@ -3050,16 +3159,16 @@ static int do_init_module(struct module *mod)
  			MODULE_STATE_COMING, mod);
  
  	/* Set RO and NX regions for core */
@@ -82659,7 +83100,7 @@ index fa53db8..6f17200 100644
  
  	do_mod_ctors(mod);
  	/* Start the module */
-@@ -3116,11 +3225,12 @@ static int do_init_module(struct module *mod)
+@@ -3121,11 +3230,12 @@ static int do_init_module(struct module *mod)
  	mod->strtab = mod->core_strtab;
  #endif
  	unset_module_init_ro_nx(mod);
@@ -82677,7 +83118,7 @@ index fa53db8..6f17200 100644
  	mutex_unlock(&module_mutex);
  	wake_up_all(&module_wq);
  
-@@ -3252,9 +3362,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
+@@ -3269,9 +3379,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
  	if (err)
  		goto free_unload;
  
@@ -82716,7 +83157,7 @@ index fa53db8..6f17200 100644
  	/* Fix up syms, so that st_value is a pointer to location. */
  	err = simplify_symbols(mod, info);
  	if (err < 0)
-@@ -3270,13 +3409,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
+@@ -3287,13 +3426,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
  
  	flush_module_icache(mod);
  
@@ -82730,7 +83171,7 @@ index fa53db8..6f17200 100644
  	dynamic_debug_setup(info->debug, info->num_debug);
  
  	/* Finally it's fully formed, ready to start executing. */
-@@ -3311,11 +3443,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
+@@ -3328,11 +3460,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
   ddebug_cleanup:
  	dynamic_debug_remove(info->debug);
  	synchronize_sched();
@@ -82743,7 +83184,7 @@ index fa53db8..6f17200 100644
   free_unload:
  	module_unload_free(mod);
   unlink_mod:
-@@ -3398,10 +3529,16 @@ static const char *get_ksymbol(struct module *mod,
+@@ -3415,10 +3546,16 @@ static const char *get_ksymbol(struct module *mod,
  	unsigned long nextval;
  
  	/* At worse, next value is at end of module */
@@ -82763,7 +83204,7 @@ index fa53db8..6f17200 100644
  
  	/* Scan for closest preceding symbol, and next symbol. (ELF
  	   starts real symbols at 1). */
-@@ -3654,7 +3791,7 @@ static int m_show(struct seq_file *m, void *p)
+@@ -3669,7 +3806,7 @@ static int m_show(struct seq_file *m, void *p)
  		return 0;
  
  	seq_printf(m, "%s %u",
@@ -82772,7 +83213,7 @@ index fa53db8..6f17200 100644
  	print_unload_info(m, mod);
  
  	/* Informative for users. */
-@@ -3663,7 +3800,7 @@ static int m_show(struct seq_file *m, void *p)
+@@ -3678,7 +3815,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. */
@@ -82781,7 +83222,7 @@ index fa53db8..6f17200 100644
  
  	/* Taints info */
  	if (mod->taints)
-@@ -3699,7 +3836,17 @@ static const struct file_operations proc_modules_operations = {
+@@ -3714,7 +3851,17 @@ static const struct file_operations proc_modules_operations = {
  
  static int __init proc_modules_init(void)
  {
@@ -82799,7 +83240,7 @@ index fa53db8..6f17200 100644
  	return 0;
  }
  module_init(proc_modules_init);
-@@ -3760,14 +3907,14 @@ struct module *__module_address(unsigned long addr)
+@@ -3775,14 +3922,14 @@ struct module *__module_address(unsigned long addr)
  {
  	struct module *mod;
  
@@ -82817,7 +83258,7 @@ index fa53db8..6f17200 100644
  			return mod;
  	}
  	return NULL;
-@@ -3802,11 +3949,20 @@ bool is_module_text_address(unsigned long addr)
+@@ -3817,11 +3964,20 @@ bool is_module_text_address(unsigned long addr)
   */
  struct module *__module_text_address(unsigned long addr)
  {
@@ -82890,10 +83331,10 @@ index 0799fd3..d06ae3b 100644
  extern void debug_mutex_init(struct mutex *lock, const char *name,
  			     struct lock_class_key *key);
 diff --git a/kernel/mutex.c b/kernel/mutex.c
-index ad53a66..f1bf8bc 100644
+index d24105b..15648eb 100644
 --- a/kernel/mutex.c
 +++ b/kernel/mutex.c
-@@ -134,7 +134,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node)
+@@ -135,7 +135,7 @@ void mspin_lock(struct mspin_node **lock, struct mspin_node *node)
  		node->locked = 1;
  		return;
  	}
@@ -82902,7 +83343,7 @@ index ad53a66..f1bf8bc 100644
  	smp_wmb();
  	/* Wait until the lock holder passes the lock down */
  	while (!ACCESS_ONCE(node->locked))
-@@ -155,7 +155,7 @@ static void mspin_unlock(struct mspin_node **lock, struct mspin_node *node)
+@@ -156,7 +156,7 @@ static void mspin_unlock(struct mspin_node **lock, struct mspin_node *node)
  		while (!(next = ACCESS_ONCE(node->next)))
  			arch_mutex_cpu_relax();
  	}
@@ -82911,8 +83352,8 @@ index ad53a66..f1bf8bc 100644
  	smp_wmb();
  }
  
-@@ -341,7 +341,7 @@ slowpath:
- 	spin_lock_mutex(&lock->wait_lock, flags);
+@@ -520,7 +520,7 @@ slowpath:
+ 		goto skip_wait;
  
  	debug_mutex_lock_common(lock, &waiter);
 -	debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
@@ -82920,25 +83361,24 @@ index ad53a66..f1bf8bc 100644
  
  	/* add waiting tasks to the end of the waitqueue (FIFO): */
  	list_add_tail(&waiter.list, &lock->wait_list);
-@@ -371,8 +371,7 @@ slowpath:
- 		 * TASK_UNINTERRUPTIBLE case.)
- 		 */
- 		if (unlikely(signal_pending_state(state, task))) {
--			mutex_remove_waiter(lock, &waiter,
--					    task_thread_info(task));
-+			mutex_remove_waiter(lock, &waiter, task);
- 			mutex_release(&lock->dep_map, 1, ip);
- 			spin_unlock_mutex(&lock->wait_lock, flags);
- 
-@@ -391,7 +390,7 @@ slowpath:
- done:
- 	lock_acquired(&lock->dep_map, ip);
- 	/* got the lock - rejoice! */
+@@ -564,7 +564,7 @@ slowpath:
+ 		schedule_preempt_disabled();
+ 		spin_lock_mutex(&lock->wait_lock, flags);
+ 	}
 -	mutex_remove_waiter(lock, &waiter, current_thread_info());
 +	mutex_remove_waiter(lock, &waiter, task);
- 	mutex_set_owner(lock);
- 
  	/* set it to 0 if there are no waiters left: */
+ 	if (likely(list_empty(&lock->wait_list)))
+ 		atomic_set(&lock->count, 0);
+@@ -601,7 +601,7 @@ skip_wait:
+ 	return 0;
+ 
+ err:
+-	mutex_remove_waiter(lock, &waiter, task_thread_info(task));
++	mutex_remove_waiter(lock, &waiter, task);
+ 	spin_unlock_mutex(&lock->wait_lock, flags);
+ 	debug_mutex_free_waiter(&waiter);
+ 	mutex_release(&lock->dep_map, 1, ip);
 diff --git a/kernel/notifier.c b/kernel/notifier.c
 index 2d5cc4c..d9ea600 100644
 --- a/kernel/notifier.c
@@ -82996,19 +83436,19 @@ index 2d5cc4c..d9ea600 100644
  	return -ENOENT;
  }
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 167ec09..0dda5f9 100644
+index b6c482c..5578061 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
-@@ -400,7 +400,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
- 				 unsigned taint, struct slowpath_args *args)
- {
- 	printk(KERN_WARNING "------------[ cut here ]------------\n");
--	printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
-+	printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
+@@ -407,7 +407,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
+ 	disable_trace_on_warning();
+ 
+ 	pr_warn("------------[ cut here ]------------\n");
+-	pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
++	pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
+ 		raw_smp_processor_id(), current->pid, file, line, caller);
  
  	if (args)
- 		vprintk(args->fmt, args->args);
-@@ -453,7 +453,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
+@@ -461,7 +461,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
   */
  void __stack_chk_fail(void)
  {
@@ -83019,7 +83459,7 @@ index 167ec09..0dda5f9 100644
  }
  EXPORT_SYMBOL(__stack_chk_fail);
 diff --git a/kernel/pid.c b/kernel/pid.c
-index 0eb6d8e..ee0e17d 100644
+index 9b9a266..c20ef80 100644
 --- a/kernel/pid.c
 +++ b/kernel/pid.c
 @@ -33,6 +33,7 @@
@@ -83039,7 +83479,7 @@ index 0eb6d8e..ee0e17d 100644
  
  int pid_max_min = RESERVED_PIDS + 1;
  int pid_max_max = PID_MAX_LIMIT;
-@@ -443,10 +444,18 @@ EXPORT_SYMBOL(pid_task);
+@@ -445,10 +446,18 @@ EXPORT_SYMBOL(pid_task);
   */
  struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
  {
@@ -83059,7 +83499,7 @@ index 0eb6d8e..ee0e17d 100644
  }
  
  struct task_struct *find_task_by_vpid(pid_t vnr)
-@@ -454,6 +463,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
+@@ -456,6 +465,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
  	return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
  }
  
@@ -83075,7 +83515,7 @@ index 0eb6d8e..ee0e17d 100644
  {
  	struct pid *pid;
 diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
-index 6917e8e..9909aeb 100644
+index 4208655..19f36a5 100644
 --- a/kernel/pid_namespace.c
 +++ b/kernel/pid_namespace.c
 @@ -247,7 +247,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
@@ -83088,10 +83528,10 @@ index 6917e8e..9909aeb 100644
  	if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
  		return -EPERM;
 diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
-index 42670e9..8719c2f 100644
+index c7f31aa..2b44977 100644
 --- a/kernel/posix-cpu-timers.c
 +++ b/kernel/posix-cpu-timers.c
-@@ -1636,14 +1636,14 @@ struct k_clock clock_posix_cpu = {
+@@ -1521,14 +1521,14 @@ struct k_clock clock_posix_cpu = {
  
  static __init int init_posix_cpu_timers(void)
  {
@@ -83225,18 +83665,18 @@ index 424c2d4..679242f 100644
  }
  
 diff --git a/kernel/power/process.c b/kernel/power/process.c
-index 98088e0..aaf95c0 100644
+index 06ec886..9dba35e 100644
 --- a/kernel/power/process.c
 +++ b/kernel/power/process.c
-@@ -33,6 +33,7 @@ static int try_to_freeze_tasks(bool user_only)
- 	u64 elapsed_csecs64;
- 	unsigned int elapsed_csecs;
+@@ -34,6 +34,7 @@ static int try_to_freeze_tasks(bool user_only)
+ 	unsigned int elapsed_msecs;
  	bool wakeup = false;
+ 	int sleep_usecs = USEC_PER_MSEC;
 +	bool timedout = false;
  
  	do_gettimeofday(&start);
  
-@@ -43,13 +44,20 @@ static int try_to_freeze_tasks(bool user_only)
+@@ -44,13 +45,20 @@ static int try_to_freeze_tasks(bool user_only)
  
  	while (true) {
  		todo = 0;
@@ -83258,7 +83698,7 @@ index 98088e0..aaf95c0 100644
  		} while_each_thread(g, p);
  		read_unlock(&tasklist_lock);
  
-@@ -58,7 +66,7 @@ static int try_to_freeze_tasks(bool user_only)
+@@ -59,7 +67,7 @@ static int try_to_freeze_tasks(bool user_only)
  			todo += wq_busy;
  		}
  
@@ -83267,11 +83707,11 @@ index 98088e0..aaf95c0 100644
  			break;
  
  		if (pm_wakeup_pending()) {
-diff --git a/kernel/printk.c b/kernel/printk.c
-index d37d45c..ab918b3 100644
---- a/kernel/printk.c
-+++ b/kernel/printk.c
-@@ -390,6 +390,11 @@ static int check_syslog_permissions(int type, bool from_file)
+diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
+index b4e8500..b457a6c 100644
+--- a/kernel/printk/printk.c
++++ b/kernel/printk/printk.c
+@@ -385,6 +385,11 @@ static int check_syslog_permissions(int type, bool from_file)
  	if (from_file && type != SYSLOG_ACTION_OPEN)
  		return 0;
  
@@ -83284,7 +83724,7 @@ index d37d45c..ab918b3 100644
  		if (capable(CAP_SYSLOG))
  			return 0;
 diff --git a/kernel/profile.c b/kernel/profile.c
-index 0bf4007..6234708 100644
+index 6631e1e..310c266 100644
 --- a/kernel/profile.c
 +++ b/kernel/profile.c
 @@ -37,7 +37,7 @@ struct profile_hit {
@@ -83345,7 +83785,7 @@ index 0bf4007..6234708 100644
  }
  
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index afadcf7..7a883f1 100644
+index 1f4bcb3..99cf7ab 100644
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -327,7 +327,7 @@ static int ptrace_attach(struct task_struct *task, long request,
@@ -83375,7 +83815,7 @@ index afadcf7..7a883f1 100644
  	unsigned long __user *datalp = datavp;
  	unsigned long flags;
  
-@@ -1012,14 +1012,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
+@@ -1052,14 +1052,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
  		goto out;
  	}
  
@@ -83398,7 +83838,7 @@ index afadcf7..7a883f1 100644
  		goto out_put_task_struct;
  	}
  
-@@ -1047,7 +1054,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
+@@ -1087,7 +1094,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
  	copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
  	if (copied != sizeof(tmp))
  		return -EIO;
@@ -83407,7 +83847,7 @@ index afadcf7..7a883f1 100644
  }
  
  int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
-@@ -1141,7 +1148,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
+@@ -1181,7 +1188,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
  }
  
  asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
@@ -83416,7 +83856,7 @@ index afadcf7..7a883f1 100644
  {
  	struct task_struct *child;
  	long ret;
-@@ -1157,14 +1164,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
+@@ -1197,14 +1204,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
  		goto out;
  	}
  
@@ -83440,10 +83880,10 @@ index afadcf7..7a883f1 100644
  	}
  
 diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c
-index 48ab703..07561d4 100644
+index b02a339..ce2d20c 100644
 --- a/kernel/rcupdate.c
 +++ b/kernel/rcupdate.c
-@@ -439,10 +439,10 @@ int rcu_jiffies_till_stall_check(void)
+@@ -312,10 +312,10 @@ int rcu_jiffies_till_stall_check(void)
  	 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
  	 */
  	if (till_stall_check < 3) {
@@ -83457,45 +83897,32 @@ index 48ab703..07561d4 100644
  	}
  	return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
 diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
-index a0714a5..2ab5e34 100644
+index 9ed6075..c9e8a63 100644
 --- a/kernel/rcutiny.c
 +++ b/kernel/rcutiny.c
-@@ -46,7 +46,7 @@
+@@ -45,7 +45,7 @@
+ /* Forward declarations for rcutiny_plugin.h. */
  struct rcu_ctrlblk;
- static void invoke_rcu_callbacks(void);
  static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
 -static void rcu_process_callbacks(struct softirq_action *unused);
 +static void rcu_process_callbacks(void);
  static void __call_rcu(struct rcu_head *head,
  		       void (*func)(struct rcu_head *rcu),
  		       struct rcu_ctrlblk *rcp);
-@@ -312,7 +312,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
- 				      rcu_is_callbacks_kthread()));
+@@ -309,7 +309,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
+ 				      false));
  }
  
 -static void rcu_process_callbacks(struct softirq_action *unused)
-+static void rcu_process_callbacks(void)
++static __latent_entropy void rcu_process_callbacks(void)
  {
  	__rcu_process_callbacks(&rcu_sched_ctrlblk);
  	__rcu_process_callbacks(&rcu_bh_ctrlblk);
-diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
-index 8a23300..4255818 100644
---- a/kernel/rcutiny_plugin.h
-+++ b/kernel/rcutiny_plugin.h
-@@ -945,7 +945,7 @@ static int rcu_kthread(void *arg)
- 		have_rcu_kthread_work = morework;
- 		local_irq_restore(flags);
- 		if (work)
--			rcu_process_callbacks(NULL);
-+			rcu_process_callbacks();
- 		schedule_timeout_interruptible(1); /* Leave CPU for others. */
- 	}
- 
 diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
-index e1f3a8c..42c94a2 100644
+index be63101..05cf721 100644
 --- a/kernel/rcutorture.c
 +++ b/kernel/rcutorture.c
-@@ -164,12 +164,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
+@@ -170,12 +170,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
  	{ 0 };
  static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
  	{ 0 };
@@ -83514,7 +83941,7 @@ index e1f3a8c..42c94a2 100644
  static long n_rcu_torture_barrier_error;
  static long n_rcu_torture_boost_ktrerror;
  static long n_rcu_torture_boost_rterror;
-@@ -287,11 +287,11 @@ rcu_torture_alloc(void)
+@@ -293,11 +293,11 @@ rcu_torture_alloc(void)
  
  	spin_lock_bh(&rcu_torture_lock);
  	if (list_empty(&rcu_torture_freelist)) {
@@ -83528,7 +83955,7 @@ index e1f3a8c..42c94a2 100644
  	p = rcu_torture_freelist.next;
  	list_del_init(p);
  	spin_unlock_bh(&rcu_torture_lock);
-@@ -304,7 +304,7 @@ rcu_torture_alloc(void)
+@@ -310,7 +310,7 @@ rcu_torture_alloc(void)
  static void
  rcu_torture_free(struct rcu_torture *p)
  {
@@ -83537,7 +83964,7 @@ index e1f3a8c..42c94a2 100644
  	spin_lock_bh(&rcu_torture_lock);
  	list_add_tail(&p->rtort_free, &rcu_torture_freelist);
  	spin_unlock_bh(&rcu_torture_lock);
-@@ -424,7 +424,7 @@ rcu_torture_cb(struct rcu_head *p)
+@@ -431,7 +431,7 @@ rcu_torture_cb(struct rcu_head *p)
  	i = rp->rtort_pipe_count;
  	if (i > RCU_TORTURE_PIPE_LEN)
  		i = RCU_TORTURE_PIPE_LEN;
@@ -83546,25 +83973,25 @@ index e1f3a8c..42c94a2 100644
  	if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
  		rp->rtort_mbtest = 0;
  		rcu_torture_free(rp);
-@@ -472,7 +472,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
- 		i = rp->rtort_pipe_count;
- 		if (i > RCU_TORTURE_PIPE_LEN)
- 			i = RCU_TORTURE_PIPE_LEN;
--		atomic_inc(&rcu_torture_wcount[i]);
-+		atomic_inc_unchecked(&rcu_torture_wcount[i]);
- 		if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
- 			rp->rtort_mbtest = 0;
- 			list_del(&rp->rtort_free);
-@@ -990,7 +990,7 @@ rcu_torture_writer(void *arg)
+@@ -821,7 +821,7 @@ rcu_torture_writer(void *arg)
  			i = old_rp->rtort_pipe_count;
  			if (i > RCU_TORTURE_PIPE_LEN)
  				i = RCU_TORTURE_PIPE_LEN;
 -			atomic_inc(&rcu_torture_wcount[i]);
 +			atomic_inc_unchecked(&rcu_torture_wcount[i]);
  			old_rp->rtort_pipe_count++;
- 			cur_ops->deferred_free(old_rp);
- 		}
-@@ -1076,7 +1076,7 @@ static void rcu_torture_timer(unsigned long unused)
+ 			if (gp_normal == gp_exp)
+ 				exp = !!(rcu_random(&rand) & 0x80);
+@@ -839,7 +839,7 @@ rcu_torture_writer(void *arg)
+ 					i = rp->rtort_pipe_count;
+ 					if (i > RCU_TORTURE_PIPE_LEN)
+ 						i = RCU_TORTURE_PIPE_LEN;
+-					atomic_inc(&rcu_torture_wcount[i]);
++					atomic_inc_unchecked(&rcu_torture_wcount[i]);
+ 					if (++rp->rtort_pipe_count >=
+ 					    RCU_TORTURE_PIPE_LEN) {
+ 						rp->rtort_mbtest = 0;
+@@ -938,7 +938,7 @@ static void rcu_torture_timer(unsigned long unused)
  		return;
  	}
  	if (p->rtort_mbtest == 0)
@@ -83573,7 +84000,7 @@ index e1f3a8c..42c94a2 100644
  	spin_lock(&rand_lock);
  	cur_ops->read_delay(&rand);
  	n_rcu_torture_timers++;
-@@ -1146,7 +1146,7 @@ rcu_torture_reader(void *arg)
+@@ -1008,7 +1008,7 @@ rcu_torture_reader(void *arg)
  			continue;
  		}
  		if (p->rtort_mbtest == 0)
@@ -83582,7 +84009,7 @@ index e1f3a8c..42c94a2 100644
  		cur_ops->read_delay(&rand);
  		preempt_disable();
  		pipe_count = p->rtort_pipe_count;
-@@ -1209,11 +1209,11 @@ rcu_torture_printk(char *page)
+@@ -1071,11 +1071,11 @@ rcu_torture_printk(char *page)
  		       rcu_torture_current,
  		       rcu_torture_current_version,
  		       list_empty(&rcu_torture_freelist),
@@ -83598,7 +84025,7 @@ index e1f3a8c..42c94a2 100644
  		       n_rcu_torture_boost_ktrerror,
  		       n_rcu_torture_boost_rterror);
  	cnt += sprintf(&page[cnt], "rtbf: %ld rtb: %ld nt: %ld ",
-@@ -1232,14 +1232,14 @@ rcu_torture_printk(char *page)
+@@ -1094,14 +1094,14 @@ rcu_torture_printk(char *page)
  		       n_barrier_attempts,
  		       n_rcu_torture_barrier_error);
  	cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
@@ -83615,7 +84042,7 @@ index e1f3a8c..42c94a2 100644
  		WARN_ON_ONCE(1);
  	}
  	cnt += sprintf(&page[cnt], "Reader Pipe: ");
-@@ -1253,7 +1253,7 @@ rcu_torture_printk(char *page)
+@@ -1115,7 +1115,7 @@ rcu_torture_printk(char *page)
  	cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
  	for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  		cnt += sprintf(&page[cnt], " %d",
@@ -83624,7 +84051,7 @@ index e1f3a8c..42c94a2 100644
  	}
  	cnt += sprintf(&page[cnt], "\n");
  	if (cur_ops->stats)
-@@ -1962,7 +1962,7 @@ rcu_torture_cleanup(void)
+@@ -1830,7 +1830,7 @@ rcu_torture_cleanup(void)
  
  	rcu_torture_stats_print();  /* -After- the stats thread is stopped! */
  
@@ -83633,7 +84060,7 @@ index e1f3a8c..42c94a2 100644
  		rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
  	else if (n_online_successes != n_online_attempts ||
  		 n_offline_successes != n_offline_attempts)
-@@ -2031,18 +2031,18 @@ rcu_torture_init(void)
+@@ -1952,18 +1952,18 @@ rcu_torture_init(void)
  
  	rcu_torture_current = NULL;
  	rcu_torture_current_version = 0;
@@ -83659,10 +84086,10 @@ index e1f3a8c..42c94a2 100644
  		for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  			per_cpu(rcu_torture_count, cpu)[i] = 0;
 diff --git a/kernel/rcutree.c b/kernel/rcutree.c
-index 3538001..e379e0b 100644
+index 32618b3..c1fb822 100644
 --- a/kernel/rcutree.c
 +++ b/kernel/rcutree.c
-@@ -358,9 +358,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
+@@ -382,9 +382,9 @@ static void rcu_eqs_enter_common(struct rcu_dynticks *rdtp, long long oldval,
  	rcu_prepare_for_idle(smp_processor_id());
  	/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
  	smp_mb__before_atomic_inc();  /* See above. */
@@ -83674,7 +84101,7 @@ index 3538001..e379e0b 100644
  
  	/*
  	 * It is illegal to enter an extended quiescent state while
-@@ -496,10 +496,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
+@@ -501,10 +501,10 @@ static void rcu_eqs_exit_common(struct rcu_dynticks *rdtp, long long oldval,
  			       int user)
  {
  	smp_mb__before_atomic_inc();  /* Force ordering w/previous sojourn. */
@@ -83685,9 +84112,9 @@ index 3538001..e379e0b 100644
 -	WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
 +	WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
  	rcu_cleanup_after_idle(smp_processor_id());
- 	trace_rcu_dyntick("End", oldval, rdtp->dynticks_nesting);
+ 	trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
  	if (!user && !is_idle_task(current)) {
-@@ -638,14 +638,14 @@ void rcu_nmi_enter(void)
+@@ -623,14 +623,14 @@ void rcu_nmi_enter(void)
  	struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
  
  	if (rdtp->dynticks_nmi_nesting == 0 &&
@@ -83705,7 +84132,7 @@ index 3538001..e379e0b 100644
  }
  
  /**
-@@ -664,9 +664,9 @@ void rcu_nmi_exit(void)
+@@ -649,9 +649,9 @@ void rcu_nmi_exit(void)
  		return;
  	/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
  	smp_mb__before_atomic_inc();  /* See above. */
@@ -83717,7 +84144,7 @@ index 3538001..e379e0b 100644
  }
  
  /**
-@@ -680,7 +680,7 @@ int rcu_is_cpu_idle(void)
+@@ -665,7 +665,7 @@ int rcu_is_cpu_idle(void)
  	int ret;
  
  	preempt_disable();
@@ -83726,16 +84153,16 @@ index 3538001..e379e0b 100644
  	preempt_enable();
  	return ret;
  }
-@@ -748,7 +748,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
-  */
- static int dyntick_save_progress_counter(struct rcu_data *rdp)
+@@ -734,7 +734,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
+ static int dyntick_save_progress_counter(struct rcu_data *rdp,
+ 					 bool *isidle, unsigned long *maxj)
  {
 -	rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
 +	rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
+ 	rcu_sysidle_check_cpu(rdp, isidle, maxj);
  	return (rdp->dynticks_snap & 0x1) == 0;
  }
- 
-@@ -763,7 +763,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
+@@ -751,7 +751,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
  	unsigned int curr;
  	unsigned int snap;
  
@@ -83744,7 +84171,7 @@ index 3538001..e379e0b 100644
  	snap = (unsigned int)rdp->dynticks_snap;
  
  	/*
-@@ -1440,9 +1440,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
+@@ -1341,9 +1341,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
  		rdp = this_cpu_ptr(rsp->rda);
  		rcu_preempt_check_blocked_tasks(rnp);
  		rnp->qsmask = rnp->qsmaskinit;
@@ -83754,9 +84181,9 @@ index 3538001..e379e0b 100644
 -		ACCESS_ONCE(rnp->completed) = rsp->completed;
 +		ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
  		if (rnp == rdp->mynode)
- 			rcu_start_gp_per_cpu(rsp, rnp, rdp);
+ 			__note_gp_changes(rsp, rnp, rdp);
  		rcu_preempt_boost_start_gp(rnp);
-@@ -1524,7 +1524,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
+@@ -1434,7 +1434,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
  	 */
  	rcu_for_each_node_breadth_first(rsp, rnp) {
  		raw_spin_lock_irq(&rnp->lock);
@@ -83764,8 +84191,8 @@ index 3538001..e379e0b 100644
 +		ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
  		rdp = this_cpu_ptr(rsp->rda);
  		if (rnp == rdp->mynode)
- 			__rcu_process_gp_end(rsp, rnp, rdp);
-@@ -1855,7 +1855,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
+ 			__note_gp_changes(rsp, rnp, rdp);
+@@ -1766,7 +1766,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
  		rsp->qlen += rdp->qlen;
  		rdp->n_cbs_orphaned += rdp->qlen;
  		rdp->qlen_lazy = 0;
@@ -83774,7 +84201,7 @@ index 3538001..e379e0b 100644
  	}
  
  	/*
-@@ -2101,7 +2101,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
+@@ -2012,7 +2012,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
  	}
  	smp_mb(); /* List handling before counting for rcu_barrier(). */
  	rdp->qlen_lazy -= count_lazy;
@@ -83783,16 +84210,25 @@ index 3538001..e379e0b 100644
  	rdp->n_cbs_invoked += count;
  
  	/* Reinstate batch limit if we have worked down the excess. */
-@@ -2295,7 +2295,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
+@@ -2209,7 +2209,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
  /*
   * Do RCU core processing for the current CPU.
   */
 -static void rcu_process_callbacks(struct softirq_action *unused)
-+static void rcu_process_callbacks(void)
++static __latent_entropy void rcu_process_callbacks(void)
  {
  	struct rcu_state *rsp;
  
-@@ -2419,7 +2419,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
+@@ -2316,7 +2316,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
+ 	WARN_ON_ONCE((unsigned long)head & 0x3); /* Misaligned rcu_head! */
+ 	if (debug_rcu_head_queue(head)) {
+ 		/* Probable double call_rcu(), so leak the callback. */
+-		ACCESS_ONCE(head->func) = rcu_leak_callback;
++		ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
+ 		WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
+ 		return;
+ 	}
+@@ -2344,7 +2344,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
  		local_irq_restore(flags);
  		return;
  	}
@@ -83801,7 +84237,7 @@ index 3538001..e379e0b 100644
  	if (lazy)
  		rdp->qlen_lazy++;
  	else
-@@ -2628,11 +2628,11 @@ void synchronize_sched_expedited(void)
+@@ -2553,11 +2553,11 @@ void synchronize_sched_expedited(void)
  	 * counter wrap on a 32-bit system.  Quite a few more CPUs would of
  	 * course be required on a 64-bit system.
  	 */
@@ -83815,7 +84251,7 @@ index 3538001..e379e0b 100644
  		return;
  	}
  
-@@ -2640,7 +2640,7 @@ void synchronize_sched_expedited(void)
+@@ -2565,7 +2565,7 @@ void synchronize_sched_expedited(void)
  	 * Take a ticket.  Note that atomic_inc_return() implies a
  	 * full memory barrier.
  	 */
@@ -83824,7 +84260,7 @@ index 3538001..e379e0b 100644
  	firstsnap = snap;
  	get_online_cpus();
  	WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
-@@ -2653,14 +2653,14 @@ void synchronize_sched_expedited(void)
+@@ -2578,14 +2578,14 @@ void synchronize_sched_expedited(void)
  			     synchronize_sched_expedited_cpu_stop,
  			     NULL) == -EAGAIN) {
  		put_online_cpus();
@@ -83841,7 +84277,7 @@ index 3538001..e379e0b 100644
  			return;
  		}
  
-@@ -2669,7 +2669,7 @@ void synchronize_sched_expedited(void)
+@@ -2594,7 +2594,7 @@ void synchronize_sched_expedited(void)
  			udelay(trycount * num_online_cpus());
  		} else {
  			wait_rcu_gp(call_rcu_sched);
@@ -83850,7 +84286,7 @@ index 3538001..e379e0b 100644
  			return;
  		}
  
-@@ -2678,7 +2678,7 @@ void synchronize_sched_expedited(void)
+@@ -2603,7 +2603,7 @@ void synchronize_sched_expedited(void)
  		if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
  			/* ensure test happens before caller kfree */
  			smp_mb__before_atomic_inc(); /* ^^^ */
@@ -83859,7 +84295,7 @@ index 3538001..e379e0b 100644
  			return;
  		}
  
-@@ -2690,10 +2690,10 @@ void synchronize_sched_expedited(void)
+@@ -2615,10 +2615,10 @@ void synchronize_sched_expedited(void)
  		 * period works for us.
  		 */
  		get_online_cpus();
@@ -83872,7 +84308,7 @@ index 3538001..e379e0b 100644
  
  	/*
  	 * Everyone up to our most recent fetch is covered by our grace
-@@ -2702,16 +2702,16 @@ void synchronize_sched_expedited(void)
+@@ -2627,16 +2627,16 @@ void synchronize_sched_expedited(void)
  	 * than we did already did their update.
  	 */
  	do {
@@ -83892,7 +84328,7 @@ index 3538001..e379e0b 100644
  
  	put_online_cpus();
  }
-@@ -2893,7 +2893,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
+@@ -2829,7 +2829,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
  	 * ACCESS_ONCE() to prevent the compiler from speculating
  	 * the increment to precede the early-exit check.
  	 */
@@ -83901,7 +84337,7 @@ index 3538001..e379e0b 100644
  	WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
  	_rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
  	smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
-@@ -2943,7 +2943,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
+@@ -2879,7 +2879,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
  
  	/* Increment ->n_barrier_done to prevent duplicate work. */
  	smp_mb(); /* Keep increment after above mechanism. */
@@ -83910,7 +84346,7 @@ index 3538001..e379e0b 100644
  	WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
  	_rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
  	smp_mb(); /* Keep increment before caller's subsequent code. */
-@@ -2988,10 +2988,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
+@@ -2924,10 +2924,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
  	rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
  	init_callback_list(rdp);
  	rdp->qlen_lazy = 0;
@@ -83923,10 +84359,10 @@ index 3538001..e379e0b 100644
  	rdp->cpu = cpu;
  	rdp->rsp = rsp;
  	rcu_boot_init_nocb_percpu_data(rdp);
-@@ -3024,8 +3024,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
- 	rdp->blimit = blimit;
+@@ -2961,8 +2961,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
  	init_callback_list(rdp);  /* Re-enable callbacks on this CPU. */
  	rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
+ 	rcu_sysidle_init_percpu_data(rdp->dynticks);
 -	atomic_set(&rdp->dynticks->dynticks,
 -		   (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
 +	atomic_set_unchecked(&rdp->dynticks->dynticks,
@@ -83934,29 +84370,25 @@ index 3538001..e379e0b 100644
  	raw_spin_unlock(&rnp->lock);		/* irqs remain disabled. */
  
  	/* Add CPU to rcu_node bitmasks. */
-@@ -3120,7 +3120,7 @@ static int __init rcu_spawn_gp_kthread(void)
- 	struct task_struct *t;
- 
- 	for_each_rcu_flavor(rsp) {
--		t = kthread_run(rcu_gp_kthread, rsp, rsp->name);
-+		t = kthread_run(rcu_gp_kthread, rsp, "%s", rsp->name);
- 		BUG_ON(IS_ERR(t));
- 		rnp = rcu_get_root(rsp);
- 		raw_spin_lock_irqsave(&rnp->lock, flags);
 diff --git a/kernel/rcutree.h b/kernel/rcutree.h
-index 4df5034..5ee93f2 100644
+index 5f97eab..db8f687 100644
 --- a/kernel/rcutree.h
 +++ b/kernel/rcutree.h
-@@ -87,7 +87,7 @@ struct rcu_dynticks {
+@@ -87,11 +87,11 @@ struct rcu_dynticks {
  	long long dynticks_nesting; /* Track irq/process nesting level. */
  				    /* Process level is worth LLONG_MAX/2. */
  	int dynticks_nmi_nesting;   /* Track NMI nesting level. */
 -	atomic_t dynticks;	    /* Even value for idle, else odd. */
 +	atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
- #ifdef CONFIG_RCU_FAST_NO_HZ
- 	bool all_lazy;		    /* Are all CPU's CBs lazy? */
- 	unsigned long nonlazy_posted;
-@@ -414,17 +414,17 @@ struct rcu_state {
+ #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
+ 	long long dynticks_idle_nesting;
+ 				    /* irq/process nesting level from idle. */
+-	atomic_t dynticks_idle;	    /* Even value for idle, else odd. */
++	atomic_unchecked_t dynticks_idle; /* Even value for idle, else odd. */
+ 				    /*  "Idle" excludes userspace execution. */
+ 	unsigned long dynticks_idle_jiffies;
+ 				    /* End of last non-NMI non-idle period. */
+@@ -427,17 +427,17 @@ struct rcu_state {
  						/*  _rcu_barrier(). */
  	/* End of fields guarded by barrier_mutex. */
  
@@ -83986,10 +84418,19 @@ index 4df5034..5ee93f2 100644
  	unsigned long jiffies_force_qs;		/* Time at which to invoke */
  						/*  force_quiescent_state(). */
 diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
-index 3db5a37..b395fb35 100644
+index 130c97b..bcbe7f7 100644
 --- a/kernel/rcutree_plugin.h
 +++ b/kernel/rcutree_plugin.h
-@@ -903,7 +903,7 @@ void synchronize_rcu_expedited(void)
+@@ -744,7 +744,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
+ static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
+ {
+ 	return !rcu_preempted_readers_exp(rnp) &&
+-	       ACCESS_ONCE(rnp->expmask) == 0;
++	       ACCESS_ONCE_RW(rnp->expmask) == 0;
+ }
+ 
+ /*
+@@ -900,7 +900,7 @@ void synchronize_rcu_expedited(void)
  
  	/* Clean up and exit. */
  	smp_mb(); /* ensure expedited GP seen before counter increment. */
@@ -83998,7 +84439,7 @@ index 3db5a37..b395fb35 100644
  unlock_mb_ret:
  	mutex_unlock(&sync_rcu_preempt_exp_mutex);
  mb_ret:
-@@ -1451,7 +1451,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
+@@ -1474,7 +1474,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
  	free_cpumask_var(cm);
  }
  
@@ -84007,16 +84448,16 @@ index 3db5a37..b395fb35 100644
  	.store			= &rcu_cpu_kthread_task,
  	.thread_should_run	= rcu_cpu_kthread_should_run,
  	.thread_fn		= rcu_cpu_kthread,
-@@ -1916,7 +1916,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
+@@ -1939,7 +1939,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
  	print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
- 	printk(KERN_ERR "\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
+ 	pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u %s\n",
  	       cpu, ticks_value, ticks_title,
 -	       atomic_read(&rdtp->dynticks) & 0xfff,
 +	       atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
  	       rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
  	       rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
  	       fast_no_hz);
-@@ -2079,7 +2079,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
+@@ -2102,7 +2102,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
  
  	/* Enqueue the callback on the nocb list and update counts. */
  	old_rhpp = xchg(&rdp->nocb_tail, rhtp);
@@ -84025,7 +84466,7 @@ index 3db5a37..b395fb35 100644
  	atomic_long_add(rhcount, &rdp->nocb_q_count);
  	atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
  
-@@ -2219,12 +2219,12 @@ static int rcu_nocb_kthread(void *arg)
+@@ -2242,12 +2242,12 @@ static int rcu_nocb_kthread(void *arg)
  		 * Extract queued callbacks, update counts, and wait
  		 * for a grace period to elapse.
  		 */
@@ -84041,7 +84482,7 @@ index 3db5a37..b395fb35 100644
  		rcu_nocb_wait_gp(rdp);
  
  		/* Each pass through the following loop invokes a callback. */
-@@ -2246,8 +2246,8 @@ static int rcu_nocb_kthread(void *arg)
+@@ -2269,8 +2269,8 @@ static int rcu_nocb_kthread(void *arg)
  			list = next;
  		}
  		trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
@@ -84052,7 +84493,7 @@ index 3db5a37..b395fb35 100644
  		rdp->n_nocbs_invoked += c;
  	}
  	return 0;
-@@ -2274,7 +2274,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
+@@ -2297,7 +2297,7 @@ static void __init rcu_spawn_nocb_kthreads(struct rcu_state *rsp)
  		t = kthread_run(rcu_nocb_kthread, rdp,
  				"rcuo%c/%d", rsp->abbr, cpu);
  		BUG_ON(IS_ERR(t));
@@ -84061,6 +84502,69 @@ index 3db5a37..b395fb35 100644
  	}
  }
  
+@@ -2423,11 +2423,11 @@ static void rcu_sysidle_enter(struct rcu_dynticks *rdtp, int irq)
+ 
+ 	/* Record start of fully idle period. */
+ 	j = jiffies;
+-	ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
++	ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
+ 	smp_mb__before_atomic_inc();
+-	atomic_inc(&rdtp->dynticks_idle);
++	atomic_inc_unchecked(&rdtp->dynticks_idle);
+ 	smp_mb__after_atomic_inc();
+-	WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
++	WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
+ }
+ 
+ /*
+@@ -2492,9 +2492,9 @@ static void rcu_sysidle_exit(struct rcu_dynticks *rdtp, int irq)
+ 
+ 	/* Record end of idle period. */
+ 	smp_mb__before_atomic_inc();
+-	atomic_inc(&rdtp->dynticks_idle);
++	atomic_inc_unchecked(&rdtp->dynticks_idle);
+ 	smp_mb__after_atomic_inc();
+-	WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
++	WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
+ 
+ 	/*
+ 	 * If we are the timekeeping CPU, we are permitted to be non-idle
+@@ -2535,7 +2535,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
+ 		WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
+ 
+ 	/* Pick up current idle and NMI-nesting counter and check. */
+-	cur = atomic_read(&rdtp->dynticks_idle);
++	cur = atomic_read_unchecked(&rdtp->dynticks_idle);
+ 	if (cur & 0x1) {
+ 		*isidle = false; /* We are not idle! */
+ 		return;
+@@ -2598,7 +2598,7 @@ static void rcu_sysidle(unsigned long j)
+ 	case RCU_SYSIDLE_NOT:
+ 
+ 		/* First time all are idle, so note a short idle period. */
+-		ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
++		ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
+ 		break;
+ 
+ 	case RCU_SYSIDLE_SHORT:
+@@ -2635,7 +2635,7 @@ static void rcu_sysidle(unsigned long j)
+ static void rcu_sysidle_cancel(void)
+ {
+ 	smp_mb();
+-	ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
++	ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
+ }
+ 
+ /*
+@@ -2683,7 +2683,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
+ 	smp_mb();  /* grace period precedes setting inuse. */
+ 
+ 	rshp = container_of(rhp, struct rcu_sysidle_head, rh);
+-	ACCESS_ONCE(rshp->inuse) = 0;
++	ACCESS_ONCE_RW(rshp->inuse) = 0;
+ }
+ 
+ /*
 diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
 index cf6c174..a8f4b50 100644
 --- a/kernel/rcutree_trace.c
@@ -84103,7 +84607,7 @@ index cf6c174..a8f4b50 100644
  }
  
 diff --git a/kernel/resource.c b/kernel/resource.c
-index d738698..5f8e60a 100644
+index 3f285dc..5755f62 100644
 --- a/kernel/resource.c
 +++ b/kernel/resource.c
 @@ -152,8 +152,18 @@ static const struct file_operations proc_iomem_operations = {
@@ -84220,7 +84724,7 @@ index 1d96dd0..994ff19 100644
  
  	default:
 diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
-index 64de5f8..7735e12 100644
+index 4a07353..66b5291 100644
 --- a/kernel/sched/auto_group.c
 +++ b/kernel/sched/auto_group.c
 @@ -11,7 +11,7 @@
@@ -84232,7 +84736,7 @@ index 64de5f8..7735e12 100644
  
  void __init autogroup_init(struct task_struct *init_task)
  {
-@@ -81,7 +81,7 @@ static inline struct autogroup *autogroup_create(void)
+@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
  
  	kref_init(&ag->kref);
  	init_rwsem(&ag->lock);
@@ -84242,37 +84746,37 @@ index 64de5f8..7735e12 100644
  #ifdef CONFIG_RT_GROUP_SCHED
  	/*
 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index e8b3350..d83d44e 100644
+index 5ac63c9..d912786 100644
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -3440,7 +3440,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
-  * The return value is -ERESTARTSYS if interrupted, 0 if timed out,
-  * positive (at least 1, or number of jiffies left till timeout) if completed.
+@@ -2868,7 +2868,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
+  * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
+  * or number of jiffies left till timeout) if completed.
   */
 -long __sched
 +long __sched __intentional_overflow(-1)
  wait_for_completion_interruptible_timeout(struct completion *x,
  					  unsigned long timeout)
  {
-@@ -3457,7 +3457,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
+@@ -2885,7 +2885,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
   *
-  * The return value is -ERESTARTSYS if interrupted, 0 if completed.
+  * Return: -ERESTARTSYS if interrupted, 0 if completed.
   */
 -int __sched wait_for_completion_killable(struct completion *x)
 +int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
  {
  	long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
  	if (t == -ERESTARTSYS)
-@@ -3478,7 +3478,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
-  * The return value is -ERESTARTSYS if interrupted, 0 if timed out,
-  * positive (at least 1, or number of jiffies left till timeout) if completed.
+@@ -2906,7 +2906,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
+  * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
+  * or number of jiffies left till timeout) if completed.
   */
 -long __sched
 +long __sched __intentional_overflow(-1)
  wait_for_completion_killable_timeout(struct completion *x,
  				     unsigned long timeout)
  {
-@@ -3704,6 +3704,8 @@ int can_nice(const struct task_struct *p, const int nice)
+@@ -3132,6 +3132,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;
  
@@ -84281,7 +84785,7 @@ index e8b3350..d83d44e 100644
  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
  }
-@@ -3737,7 +3739,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -3165,7 +3167,8 @@ SYSCALL_DEFINE1(nice, int, increment)
  	if (nice > 19)
  		nice = 19;
  
@@ -84291,7 +84795,7 @@ index e8b3350..d83d44e 100644
  		return -EPERM;
  
  	retval = security_task_setnice(current, nice);
-@@ -3891,6 +3894,7 @@ recheck:
+@@ -3327,6 +3330,7 @@ recheck:
  			unsigned long rlim_rtprio =
  					task_rlimit(p, RLIMIT_RTPRIO);
  
@@ -84299,7 +84803,7 @@ index e8b3350..d83d44e 100644
  			/* can't set/change the rt policy */
  			if (policy != p->policy && !rlim_rtprio)
  				return -EPERM;
-@@ -4988,7 +4992,7 @@ static void migrate_tasks(unsigned int dead_cpu)
+@@ -4456,7 +4460,7 @@ static void migrate_tasks(unsigned int dead_cpu)
  
  #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
  
@@ -84308,7 +84812,7 @@ index e8b3350..d83d44e 100644
  	{
  		.procname	= "sched_domain",
  		.mode		= 0555,
-@@ -5005,17 +5009,17 @@ static struct ctl_table sd_ctl_root[] = {
+@@ -4473,17 +4477,17 @@ static struct ctl_table sd_ctl_root[] = {
  	{}
  };
  
@@ -84330,7 +84834,7 @@ index e8b3350..d83d44e 100644
  
  	/*
  	 * In the intermediate directories, both the child directory and
-@@ -5023,22 +5027,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
+@@ -4491,22 +4495,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
  	 * will always be set. In the lowest directory the names are
  	 * static strings and all have proc handlers.
  	 */
@@ -84362,7 +84866,7 @@ index e8b3350..d83d44e 100644
  		const char *procname, void *data, int maxlen,
  		umode_t mode, proc_handler *proc_handler,
  		bool load_idx)
-@@ -5058,7 +5065,7 @@ set_table_entry(struct ctl_table *entry,
+@@ -4526,7 +4533,7 @@ set_table_entry(struct ctl_table *entry,
  static struct ctl_table *
  sd_alloc_ctl_domain_table(struct sched_domain *sd)
  {
@@ -84371,11 +84875,11 @@ index e8b3350..d83d44e 100644
  
  	if (table == NULL)
  		return NULL;
-@@ -5093,9 +5100,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
+@@ -4561,9 +4568,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
  	return table;
  }
  
--static ctl_table *sd_alloc_ctl_cpu_table(int cpu)
+-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
 +static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
  {
 -	struct ctl_table *entry, *table;
@@ -84383,7 +84887,7 @@ index e8b3350..d83d44e 100644
  	struct sched_domain *sd;
  	int domain_num = 0, i;
  	char buf[32];
-@@ -5122,11 +5129,13 @@ static struct ctl_table_header *sd_sysctl_header;
+@@ -4590,11 +4597,13 @@ static struct ctl_table_header *sd_sysctl_header;
  static void register_sched_domain_sysctl(void)
  {
  	int i, cpu_num = num_possible_cpus();
@@ -84398,7 +84902,7 @@ index e8b3350..d83d44e 100644
  
  	if (entry == NULL)
  		return;
-@@ -5149,8 +5158,12 @@ static void unregister_sched_domain_sysctl(void)
+@@ -4617,8 +4626,12 @@ static void unregister_sched_domain_sysctl(void)
  	if (sd_sysctl_header)
  		unregister_sysctl_table(sd_sysctl_header);
  	sd_sysctl_header = NULL;
@@ -84413,20 +84917,11 @@ index e8b3350..d83d44e 100644
  }
  #else
  static void register_sched_domain_sysctl(void)
-@@ -5249,7 +5262,7 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
-  * happens before everything else.  This has to be lower priority than
-  * the notifier in the perf_event subsystem, though.
-  */
--static struct notifier_block __cpuinitdata migration_notifier = {
-+static struct notifier_block migration_notifier = {
- 	.notifier_call = migration_call,
- 	.priority = CPU_PRI_MIGRATION,
- };
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 009a62b..ae011f8 100644
+index 7c70201..23f52b6 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
-@@ -831,7 +831,7 @@ void task_numa_fault(int node, int pages, bool migrated)
+@@ -869,7 +869,7 @@ void task_numa_fault(int node, int pages, bool migrated)
  
  static void reset_ptenuma_scan(struct task_struct *p)
  {
@@ -84435,20 +84930,20 @@ index 009a62b..ae011f8 100644
  	p->mm->numa_scan_offset = 0;
  }
  
-@@ -5687,7 +5687,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
+@@ -5838,7 +5838,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
   * run_rebalance_domains is triggered when needed from the scheduler tick.
   * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
   */
 -static void run_rebalance_domains(struct softirq_action *h)
-+static void run_rebalance_domains(void)
++static __latent_entropy void run_rebalance_domains(void)
  {
  	int this_cpu = smp_processor_id();
  	struct rq *this_rq = cpu_rq(this_cpu);
 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index ce39224d..0e09343 100644
+index b3c5653..a4d192a 100644
 --- a/kernel/sched/sched.h
 +++ b/kernel/sched/sched.h
-@@ -1009,7 +1009,7 @@ struct sched_class {
+@@ -1004,7 +1004,7 @@ struct sched_class {
  #ifdef CONFIG_FAIR_GROUP_SCHED
  	void (*task_move_group) (struct task_struct *p, int on_rq);
  #endif
@@ -84458,7 +84953,7 @@ index ce39224d..0e09343 100644
  #define sched_class_highest (&stop_sched_class)
  #define for_each_class(class) \
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 113411b..17190e2 100644
+index ded28b9..6886c08 100644
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
 @@ -51,12 +51,12 @@ static struct kmem_cache *sigqueue_cachep;
@@ -84595,21 +85090,8 @@ index 113411b..17190e2 100644
  			     compat_user_stack_pointer());
  	set_fs(seg);
  	if (ret >= 0 && uoss_ptr)  {
-diff --git a/kernel/smp.c b/kernel/smp.c
-index 4dba0f7..fe9f773 100644
---- a/kernel/smp.c
-+++ b/kernel/smp.c
-@@ -73,7 +73,7 @@ hotplug_cfd(struct notifier_block *nfb, unsigned long action, void *hcpu)
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata hotplug_cfd_notifier = {
-+static struct notifier_block hotplug_cfd_notifier = {
- 	.notifier_call		= hotplug_cfd,
- };
- 
 diff --git a/kernel/smpboot.c b/kernel/smpboot.c
-index 02fc5c9..e54c335 100644
+index eb89e18..a4e6792 100644
 --- a/kernel/smpboot.c
 +++ b/kernel/smpboot.c
 @@ -288,7 +288,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
@@ -84631,7 +85113,7 @@ index 02fc5c9..e54c335 100644
  	mutex_unlock(&smpboot_threads_lock);
  	put_online_cpus();
 diff --git a/kernel/softirq.c b/kernel/softirq.c
-index 787b3a0..07213e9 100644
+index d7d498d..94fe0f7 100644
 --- a/kernel/softirq.c
 +++ b/kernel/softirq.c
 @@ -53,11 +53,11 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
@@ -84648,7 +85130,7 @@ index 787b3a0..07213e9 100644
  	"HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
  	"TASKLET", "SCHED", "HRTIMER", "RCU"
  };
-@@ -250,7 +250,7 @@ restart:
+@@ -248,7 +248,7 @@ restart:
  			kstat_incr_softirqs_this_cpu(vec_nr);
  
  			trace_softirq_entry(vec_nr);
@@ -84657,7 +85139,7 @@ index 787b3a0..07213e9 100644
  			trace_softirq_exit(vec_nr);
  			if (unlikely(prev_count != preempt_count())) {
  				printk(KERN_ERR "huh, entered softirq %u %s %p"
-@@ -414,7 +414,7 @@ void __raise_softirq_irqoff(unsigned int nr)
+@@ -412,7 +412,7 @@ void __raise_softirq_irqoff(unsigned int nr)
  	or_softirq_pending(1UL << nr);
  }
  
@@ -84666,39 +85148,25 @@ index 787b3a0..07213e9 100644
  {
  	softirq_vec[nr].action = action;
  }
-@@ -470,7 +470,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
+@@ -468,7 +468,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
  
  EXPORT_SYMBOL(__tasklet_hi_schedule_first);
  
 -static void tasklet_action(struct softirq_action *a)
-+static void tasklet_action(void)
++static __latent_entropy void tasklet_action(void)
  {
  	struct tasklet_struct *list;
  
-@@ -505,7 +505,7 @@ static void tasklet_action(struct softirq_action *a)
+@@ -503,7 +503,7 @@ static void tasklet_action(struct softirq_action *a)
  	}
  }
  
 -static void tasklet_hi_action(struct softirq_action *a)
-+static void tasklet_hi_action(void)
++static __latent_entropy void tasklet_hi_action(void)
  {
  	struct tasklet_struct *list;
  
-@@ -739,7 +739,7 @@ static int __cpuinit remote_softirq_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata remote_softirq_cpu_notifier = {
-+static struct notifier_block remote_softirq_cpu_notifier = {
- 	.notifier_call	= remote_softirq_cpu_notify,
- };
- 
-@@ -856,11 +856,11 @@ static int __cpuinit cpu_callback(struct notifier_block *nfb,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata cpu_nfb = {
-+static struct notifier_block cpu_nfb = {
+@@ -858,7 +858,7 @@ static struct notifier_block cpu_nfb = {
  	.notifier_call = cpu_callback
  };
  
@@ -84724,10 +85192,10 @@ index 01d5ccb..cdcbee6 100644
  	return idx;
  }
 diff --git a/kernel/sys.c b/kernel/sys.c
-index 2bbd9a7..0875671 100644
+index c18ecca..b3c2dd2 100644
 --- a/kernel/sys.c
 +++ b/kernel/sys.c
-@@ -163,6 +163,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
+@@ -149,6 +149,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
  		error = -EACCES;
  		goto out;
  	}
@@ -84740,7 +85208,7 @@ index 2bbd9a7..0875671 100644
  	no_nice = security_task_setnice(p, niceval);
  	if (no_nice) {
  		error = no_nice;
-@@ -626,6 +632,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
+@@ -352,6 +358,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
  			goto error;
  	}
  
@@ -84750,7 +85218,7 @@ index 2bbd9a7..0875671 100644
  	if (rgid != (gid_t) -1 ||
  	    (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
  		new->sgid = new->egid;
-@@ -661,6 +670,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -387,6 +396,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
  	old = current_cred();
  
  	retval = -EPERM;
@@ -84758,10 +85226,10 @@ index 2bbd9a7..0875671 100644
 +	if (gr_check_group_change(kgid, kgid, kgid))
 +		goto error;
 +
- 	if (nsown_capable(CAP_SETGID))
+ 	if (ns_capable(old->user_ns, CAP_SETGID))
  		new->gid = new->egid = new->sgid = new->fsgid = kgid;
  	else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
-@@ -678,7 +691,7 @@ error:
+@@ -404,7 +417,7 @@ error:
  /*
   * change the user struct in a credentials set to match the new UID
   */
@@ -84770,7 +85238,7 @@ index 2bbd9a7..0875671 100644
  {
  	struct user_struct *new_user;
  
-@@ -758,6 +771,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
+@@ -484,6 +497,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
  			goto error;
  	}
  
@@ -84780,7 +85248,7 @@ index 2bbd9a7..0875671 100644
  	if (!uid_eq(new->uid, old->uid)) {
  		retval = set_user(new);
  		if (retval < 0)
-@@ -808,6 +824,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -534,6 +550,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
  	old = current_cred();
  
  	retval = -EPERM;
@@ -84790,10 +85258,10 @@ index 2bbd9a7..0875671 100644
 +	if (gr_check_user_change(kuid, kuid, kuid))
 +		goto error;
 +
- 	if (nsown_capable(CAP_SETUID)) {
+ 	if (ns_capable(old->user_ns, CAP_SETUID)) {
  		new->suid = new->uid = kuid;
  		if (!uid_eq(kuid, old->uid)) {
-@@ -877,6 +899,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
+@@ -603,6 +625,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
  			goto error;
  	}
  
@@ -84803,7 +85271,7 @@ index 2bbd9a7..0875671 100644
  	if (ruid != (uid_t) -1) {
  		new->uid = kruid;
  		if (!uid_eq(kruid, old->uid)) {
-@@ -959,6 +984,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
+@@ -685,6 +710,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
  			goto error;
  	}
  
@@ -84813,9 +85281,9 @@ index 2bbd9a7..0875671 100644
  	if (rgid != (gid_t) -1)
  		new->gid = krgid;
  	if (egid != (gid_t) -1)
-@@ -1020,12 +1048,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -746,12 +774,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
  	    uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
- 	    nsown_capable(CAP_SETUID)) {
+ 	    ns_capable(old->user_ns, CAP_SETUID)) {
  		if (!uid_eq(kuid, old->fsuid)) {
 +			if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
 +				goto error;
@@ -84830,10 +85298,10 @@ index 2bbd9a7..0875671 100644
  	abort_creds(new);
  	return old_fsuid;
  
-@@ -1058,12 +1090,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -784,12 +816,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
  	if (gid_eq(kgid, old->gid)  || gid_eq(kgid, old->egid)  ||
  	    gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
- 	    nsown_capable(CAP_SETGID)) {
+ 	    ns_capable(old->user_ns, CAP_SETGID)) {
 +		if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
 +			goto error;
 +
@@ -84847,7 +85315,7 @@ index 2bbd9a7..0875671 100644
  	abort_creds(new);
  	return old_fsgid;
  
-@@ -1432,19 +1468,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
+@@ -1169,19 +1205,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
  		return -EFAULT;
  
  	down_read(&uts_sem);
@@ -84872,7 +85340,7 @@ index 2bbd9a7..0875671 100644
  				__OLD_UTS_LEN);
  	error |= __put_user(0, name->machine + __OLD_UTS_LEN);
  	up_read(&uts_sem);
-@@ -1646,6 +1682,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
+@@ -1383,6 +1419,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
  			 */
  			new_rlim->rlim_cur = 1;
  		}
@@ -84887,7 +85355,7 @@ index 2bbd9a7..0875671 100644
  	if (!retval) {
  		if (old_rlim)
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 9edcf45..713c960 100644
+index b2f06f3..e6354ab 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
 @@ -93,7 +93,6 @@
@@ -84898,12 +85366,11 @@ index 9edcf45..713c960 100644
  /* External variables not in a header file. */
  extern int sysctl_overcommit_memory;
  extern int sysctl_overcommit_ratio;
-@@ -119,18 +118,18 @@ extern int blk_iopoll_enabled;
+@@ -119,17 +118,18 @@ extern int blk_iopoll_enabled;
  
  /* Constants used for minimum and  maximum */
  #ifdef CONFIG_LOCKUP_DETECTOR
 -static int sixty = 60;
--static int neg_one = -1;
 +static int sixty __read_only = 60;
  #endif
  
@@ -84926,7 +85393,7 @@ index 9edcf45..713c960 100644
  #endif
  
  /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
-@@ -177,10 +176,8 @@ static int proc_taint(struct ctl_table *table, int write,
+@@ -176,10 +176,8 @@ static int proc_taint(struct ctl_table *table, int write,
  			       void __user *buffer, size_t *lenp, loff_t *ppos);
  #endif
  
@@ -84937,7 +85404,7 @@ index 9edcf45..713c960 100644
  
  static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
  		void __user *buffer, size_t *lenp, loff_t *ppos);
-@@ -211,6 +208,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
+@@ -210,6 +208,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
  
  #endif
  
@@ -84946,7 +85413,7 @@ index 9edcf45..713c960 100644
  static struct ctl_table kern_table[];
  static struct ctl_table vm_table[];
  static struct ctl_table fs_table[];
-@@ -225,6 +224,20 @@ extern struct ctl_table epoll_table[];
+@@ -224,6 +224,20 @@ extern struct ctl_table epoll_table[];
  int sysctl_legacy_va_layout;
  #endif
  
@@ -84967,7 +85434,7 @@ index 9edcf45..713c960 100644
  /* The default sysctl tables: */
  
  static struct ctl_table sysctl_base_table[] = {
-@@ -273,6 +286,22 @@ static int max_extfrag_threshold = 1000;
+@@ -272,6 +286,22 @@ static int max_extfrag_threshold = 1000;
  #endif
  
  static struct ctl_table kern_table[] = {
@@ -84990,7 +85457,7 @@ index 9edcf45..713c960 100644
  	{
  		.procname	= "sched_child_runs_first",
  		.data		= &sysctl_sched_child_runs_first,
-@@ -607,7 +636,7 @@ static struct ctl_table kern_table[] = {
+@@ -613,7 +643,7 @@ static struct ctl_table kern_table[] = {
  		.data		= &modprobe_path,
  		.maxlen		= KMOD_PATH_LEN,
  		.mode		= 0644,
@@ -84999,7 +85466,7 @@ index 9edcf45..713c960 100644
  	},
  	{
  		.procname	= "modules_disabled",
-@@ -774,16 +803,20 @@ static struct ctl_table kern_table[] = {
+@@ -780,16 +810,20 @@ static struct ctl_table kern_table[] = {
  		.extra1		= &zero,
  		.extra2		= &one,
  	},
@@ -85021,7 +85488,7 @@ index 9edcf45..713c960 100644
  	{
  		.procname	= "ngroups_max",
  		.data		= &ngroups_max,
-@@ -1025,10 +1058,17 @@ static struct ctl_table kern_table[] = {
+@@ -1031,10 +1065,17 @@ static struct ctl_table kern_table[] = {
  	 */
  	{
  		.procname	= "perf_event_paranoid",
@@ -85042,7 +85509,7 @@ index 9edcf45..713c960 100644
  	},
  	{
  		.procname	= "perf_event_mlock_kb",
-@@ -1282,6 +1322,13 @@ static struct ctl_table vm_table[] = {
+@@ -1297,6 +1338,13 @@ static struct ctl_table vm_table[] = {
  		.proc_handler	= proc_dointvec_minmax,
  		.extra1		= &zero,
  	},
@@ -85056,7 +85523,7 @@ index 9edcf45..713c960 100644
  #else
  	{
  		.procname	= "nr_trim_pages",
-@@ -1746,6 +1793,16 @@ int proc_dostring(struct ctl_table *table, int write,
+@@ -1761,6 +1809,16 @@ int proc_dostring(struct ctl_table *table, int write,
  			       buffer, lenp, ppos);
  }
  
@@ -85073,7 +85540,7 @@ index 9edcf45..713c960 100644
  static size_t proc_skip_spaces(char **buf)
  {
  	size_t ret;
-@@ -1851,6 +1908,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
+@@ -1866,6 +1924,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
  	len = strlen(tmp);
  	if (len > *size)
  		len = *size;
@@ -85082,7 +85549,7 @@ index 9edcf45..713c960 100644
  	if (copy_to_user(*buf, tmp, len))
  		return -EFAULT;
  	*size -= len;
-@@ -2015,7 +2074,7 @@ int proc_dointvec(struct ctl_table *table, int write,
+@@ -2030,7 +2090,7 @@ int proc_dointvec(struct ctl_table *table, int write,
  static int proc_taint(struct ctl_table *table, int write,
  			       void __user *buffer, size_t *lenp, loff_t *ppos)
  {
@@ -85091,7 +85558,7 @@ index 9edcf45..713c960 100644
  	unsigned long tmptaint = get_taint();
  	int err;
  
-@@ -2043,7 +2102,6 @@ static int proc_taint(struct ctl_table *table, int write,
+@@ -2058,7 +2118,6 @@ static int proc_taint(struct ctl_table *table, int write,
  	return err;
  }
  
@@ -85099,7 +85566,7 @@ index 9edcf45..713c960 100644
  static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
  				void __user *buffer, size_t *lenp, loff_t *ppos)
  {
-@@ -2052,7 +2110,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
+@@ -2067,7 +2126,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
  
  	return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
  }
@@ -85107,7 +85574,7 @@ index 9edcf45..713c960 100644
  
  struct do_proc_dointvec_minmax_conv_param {
  	int *min;
-@@ -2199,8 +2256,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
+@@ -2214,8 +2272,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
  			*i = val;
  		} else {
  			val = convdiv * (*i) / convmul;
@@ -85120,7 +85587,7 @@ index 9edcf45..713c960 100644
  			err = proc_put_long(&buffer, &left, val, false);
  			if (err)
  				break;
-@@ -2592,6 +2652,12 @@ int proc_dostring(struct ctl_table *table, int write,
+@@ -2611,6 +2672,12 @@ int proc_dostring(struct ctl_table *table, int write,
  	return -ENOSYS;
  }
  
@@ -85133,7 +85600,7 @@ index 9edcf45..713c960 100644
  int proc_dointvec(struct ctl_table *table, int write,
  		  void __user *buffer, size_t *lenp, loff_t *ppos)
  {
-@@ -2648,5 +2714,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
+@@ -2667,5 +2734,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
  EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
  EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
  EXPORT_SYMBOL(proc_dostring);
@@ -85168,7 +85635,7 @@ index 145bb4d..b2aa969 100644
  		return cmd_attr_register_cpumask(info);
  	else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
 diff --git a/kernel/time.c b/kernel/time.c
-index d3617db..c98bbe9 100644
+index 7c7964c..2a0d412 100644
 --- a/kernel/time.c
 +++ b/kernel/time.c
 @@ -172,6 +172,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
@@ -85183,20 +85650,11 @@ index d3617db..c98bbe9 100644
  		sys_tz = *tz;
  		update_vsyscall_tz();
  		if (firsttime) {
-@@ -502,7 +507,7 @@ EXPORT_SYMBOL(usecs_to_jiffies);
-  * The >> (NSEC_JIFFIE_SC - SEC_JIFFIE_SC) converts the scaled nsec
-  * value to a scaled second value.
-  */
--unsigned long
-+unsigned long __intentional_overflow(-1)
- timespec_to_jiffies(const struct timespec *value)
- {
- 	unsigned long sec = value->tv_sec;
 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
-index a8f5084..5a673cb 100644
+index 88c9c65..7497ebc 100644
 --- a/kernel/time/alarmtimer.c
 +++ b/kernel/time/alarmtimer.c
-@@ -750,7 +750,7 @@ static int __init alarmtimer_init(void)
+@@ -795,7 +795,7 @@ static int __init alarmtimer_init(void)
  	struct platform_device *pdev;
  	int error = 0;
  	int i;
@@ -85206,7 +85664,7 @@ index a8f5084..5a673cb 100644
  		.clock_get	= alarm_clock_get,
  		.timer_create	= alarm_timer_create,
 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index fcc261c..119dc3b 100644
+index 947ba25..20cbade 100644
 --- a/kernel/time/timekeeping.c
 +++ b/kernel/time/timekeeping.c
 @@ -15,6 +15,7 @@
@@ -85217,7 +85675,7 @@ index fcc261c..119dc3b 100644
  #include <linux/syscore_ops.h>
  #include <linux/clocksource.h>
  #include <linux/jiffies.h>
-@@ -495,6 +496,8 @@ int do_settimeofday(const struct timespec *tv)
+@@ -500,6 +501,8 @@ int do_settimeofday(const struct timespec *tv)
  	if (!timespec_valid_strict(tv))
  		return -EINVAL;
  
@@ -85345,7 +85803,7 @@ index 0b537f2..40d6c20 100644
  		return -ENOMEM;
  	return 0;
 diff --git a/kernel/timer.c b/kernel/timer.c
-index 15bc1b4..32da49c 100644
+index 4296d13..0164b04 100644
 --- a/kernel/timer.c
 +++ b/kernel/timer.c
 @@ -1366,7 +1366,7 @@ void update_process_times(int user_tick)
@@ -85353,7 +85811,7 @@ index 15bc1b4..32da49c 100644
   * This function runs timers and the timer-tq in bottom half context.
   */
 -static void run_timer_softirq(struct softirq_action *h)
-+static void run_timer_softirq(void)
++static __latent_entropy void run_timer_softirq(void)
  {
  	struct tvec_base *base = __this_cpu_read(tvec_bases);
  
@@ -85366,15 +85824,6 @@ index 15bc1b4..32da49c 100644
  {
  	struct timer_list timer;
  	unsigned long expire;
-@@ -1635,7 +1635,7 @@ static int __cpuinit timer_cpu_notify(struct notifier_block *self,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata timers_nb = {
-+static struct notifier_block timers_nb = {
- 	.notifier_call	= timer_cpu_notify,
- };
- 
 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
 index b8b8560..75b1a09 100644
 --- a/kernel/trace/blktrace.c
@@ -85407,10 +85856,10 @@ index b8b8560..75b1a09 100644
  	ret = -EIO;
  	bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
-index 331c102..b7a32e2 100644
+index f3bd09ee..9bb9586 100644
 --- a/kernel/trace/ftrace.c
 +++ b/kernel/trace/ftrace.c
-@@ -1919,12 +1919,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
+@@ -1944,12 +1944,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
  	if (unlikely(ftrace_disabled))
  		return 0;
  
@@ -85430,7 +85879,7 @@ index 331c102..b7a32e2 100644
  }
  
  /*
-@@ -3994,8 +3999,10 @@ static int ftrace_process_locs(struct module *mod,
+@@ -4043,8 +4048,10 @@ static int ftrace_process_locs(struct module *mod,
  	if (!count)
  		return 0;
  
@@ -85441,7 +85890,7 @@ index 331c102..b7a32e2 100644
  
  	start_pg = ftrace_allocate_pages(count);
  	if (!start_pg)
-@@ -4717,8 +4724,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
+@@ -4766,8 +4773,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
  
  static int ftrace_graph_active;
@@ -85450,18 +85899,18 @@ index 331c102..b7a32e2 100644
  int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace)
  {
  	return 0;
-@@ -4862,6 +4867,10 @@ ftrace_suspend_notifier_call(struct notifier_block *bl, unsigned long state,
- 	return NOTIFY_DONE;
- }
+@@ -4918,6 +4923,10 @@ static struct ftrace_ops fgraph_ops __read_mostly = {
+ 				FTRACE_OPS_FL_RECURSION_SAFE,
+ };
  
 +static struct notifier_block ftrace_suspend_notifier = {
 +	.notifier_call = ftrace_suspend_notifier_call
 +};
 +
- /* Just a place holder for function graph */
- static struct ftrace_ops fgraph_ops __read_mostly = {
- 	.func		= ftrace_stub,
-@@ -4882,7 +4891,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
+ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
+ 			trace_func_graph_ent_t entryfunc)
+ {
+@@ -4931,7 +4940,6 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc,
  		goto out;
  	}
  
@@ -85470,7 +85919,7 @@ index 331c102..b7a32e2 100644
  
  	ftrace_graph_active++;
 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index e444ff8..438b8f4 100644
+index cc2f66f..05edd54 100644
 --- a/kernel/trace/ring_buffer.c
 +++ b/kernel/trace/ring_buffer.c
 @@ -352,9 +352,9 @@ struct buffer_data_page {
@@ -85542,7 +85991,7 @@ index e444ff8..438b8f4 100644
  			local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
  		}
  
-@@ -2063,7 +2063,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2064,7 +2064,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
  		 * it is our responsibility to update
  		 * the counters.
  		 */
@@ -85551,7 +86000,7 @@ index e444ff8..438b8f4 100644
  		local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
  
  		/*
-@@ -2213,7 +2213,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2214,7 +2214,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
  		if (tail == BUF_PAGE_SIZE)
  			tail_page->real_end = 0;
  
@@ -85560,7 +86009,7 @@ index e444ff8..438b8f4 100644
  		return;
  	}
  
-@@ -2248,7 +2248,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2249,7 +2249,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
  		rb_event_set_padding(event);
  
  		/* Set the write back to the previous setting */
@@ -85569,7 +86018,7 @@ index e444ff8..438b8f4 100644
  		return;
  	}
  
-@@ -2260,7 +2260,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2261,7 +2261,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
  
  	/* Set write to end of buffer */
  	length = (tail + length) - BUF_PAGE_SIZE;
@@ -85578,7 +86027,7 @@ index e444ff8..438b8f4 100644
  }
  
  /*
-@@ -2286,7 +2286,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2287,7 +2287,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
  	 * about it.
  	 */
  	if (unlikely(next_page == commit_page)) {
@@ -85587,7 +86036,7 @@ index e444ff8..438b8f4 100644
  		goto out_reset;
  	}
  
-@@ -2342,7 +2342,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2343,7 +2343,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
  				      cpu_buffer->tail_page) &&
  				     (cpu_buffer->commit_page ==
  				      cpu_buffer->reader_page))) {
@@ -85596,7 +86045,7 @@ index e444ff8..438b8f4 100644
  				goto out_reset;
  			}
  		}
-@@ -2390,7 +2390,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2391,7 +2391,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
  		length += RB_LEN_TIME_EXTEND;
  
  	tail_page = cpu_buffer->tail_page;
@@ -85605,7 +86054,7 @@ index e444ff8..438b8f4 100644
  
  	/* set write to only the index of the write */
  	write &= RB_WRITE_MASK;
-@@ -2407,7 +2407,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2408,7 +2408,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
  	kmemcheck_annotate_bitfield(event, bitfield);
  	rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
  
@@ -85614,7 +86063,7 @@ index e444ff8..438b8f4 100644
  
  	/*
  	 * If this is the first commit on the page, then update
-@@ -2440,7 +2440,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2441,7 +2441,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
  
  	if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
  		unsigned long write_mask =
@@ -85623,7 +86072,7 @@ index e444ff8..438b8f4 100644
  		unsigned long event_length = rb_event_length(event);
  		/*
  		 * This is on the tail page. It is possible that
-@@ -2450,7 +2450,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2451,7 +2451,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
  		 */
  		old_index += write_mask;
  		new_index += write_mask;
@@ -85632,7 +86081,7 @@ index e444ff8..438b8f4 100644
  		if (index == old_index) {
  			/* update counters */
  			local_sub(event_length, &cpu_buffer->entries_bytes);
-@@ -2842,7 +2842,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2843,7 +2843,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
  
  	/* Do the likely case first */
  	if (likely(bpage->page == (void *)addr)) {
@@ -85641,7 +86090,7 @@ index e444ff8..438b8f4 100644
  		return;
  	}
  
-@@ -2854,7 +2854,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2855,7 +2855,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
  	start = bpage;
  	do {
  		if (bpage->page == (void *)addr) {
@@ -85650,7 +86099,7 @@ index e444ff8..438b8f4 100644
  			return;
  		}
  		rb_inc_page(cpu_buffer, &bpage);
-@@ -3138,7 +3138,7 @@ static inline unsigned long
+@@ -3139,7 +3139,7 @@ static inline unsigned long
  rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
  {
  	return local_read(&cpu_buffer->entries) -
@@ -85659,7 +86108,7 @@ index e444ff8..438b8f4 100644
  }
  
  /**
-@@ -3227,7 +3227,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
+@@ -3228,7 +3228,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
  		return 0;
  
  	cpu_buffer = buffer->buffers[cpu];
@@ -85668,7 +86117,7 @@ index e444ff8..438b8f4 100644
  
  	return ret;
  }
-@@ -3250,7 +3250,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
+@@ -3251,7 +3251,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
  		return 0;
  
  	cpu_buffer = buffer->buffers[cpu];
@@ -85677,7 +86126,7 @@ index e444ff8..438b8f4 100644
  
  	return ret;
  }
-@@ -3335,7 +3335,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
+@@ -3336,7 +3336,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
  	/* if you care about this being correct, lock the buffer */
  	for_each_buffer_cpu(buffer, cpu) {
  		cpu_buffer = buffer->buffers[cpu];
@@ -85686,7 +86135,7 @@ index e444ff8..438b8f4 100644
  	}
  
  	return overruns;
-@@ -3511,8 +3511,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -3512,8 +3512,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
  	/*
  	 * Reset the reader page to size zero.
  	 */
@@ -85697,7 +86146,7 @@ index e444ff8..438b8f4 100644
  	local_set(&cpu_buffer->reader_page->page->commit, 0);
  	cpu_buffer->reader_page->real_end = 0;
  
-@@ -3546,7 +3546,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -3547,7 +3547,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
  	 * want to compare with the last_overrun.
  	 */
  	smp_mb();
@@ -85706,7 +86155,7 @@ index e444ff8..438b8f4 100644
  
  	/*
  	 * Here's the tricky part.
-@@ -4116,8 +4116,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -4117,8 +4117,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
  
  	cpu_buffer->head_page
  		= list_entry(cpu_buffer->pages, struct buffer_page, list);
@@ -85717,7 +86166,7 @@ index e444ff8..438b8f4 100644
  	local_set(&cpu_buffer->head_page->page->commit, 0);
  
  	cpu_buffer->head_page->read = 0;
-@@ -4127,14 +4127,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -4128,14 +4128,14 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
  
  	INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
  	INIT_LIST_HEAD(&cpu_buffer->new_pages);
@@ -85736,7 +86185,7 @@ index e444ff8..438b8f4 100644
  	local_set(&cpu_buffer->dropped_events, 0);
  	local_set(&cpu_buffer->entries, 0);
  	local_set(&cpu_buffer->committing, 0);
-@@ -4538,8 +4538,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
+@@ -4540,8 +4540,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
  		rb_init_page(bpage);
  		bpage = reader->page;
  		reader->page = *data_page;
@@ -85748,10 +86197,10 @@ index e444ff8..438b8f4 100644
  		*data_page = bpage;
  
 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 5546ae9..26f7728 100644
+index b778e96..4e84621 100644
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -3330,7 +3330,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
+@@ -3335,7 +3335,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
  	return 0;
  }
  
@@ -85761,10 +86210,10 @@ index 5546ae9..26f7728 100644
  	/* do nothing if flag is already set */
  	if (!!(trace_flags & mask) == !!enabled)
 diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index 51b4448..7be601f 100644
+index 10c86fb..645ab0a 100644
 --- a/kernel/trace/trace.h
 +++ b/kernel/trace/trace.h
-@@ -1035,7 +1035,7 @@ extern const char *__stop___trace_bprintk_fmt[];
+@@ -1029,7 +1029,7 @@ extern const char *__stop___tracepoint_str[];
  void trace_printk_init_buffers(void);
  void trace_printk_start_comm(void);
  int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
@@ -85794,57 +86243,19 @@ index 26dc348..8708ca7 100644
 +	return atomic64_inc_return_unchecked(&trace_counter);
  }
 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 3d18aad..d1be0eb 100644
+index 368a4d5..7b6d1d5 100644
 --- a/kernel/trace/trace_events.c
 +++ b/kernel/trace/trace_events.c
-@@ -1794,10 +1794,6 @@ static LIST_HEAD(ftrace_module_file_list);
- struct ftrace_module_file_ops {
- 	struct list_head		list;
- 	struct module			*mod;
--	struct file_operations		id;
--	struct file_operations		enable;
--	struct file_operations		format;
--	struct file_operations		filter;
- };
- 
- static struct ftrace_module_file_ops *
-@@ -1838,17 +1834,12 @@ trace_create_file_ops(struct module *mod)
- 
- 	file_ops->mod = mod;
- 
--	file_ops->id = ftrace_event_id_fops;
--	file_ops->id.owner = mod;
--
--	file_ops->enable = ftrace_enable_fops;
--	file_ops->enable.owner = mod;
--
--	file_ops->filter = ftrace_event_filter_fops;
--	file_ops->filter.owner = mod;
--
--	file_ops->format = ftrace_event_format_fops;
--	file_ops->format.owner = mod;
-+	pax_open_kernel();
-+	mod->trace_id.owner = mod;
-+	mod->trace_enable.owner = mod;
-+	mod->trace_filter.owner = mod;
-+	mod->trace_format.owner = mod;
-+	pax_close_kernel();
- 
- 	list_add(&file_ops->list, &ftrace_module_file_list);
- 
-@@ -1941,8 +1932,8 @@ __trace_add_new_mod_event(struct ftrace_event_call *call,
- 			  struct ftrace_module_file_ops *file_ops)
- {
- 	return __trace_add_new_event(call, tr,
--				     &file_ops->id, &file_ops->enable,
--				     &file_ops->filter, &file_ops->format);
-+				     &file_ops->mod->trace_id, &file_ops->mod->trace_enable,
-+				     &file_ops->mod->trace_filter, &file_ops->mod->trace_format);
+@@ -1673,7 +1673,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
+ 	return 0;
  }
  
- #else
+-struct ftrace_module_file_ops;
+ static void __add_event_to_tracers(struct ftrace_event_call *call);
+ 
+ /* Add an additional event_call dynamically */
 diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
-index a5e8f48..a9690d2 100644
+index b3dcfb2..ebee344 100644
 --- a/kernel/trace/trace_mmiotrace.c
 +++ b/kernel/trace/trace_mmiotrace.c
 @@ -24,7 +24,7 @@ struct header_iter {
@@ -85884,7 +86295,7 @@ index a5e8f48..a9690d2 100644
  	}
  	entry	= ring_buffer_event_data(event);
 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index bb922d9..2a54a257 100644
+index 34e7cba..6f9a729 100644
 --- a/kernel/trace/trace_output.c
 +++ b/kernel/trace/trace_output.c
 @@ -294,7 +294,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
@@ -85931,7 +86342,7 @@ index b20428c..4845a10 100644
  
  	local_irq_save(flags);
 diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 9064b91..1f5d2f8 100644
+index 13fb113..a6ced3f 100644
 --- a/kernel/user_namespace.c
 +++ b/kernel/user_namespace.c
 @@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
@@ -85956,7 +86367,7 @@ index 9064b91..1f5d2f8 100644
  	ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
  	if (!ns)
  		return -ENOMEM;
-@@ -862,7 +877,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
+@@ -860,7 +875,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
  	if (atomic_read(&current->mm->mm_users) > 1)
  		return -EINVAL;
  
@@ -85979,12 +86390,12 @@ index 4f69f9a..7c6f8f8 100644
  	memcpy(&uts_table, table, sizeof(uts_table));
  	uts_table.data = get_uts(table, write);
 diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 05039e3..17490c7 100644
+index 4431610..4265616 100644
 --- a/kernel/watchdog.c
 +++ b/kernel/watchdog.c
-@@ -531,7 +531,7 @@ int proc_dowatchdog(struct ctl_table *table, int write,
- }
- #endif /* CONFIG_SYSCTL */
+@@ -475,7 +475,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
+ static void watchdog_nmi_disable(unsigned int cpu) { return; }
+ #endif /* CONFIG_HARDLOCKUP_DETECTOR */
  
 -static struct smp_hotplug_thread watchdog_threads = {
 +static struct smp_hotplug_thread watchdog_threads __read_only = {
@@ -85992,10 +86403,10 @@ index 05039e3..17490c7 100644
  	.thread_should_run	= watchdog_should_run,
  	.thread_fn		= watchdog,
 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index 68086a3..729fa07 100644
+index 93c2652..66a1cfd 100644
 --- a/kernel/workqueue.c
 +++ b/kernel/workqueue.c
-@@ -4615,7 +4615,7 @@ static void rebind_workers(struct worker_pool *pool)
+@@ -4668,7 +4668,7 @@ static void rebind_workers(struct worker_pool *pool)
  		WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
  		worker_flags |= WORKER_REBOUND;
  		worker_flags &= ~WORKER_UNBOUND;
@@ -86005,10 +86416,19 @@ index 68086a3..729fa07 100644
  
  	spin_unlock_irq(&pool->lock);
 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 74fdc5c..3310593 100644
+index 094f315..244a824 100644
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
-@@ -549,7 +549,7 @@ config DEBUG_MUTEXES
+@@ -836,7 +836,7 @@ config DEBUG_MUTEXES
+ 
+ config DEBUG_WW_MUTEX_SLOWPATH
+ 	bool "Wait/wound mutex debugging: Slowpath testing"
+-	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
++	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
+ 	select DEBUG_LOCK_ALLOC
+ 	select DEBUG_SPINLOCK
+ 	select DEBUG_MUTEXES
+@@ -849,7 +849,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
  
  config DEBUG_LOCK_ALLOC
  	bool "Lock debugging: detect incorrect freeing of live locks"
@@ -86017,7 +86437,7 @@ index 74fdc5c..3310593 100644
  	select DEBUG_SPINLOCK
  	select DEBUG_MUTEXES
  	select LOCKDEP
-@@ -563,7 +563,7 @@ config DEBUG_LOCK_ALLOC
+@@ -863,7 +863,7 @@ config DEBUG_LOCK_ALLOC
  
  config PROVE_LOCKING
  	bool "Lock debugging: prove locking correctness"
@@ -86026,7 +86446,7 @@ index 74fdc5c..3310593 100644
  	select LOCKDEP
  	select DEBUG_SPINLOCK
  	select DEBUG_MUTEXES
-@@ -614,7 +614,7 @@ config LOCKDEP
+@@ -914,7 +914,7 @@ config LOCKDEP
  
  config LOCK_STAT
  	bool "Lock usage statistics"
@@ -86035,15 +86455,15 @@ index 74fdc5c..3310593 100644
  	select LOCKDEP
  	select DEBUG_SPINLOCK
  	select DEBUG_MUTEXES
-@@ -1282,6 +1282,7 @@ config LATENCYTOP
+@@ -1376,6 +1376,7 @@ config LATENCYTOP
  	depends on DEBUG_KERNEL
  	depends on STACKTRACE_SUPPORT
  	depends on PROC_FS
 +	depends on !GRKERNSEC_HIDESYM
- 	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
+ 	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
  	select KALLSYMS
  	select KALLSYMS_ALL
-@@ -1298,7 +1299,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+@@ -1392,7 +1393,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
  config DEBUG_STRICT_USER_COPY_CHECKS
  	bool "Strict user copy size checks"
  	depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
@@ -86052,7 +86472,7 @@ index 74fdc5c..3310593 100644
  	help
  	  Enabling this option turns a certain set of sanity checks for user
  	  copy operations into compile time failures.
-@@ -1328,7 +1329,7 @@ config INTERVAL_TREE_TEST
+@@ -1502,7 +1503,7 @@ endmenu # runtime tests
  
  config PROVIDE_OHCI1394_DMA_INIT
  	bool "Remote debugging over FireWire early on boot"
@@ -86061,7 +86481,7 @@ index 74fdc5c..3310593 100644
  	help
  	  If you want to debug problems which hang or crash the kernel early
  	  on boot and the crashing machine has a FireWire port, you can use
-@@ -1357,7 +1358,7 @@ config PROVIDE_OHCI1394_DMA_INIT
+@@ -1531,7 +1532,7 @@ config PROVIDE_OHCI1394_DMA_INIT
  
  config FIREWIRE_OHCI_REMOTE_DMA
  	bool "Remote debugging over FireWire with firewire-ohci"
@@ -86071,10 +86491,10 @@ index 74fdc5c..3310593 100644
  	  This option lets you use the FireWire bus for remote debugging
  	  with help of the firewire-ohci driver. It enables unfiltered
 diff --git a/lib/Makefile b/lib/Makefile
-index c55a037..fb46e3b 100644
+index f3bb2cb..b358ace 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -50,7 +50,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
+@@ -52,7 +52,7 @@ obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o
  
  obj-$(CONFIG_BTREE) += btree.o
  obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
@@ -86137,7 +86557,7 @@ index 1686034..a9c00c8 100644
  	file = NULL;
  	line = 0;
 diff --git a/lib/debugobjects.c b/lib/debugobjects.c
-index 37061ed..da83f48 100644
+index bf2c8b1..1d00ccf 100644
 --- a/lib/debugobjects.c
 +++ b/lib/debugobjects.c
 @@ -286,7 +286,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
@@ -86172,7 +86592,7 @@ index 8235331..5881053 100644
  EXPORT_SYMBOL(devm_ioport_unmap);
  #endif /* CONFIG_HAS_IOPORT */
 diff --git a/lib/div64.c b/lib/div64.c
-index a163b6c..9618fa5 100644
+index 4382ad7..08aa558 100644
 --- a/lib/div64.c
 +++ b/lib/div64.c
 @@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
@@ -86184,7 +86604,7 @@ index a163b6c..9618fa5 100644
  {
  	u64 quotient;
  
-@@ -90,7 +90,7 @@ EXPORT_SYMBOL(div_s64_rem);
+@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
   * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
   */
  #ifndef div64_u64
@@ -86265,19 +86685,10 @@ index bd2bea9..6b3c95e 100644
  		return false;
  
 diff --git a/lib/kobject.c b/lib/kobject.c
-index b7e29a6..2f3ca75 100644
+index 084f7b1..d265b8a 100644
 --- a/lib/kobject.c
 +++ b/lib/kobject.c
-@@ -805,7 +805,7 @@ static struct kset *kset_create(const char *name,
- 	kset = kzalloc(sizeof(*kset), GFP_KERNEL);
- 	if (!kset)
- 		return NULL;
--	retval = kobject_set_name(&kset->kobj, name);
-+	retval = kobject_set_name(&kset->kobj, "%s", name);
- 	if (retval) {
- 		kfree(kset);
- 		return NULL;
-@@ -859,9 +859,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
+@@ -875,9 +875,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
  
  
  static DEFINE_SPINLOCK(kobj_ns_type_lock);
@@ -86290,7 +86701,7 @@ index b7e29a6..2f3ca75 100644
  	enum kobj_ns_type type = ops->type;
  	int error;
 diff --git a/lib/list_debug.c b/lib/list_debug.c
-index c24c2f7..06e070b 100644
+index c24c2f7..f0296f4 100644
 --- a/lib/list_debug.c
 +++ b/lib/list_debug.c
 @@ -11,7 +11,9 @@
@@ -86303,50 +86714,61 @@ index c24c2f7..06e070b 100644
  /*
   * Insert a new entry between two known consecutive entries.
   *
-@@ -19,21 +21,32 @@
+@@ -19,21 +21,40 @@
   * the prev/next entries already!
   */
  
--void __list_add(struct list_head *new,
--			      struct list_head *prev,
--			      struct list_head *next)
 +static bool __list_add_debug(struct list_head *new,
 +			     struct list_head *prev,
 +			     struct list_head *next)
++{
++	if (unlikely(next->prev != prev)) {
++		printk(KERN_ERR "list_add corruption. next->prev should be "
++			"prev (%p), but was %p. (next=%p).\n",
++			prev, next->prev, next);
++		BUG();
++		return false;
++	}
++	if (unlikely(prev->next != next)) {
++		printk(KERN_ERR "list_add corruption. prev->next should be "
++			"next (%p), but was %p. (prev=%p).\n",
++			next, prev->next, prev);
++		BUG();
++		return false;
++	}
++	if (unlikely(new == prev || new == next)) {
++		printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
++			new, prev, next);
++		BUG();
++		return false;
++	}
++	return true;
++}
++
+ void __list_add(struct list_head *new,
+-			      struct list_head *prev,
+-			      struct list_head *next)
++		struct list_head *prev,
++		struct list_head *next)
  {
 -	WARN(next->prev != prev,
-+	if (WARN(next->prev != prev,
- 		"list_add corruption. next->prev should be "
- 		"prev (%p), but was %p. (next=%p).\n",
+-		"list_add corruption. next->prev should be "
+-		"prev (%p), but was %p. (next=%p).\n",
 -		prev, next->prev, next);
 -	WARN(prev->next != next,
-+		prev, next->prev, next) ||
-+	    WARN(prev->next != next,
- 		"list_add corruption. prev->next should be "
- 		"next (%p), but was %p. (prev=%p).\n",
+-		"list_add corruption. prev->next should be "
+-		"next (%p), but was %p. (prev=%p).\n",
 -		next, prev->next, prev);
 -	WARN(new == prev || new == next,
 -	     "list_add double add: new=%p, prev=%p, next=%p.\n",
 -	     new, prev, next);
-+		next, prev->next, prev) ||
-+	    WARN(new == prev || new == next,
-+		"list_add double add: new=%p, prev=%p, next=%p.\n",
-+		new, prev, next))
-+		return false;
-+	return true;
-+}
-+
-+void __list_add(struct list_head *new,
-+		struct list_head *prev,
-+		struct list_head *next)
-+{
 +	if (!__list_add_debug(new, prev, next))
 +		return;
 +
  	next->prev = new;
  	new->next = next;
  	new->prev = prev;
-@@ -41,7 +54,7 @@ void __list_add(struct list_head *new,
+@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
  }
  EXPORT_SYMBOL(__list_add);
  
@@ -86355,11 +86777,45 @@ index c24c2f7..06e070b 100644
  {
  	struct list_head *prev, *next;
  
-@@ -60,9 +73,16 @@ void __list_del_entry(struct list_head *entry)
- 	    WARN(next->prev != entry,
- 		"list_del corruption. next->prev should be %p, "
- 		"but was %p\n", entry, next->prev))
+ 	prev = entry->prev;
+ 	next = entry->next;
+ 
+-	if (WARN(next == LIST_POISON1,
+-		"list_del corruption, %p->next is LIST_POISON1 (%p)\n",
+-		entry, LIST_POISON1) ||
+-	    WARN(prev == LIST_POISON2,
+-		"list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
+-		entry, LIST_POISON2) ||
+-	    WARN(prev->next != entry,
+-		"list_del corruption. prev->next should be %p, "
+-		"but was %p\n", entry, prev->next) ||
+-	    WARN(next->prev != entry,
+-		"list_del corruption. next->prev should be %p, "
+-		"but was %p\n", entry, next->prev))
++	if (unlikely(next == LIST_POISON1)) {
++		printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
++			entry, LIST_POISON1);
++		BUG();
 +		return false;
++	}
++	if (unlikely(prev == LIST_POISON2)) {
++		printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
++			entry, LIST_POISON2);
++		BUG();
++		return false;
++	}
++	if (unlikely(entry->prev->next != entry)) {
++		printk(KERN_ERR "list_del corruption. prev->next should be %p, "
++			"but was %p\n", entry, prev->next);
++		BUG();
++		return false;
++	}
++	if (unlikely(entry->next->prev != entry)) {
++		printk(KERN_ERR "list_del corruption. next->prev should be %p, "
++			"but was %p\n", entry, next->prev);
++		BUG();
++		return false;
++	}
 +	return true;
 +}
 +
@@ -86373,7 +86829,7 @@ index c24c2f7..06e070b 100644
  }
  EXPORT_SYMBOL(__list_del_entry);
  
-@@ -86,15 +106,85 @@ EXPORT_SYMBOL(list_del);
+@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
  void __list_add_rcu(struct list_head *new,
  		    struct list_head *prev, struct list_head *next)
  {
@@ -86465,11 +86921,24 @@ index c24c2f7..06e070b 100644
 +	pax_close_kernel();
 +}
 +EXPORT_SYMBOL(pax_list_del_rcu);
+diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
+index 1a53d49..ace934c 100644
+--- a/lib/percpu-refcount.c
++++ b/lib/percpu-refcount.c
+@@ -29,7 +29,7 @@
+  * can't hit 0 before we've added up all the percpu refs.
+  */
+ 
+-#define PCPU_COUNT_BIAS		(1U << 31)
++#define PCPU_COUNT_BIAS		(1U << 30)
+ 
+ /**
+  * percpu_ref_init - initialize a percpu refcount
 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
-index e796429..6e38f9f 100644
+index 7811ed3..f80ca19 100644
 --- a/lib/radix-tree.c
 +++ b/lib/radix-tree.c
-@@ -92,7 +92,7 @@ struct radix_tree_preload {
+@@ -93,7 +93,7 @@ struct radix_tree_preload {
  	int nr;
  	struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
  };
@@ -86505,7 +86974,7 @@ index a28df52..3d55877 100644
  	unsigned long c;
  
 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
-index d23762e..e21eab2 100644
+index 4e8686c..3e8c92f 100644
 --- a/lib/swiotlb.c
 +++ b/lib/swiotlb.c
 @@ -664,7 +664,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
@@ -86532,7 +87001,7 @@ index 4f5b1dd..7cab418 100644
 +}
 +EXPORT_SYMBOL(copy_to_user_overflow);
 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index 620fae4..6ed4d6c 100644
+index d76555c..62d4bfe 100644
 --- a/lib/vsprintf.c
 +++ b/lib/vsprintf.c
 @@ -16,6 +16,9 @@
@@ -86545,7 +87014,7 @@ index 620fae4..6ed4d6c 100644
  #include <stdarg.h>
  #include <linux/module.h>	/* for KSYM_SYMBOL_LEN */
  #include <linux/types.h>
-@@ -982,7 +985,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
+@@ -1155,7 +1158,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
  	return number(buf, end, *(const netdev_features_t *)addr, spec);
  }
  
@@ -86557,7 +87026,7 @@ index 620fae4..6ed4d6c 100644
  
  /*
   * Show a '%p' thing.  A kernel extension is that the '%p' is followed
-@@ -995,6 +1002,7 @@ int kptr_restrict __read_mostly;
+@@ -1168,6 +1175,7 @@ int kptr_restrict __read_mostly;
   * - 'f' For simple symbolic function names without offset
   * - 'S' For symbolic direct pointers with offset
   * - 's' For symbolic direct pointers without offset
@@ -86565,7 +87034,7 @@ index 620fae4..6ed4d6c 100644
   * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
   * - 'B' For backtraced symbolic direct pointers with offset
   * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
-@@ -1053,12 +1061,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1232,12 +1240,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
  
  	if (!ptr && *fmt != 'K') {
  		/*
@@ -86580,7 +87049,7 @@ index 620fae4..6ed4d6c 100644
  	}
  
  	switch (*fmt) {
-@@ -1068,6 +1076,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1247,6 +1255,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
  		/* Fallthrough */
  	case 'S':
  	case 's':
@@ -86593,7 +87062,7 @@ index 620fae4..6ed4d6c 100644
  	case 'B':
  		return symbol_string(buf, end, ptr, spec, fmt);
  	case 'R':
-@@ -1108,6 +1122,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1302,6 +1316,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
  			va_end(va);
  			return buf;
  		}
@@ -86602,9 +87071,9 @@ index 620fae4..6ed4d6c 100644
  	case 'K':
  		/*
  		 * %pK cannot be used in IRQ context because its test
-@@ -1163,6 +1179,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
- 		return number(buf, end,
- 			      (unsigned long long) *((phys_addr_t *)ptr), spec);
+@@ -1363,6 +1379,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+ 				   ((const struct file *)ptr)->f_path.dentry,
+ 				   spec, fmt);
  	}
 +
 +#ifdef CONFIG_GRKERNSEC_HIDESYM
@@ -86624,7 +87093,7 @@ index 620fae4..6ed4d6c 100644
  	spec.flags |= SMALL;
  	if (spec.field_width == -1) {
  		spec.field_width = default_width;
-@@ -1884,11 +1915,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
+@@ -2086,11 +2117,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
  	typeof(type) value;						\
  	if (sizeof(type) == 8) {					\
  		args = PTR_ALIGN(args, sizeof(u32));			\
@@ -86639,7 +87108,7 @@ index 620fae4..6ed4d6c 100644
  	}								\
  	args += sizeof(type);						\
  	value;								\
-@@ -1951,7 +1982,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
+@@ -2153,7 +2184,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
  		case FORMAT_TYPE_STR: {
  			const char *str_arg = args;
  			args += strlen(str_arg) + 1;
@@ -86656,10 +87125,10 @@ index 0000000..7cd6065
 @@ -0,0 +1 @@
 +-grsec
 diff --git a/mm/Kconfig b/mm/Kconfig
-index e742d06..c56fdd8 100644
+index 394838f..0e5f816 100644
 --- a/mm/Kconfig
 +++ b/mm/Kconfig
-@@ -317,10 +317,10 @@ config KSM
+@@ -317,10 +317,11 @@ config KSM
  	  root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
  
  config DEFAULT_MMAP_MIN_ADDR
@@ -86668,12 +87137,13 @@ index e742d06..c56fdd8 100644
  	depends on MMU
 -        default 4096
 -        help
++	default 32768 if ALPHA || ARM || PARISC || SPARC32
 +	default 65536
 +	help
  	  This is the portion of low virtual memory which should be protected
  	  from userspace allocation.  Keeping a user from writing to low pages
  	  can help reduce the impact of kernel NULL pointer bugs.
-@@ -351,7 +351,7 @@ config MEMORY_FAILURE
+@@ -351,7 +352,7 @@ config MEMORY_FAILURE
  
  config HWPOISON_INJECT
  	tristate "HWPoison pages injector"
@@ -86683,7 +87153,7 @@ index e742d06..c56fdd8 100644
  
  config NOMMU_INITIAL_TRIM_EXCESS
 diff --git a/mm/backing-dev.c b/mm/backing-dev.c
-index 5025174..9d67dcd 100644
+index ce682f7..1fb54f9 100644
 --- a/mm/backing-dev.c
 +++ b/mm/backing-dev.c
 @@ -12,7 +12,7 @@
@@ -86695,29 +87165,20 @@ index 5025174..9d67dcd 100644
  
  struct backing_dev_info default_backing_dev_info = {
  	.name		= "default",
-@@ -515,7 +515,6 @@ EXPORT_SYMBOL(bdi_destroy);
- int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
- 			   unsigned int cap)
- {
--	char tmp[32];
- 	int err;
- 
- 	bdi->name = name;
-@@ -524,8 +523,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
- 	if (err)
+@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
  		return err;
  
--	sprintf(tmp, "%.28s%s", name, "-%d");
--	err = bdi_register(bdi, NULL, tmp, atomic_long_inc_return(&bdi_seq));
-+	err = bdi_register(bdi, NULL, "%.28s-%ld", name, atomic_long_inc_return_unchecked(&bdi_seq));
+ 	err = bdi_register(bdi, NULL, "%.28s-%ld", name,
+-			   atomic_long_inc_return(&bdi_seq));
++			   atomic_long_inc_return_unchecked(&bdi_seq));
  	if (err) {
  		bdi_destroy(bdi);
  		return err;
 diff --git a/mm/filemap.c b/mm/filemap.c
-index 7905fe7..f59502b 100644
+index ae4846f..b0acebe 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -1766,7 +1766,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
+@@ -1768,7 +1768,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)
@@ -86726,7 +87187,7 @@ index 7905fe7..f59502b 100644
  	file_accessed(file);
  	vma->vm_ops = &generic_file_vm_ops;
  	return 0;
-@@ -1948,7 +1948,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
+@@ -1950,7 +1950,7 @@ static size_t __iovec_copy_from_user_inatomic(char *vaddr,
  
  	while (bytes) {
  		char __user *buf = iov->iov_base + base;
@@ -86735,7 +87196,7 @@ index 7905fe7..f59502b 100644
  
  		base = 0;
  		left = __copy_from_user_inatomic(vaddr, buf, copy);
-@@ -1977,7 +1977,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
+@@ -1979,7 +1979,7 @@ size_t iov_iter_copy_from_user_atomic(struct page *page,
  	BUG_ON(!in_atomic());
  	kaddr = kmap_atomic(page);
  	if (likely(i->nr_segs == 1)) {
@@ -86744,7 +87205,7 @@ index 7905fe7..f59502b 100644
  		char __user *buf = i->iov->iov_base + i->iov_offset;
  		left = __copy_from_user_inatomic(kaddr + offset, buf, bytes);
  		copied = bytes - left;
-@@ -2005,7 +2005,7 @@ size_t iov_iter_copy_from_user(struct page *page,
+@@ -2007,7 +2007,7 @@ size_t iov_iter_copy_from_user(struct page *page,
  
  	kaddr = kmap(page);
  	if (likely(i->nr_segs == 1)) {
@@ -86753,7 +87214,7 @@ index 7905fe7..f59502b 100644
  		char __user *buf = i->iov->iov_base + i->iov_offset;
  		left = __copy_from_user(kaddr + offset, buf, bytes);
  		copied = bytes - left;
-@@ -2035,7 +2035,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
+@@ -2037,7 +2037,7 @@ void iov_iter_advance(struct iov_iter *i, size_t bytes)
  		 * zero-length segments (without overruning the iovec).
  		 */
  		while (bytes || unlikely(i->count && !iov->iov_len)) {
@@ -86762,7 +87223,7 @@ index 7905fe7..f59502b 100644
  
  			copy = min(bytes, iov->iov_len - base);
  			BUG_ON(!i->count || i->count < copy);
-@@ -2106,6 +2106,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
+@@ -2108,6 +2108,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) {
@@ -86771,10 +87232,10 @@ index 7905fe7..f59502b 100644
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
 diff --git a/mm/fremap.c b/mm/fremap.c
-index 87da359..3f41cb1 100644
+index 5bff081..d8189a9 100644
 --- a/mm/fremap.c
 +++ b/mm/fremap.c
-@@ -158,6 +158,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -163,6 +163,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
   retry:
  	vma = find_vma(mm, start);
  
@@ -86815,10 +87276,10 @@ index b32b70c..e512eb0 100644
  	set_page_address(page, (void *)vaddr);
  
 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
-index 7c5eb85..5c01c2f 100644
+index 0b7656e..d21cefc 100644
 --- a/mm/hugetlb.c
 +++ b/mm/hugetlb.c
-@@ -2022,15 +2022,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
+@@ -2094,15 +2094,17 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
  	struct hstate *h = &default_hstate;
  	unsigned long tmp;
  	int ret;
@@ -86839,7 +87300,7 @@ index 7c5eb85..5c01c2f 100644
  	if (ret)
  		goto out;
  
-@@ -2087,15 +2089,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
+@@ -2147,15 +2149,17 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
  	struct hstate *h = &default_hstate;
  	unsigned long tmp;
  	int ret;
@@ -86860,7 +87321,7 @@ index 7c5eb85..5c01c2f 100644
  	if (ret)
  		goto out;
  
-@@ -2545,6 +2549,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2605,6 +2609,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
  	return 1;
  }
  
@@ -86888,7 +87349,7 @@ index 7c5eb85..5c01c2f 100644
  /*
   * Hugetlb_cow() should be called with page lock of the original hugepage held.
   * Called with hugetlb_instantiation_mutex held and pte_page locked so we
-@@ -2663,6 +2688,11 @@ retry_avoidcopy:
+@@ -2721,6 +2746,11 @@ retry_avoidcopy:
  				make_huge_pte(vma, new_page, 1));
  		page_remove_rmap(old_page);
  		hugepage_add_new_anon_rmap(new_page, vma, address);
@@ -86900,7 +87361,7 @@ index 7c5eb85..5c01c2f 100644
  		/* Make the old page be freed below */
  		new_page = old_page;
  	}
-@@ -2821,6 +2851,10 @@ retry:
+@@ -2883,6 +2913,10 @@ retry:
  				&& (vma->vm_flags & VM_SHARED)));
  	set_huge_pte_at(mm, address, ptep, new_pte);
  
@@ -86911,7 +87372,7 @@ index 7c5eb85..5c01c2f 100644
  	if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
  		/* Optimization, do the COW without a second fault */
  		ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
-@@ -2850,6 +2884,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2912,6 +2946,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  	static DEFINE_MUTEX(hugetlb_instantiation_mutex);
  	struct hstate *h = hstate_vma(vma);
  
@@ -86922,7 +87383,7 @@ index 7c5eb85..5c01c2f 100644
  	address &= huge_page_mask(h);
  
  	ptep = huge_pte_offset(mm, address);
-@@ -2863,6 +2901,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2925,6 +2963,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  				VM_FAULT_SET_HINDEX(hstate_index(h));
  	}
  
@@ -86950,10 +87411,10 @@ index 7c5eb85..5c01c2f 100644
  	if (!ptep)
  		return VM_FAULT_OOM;
 diff --git a/mm/internal.h b/mm/internal.h
-index 8562de0..92b2073 100644
+index 684f7aa..9eb9edc 100644
 --- a/mm/internal.h
 +++ b/mm/internal.h
-@@ -100,6 +100,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
+@@ -97,6 +97,7 @@ extern pmd_t *mm_find_pmd(struct mm_struct *mm, unsigned long address);
   * in mm/page_alloc.c
   */
  extern void __free_pages_bootmem(struct page *page, unsigned int order);
@@ -86961,7 +87422,7 @@ index 8562de0..92b2073 100644
  extern void prep_compound_page(struct page *page, unsigned long order);
  #ifdef CONFIG_MEMORY_FAILURE
  extern bool is_free_buddy_page(struct page *page);
-@@ -355,7 +356,7 @@ extern u32 hwpoison_filter_enable;
+@@ -352,7 +353,7 @@ extern u32 hwpoison_filter_enable;
  
  extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
          unsigned long, unsigned long,
@@ -86971,7 +87432,7 @@ index 8562de0..92b2073 100644
  extern void set_pageblock_order(void);
  unsigned long reclaim_clean_pages_from_list(struct zone *zone,
 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
-index c8d7f31..2dbeffd 100644
+index e126b0e..e986018 100644
 --- a/mm/kmemleak.c
 +++ b/mm/kmemleak.c
 @@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
@@ -87015,10 +87476,10 @@ index d53adf9..03a24bf 100644
  	set_fs(old_fs);
  
 diff --git a/mm/madvise.c b/mm/madvise.c
-index 7055883..aafb1ed 100644
+index 539eeb9..e24a987 100644
 --- a/mm/madvise.c
 +++ b/mm/madvise.c
-@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
+@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
  	pgoff_t pgoff;
  	unsigned long new_flags = vma->vm_flags;
  
@@ -87043,8 +87504,8 @@ index 7055883..aafb1ed 100644
  	vma->vm_flags = new_flags;
  
  out:
-@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
- 			     struct vm_area_struct ** prev,
+@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
+ 			     struct vm_area_struct **prev,
  			     unsigned long start, unsigned long end)
  {
 +
@@ -87055,7 +87516,7 @@ index 7055883..aafb1ed 100644
  	*prev = vma;
  	if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
  		return -EINVAL;
-@@ -286,6 +302,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
+@@ -286,6 +302,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);
@@ -87077,7 +87538,7 @@ index 7055883..aafb1ed 100644
  	return 0;
  }
  
-@@ -485,6 +516,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
+@@ -491,6 +522,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
  	if (end < start)
  		return error;
  
@@ -87095,7 +87556,7 @@ index 7055883..aafb1ed 100644
  	if (end == start)
  		return error;
 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
-index ceb0c7f..b2b8e94 100644
+index bf3351b..aea800d 100644
 --- a/mm/memory-failure.c
 +++ b/mm/memory-failure.c
 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
@@ -87116,7 +87577,7 @@ index ceb0c7f..b2b8e94 100644
  #ifdef __ARCH_SI_TRAPNO
  	si.si_trapno = trapno;
  #endif
-@@ -760,7 +760,7 @@ static struct page_state {
+@@ -762,7 +762,7 @@ static struct page_state {
  	unsigned long res;
  	char *msg;
  	int (*action)(struct page *p, unsigned long pfn);
@@ -87125,7 +87586,7 @@ index ceb0c7f..b2b8e94 100644
  	{ reserved,	reserved,	"reserved kernel",	me_kernel },
  	/*
  	 * free pages are specially detected outside this table:
-@@ -1051,7 +1051,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1053,7 +1053,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
  		nr_pages = 1 << compound_order(hpage);
  	else /* normal page or thp */
  		nr_pages = 1;
@@ -87134,7 +87595,7 @@ index ceb0c7f..b2b8e94 100644
  
  	/*
  	 * We need/can do nothing about count=0 pages.
-@@ -1081,7 +1081,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1083,7 +1083,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
  			if (!PageHWPoison(hpage)
  			    || (hwpoison_filter(p) && TestClearPageHWPoison(p))
  			    || (p != hpage && TestSetPageHWPoison(hpage))) {
@@ -87143,7 +87604,7 @@ index ceb0c7f..b2b8e94 100644
  				return 0;
  			}
  			set_page_hwpoison_huge_page(hpage);
-@@ -1148,7 +1148,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1152,7 +1152,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
  	}
  	if (hwpoison_filter(p)) {
  		if (TestClearPageHWPoison(p))
@@ -87152,16 +87613,16 @@ index ceb0c7f..b2b8e94 100644
  		unlock_page(hpage);
  		put_page(hpage);
  		return 0;
-@@ -1350,7 +1350,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1370,7 +1370,7 @@ int unpoison_memory(unsigned long pfn)
  			return 0;
  		}
  		if (TestClearPageHWPoison(p))
--			atomic_long_sub(nr_pages, &num_poisoned_pages);
-+			atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
+-			atomic_long_dec(&num_poisoned_pages);
++			atomic_long_dec_unchecked(&num_poisoned_pages);
  		pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
  		return 0;
  	}
-@@ -1364,7 +1364,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1384,7 +1384,7 @@ int unpoison_memory(unsigned long pfn)
  	 */
  	if (TestClearPageHWPoison(page)) {
  		pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
@@ -87170,30 +87631,16 @@ index ceb0c7f..b2b8e94 100644
  		freeit = 1;
  		if (PageHuge(page))
  			clear_page_hwpoison_huge_page(page);
-@@ -1491,7 +1491,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
+@@ -1521,7 +1521,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
  	} else {
  		set_page_hwpoison_huge_page(hpage);
  		dequeue_hwpoisoned_huge_page(hpage);
--		atomic_long_add(1 << compound_trans_order(hpage),
-+		atomic_long_add_unchecked(1 << compound_trans_order(hpage),
+-		atomic_long_add(1 << compound_order(hpage),
++		atomic_long_add_unchecked(1 << compound_order(hpage),
  				&num_poisoned_pages);
  	}
- 	/* keep elevated page count for bad page */
-@@ -1552,11 +1552,11 @@ int soft_offline_page(struct page *page, int flags)
- 		if (PageHuge(page)) {
- 			set_page_hwpoison_huge_page(hpage);
- 			dequeue_hwpoisoned_huge_page(hpage);
--			atomic_long_add(1 << compound_trans_order(hpage),
-+			atomic_long_add_unchecked(1 << compound_trans_order(hpage),
- 					&num_poisoned_pages);
- 		} else {
- 			SetPageHWPoison(page);
--			atomic_long_inc(&num_poisoned_pages);
-+			atomic_long_inc_unchecked(&num_poisoned_pages);
- 		}
- 	}
- 	/* keep elevated page count for bad page */
-@@ -1596,7 +1596,7 @@ static int __soft_offline_page(struct page *page, int flags)
+ 	return ret;
+@@ -1560,7 +1560,7 @@ static int __soft_offline_page(struct page *page, int flags)
  		put_page(page);
  		pr_info("soft_offline: %#lx: invalidated\n", pfn);
  		SetPageHWPoison(page);
@@ -87202,20 +87649,34 @@ index ceb0c7f..b2b8e94 100644
  		return 0;
  	}
  
-@@ -1626,7 +1626,7 @@ static int __soft_offline_page(struct page *page, int flags)
- 				ret = -EIO;
- 		} else {
- 			SetPageHWPoison(page);
+@@ -1605,7 +1605,7 @@ static int __soft_offline_page(struct page *page, int flags)
+ 			if (!is_free_buddy_page(page))
+ 				pr_info("soft offline: %#lx: page leaked\n",
+ 					pfn);
 -			atomic_long_inc(&num_poisoned_pages);
 +			atomic_long_inc_unchecked(&num_poisoned_pages);
  		}
  	} else {
  		pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
+@@ -1666,11 +1666,11 @@ int soft_offline_page(struct page *page, int flags)
+ 		if (PageHuge(page)) {
+ 			set_page_hwpoison_huge_page(hpage);
+ 			dequeue_hwpoisoned_huge_page(hpage);
+-			atomic_long_add(1 << compound_order(hpage),
++			atomic_long_add_unchecked(1 << compound_order(hpage),
+ 					&num_poisoned_pages);
+ 		} else {
+ 			SetPageHWPoison(page);
+-			atomic_long_inc(&num_poisoned_pages);
++			atomic_long_inc_unchecked(&num_poisoned_pages);
+ 		}
+ 	}
+ unset:
 diff --git a/mm/memory.c b/mm/memory.c
-index 4b60011..80b1cba 100644
+index d176154..cd1b387 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -428,6 +428,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
+@@ -402,6 +402,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
  		free_pte_range(tlb, pmd, addr);
  	} while (pmd++, addr = next, addr != end);
  
@@ -87223,7 +87684,7 @@ index 4b60011..80b1cba 100644
  	start &= PUD_MASK;
  	if (start < floor)
  		return;
-@@ -442,6 +443,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
+@@ -416,6 +417,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
  	pmd = pmd_offset(pud, start);
  	pud_clear(pud);
  	pmd_free_tlb(tlb, pmd, start);
@@ -87232,7 +87693,7 @@ index 4b60011..80b1cba 100644
  }
  
  static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
-@@ -461,6 +464,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -435,6 +438,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
  		free_pmd_range(tlb, pud, addr, next, floor, ceiling);
  	} while (pud++, addr = next, addr != end);
  
@@ -87240,7 +87701,7 @@ index 4b60011..80b1cba 100644
  	start &= PGDIR_MASK;
  	if (start < floor)
  		return;
-@@ -475,6 +479,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -449,6 +453,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
  	pud = pud_offset(pgd, start);
  	pgd_clear(pgd);
  	pud_free_tlb(tlb, pud, start);
@@ -87249,7 +87710,7 @@ index 4b60011..80b1cba 100644
  }
  
  /*
-@@ -1644,12 +1650,6 @@ no_page_table:
+@@ -1636,12 +1642,6 @@ no_page_table:
  	return page;
  }
  
@@ -87262,7 +87723,7 @@ index 4b60011..80b1cba 100644
  /**
   * __get_user_pages() - pin user pages in memory
   * @tsk:	task_struct of target task
-@@ -1736,10 +1736,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+@@ -1728,10 +1728,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
  
  	i = 0;
  
@@ -87275,7 +87736,7 @@ index 4b60011..80b1cba 100644
  		if (!vma && in_gate_area(mm, start)) {
  			unsigned long pg = start & PAGE_MASK;
  			pgd_t *pgd;
-@@ -1788,7 +1788,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+@@ -1780,7 +1780,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
  			goto next_page;
  		}
  
@@ -87284,7 +87745,7 @@ index 4b60011..80b1cba 100644
  		    (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
  		    !(vm_flags & vma->vm_flags))
  			return i ? : -EFAULT;
-@@ -1817,11 +1817,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+@@ -1809,11 +1809,6 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
  				int ret;
  				unsigned int fault_flags = 0;
  
@@ -87296,7 +87757,7 @@ index 4b60011..80b1cba 100644
  				if (foll_flags & FOLL_WRITE)
  					fault_flags |= FAULT_FLAG_WRITE;
  				if (nonblocking)
-@@ -1901,7 +1896,7 @@ next_page:
+@@ -1893,7 +1888,7 @@ next_page:
  			start += page_increm * PAGE_SIZE;
  			nr_pages -= page_increm;
  		} while (nr_pages && start < vma->vm_end);
@@ -87305,7 +87766,7 @@ index 4b60011..80b1cba 100644
  	return i;
  }
  EXPORT_SYMBOL(__get_user_pages);
-@@ -2108,6 +2103,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
+@@ -2100,6 +2095,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));
  
@@ -87316,7 +87777,7 @@ index 4b60011..80b1cba 100644
  	retval = 0;
  	pte_unmap_unlock(pte, ptl);
  	return retval;
-@@ -2152,9 +2151,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
+@@ -2144,9 +2143,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
  	if (!page_count(page))
  		return -EINVAL;
  	if (!(vma->vm_flags & VM_MIXEDMAP)) {
@@ -87338,7 +87799,7 @@ index 4b60011..80b1cba 100644
  	}
  	return insert_page(vma, addr, page, vma->vm_page_prot);
  }
-@@ -2237,6 +2248,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
+@@ -2229,6 +2240,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
  			unsigned long pfn)
  {
  	BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
@@ -87346,7 +87807,7 @@ index 4b60011..80b1cba 100644
  
  	if (addr < vma->vm_start || addr >= vma->vm_end)
  		return -EFAULT;
-@@ -2484,7 +2496,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
+@@ -2476,7 +2488,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
  
  	BUG_ON(pud_huge(*pud));
  
@@ -87357,7 +87818,7 @@ index 4b60011..80b1cba 100644
  	if (!pmd)
  		return -ENOMEM;
  	do {
-@@ -2504,7 +2518,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
+@@ -2496,7 +2510,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
  	unsigned long next;
  	int err;
  
@@ -87368,7 +87829,7 @@ index 4b60011..80b1cba 100644
  	if (!pud)
  		return -ENOMEM;
  	do {
-@@ -2592,6 +2608,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
+@@ -2584,6 +2600,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
  		copy_user_highpage(dst, src, va, vma);
  }
  
@@ -87555,7 +88016,7 @@ index 4b60011..80b1cba 100644
  /*
   * This routine handles present pages, when users try to write
   * to a shared page. It is done by copying the page to a new address
-@@ -2808,6 +3004,12 @@ gotten:
+@@ -2800,6 +2996,12 @@ gotten:
  	 */
  	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
  	if (likely(pte_same(*page_table, orig_pte))) {
@@ -87568,7 +88029,7 @@ index 4b60011..80b1cba 100644
  		if (old_page) {
  			if (!PageAnon(old_page)) {
  				dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2859,6 +3061,10 @@ gotten:
+@@ -2851,6 +3053,10 @@ gotten:
  			page_remove_rmap(old_page);
  		}
  
@@ -87579,7 +88040,7 @@ index 4b60011..80b1cba 100644
  		/* Free the old page.. */
  		new_page = old_page;
  		ret |= VM_FAULT_WRITE;
-@@ -3134,6 +3340,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3128,6 +3334,11 @@ 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);
@@ -87591,7 +88052,7 @@ index 4b60011..80b1cba 100644
  	unlock_page(page);
  	if (page != swapcache) {
  		/*
-@@ -3157,6 +3368,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3151,6 +3362,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, page_table);
@@ -87603,7 +88064,7 @@ index 4b60011..80b1cba 100644
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  out:
-@@ -3176,40 +3392,6 @@ out_release:
+@@ -3170,40 +3386,6 @@ out_release:
  }
  
  /*
@@ -87644,7 +88105,7 @@ index 4b60011..80b1cba 100644
   * We enter with non-exclusive mmap_sem (to exclude vma changes,
   * but allow concurrent faults), and pte mapped but not yet locked.
   * We return with mmap_sem still held, but pte unmapped and unlocked.
-@@ -3218,27 +3400,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3212,27 +3394,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)
  {
@@ -87677,7 +88138,7 @@ index 4b60011..80b1cba 100644
  	if (unlikely(anon_vma_prepare(vma)))
  		goto oom;
  	page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -3262,6 +3440,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3256,6 +3434,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
  	if (!pte_none(*page_table))
  		goto release;
  
@@ -87689,7 +88150,7 @@ index 4b60011..80b1cba 100644
  	inc_mm_counter_fast(mm, MM_ANONPAGES);
  	page_add_new_anon_rmap(page, vma, address);
  setpte:
-@@ -3269,6 +3452,12 @@ setpte:
+@@ -3263,6 +3446,12 @@ setpte:
  
  	/* No need to invalidate - it was non-present before */
  	update_mmu_cache(vma, address, page_table);
@@ -87702,7 +88163,7 @@ index 4b60011..80b1cba 100644
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  	return 0;
-@@ -3412,6 +3601,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3406,6 +3595,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))) {
@@ -87715,7 +88176,7 @@ index 4b60011..80b1cba 100644
  		flush_icache_page(vma, page);
  		entry = mk_pte(page, vma->vm_page_prot);
  		if (flags & FAULT_FLAG_WRITE)
-@@ -3431,6 +3626,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3427,6 +3622,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, page_table);
@@ -87730,7 +88191,7 @@ index 4b60011..80b1cba 100644
  	} else {
  		if (cow_page)
  			mem_cgroup_uncharge_page(cow_page);
-@@ -3741,6 +3944,12 @@ int handle_pte_fault(struct mm_struct *mm,
+@@ -3737,6 +3940,12 @@ static int handle_pte_fault(struct mm_struct *mm,
  		if (flags & FAULT_FLAG_WRITE)
  			flush_tlb_fix_spurious_fault(vma, address);
  	}
@@ -87743,7 +88204,7 @@ index 4b60011..80b1cba 100644
  unlock:
  	pte_unmap_unlock(pte, ptl);
  	return 0;
-@@ -3757,6 +3966,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3753,9 +3962,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  	pmd_t *pmd;
  	pte_t *pte;
  
@@ -87751,10 +88212,6 @@ index 4b60011..80b1cba 100644
 +	struct vm_area_struct *vma_m;
 +#endif
 +
- 	__set_current_state(TASK_RUNNING);
- 
- 	count_vm_event(PGFAULT);
-@@ -3768,6 +3981,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);
  
@@ -87789,7 +88246,7 @@ index 4b60011..80b1cba 100644
  retry:
  	pgd = pgd_offset(mm, address);
  	pud = pud_alloc(mm, pgd, address);
-@@ -3866,6 +4107,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
+@@ -3894,6 +4135,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
  	spin_unlock(&mm->page_table_lock);
  	return 0;
  }
@@ -87813,7 +88270,7 @@ index 4b60011..80b1cba 100644
  #endif /* __PAGETABLE_PUD_FOLDED */
  
  #ifndef __PAGETABLE_PMD_FOLDED
-@@ -3896,6 +4154,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
+@@ -3924,6 +4182,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
  	spin_unlock(&mm->page_table_lock);
  	return 0;
  }
@@ -87844,7 +88301,7 @@ index 4b60011..80b1cba 100644
  #endif /* __PAGETABLE_PMD_FOLDED */
  
  #if !defined(__HAVE_ARCH_GATE_AREA)
-@@ -3909,7 +4191,7 @@ static int __init gate_vma_init(void)
+@@ -3937,7 +4219,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;
@@ -87853,7 +88310,7 @@ index 4b60011..80b1cba 100644
  
  	return 0;
  }
-@@ -4043,8 +4325,8 @@ out:
+@@ -4071,8 +4353,8 @@ out:
  	return ret;
  }
  
@@ -87864,7 +88321,7 @@ index 4b60011..80b1cba 100644
  {
  	resource_size_t phys_addr;
  	unsigned long prot = 0;
-@@ -4070,8 +4352,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
+@@ -4098,8 +4380,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
   * Access another process' address space as given in mm.  If non-NULL, use the
   * given task for page fault accounting.
   */
@@ -87875,7 +88332,7 @@ index 4b60011..80b1cba 100644
  {
  	struct vm_area_struct *vma;
  	void *old_buf = buf;
-@@ -4079,7 +4361,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -4107,7 +4389,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
  	down_read(&mm->mmap_sem);
  	/* ignore errors, just check how much was successfully transferred */
  	while (len) {
@@ -87884,7 +88341,7 @@ index 4b60011..80b1cba 100644
  		void *maddr;
  		struct page *page = NULL;
  
-@@ -4138,8 +4420,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -4166,8 +4448,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
   *
   * The caller must hold a reference on @mm.
   */
@@ -87895,7 +88352,7 @@ index 4b60011..80b1cba 100644
  {
  	return __access_remote_vm(NULL, mm, addr, buf, len, write);
  }
-@@ -4149,11 +4431,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
+@@ -4177,11 +4459,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
   * Source/target buffer must be kernel space,
   * Do not walk the page table directly, use get_user_pages
   */
@@ -87911,10 +88368,10 @@ index 4b60011..80b1cba 100644
  	mm = get_task_mm(tsk);
  	if (!mm)
 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
-index 4baf12e..5497066 100644
+index 0472964..7d5a0ea 100644
 --- a/mm/mempolicy.c
 +++ b/mm/mempolicy.c
-@@ -708,6 +708,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+@@ -746,6 +746,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
  	unsigned long vmstart;
  	unsigned long vmend;
  
@@ -87925,7 +88382,7 @@ index 4baf12e..5497066 100644
  	vma = find_vma(mm, start);
  	if (!vma || vma->vm_start > start)
  		return -EFAULT;
-@@ -751,6 +755,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+@@ -789,6 +793,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
  		err = vma_replace_policy(vma, new_pol);
  		if (err)
  			goto out;
@@ -87942,7 +88399,7 @@ index 4baf12e..5497066 100644
  	}
  
   out:
-@@ -1206,6 +1220,17 @@ static long do_mbind(unsigned long start, unsigned long len,
+@@ -1252,6 +1266,17 @@ static long do_mbind(unsigned long start, unsigned long len,
  
  	if (end < start)
  		return -EINVAL;
@@ -87960,7 +88417,7 @@ index 4baf12e..5497066 100644
  	if (end == start)
  		return 0;
  
-@@ -1434,8 +1459,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+@@ -1480,8 +1505,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
  	 */
  	tcred = __task_cred(task);
  	if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
@@ -87970,7 +88427,7 @@ index 4baf12e..5497066 100644
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out_put;
-@@ -1466,6 +1490,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+@@ -1512,6 +1536,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
  		goto out;
  	}
  
@@ -87987,10 +88444,10 @@ index 4baf12e..5497066 100644
  		capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
  
 diff --git a/mm/migrate.c b/mm/migrate.c
-index bf436c1..f571994 100644
+index c046927..6996b40 100644
 --- a/mm/migrate.c
 +++ b/mm/migrate.c
-@@ -1399,8 +1399,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
+@@ -1404,8 +1404,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
  	 */
  	tcred = __task_cred(task);
  	if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
@@ -88001,18 +88458,18 @@ index bf436c1..f571994 100644
  		err = -EPERM;
  		goto out;
 diff --git a/mm/mlock.c b/mm/mlock.c
-index 79b7cf7..9944291 100644
+index d480cd6..0f98458 100644
 --- a/mm/mlock.c
 +++ b/mm/mlock.c
-@@ -13,6 +13,7 @@
- #include <linux/pagemap.h>
+@@ -14,6 +14,7 @@
+ #include <linux/pagevec.h>
  #include <linux/mempolicy.h>
  #include <linux/syscalls.h>
 +#include <linux/security.h>
  #include <linux/sched.h>
  #include <linux/export.h>
  #include <linux/rmap.h>
-@@ -334,7 +335,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -568,7 +569,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
  {
  	unsigned long nstart, end, tmp;
  	struct vm_area_struct * vma, * prev;
@@ -88021,7 +88478,7 @@ index 79b7cf7..9944291 100644
  
  	VM_BUG_ON(start & ~PAGE_MASK);
  	VM_BUG_ON(len != PAGE_ALIGN(len));
-@@ -343,6 +344,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -577,6 +578,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
  		return -EINVAL;
  	if (end == start)
  		return 0;
@@ -88031,7 +88488,7 @@ index 79b7cf7..9944291 100644
  	vma = find_vma(current->mm, start);
  	if (!vma || vma->vm_start > start)
  		return -ENOMEM;
-@@ -354,6 +358,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -588,6 +592,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
  	for (nstart = start ; ; ) {
  		vm_flags_t newflags;
  
@@ -88043,7 +88500,7 @@ index 79b7cf7..9944291 100644
  		/* Here we know that  vma->vm_start <= nstart < vma->vm_end. */
  
  		newflags = vma->vm_flags & ~VM_LOCKED;
-@@ -466,6 +475,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
+@@ -700,6 +709,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
  	lock_limit >>= PAGE_SHIFT;
  
  	/* check against resource limits */
@@ -88051,7 +88508,7 @@ index 79b7cf7..9944291 100644
  	if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
  		error = do_mlock(start, len, 1);
  	up_write(&current->mm->mmap_sem);
-@@ -500,6 +510,11 @@ static int do_mlockall(int flags)
+@@ -734,6 +744,11 @@ static int do_mlockall(int flags)
  	for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
  		vm_flags_t newflags;
  
@@ -88063,7 +88520,7 @@ index 79b7cf7..9944291 100644
  		newflags = vma->vm_flags & ~VM_LOCKED;
  		if (flags & MCL_CURRENT)
  			newflags |= VM_LOCKED;
-@@ -532,6 +547,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
+@@ -767,6 +782,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
  	lock_limit >>= PAGE_SHIFT;
  
  	ret = -ENOMEM;
@@ -88072,7 +88529,7 @@ index 79b7cf7..9944291 100644
  	    capable(CAP_IPC_LOCK))
  		ret = do_mlockall(flags);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 8f87b14..5748b4e 100644
+index 362e5f1..8968e02 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -36,6 +36,7 @@
@@ -88295,7 +88752,7 @@ index 8f87b14..5748b4e 100644
  		mm->stack_vm += pages;
  }
  #endif /* CONFIG_PROC_FS */
-@@ -1213,7 +1296,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1212,7 +1295,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.)
  	 */
@@ -88304,7 +88761,7 @@ index 8f87b14..5748b4e 100644
  		if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
  			prot |= PROT_EXEC;
  
-@@ -1239,7 +1322,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1238,7 +1321,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.
  	 */
@@ -88313,7 +88770,7 @@ index 8f87b14..5748b4e 100644
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1250,6 +1333,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1249,6 +1332,43 @@ 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;
  
@@ -88357,7 +88814,7 @@ index 8f87b14..5748b4e 100644
  	if (flags & MAP_LOCKED)
  		if (!can_do_mlock())
  			return -EPERM;
-@@ -1261,6 +1381,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1260,6 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  		locked += mm->locked_vm;
  		lock_limit = rlimit(RLIMIT_MEMLOCK);
  		lock_limit >>= PAGE_SHIFT;
@@ -88365,7 +88822,7 @@ index 8f87b14..5748b4e 100644
  		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
  			return -EAGAIN;
  	}
-@@ -1341,6 +1462,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1344,6 +1465,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  			vm_flags |= VM_NORESERVE;
  	}
  
@@ -88375,7 +88832,7 @@ index 8f87b14..5748b4e 100644
  	addr = mmap_region(file, addr, len, vm_flags, pgoff);
  	if (!IS_ERR_VALUE(addr) &&
  	    ((vm_flags & VM_LOCKED) ||
-@@ -1432,7 +1556,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
+@@ -1437,7 +1561,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
  	vm_flags_t vm_flags = vma->vm_flags;
  
  	/* If it was private or non-writable, the write bit is already clear */
@@ -88384,9 +88841,9 @@ index 8f87b14..5748b4e 100644
  		return 0;
  
  	/* The backer wishes to know when pages are first written to? */
-@@ -1480,7 +1604,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1483,7 +1607,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+ 	struct rb_node **rb_link, *rb_parent;
  	unsigned long charged = 0;
- 	struct inode *inode =  file ? file_inode(file) : NULL;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	struct vm_area_struct *vma_m = NULL;
@@ -88407,7 +88864,7 @@ index 8f87b14..5748b4e 100644
  	if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
  		unsigned long nr_pages;
  
-@@ -1499,11 +1638,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1502,11 +1641,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  
  	/* Clear old maps */
  	error = -ENOMEM;
@@ -88420,7 +88877,7 @@ index 8f87b14..5748b4e 100644
  	}
  
  	/*
-@@ -1534,6 +1672,16 @@ munmap_back:
+@@ -1537,6 +1675,16 @@ munmap_back:
  		goto unacct_error;
  	}
  
@@ -88437,7 +88894,7 @@ index 8f87b14..5748b4e 100644
  	vma->vm_mm = mm;
  	vma->vm_start = addr;
  	vma->vm_end = addr + len;
-@@ -1558,6 +1706,13 @@ munmap_back:
+@@ -1556,6 +1704,13 @@ munmap_back:
  		if (error)
  			goto unmap_and_free_vma;
  
@@ -88451,19 +88908,20 @@ index 8f87b14..5748b4e 100644
  		/* Can addr have changed??
  		 *
  		 * Answer: Yes, several device drivers can do it in their
-@@ -1596,6 +1751,11 @@ munmap_back:
- 	vma_link(mm, vma, prev, rb_link, rb_parent);
- 	file = vma->vm_file;
+@@ -1589,6 +1744,12 @@ munmap_back:
+ 	}
  
+ 	vma_link(mm, vma, prev, rb_link, rb_parent);
++
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if (vma_m)
 +		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);
-@@ -1603,6 +1763,7 @@ out:
+ 	if (vm_flags & VM_DENYWRITE)
+ 		allow_write_access(file);
+@@ -1597,6 +1758,7 @@ out:
  	perf_event_mmap(vma);
  
  	vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
@@ -88471,7 +88929,7 @@ index 8f87b14..5748b4e 100644
  	if (vm_flags & VM_LOCKED) {
  		if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
  					vma == get_gate_vma(current->mm)))
-@@ -1626,6 +1787,12 @@ unmap_and_free_vma:
+@@ -1629,6 +1791,12 @@ unmap_and_free_vma:
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
  	charged = 0;
  free_vma:
@@ -88484,7 +88942,7 @@ index 8f87b14..5748b4e 100644
  	kmem_cache_free(vm_area_cachep, vma);
  unacct_error:
  	if (charged)
-@@ -1633,7 +1800,63 @@ unacct_error:
+@@ -1636,7 +1804,63 @@ unacct_error:
  	return error;
  }
  
@@ -88549,7 +89007,7 @@ index 8f87b14..5748b4e 100644
  {
  	/*
  	 * We implement the search by looking for an rbtree node that
-@@ -1681,11 +1904,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
+@@ -1684,11 +1908,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
  			}
  		}
  
@@ -88580,7 +89038,7 @@ index 8f87b14..5748b4e 100644
  		if (gap_end >= low_limit && gap_end - gap_start >= length)
  			goto found;
  
-@@ -1735,7 +1976,7 @@ found:
+@@ -1738,7 +1980,7 @@ found:
  	return gap_start;
  }
  
@@ -88589,7 +89047,7 @@ index 8f87b14..5748b4e 100644
  {
  	struct mm_struct *mm = current->mm;
  	struct vm_area_struct *vma;
-@@ -1789,6 +2030,24 @@ check_current:
+@@ -1792,6 +2034,24 @@ check_current:
  		gap_end = vma->vm_start;
  		if (gap_end < low_limit)
  			return -ENOMEM;
@@ -88614,7 +89072,7 @@ index 8f87b14..5748b4e 100644
  		if (gap_start <= high_limit && gap_end - gap_start >= length)
  			goto found;
  
-@@ -1852,6 +2111,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1855,6 +2115,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	struct mm_struct *mm = current->mm;
  	struct vm_area_struct *vma;
  	struct vm_unmapped_area_info info;
@@ -88622,7 +89080,7 @@ index 8f87b14..5748b4e 100644
  
  	if (len > TASK_SIZE - mmap_min_addr)
  		return -ENOMEM;
-@@ -1859,29 +2119,46 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1862,19 +2123,30 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -88654,24 +89112,7 @@ index 8f87b14..5748b4e 100644
  	return vm_unmapped_area(&info);
  }
  #endif	
- 
- void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
- {
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+	if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
-+		return;
-+#endif
-+
- 	/*
- 	 * Is this a new hole at the lowest possible address?
- 	 */
--	if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache)
-+	if (addr >= mm->mmap_base && addr < mm->free_area_cache)
- 		mm->free_area_cache = addr;
- }
- 
-@@ -1899,6 +2176,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1893,6 +2165,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  	struct mm_struct *mm = current->mm;
  	unsigned long addr = addr0;
  	struct vm_unmapped_area_info info;
@@ -88679,7 +89120,7 @@ index 8f87b14..5748b4e 100644
  
  	/* requested length too big for entire address space */
  	if (len > TASK_SIZE - mmap_min_addr)
-@@ -1907,12 +2185,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1901,12 +2174,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -88697,7 +89138,7 @@ index 8f87b14..5748b4e 100644
  			return addr;
  	}
  
-@@ -1921,6 +2203,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1915,6 +2192,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  	info.low_limit = max(PAGE_SIZE, mmap_min_addr);
  	info.high_limit = mm->mmap_base;
  	info.align_mask = 0;
@@ -88705,7 +89146,7 @@ index 8f87b14..5748b4e 100644
  	addr = vm_unmapped_area(&info);
  
  	/*
-@@ -1933,6 +2216,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1927,6 +2205,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  		VM_BUG_ON(addr != -ENOMEM);
  		info.flags = 0;
  		info.low_limit = TASK_UNMAPPED_BASE;
@@ -88718,32 +89159,7 @@ index 8f87b14..5748b4e 100644
  		info.high_limit = TASK_SIZE;
  		addr = vm_unmapped_area(&info);
  	}
-@@ -1943,6 +2232,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
- 
- void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
- {
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+	if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
-+		return;
-+#endif
-+
- 	/*
- 	 * Is this a new hole at the highest possible address?
- 	 */
-@@ -1950,8 +2245,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
- 		mm->free_area_cache = addr;
- 
- 	/* dont allow allocations above current base */
--	if (mm->free_area_cache > mm->mmap_base)
-+	if (mm->free_area_cache > mm->mmap_base) {
- 		mm->free_area_cache = mm->mmap_base;
-+		mm->cached_hole_size = ~0UL;
-+	}
- }
- 
- unsigned long
-@@ -2047,6 +2344,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
+@@ -2028,6 +2312,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
  	return vma;
  }
  
@@ -88772,7 +89188,7 @@ index 8f87b14..5748b4e 100644
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -2063,6 +2382,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -2044,6 +2350,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -88780,7 +89196,7 @@ index 8f87b14..5748b4e 100644
  	if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
  		return -ENOMEM;
  
-@@ -2073,6 +2393,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -2054,6 +2361,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  		locked = mm->locked_vm + grow;
  		limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
  		limit >>= PAGE_SHIFT;
@@ -88788,7 +89204,7 @@ index 8f87b14..5748b4e 100644
  		if (locked > limit && !capable(CAP_IPC_LOCK))
  			return -ENOMEM;
  	}
-@@ -2102,37 +2423,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -2083,37 +2391,48 @@ 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.
   */
@@ -88846,7 +89262,7 @@ index 8f87b14..5748b4e 100644
  		unsigned long size, grow;
  
  		size = address - vma->vm_start;
-@@ -2167,6 +2499,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
+@@ -2148,6 +2467,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
  			}
  		}
  	}
@@ -88855,7 +89271,7 @@ index 8f87b14..5748b4e 100644
  	vma_unlock_anon_vma(vma);
  	khugepaged_enter_vma_merge(vma);
  	validate_mm(vma->vm_mm);
-@@ -2181,6 +2515,8 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2162,6 +2483,8 @@ int expand_downwards(struct vm_area_struct *vma,
  				   unsigned long address)
  {
  	int error;
@@ -88864,7 +89280,7 @@ index 8f87b14..5748b4e 100644
  
  	/*
  	 * We must make sure the anon_vma is allocated
-@@ -2194,6 +2530,15 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2175,6 +2498,15 @@ int expand_downwards(struct vm_area_struct *vma,
  	if (error)
  		return error;
  
@@ -88880,7 +89296,7 @@ index 8f87b14..5748b4e 100644
  	vma_lock_anon_vma(vma);
  
  	/*
-@@ -2203,9 +2548,17 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2184,9 +2516,17 @@ int expand_downwards(struct vm_area_struct *vma,
  	 */
  
  	/* Somebody else might have raced and expanded it already */
@@ -88899,7 +89315,7 @@ index 8f87b14..5748b4e 100644
  		size = vma->vm_end - address;
  		grow = (vma->vm_start - address) >> PAGE_SHIFT;
  
-@@ -2230,13 +2583,27 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2211,13 +2551,27 @@ int expand_downwards(struct vm_area_struct *vma,
  				vma->vm_pgoff -= grow;
  				anon_vma_interval_tree_post_update_vma(vma);
  				vma_gap_update(vma);
@@ -88927,7 +89343,7 @@ index 8f87b14..5748b4e 100644
  	khugepaged_enter_vma_merge(vma);
  	validate_mm(vma->vm_mm);
  	return error;
-@@ -2334,6 +2701,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -2315,6 +2669,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
  	do {
  		long nrpages = vma_pages(vma);
  
@@ -88941,7 +89357,7 @@ index 8f87b14..5748b4e 100644
  		if (vma->vm_flags & VM_ACCOUNT)
  			nr_accounted += nrpages;
  		vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
-@@ -2379,6 +2753,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2359,6 +2720,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 {
@@ -88958,7 +89374,7 @@ index 8f87b14..5748b4e 100644
  		vma_rb_erase(vma, &mm->mm_rb);
  		mm->map_count--;
  		tail_vma = vma;
-@@ -2410,14 +2794,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2384,14 +2755,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	struct vm_area_struct *new;
  	int err = -ENOMEM;
  
@@ -88992,7 +89408,7 @@ index 8f87b14..5748b4e 100644
  	/* most fields are the same, copy all, and then fixup */
  	*new = *vma;
  
-@@ -2430,6 +2833,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2404,6 +2794,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  		new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
  	}
  
@@ -89012,20 +89428,22 @@ index 8f87b14..5748b4e 100644
 +	}
 +#endif
 +
- 	pol = mpol_dup(vma_policy(vma));
- 	if (IS_ERR(pol)) {
- 		err = PTR_ERR(pol);
-@@ -2452,6 +2871,36 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+ 	err = vma_dup_policy(vma, new);
+ 	if (err)
+ 		goto out_free_vma;
+@@ -2423,6 +2829,38 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  	else
  		err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if (!err && vma_m) {
++		struct mempolicy *pol = vma_policy(new);
++
 +		if (anon_vma_clone(new_m, vma_m))
 +			goto out_free_mpol;
 +
 +		mpol_get(pol);
-+		vma_set_policy(new_m, pol);
++		set_vma_policy(new_m, pol);
 +
 +		if (new_m->vm_file)
 +			get_file(new_m->vm_file);
@@ -89052,13 +89470,13 @@ index 8f87b14..5748b4e 100644
  	/* Success. */
  	if (!err)
  		return 0;
-@@ -2461,10 +2910,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2432,10 +2870,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
  		new->vm_ops->close(new);
  	if (new->vm_file)
  		fput(new->vm_file);
 -	unlink_anon_vmas(new);
   out_free_mpol:
- 	mpol_put(pol);
+ 	mpol_put(vma_policy(new));
   out_free_vma:
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
@@ -89072,7 +89490,7 @@ index 8f87b14..5748b4e 100644
  	kmem_cache_free(vm_area_cachep, new);
   out_err:
  	return err;
-@@ -2477,6 +2934,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2448,6 +2894,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)
  {
@@ -89088,13 +89506,13 @@ index 8f87b14..5748b4e 100644
  	if (mm->map_count >= sysctl_max_map_count)
  		return -ENOMEM;
  
-@@ -2488,11 +2954,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2459,11 +2914,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;
@@ -89104,9 +89522,9 @@ index 8f87b14..5748b4e 100644
 +
 +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;
  
@@ -89119,7 +89537,7 @@ index 8f87b14..5748b4e 100644
  	if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
  		return -EINVAL;
  
-@@ -2567,6 +3052,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
+@@ -2538,6 +3012,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);
  
@@ -89128,7 +89546,7 @@ index 8f87b14..5748b4e 100644
  	return 0;
  }
  
-@@ -2575,6 +3062,13 @@ int vm_munmap(unsigned long start, size_t len)
+@@ -2546,6 +3022,13 @@ int vm_munmap(unsigned long start, size_t len)
  	int ret;
  	struct mm_struct *mm = current->mm;
  
@@ -89142,7 +89560,7 @@ index 8f87b14..5748b4e 100644
  	down_write(&mm->mmap_sem);
  	ret = do_munmap(mm, start, len);
  	up_write(&mm->mmap_sem);
-@@ -2588,16 +3082,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
+@@ -2559,16 +3042,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
  	return vm_munmap(addr, len);
  }
  
@@ -89159,7 +89577,7 @@ index 8f87b14..5748b4e 100644
  /*
   *  this is really a simplified "do_mmap".  it only handles
   *  anonymous maps.  eventually we may be able to do some
-@@ -2611,6 +3095,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2582,6 +3055,7 @@ static 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;
@@ -89167,7 +89585,7 @@ index 8f87b14..5748b4e 100644
  
  	len = PAGE_ALIGN(len);
  	if (!len)
-@@ -2618,16 +3103,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2589,16 +3063,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
  
  	flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
  
@@ -89199,7 +89617,7 @@ index 8f87b14..5748b4e 100644
  		locked += mm->locked_vm;
  		lock_limit = rlimit(RLIMIT_MEMLOCK);
  		lock_limit >>= PAGE_SHIFT;
-@@ -2644,21 +3143,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2615,21 +3103,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
  	/*
  	 * Clear old maps.  this also does some error checking for us
  	 */
@@ -89224,7 +89642,7 @@ index 8f87b14..5748b4e 100644
  		return -ENOMEM;
  
  	/* Can we just expand an old private anonymous mapping? */
-@@ -2672,7 +3170,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2643,7 +3130,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
  	 */
  	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
  	if (!vma) {
@@ -89233,7 +89651,7 @@ index 8f87b14..5748b4e 100644
  		return -ENOMEM;
  	}
  
-@@ -2686,9 +3184,10 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2657,10 +3144,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
  	vma_link(mm, vma, prev, rb_link, rb_parent);
  out:
  	perf_event_mmap(vma);
@@ -89242,11 +89660,12 @@ index 8f87b14..5748b4e 100644
  	if (flags & VM_LOCKED)
 -		mm->locked_vm += (len >> PAGE_SHIFT);
 +		mm->locked_vm += charged;
+ 	vma->vm_flags |= VM_SOFTDIRTY;
 +	track_exec_limit(mm, addr, addr + len, flags);
  	return addr;
  }
  
-@@ -2750,6 +3249,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2722,6 +3210,7 @@ void exit_mmap(struct mm_struct *mm)
  	while (vma) {
  		if (vma->vm_flags & VM_ACCOUNT)
  			nr_accounted += vma_pages(vma);
@@ -89254,7 +89673,7 @@ index 8f87b14..5748b4e 100644
  		vma = remove_vma(vma);
  	}
  	vm_unacct_memory(nr_accounted);
-@@ -2766,6 +3266,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -2738,6 +3227,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
  	struct vm_area_struct *prev;
  	struct rb_node **rb_link, *rb_parent;
  
@@ -89268,7 +89687,7 @@ index 8f87b14..5748b4e 100644
  	/*
  	 * The vm_pgoff of a purely anonymous vma should be irrelevant
  	 * until its first write fault, when page's anon_vma and index
-@@ -2789,7 +3296,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -2761,7 +3257,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
  	     security_vm_enough_memory_mm(mm, vma_pages(vma)))
  		return -ENOMEM;
  
@@ -89290,8 +89709,8 @@ index 8f87b14..5748b4e 100644
  	return 0;
  }
  
-@@ -2809,6 +3330,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
- 	struct mempolicy *pol;
+@@ -2780,6 +3290,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+ 	struct rb_node **rb_link, *rb_parent;
  	bool faulted_in_anon_vma = true;
  
 +	BUG_ON(vma->vm_mirror);
@@ -89299,7 +89718,7 @@ index 8f87b14..5748b4e 100644
  	/*
  	 * If anonymous vma has not yet been faulted, update new pgoff
  	 * to match new location, to increase its chance of merging.
-@@ -2875,6 +3398,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2844,6 +3356,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
  	return NULL;
  }
  
@@ -89319,7 +89738,7 @@ index 8f87b14..5748b4e 100644
 +		return -ENOMEM;
 +	pol_m = vma_policy(vma_m);
 +	mpol_get(pol_m);
-+	vma_set_policy(vma_m, pol_m);
++	set_vma_policy(vma_m, pol_m);
 +	vma_m->vm_start += SEGMEXEC_TASK_SIZE;
 +	vma_m->vm_end += SEGMEXEC_TASK_SIZE;
 +	vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
@@ -89339,7 +89758,7 @@ index 8f87b14..5748b4e 100644
  /*
   * Return true if the calling process may expand its vm space by the passed
   * number of pages
-@@ -2886,6 +3442,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
+@@ -2855,6 +3400,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
  
  	lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
  
@@ -89347,7 +89766,7 @@ index 8f87b14..5748b4e 100644
  	if (cur + npages > lim)
  		return 0;
  	return 1;
-@@ -2956,6 +3513,22 @@ int install_special_mapping(struct mm_struct *mm,
+@@ -2925,6 +3471,22 @@ int install_special_mapping(struct mm_struct *mm,
  	vma->vm_start = addr;
  	vma->vm_end = addr + len;
  
@@ -89367,11 +89786,11 @@ index 8f87b14..5748b4e 100644
 +	}
 +#endif
 +
- 	vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
+ 	vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index d4d5399..48cbd4a 100644
+index 6c3f56f..b2340b0 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
 @@ -23,10 +23,18 @@
@@ -89393,7 +89812,7 @@ index d4d5399..48cbd4a 100644
  
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -238,6 +246,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
+@@ -241,6 +249,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
  	return pages;
  }
  
@@ -89442,7 +89861,7 @@ index d4d5399..48cbd4a 100644
  int
  mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	unsigned long start, unsigned long end, unsigned long newflags)
-@@ -250,11 +300,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -253,11 +303,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	int error;
  	int dirty_accountable = 0;
  
@@ -89472,7 +89891,7 @@ index d4d5399..48cbd4a 100644
  	/*
  	 * If we make a private mapping writable we increase our commit;
  	 * but (without finer accounting) cannot reduce our commit if we
-@@ -271,6 +339,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -274,6 +342,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  		}
  	}
  
@@ -89515,7 +89934,7 @@ index d4d5399..48cbd4a 100644
  	/*
  	 * First try to merge with previous and/or next vma.
  	 */
-@@ -301,9 +405,21 @@ success:
+@@ -304,9 +408,21 @@ success:
  	 * vm_flags and vm_page_prot are protected by the mmap_sem
  	 * held in write mode.
  	 */
@@ -89538,7 +89957,7 @@ index d4d5399..48cbd4a 100644
  
  	if (vma_wants_writenotify(vma)) {
  		vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
-@@ -342,6 +458,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -345,6 +461,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  	end = start + len;
  	if (end <= start)
  		return -ENOMEM;
@@ -89556,7 +89975,7 @@ index d4d5399..48cbd4a 100644
  	if (!arch_validate_prot(prot))
  		return -EINVAL;
  
-@@ -349,7 +476,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -352,7 +479,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  	/*
  	 * Does the application expect PROT_READ to imply PROT_EXEC:
  	 */
@@ -89565,7 +89984,7 @@ index d4d5399..48cbd4a 100644
  		prot |= PROT_EXEC;
  
  	vm_flags = calc_vm_prot_bits(prot);
-@@ -381,6 +508,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -384,6 +511,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  	if (start > vma->vm_start)
  		prev = vma;
  
@@ -89577,7 +89996,7 @@ index d4d5399..48cbd4a 100644
  	for (nstart = start ; ; ) {
  		unsigned long newflags;
  
-@@ -391,6 +523,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -394,6 +526,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)) {
@@ -89592,7 +90011,7 @@ index d4d5399..48cbd4a 100644
  			error = -EACCES;
  			goto out;
  		}
-@@ -405,6 +545,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -408,6 +548,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  		error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
  		if (error)
  			goto out;
@@ -89603,23 +90022,23 @@ index d4d5399..48cbd4a 100644
  
  		if (nstart < prev->vm_end)
 diff --git a/mm/mremap.c b/mm/mremap.c
-index 463a257..c0c7a92 100644
+index 0843feb..4f5b2e6 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
-@@ -126,6 +126,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
+@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
  			continue;
  		pte = ptep_get_and_clear(mm, old_addr, old_pte);
  		pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
 +
 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
-+		if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
++		if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
 +			pte = pte_exprotect(pte);
 +#endif
 +
+ 		pte = move_soft_dirty_pte(pte);
  		set_pte_at(mm, new_addr, new_pte, pte);
  	}
- 
-@@ -318,6 +324,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
+@@ -337,6 +343,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
  	if (is_vm_hugetlb_page(vma))
  		goto Einval;
  
@@ -89631,7 +90050,7 @@ index 463a257..c0c7a92 100644
  	/* We can't remap across vm area boundaries */
  	if (old_len > vma->vm_end - addr)
  		goto Efault;
-@@ -373,20 +384,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
+@@ -392,20 +403,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
  	unsigned long ret = -EINVAL;
  	unsigned long charged = 0;
  	unsigned long map_flags;
@@ -89662,17 +90081,17 @@ index 463a257..c0c7a92 100644
  		goto out;
  
  	ret = do_munmap(mm, new_addr, new_len);
-@@ -455,6 +471,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -474,6 +490,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
  	unsigned long ret = -EINVAL;
  	unsigned long charged = 0;
  	bool locked = false;
 +	unsigned long pax_task_size = TASK_SIZE;
  
- 	down_write(&current->mm->mmap_sem);
- 
-@@ -475,6 +492,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+ 	if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
+ 		return ret;
+@@ -495,6 +512,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
  	if (!new_len)
- 		goto out;
+ 		return ret;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if (mm->pax_flags & MF_PAX_SEGMEXEC)
@@ -89683,12 +90102,12 @@ index 463a257..c0c7a92 100644
 +
 +	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;
++		return ret;
 +
+ 	down_write(&current->mm->mmap_sem);
+ 
  	if (flags & MREMAP_FIXED) {
- 		if (flags & MREMAP_MAYMOVE)
- 			ret = mremap_to(addr, old_len, new_addr, new_len,
-@@ -524,6 +552,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -545,6 +573,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
  				new_addr = addr;
  			}
  			ret = addr;
@@ -89696,7 +90115,7 @@ index 463a257..c0c7a92 100644
  			goto out;
  		}
  	}
-@@ -547,7 +576,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -568,7 +597,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
  			goto out;
  		}
  
@@ -89710,10 +90129,10 @@ index 463a257..c0c7a92 100644
  out:
  	if (ret & ~PAGE_MASK)
 diff --git a/mm/nommu.c b/mm/nommu.c
-index 298884d..5f74980 100644
+index ecd1f15..77039bd 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
-@@ -65,7 +65,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
+@@ -64,7 +64,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
  int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
  unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
  unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
@@ -89721,7 +90140,7 @@ index 298884d..5f74980 100644
  
  atomic_long_t mmap_pages_allocated;
  
-@@ -842,15 +841,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+@@ -844,15 +843,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
  EXPORT_SYMBOL(find_vma);
  
  /*
@@ -89737,7 +90156,7 @@ index 298884d..5f74980 100644
   * expand a stack to a given address
   * - not supported under NOMMU conditions
   */
-@@ -1561,6 +1551,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -1563,6 +1553,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;
@@ -89745,7 +90164,7 @@ index 298884d..5f74980 100644
  	*region = *vma->vm_region;
  	new->vm_region = region;
  
-@@ -1995,8 +1986,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
+@@ -1993,8 +1984,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
  }
  EXPORT_SYMBOL(generic_file_remap_pages);
  
@@ -89756,7 +90175,7 @@ index 298884d..5f74980 100644
  {
  	struct vm_area_struct *vma;
  
-@@ -2037,8 +2028,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -2035,8 +2026,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
   *
   * The caller must hold a reference on @mm.
   */
@@ -89767,7 +90186,7 @@ index 298884d..5f74980 100644
  {
  	return __access_remote_vm(NULL, mm, addr, buf, len, write);
  }
-@@ -2047,7 +2038,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
+@@ -2045,7 +2036,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
   * Access another process' address space.
   * - source/target buffer must be kernel space
   */
@@ -89777,10 +90196,10 @@ index 298884d..5f74980 100644
  	struct mm_struct *mm;
  
 diff --git a/mm/page-writeback.c b/mm/page-writeback.c
-index aca4364..09039c6 100644
+index 6380758..4064aec 100644
 --- a/mm/page-writeback.c
 +++ b/mm/page-writeback.c
-@@ -659,7 +659,7 @@ unsigned long bdi_dirty_limit(struct backing_dev_info *bdi, unsigned long dirty)
+@@ -690,7 +690,7 @@ static inline long long pos_ratio_polynom(unsigned long setpoint,
   *   card's bdi_dirty may rush to many times higher than bdi_setpoint.
   * - the bdi dirty thresh drops quickly due to change of JBOD workload
   */
@@ -89789,28 +90208,19 @@ index aca4364..09039c6 100644
  					unsigned long thresh,
  					unsigned long bg_thresh,
  					unsigned long dirty,
-@@ -1634,7 +1634,7 @@ ratelimit_handler(struct notifier_block *self, unsigned long action,
- 	}
- }
- 
--static struct notifier_block __cpuinitdata ratelimit_nb = {
-+static struct notifier_block ratelimit_nb = {
- 	.notifier_call	= ratelimit_handler,
- 	.next		= NULL,
- };
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 2ee0fd3..6e2edfb 100644
+index dd886fa..7686339 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -60,6 +60,7 @@
+@@ -61,6 +61,7 @@
  #include <linux/page-debug-flags.h>
  #include <linux/hugetlb.h>
  #include <linux/sched/rt.h>
 +#include <linux/random.h>
  
+ #include <asm/sections.h>
  #include <asm/tlbflush.h>
- #include <asm/div64.h>
-@@ -345,7 +346,7 @@ out:
+@@ -354,7 +355,7 @@ out:
   * This usage means that zero-order pages may not be compound.
   */
  
@@ -89819,7 +90229,7 @@ index 2ee0fd3..6e2edfb 100644
  {
  	__free_pages_ok(page, compound_order(page));
  }
-@@ -702,6 +703,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -712,6 +713,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
  	int i;
  	int bad = 0;
  
@@ -89830,7 +90240,7 @@ index 2ee0fd3..6e2edfb 100644
  	trace_mm_page_free(page, order);
  	kmemcheck_free_shadow(page, order);
  
-@@ -717,6 +722,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -728,6 +733,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
  		debug_check_no_obj_freed(page_address(page),
  					   PAGE_SIZE << order);
  	}
@@ -89843,7 +90253,7 @@ index 2ee0fd3..6e2edfb 100644
  	arch_free_page(page, order);
  	kernel_map_pages(page, 1 << order, 0);
  
-@@ -739,6 +750,19 @@ static void __free_pages_ok(struct page *page, unsigned int order)
+@@ -750,6 +761,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
  	local_irq_restore(flags);
  }
  
@@ -89857,15 +90267,16 @@ index 2ee0fd3..6e2edfb 100644
 +}
 +early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
 +
-+volatile u64 latent_entropy;
++volatile u64 latent_entropy __latent_entropy;
++EXPORT_SYMBOL(latent_entropy);
 +#endif
 +
- /*
-  * Read access to zone->managed_pages is safe because it's unsigned long,
-  * but we still need to serialize writers. Currently all callers of
-@@ -761,6 +785,19 @@ void __meminit __free_pages_bootmem(struct page *page, unsigned int order)
- 		set_page_count(p, 0);
- 	}
+ void __init __free_pages_bootmem(struct page *page, unsigned int order)
+ {
+ 	unsigned int nr_pages = 1 << order;
+@@ -765,6 +790,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
+ 	__ClearPageReserved(p);
+ 	set_page_count(p, 0);
  
 +#ifdef CONFIG_PAX_LATENT_ENTROPY
 +	if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
@@ -89880,10 +90291,10 @@ index 2ee0fd3..6e2edfb 100644
 +	}
 +#endif
 +
- 	page_zone(page)->managed_pages += 1 << order;
+ 	page_zone(page)->managed_pages += nr_pages;
  	set_page_refcounted(page);
  	__free_pages(page, order);
-@@ -870,8 +907,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
+@@ -870,8 +908,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);
  
@@ -89895,10 +90306,10 @@ index 2ee0fd3..6e2edfb 100644
  	if (order && (gfp_flags & __GFP_COMP))
  		prep_compound_page(page, order);
 diff --git a/mm/page_io.c b/mm/page_io.c
-index a8a3ef4..7260a60 100644
+index 8c79a47..a689e0d 100644
 --- a/mm/page_io.c
 +++ b/mm/page_io.c
-@@ -214,7 +214,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
+@@ -260,7 +260,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
  		struct file *swap_file = sis->swap_file;
  		struct address_space *mapping = swap_file->f_mapping;
  		struct iovec iov = {
@@ -89972,7 +90383,7 @@ index fd26d04..0cea1b0 100644
  	if (!mm || IS_ERR(mm)) {
  		rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
 diff --git a/mm/rmap.c b/mm/rmap.c
-index 6280da8..b5c090e 100644
+index fd3ee7a..3613079 100644
 --- a/mm/rmap.c
 +++ b/mm/rmap.c
 @@ -163,6 +163,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
@@ -90075,7 +90486,7 @@ index 6280da8..b5c090e 100644
  
  /*
 diff --git a/mm/shmem.c b/mm/shmem.c
-index 509b393..49ecfea 100644
+index 8297623..6b9dfe9 100644
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
 @@ -33,7 +33,7 @@
@@ -90096,7 +90507,7 @@ index 509b393..49ecfea 100644
  
  /*
   * shmem_fallocate and shmem_writepage communicate via inode->i_private
-@@ -2203,6 +2203,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
+@@ -2232,6 +2232,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
  static int shmem_xattr_validate(const char *name)
  {
  	struct { const char *prefix; size_t len; } arr[] = {
@@ -90108,7 +90519,7 @@ index 509b393..49ecfea 100644
  		{ XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
  		{ XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
  	};
-@@ -2258,6 +2263,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
+@@ -2287,6 +2292,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
  	if (err)
  		return err;
  
@@ -90124,7 +90535,7 @@ index 509b393..49ecfea 100644
  	return simple_xattr_set(&info->xattrs, name, value, size, flags);
  }
  
-@@ -2570,8 +2584,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
+@@ -2599,8 +2613,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
  	int err = -ENOMEM;
  
  	/* Round up to L1_CACHE_BYTES to resist false sharing */
@@ -90135,7 +90546,7 @@ index 509b393..49ecfea 100644
  		return -ENOMEM;
  
 diff --git a/mm/slab.c b/mm/slab.c
-index bd88411..2d46fd6 100644
+index 2580db0..0523956 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
 @@ -366,10 +366,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
@@ -90173,16 +90584,7 @@ index bd88411..2d46fd6 100644
  {
  	u32 offset = (obj - slab->s_mem);
  	return reciprocal_divide(offset, cache->reciprocal_buffer_size);
-@@ -1384,7 +1388,7 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb,
- 	return notifier_from_errno(err);
- }
- 
--static struct notifier_block __cpuinitdata cpucache_notifier = {
-+static struct notifier_block cpucache_notifier = {
- 	&cpuup_callback, NULL, 0
- };
- 
-@@ -1565,12 +1569,12 @@ void __init kmem_cache_init(void)
+@@ -1571,12 +1575,12 @@ void __init kmem_cache_init(void)
  	 */
  
  	kmalloc_caches[INDEX_AC] = create_kmalloc_cache("kmalloc-ac",
@@ -90197,7 +90599,7 @@ index bd88411..2d46fd6 100644
  
  	slab_early_init = 0;
  
-@@ -3583,6 +3587,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
+@@ -3577,6 +3581,21 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
  	struct array_cache *ac = cpu_cache_get(cachep);
  
  	check_irq_off();
@@ -90219,7 +90621,7 @@ index bd88411..2d46fd6 100644
  	kmemleak_free_recursive(objp, cachep->flags);
  	objp = cache_free_debugcheck(cachep, objp, caller);
  
-@@ -3800,6 +3819,7 @@ void kfree(const void *objp)
+@@ -3805,6 +3824,7 @@ void kfree(const void *objp)
  
  	if (unlikely(ZERO_OR_NULL_PTR(objp)))
  		return;
@@ -90227,7 +90629,7 @@ index bd88411..2d46fd6 100644
  	local_irq_save(flags);
  	kfree_debugcheck(objp);
  	c = virt_to_cache(objp);
-@@ -4241,14 +4261,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
+@@ -4246,14 +4266,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
  	}
  	/* cpu stats */
  	{
@@ -90254,7 +90656,7 @@ index bd88411..2d46fd6 100644
  #endif
  }
  
-@@ -4476,13 +4504,71 @@ static const struct file_operations proc_slabstats_operations = {
+@@ -4471,13 +4499,71 @@ static const struct file_operations proc_slabstats_operations = {
  static int __init slab_proc_init(void)
  {
  #ifdef CONFIG_DEBUG_SLAB_LEAK
@@ -90328,7 +90730,7 @@ index bd88411..2d46fd6 100644
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
 diff --git a/mm/slab.h b/mm/slab.h
-index 4d6d836..3fb743a 100644
+index a535033..2f98fe5 100644
 --- a/mm/slab.h
 +++ b/mm/slab.h
 @@ -32,6 +32,15 @@ extern struct list_head slab_caches;
@@ -90368,10 +90770,10 @@ index 4d6d836..3fb743a 100644
  	if (slab_equal_or_root(cachep, s))
  		return cachep;
 diff --git a/mm/slab_common.c b/mm/slab_common.c
-index 2d41450..4efe6ee 100644
+index e2e98af..3b1a163 100644
 --- a/mm/slab_common.c
 +++ b/mm/slab_common.c
-@@ -22,11 +22,22 @@
+@@ -23,11 +23,22 @@
  
  #include "slab.h"
  
@@ -90395,7 +90797,7 @@ index 2d41450..4efe6ee 100644
  #ifdef CONFIG_DEBUG_VM
  static int kmem_cache_sanity_check(struct mem_cgroup *memcg, const char *name,
  				   size_t size)
-@@ -209,7 +220,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
+@@ -212,7 +223,7 @@ kmem_cache_create_memcg(struct mem_cgroup *memcg, const char *name, size_t size,
  
  		err = __kmem_cache_create(s, flags);
  		if (!err) {
@@ -90404,7 +90806,7 @@ index 2d41450..4efe6ee 100644
  			list_add(&s->list, &slab_caches);
  			memcg_cache_list_add(memcg, s);
  		} else {
-@@ -255,8 +266,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
+@@ -258,8 +269,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
  
  	get_online_cpus();
  	mutex_lock(&slab_mutex);
@@ -90414,7 +90816,7 @@ index 2d41450..4efe6ee 100644
  		list_del(&s->list);
  
  		if (!__kmem_cache_shutdown(s)) {
-@@ -302,7 +312,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
+@@ -305,7 +315,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
  		panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
  					name, size, err);
  
@@ -90423,7 +90825,7 @@ index 2d41450..4efe6ee 100644
  }
  
  struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
-@@ -315,7 +325,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
+@@ -318,7 +328,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
  
  	create_boot_cache(s, name, size, flags);
  	list_add(&s->list, &slab_caches);
@@ -90432,7 +90834,7 @@ index 2d41450..4efe6ee 100644
  	return s;
  }
  
-@@ -327,6 +337,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
+@@ -330,6 +340,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
  EXPORT_SYMBOL(kmalloc_dma_caches);
  #endif
  
@@ -90444,7 +90846,7 @@ index 2d41450..4efe6ee 100644
  /*
   * Conversion table for small slabs sizes / 8 to the index in the
   * kmalloc array. This is necessary for slabs < 192 since we have non power
-@@ -391,6 +406,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
+@@ -394,6 +409,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
  		return kmalloc_dma_caches[index];
  
  #endif
@@ -90458,7 +90860,7 @@ index 2d41450..4efe6ee 100644
  	return kmalloc_caches[index];
  }
  
-@@ -447,7 +469,7 @@ void __init create_kmalloc_caches(unsigned long flags)
+@@ -450,7 +472,7 @@ void __init create_kmalloc_caches(unsigned long flags)
  	for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
  		if (!kmalloc_caches[i]) {
  			kmalloc_caches[i] = create_kmalloc_cache(NULL,
@@ -90467,7 +90869,7 @@ index 2d41450..4efe6ee 100644
  		}
  
  		/*
-@@ -456,10 +478,10 @@ void __init create_kmalloc_caches(unsigned long flags)
+@@ -459,10 +481,10 @@ void __init create_kmalloc_caches(unsigned long flags)
  		 * earlier power of two caches
  		 */
  		if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
@@ -90480,7 +90882,7 @@ index 2d41450..4efe6ee 100644
  	}
  
  	/* Kmalloc array is now usable */
-@@ -492,6 +514,23 @@ void __init create_kmalloc_caches(unsigned long flags)
+@@ -495,6 +517,23 @@ void __init create_kmalloc_caches(unsigned long flags)
  		}
  	}
  #endif
@@ -90504,7 +90906,7 @@ index 2d41450..4efe6ee 100644
  }
  #endif /* !CONFIG_SLOB */
  
-@@ -516,6 +555,9 @@ void print_slabinfo_header(struct seq_file *m)
+@@ -535,6 +574,9 @@ void print_slabinfo_header(struct seq_file *m)
  	seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
  		 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
  	seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
@@ -90515,7 +90917,7 @@ index 2d41450..4efe6ee 100644
  	seq_putc(m, '\n');
  }
 diff --git a/mm/slob.c b/mm/slob.c
-index eeed4a0..bb0e9ab 100644
+index 4bf8809..98a6914 100644
 --- a/mm/slob.c
 +++ b/mm/slob.c
 @@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
@@ -90799,7 +91201,7 @@ index eeed4a0..bb0e9ab 100644
  
 @@ -536,23 +638,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
  
- void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
+ void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
  {
 -	void *b;
 +	void *b = NULL;
@@ -90831,9 +91233,9 @@ index eeed4a0..bb0e9ab 100644
  	}
 +#endif
  
- 	if (c->ctor)
+ 	if (b && c->ctor)
  		c->ctor(b);
-@@ -564,10 +676,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
+@@ -584,10 +696,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
  
  static void __kmem_cache_free(void *b, int size)
  {
@@ -90850,7 +91252,7 @@ index eeed4a0..bb0e9ab 100644
  }
  
  static void kmem_rcu_free(struct rcu_head *head)
-@@ -580,17 +696,31 @@ static void kmem_rcu_free(struct rcu_head *head)
+@@ -600,17 +716,31 @@ static void kmem_rcu_free(struct rcu_head *head)
  
  void kmem_cache_free(struct kmem_cache *c, void *b)
  {
@@ -90886,10 +91288,10 @@ index eeed4a0..bb0e9ab 100644
  EXPORT_SYMBOL(kmem_cache_free);
  
 diff --git a/mm/slub.c b/mm/slub.c
-index c34bd44..11a3c00 100644
+index 96f2169..9111a59 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -198,7 +198,7 @@ struct track {
+@@ -207,7 +207,7 @@ struct track {
  
  enum track_item { TRACK_ALLOC, TRACK_FREE };
  
@@ -90898,7 +91300,7 @@ index c34bd44..11a3c00 100644
  static int sysfs_slab_add(struct kmem_cache *);
  static int sysfs_slab_alias(struct kmem_cache *, const char *);
  static void sysfs_slab_remove(struct kmem_cache *);
-@@ -519,7 +519,7 @@ static void print_track(const char *s, struct track *t)
+@@ -530,7 +530,7 @@ static void print_track(const char *s, struct track *t)
  	if (!t->addr)
  		return;
  
@@ -90907,7 +91309,7 @@ index c34bd44..11a3c00 100644
  		s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
  #ifdef CONFIG_STACKTRACE
  	{
-@@ -2594,6 +2594,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
+@@ -2616,6 +2616,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
  
  	slab_free_hook(s, x);
  
@@ -90922,7 +91324,7 @@ index c34bd44..11a3c00 100644
  redo:
  	/*
  	 * Determine the currently cpus per cpu slab.
-@@ -2661,7 +2669,7 @@ static int slub_min_objects;
+@@ -2683,7 +2691,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.)
   */
@@ -90931,7 +91333,7 @@ index c34bd44..11a3c00 100644
  
  /*
   * Calculate the order of allocation given an slab object size.
-@@ -2938,6 +2946,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
+@@ -2960,6 +2968,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
  	s->inuse = size;
  
  	if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
@@ -90941,7 +91343,7 @@ index c34bd44..11a3c00 100644
  		s->ctor)) {
  		/*
  		 * Relocate free pointer after the object if it is not
-@@ -3283,6 +3294,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
+@@ -3305,6 +3316,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
  EXPORT_SYMBOL(__kmalloc_node);
  #endif
  
@@ -91001,7 +91403,7 @@ index c34bd44..11a3c00 100644
  size_t ksize(const void *object)
  {
  	struct page *page;
-@@ -3347,6 +3411,7 @@ void kfree(const void *x)
+@@ -3333,6 +3397,7 @@ void kfree(const void *x)
  	if (unlikely(ZERO_OR_NULL_PTR(x)))
  		return;
  
@@ -91009,7 +91411,7 @@ index c34bd44..11a3c00 100644
  	page = virt_to_head_page(x);
  	if (unlikely(!PageSlab(page))) {
  		BUG_ON(!PageCompound(page));
-@@ -3652,7 +3717,7 @@ static int slab_unmergeable(struct kmem_cache *s)
+@@ -3638,7 +3703,7 @@ static int slab_unmergeable(struct kmem_cache *s)
  	/*
  	 * We may have set a slab to be unmergeable during bootstrap.
  	 */
@@ -91018,7 +91420,7 @@ index c34bd44..11a3c00 100644
  		return 1;
  
  	return 0;
-@@ -3710,7 +3775,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
+@@ -3696,7 +3761,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
  
  	s = find_mergeable(memcg, size, align, flags, name, ctor);
  	if (s) {
@@ -91027,7 +91429,7 @@ index c34bd44..11a3c00 100644
  		/*
  		 * Adjust the object sizes so that we clear
  		 * the complete object on kzalloc.
-@@ -3719,7 +3784,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
+@@ -3705,7 +3770,7 @@ __kmem_cache_alias(struct mem_cgroup *memcg, const char *name, size_t size,
  		s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
  
  		if (sysfs_slab_alias(s, name)) {
@@ -91036,16 +91438,7 @@ index c34bd44..11a3c00 100644
  			s = NULL;
  		}
  	}
-@@ -3781,7 +3846,7 @@ static int __cpuinit slab_cpuup_callback(struct notifier_block *nfb,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata slab_notifier = {
-+static struct notifier_block slab_notifier = {
- 	.notifier_call = slab_cpuup_callback
- };
- 
-@@ -3839,7 +3904,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
+@@ -3825,7 +3890,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
  }
  #endif
  
@@ -91054,7 +91447,7 @@ index c34bd44..11a3c00 100644
  static int count_inuse(struct page *page)
  {
  	return page->inuse;
-@@ -4226,12 +4291,12 @@ static void resiliency_test(void)
+@@ -4214,12 +4279,12 @@ static void resiliency_test(void)
  	validate_slab_cache(kmalloc_caches[9]);
  }
  #else
@@ -91069,7 +91462,7 @@ index c34bd44..11a3c00 100644
  enum slab_stat_type {
  	SL_ALL,			/* All slabs */
  	SL_PARTIAL,		/* Only partially allocated slabs */
-@@ -4475,7 +4540,7 @@ SLAB_ATTR_RO(ctor);
+@@ -4459,7 +4524,7 @@ SLAB_ATTR_RO(ctor);
  
  static ssize_t aliases_show(struct kmem_cache *s, char *buf)
  {
@@ -91078,7 +91471,7 @@ index c34bd44..11a3c00 100644
  }
  SLAB_ATTR_RO(aliases);
  
-@@ -4563,6 +4628,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
+@@ -4547,6 +4612,14 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
  SLAB_ATTR_RO(cache_dma);
  #endif
  
@@ -91093,7 +91486,7 @@ index c34bd44..11a3c00 100644
  static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
  {
  	return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
-@@ -4897,6 +4970,9 @@ static struct attribute *slab_attrs[] = {
+@@ -4881,6 +4954,9 @@ static struct attribute *slab_attrs[] = {
  #ifdef CONFIG_ZONE_DMA
  	&cache_dma_attr.attr,
  #endif
@@ -91103,7 +91496,7 @@ index c34bd44..11a3c00 100644
  #ifdef CONFIG_NUMA
  	&remote_node_defrag_ratio_attr.attr,
  #endif
-@@ -5128,6 +5204,7 @@ static char *create_unique_id(struct kmem_cache *s)
+@@ -5113,6 +5189,7 @@ static char *create_unique_id(struct kmem_cache *s)
  	return name;
  }
  
@@ -91111,7 +91504,7 @@ index c34bd44..11a3c00 100644
  static int sysfs_slab_add(struct kmem_cache *s)
  {
  	int err;
-@@ -5151,7 +5228,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
+@@ -5136,7 +5213,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
  	}
  
  	s->kobj.kset = slab_kset;
@@ -91120,7 +91513,7 @@ index c34bd44..11a3c00 100644
  	if (err) {
  		kobject_put(&s->kobj);
  		return err;
-@@ -5185,6 +5262,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
+@@ -5170,6 +5247,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
  	kobject_del(&s->kobj);
  	kobject_put(&s->kobj);
  }
@@ -91128,7 +91521,7 @@ index c34bd44..11a3c00 100644
  
  /*
   * Need to buffer aliases during bootup until sysfs becomes
-@@ -5198,6 +5276,7 @@ struct saved_alias {
+@@ -5183,6 +5261,7 @@ struct saved_alias {
  
  static struct saved_alias *alias_list;
  
@@ -91136,7 +91529,7 @@ index c34bd44..11a3c00 100644
  static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
  {
  	struct saved_alias *al;
-@@ -5220,6 +5299,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
+@@ -5205,6 +5284,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
  	alias_list = al;
  	return 0;
  }
@@ -91167,10 +91560,10 @@ index 27eeab3..7c3f7f2 100644
  	return pgd;
  }
 diff --git a/mm/sparse.c b/mm/sparse.c
-index 1c91f0d3..485470a 100644
+index 4ac1d7e..bbfcb1f 100644
 --- a/mm/sparse.c
 +++ b/mm/sparse.c
-@@ -761,7 +761,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
+@@ -745,7 +745,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
  
  	for (i = 0; i < PAGES_PER_SECTION; i++) {
  		if (PageHWPoison(&memmap[i])) {
@@ -91180,10 +91573,10 @@ index 1c91f0d3..485470a 100644
  		}
  	}
 diff --git a/mm/swap.c b/mm/swap.c
-index 9f2225f..393d519 100644
+index 759c3ca..7c1a5b4 100644
 --- a/mm/swap.c
 +++ b/mm/swap.c
-@@ -74,6 +74,8 @@ static void __put_compound_page(struct page *page)
+@@ -77,6 +77,8 @@ static void __put_compound_page(struct page *page)
  
  	__page_cache_release(page);
  	dtor = get_compound_page_dtor(page);
@@ -91193,7 +91586,7 @@ index 9f2225f..393d519 100644
  }
  
 diff --git a/mm/swapfile.c b/mm/swapfile.c
-index 746af55b..7ac94ae 100644
+index de7c904..c84bf11 100644
 --- a/mm/swapfile.c
 +++ b/mm/swapfile.c
 @@ -66,7 +66,7 @@ static DEFINE_MUTEX(swapon_mutex);
@@ -91205,7 +91598,7 @@ index 746af55b..7ac94ae 100644
  
  static inline unsigned char swap_count(unsigned char ent)
  {
-@@ -1684,7 +1684,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
+@@ -1949,7 +1949,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
  	}
  	filp_close(swap_file, NULL);
  	err = 0;
@@ -91214,7 +91607,7 @@ index 746af55b..7ac94ae 100644
  	wake_up_interruptible(&proc_poll_wait);
  
  out_dput:
-@@ -1701,8 +1701,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
+@@ -1966,8 +1966,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
  
  	poll_wait(file, &proc_poll_wait, wait);
  
@@ -91225,7 +91618,7 @@ index 746af55b..7ac94ae 100644
  		return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
  	}
  
-@@ -1800,7 +1800,7 @@ static int swaps_open(struct inode *inode, struct file *file)
+@@ -2065,7 +2065,7 @@ static int swaps_open(struct inode *inode, struct file *file)
  		return ret;
  
  	seq = file->private_data;
@@ -91234,7 +91627,7 @@ index 746af55b..7ac94ae 100644
  	return 0;
  }
  
-@@ -2143,7 +2143,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
+@@ -2524,7 +2524,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
  		(frontswap_map) ? "FS" : "");
  
  	mutex_unlock(&swapon_mutex);
@@ -91244,7 +91637,7 @@ index 746af55b..7ac94ae 100644
  
  	if (S_ISREG(inode->i_mode))
 diff --git a/mm/util.c b/mm/util.c
-index ab1424d..7c5bd5a 100644
+index eaf63fc2..32b2629 100644
 --- a/mm/util.c
 +++ b/mm/util.c
 @@ -294,6 +294,12 @@ done:
@@ -91258,10 +91651,10 @@ index ab1424d..7c5bd5a 100644
 +#endif
 +
  	mm->get_unmapped_area = arch_get_unmapped_area;
- 	mm->unmap_area = arch_unmap_area;
  }
+ #endif
 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index d456560..3ed6863 100644
+index 1074543..136dbe0 100644
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
 @@ -59,8 +59,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
@@ -91364,16 +91757,7 @@ index d456560..3ed6863 100644
  			if (!pmd_none(*pmd)) {
  				pte_t *ptep, pte;
  
-@@ -339,7 +375,7 @@ static void purge_vmap_area_lazy(void);
-  * Allocate a region of KVA of the specified size and alignment, within the
-  * vstart and vend.
-  */
--static struct vmap_area *alloc_vmap_area(unsigned long size,
-+static __size_overflow(1) struct vmap_area *alloc_vmap_area(unsigned long size,
- 				unsigned long align,
- 				unsigned long vstart, unsigned long vend,
- 				int node, gfp_t gfp_mask)
-@@ -1337,6 +1373,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
+@@ -1303,6 +1339,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
  	struct vm_struct *area;
  
  	BUG_ON(in_interrupt());
@@ -91387,10 +91771,10 @@ index d456560..3ed6863 100644
 +	}
 +#endif
 +
- 	if (flags & VM_IOREMAP) {
- 		int bit = fls(size);
+ 	if (flags & VM_IOREMAP)
+ 		align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
  
-@@ -1581,6 +1627,11 @@ void *vmap(struct page **pages, unsigned int count,
+@@ -1528,6 +1574,11 @@ void *vmap(struct page **pages, unsigned int count,
  	if (count > totalram_pages)
  		return NULL;
  
@@ -91402,21 +91786,21 @@ index d456560..3ed6863 100644
  	area = get_vm_area_caller((count << PAGE_SHIFT), flags,
  					__builtin_return_address(0));
  	if (!area)
-@@ -1682,6 +1733,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
+@@ -1629,6 +1680,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
  	if (!size || (size >> PAGE_SHIFT) > totalram_pages)
  		goto fail;
  
 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
 +	if (!(pgprot_val(prot) & _PAGE_NX))
-+		area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
++		area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED | VM_KERNEXEC,
 +					  VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
 +	else
 +#endif
 +
- 	area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
+ 	area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
  				  start, end, node, gfp_mask, caller);
  	if (!area)
-@@ -1858,10 +1916,9 @@ EXPORT_SYMBOL(vzalloc_node);
+@@ -1805,10 +1863,9 @@ EXPORT_SYMBOL(vzalloc_node);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -91428,16 +91812,16 @@ index d456560..3ed6863 100644
  			      NUMA_NO_NODE, __builtin_return_address(0));
  }
  
-@@ -2168,6 +2225,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;
+@@ -2115,6 +2172,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
+ {
+ 	struct vm_struct *area;
  
 +	BUG_ON(vma->vm_mirror);
 +
- 	if ((PAGE_SIZE-1) & (unsigned long)addr)
- 		return -EINVAL;
+ 	size = PAGE_ALIGN(size);
  
-@@ -2629,7 +2688,11 @@ static int s_show(struct seq_file *m, void *p)
+ 	if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
+@@ -2600,7 +2659,11 @@ static int s_show(struct seq_file *m, void *p)
  		v->addr, v->addr + v->size, v->size);
  
  	if (v->caller)
@@ -91450,10 +91834,10 @@ index d456560..3ed6863 100644
  	if (v->nr_pages)
  		seq_printf(m, " pages=%d", v->nr_pages);
 diff --git a/mm/vmstat.c b/mm/vmstat.c
-index 10bbb54..7a0cf21 100644
+index 5a442a7..5eb281e 100644
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
-@@ -76,7 +76,7 @@ void vm_events_fold_cpu(int cpu)
+@@ -79,7 +79,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
   */
@@ -91462,25 +91846,34 @@ index 10bbb54..7a0cf21 100644
  EXPORT_SYMBOL(vm_stat);
  
  #ifdef CONFIG_SMP
-@@ -452,7 +452,7 @@ void refresh_cpu_vm_stats(int cpu)
- 				v = p->vm_stat_diff[i];
- 				p->vm_stat_diff[i] = 0;
- 				local_irq_restore(flags);
+@@ -423,7 +423,7 @@ static inline void fold_diff(int *diff)
+ 
+ 	for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
+ 		if (diff[i])
+-			atomic_long_add(diff[i], &vm_stat[i]);
++			atomic_long_add_unchecked(diff[i], &vm_stat[i]);
+ }
+ 
+ /*
+@@ -455,7 +455,7 @@ static void refresh_cpu_vm_stats(void)
+ 			v = this_cpu_xchg(p->vm_stat_diff[i], 0);
+ 			if (v) {
+ 
 -				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 */
-@@ -490,7 +490,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]);
- }
+@@ -517,7 +517,7 @@ void cpu_vm_stats_fold(int cpu)
  
- /*
-@@ -505,8 +505,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
+ 				v = p->vm_stat_diff[i];
+ 				p->vm_stat_diff[i] = 0;
+-				atomic_long_add(v, &zone->vm_stat[i]);
++				atomic_long_add_unchecked(v, &zone->vm_stat[i]);
+ 				global_diff[i] += v;
+ 			}
+ 	}
+@@ -537,8 +537,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
  		if (pset->vm_stat_diff[i]) {
  			int v = pset->vm_stat_diff[i];
  			pset->vm_stat_diff[i] = 0;
@@ -91491,16 +91884,7 @@ index 10bbb54..7a0cf21 100644
  		}
  }
  #endif
-@@ -1227,7 +1227,7 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb,
- 	return NOTIFY_OK;
- }
- 
--static struct notifier_block __cpuinitdata vmstat_notifier =
-+static struct notifier_block vmstat_notifier =
- 	{ &vmstat_cpuup_callback, NULL, 0 };
- #endif
- 
-@@ -1242,10 +1242,20 @@ static int __init setup_vmstat(void)
+@@ -1281,10 +1281,20 @@ static int __init setup_vmstat(void)
  		start_cpu_timer(cpu);
  #endif
  #ifdef CONFIG_PROC_FS
@@ -91526,10 +91910,10 @@ index 10bbb54..7a0cf21 100644
  	return 0;
  }
 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
-index 9424f37..6aabf19 100644
+index 61fc573..b5e47d0 100644
 --- a/net/8021q/vlan.c
 +++ b/net/8021q/vlan.c
-@@ -469,7 +469,7 @@ out:
+@@ -472,7 +472,7 @@ out:
  	return NOTIFY_DONE;
  }
  
@@ -91538,7 +91922,7 @@ index 9424f37..6aabf19 100644
  	.notifier_call = vlan_device_event,
  };
  
-@@ -544,8 +544,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
+@@ -547,8 +547,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
  		err = -EPERM;
  		if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
  			break;
@@ -91571,10 +91955,10 @@ index 6ab36ae..6f1841b 100644
  }
  EXPORT_SYMBOL(v9fs_unregister_trans);
 diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
-index 02efb25..41541a9 100644
+index 3ffda1b..fceac96 100644
 --- a/net/9p/trans_fd.c
 +++ b/net/9p/trans_fd.c
-@@ -425,7 +425,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
+@@ -432,7 +432,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
  	oldfs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -91676,7 +92060,7 @@ index 0447d5d..3cf4728 100644
  #undef __HANDLE_ITEM
  }
 diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
-index d5744b7..506bae3 100644
+index 919a5ce..cc6b444 100644
 --- a/net/ax25/sysctl_net_ax25.c
 +++ b/net/ax25/sysctl_net_ax25.c
 @@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
@@ -91689,10 +92073,10 @@ index d5744b7..506bae3 100644
  	table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
  	if (!table)
 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
-index f680ee1..97e3542 100644
+index 0a8a80c..f7e89aa 100644
 --- a/net/batman-adv/bat_iv_ogm.c
 +++ b/net/batman-adv/bat_iv_ogm.c
-@@ -79,7 +79,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
+@@ -121,7 +121,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
  
  	/* randomize initial seqno to avoid collision */
  	get_random_bytes(&random_seqno, sizeof(random_seqno));
@@ -91701,7 +92085,7 @@ index f680ee1..97e3542 100644
  
  	hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
  	ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
-@@ -627,9 +627,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
+@@ -703,9 +703,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
  	batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff);
  
  	/* change sequence number to network order */
@@ -91713,7 +92097,7 @@ index f680ee1..97e3542 100644
  
  	batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn);
  	batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc);
-@@ -1037,7 +1037,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
+@@ -1111,7 +1111,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
  		return;
  
  	/* could be changed by schedule_own_packet() */
@@ -91722,94 +92106,11 @@ index f680ee1..97e3542 100644
  
  	if (batadv_ogm_packet->flags & BATADV_DIRECTLINK)
  		has_directlink_flag = 1;
-diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
-index de27b31..7058bfe 100644
---- a/net/batman-adv/bridge_loop_avoidance.c
-+++ b/net/batman-adv/bridge_loop_avoidance.c
-@@ -1522,6 +1522,8 @@ out:
-  * in these cases, the skb is further handled by this function and
-  * returns 1, otherwise it returns 0 and the caller shall further
-  * process the skb.
-+ *
-+ * This call might reallocate skb data.
-  */
- int batadv_bla_tx(struct batadv_priv *bat_priv, struct sk_buff *skb, short vid)
- {
-diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c
-index f105219..7614af3 100644
---- a/net/batman-adv/gateway_client.c
-+++ b/net/batman-adv/gateway_client.c
-@@ -508,6 +508,7 @@ out:
- 	return 0;
- }
- 
-+/* this call might reallocate skb data */
- static bool batadv_is_type_dhcprequest(struct sk_buff *skb, int header_len)
- {
- 	int ret = false;
-@@ -568,6 +569,7 @@ out:
- 	return ret;
- }
- 
-+/* this call might reallocate skb data */
- bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
- {
- 	struct ethhdr *ethhdr;
-@@ -619,6 +621,12 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
- 
- 	if (!pskb_may_pull(skb, *header_len + sizeof(*udphdr)))
- 		return false;
-+
-+	/* skb->data might have been reallocated by pskb_may_pull() */
-+	ethhdr = (struct ethhdr *)skb->data;
-+	if (ntohs(ethhdr->h_proto) == ETH_P_8021Q)
-+		ethhdr = (struct ethhdr *)(skb->data + VLAN_HLEN);
-+
- 	udphdr = (struct udphdr *)(skb->data + *header_len);
- 	*header_len += sizeof(*udphdr);
- 
-@@ -634,12 +642,14 @@ bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len)
- 	return true;
- }
- 
-+/* this call might reallocate skb data */
- bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,
--			    struct sk_buff *skb, struct ethhdr *ethhdr)
-+			    struct sk_buff *skb)
- {
- 	struct batadv_neigh_node *neigh_curr = NULL, *neigh_old = NULL;
- 	struct batadv_orig_node *orig_dst_node = NULL;
- 	struct batadv_gw_node *curr_gw = NULL;
-+	struct ethhdr *ethhdr;
- 	bool ret, out_of_range = false;
- 	unsigned int header_len = 0;
- 	uint8_t curr_tq_avg;
-@@ -648,6 +658,7 @@ bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,
- 	if (!ret)
- 		goto out;
- 
-+	ethhdr = (struct ethhdr *)skb->data;
- 	orig_dst_node = batadv_transtable_search(bat_priv, ethhdr->h_source,
- 						 ethhdr->h_dest);
- 	if (!orig_dst_node)
-diff --git a/net/batman-adv/gateway_client.h b/net/batman-adv/gateway_client.h
-index 039902d..1037d75 100644
---- a/net/batman-adv/gateway_client.h
-+++ b/net/batman-adv/gateway_client.h
-@@ -34,7 +34,6 @@ void batadv_gw_node_delete(struct batadv_priv *bat_priv,
- void batadv_gw_node_purge(struct batadv_priv *bat_priv);
- int batadv_gw_client_seq_print_text(struct seq_file *seq, void *offset);
- bool batadv_gw_is_dhcp_target(struct sk_buff *skb, unsigned int *header_len);
--bool batadv_gw_out_of_range(struct batadv_priv *bat_priv,
--			    struct sk_buff *skb, struct ethhdr *ethhdr);
-+bool batadv_gw_out_of_range(struct batadv_priv *bat_priv, struct sk_buff *skb);
- 
- #endif /* _NET_BATMAN_ADV_GATEWAY_CLIENT_H_ */
 diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index 522243a..b48c0ef 100644
+index c478e6b..469fd2f 100644
 --- a/net/batman-adv/hard-interface.c
 +++ b/net/batman-adv/hard-interface.c
-@@ -401,7 +401,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
+@@ -453,7 +453,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
  	hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
  	dev_add_pack(&hard_iface->batman_adv_ptype);
  
@@ -91818,41 +92119,11 @@ index 522243a..b48c0ef 100644
  	batadv_info(hard_iface->soft_iface, "Adding interface: %s\n",
  		    hard_iface->net_dev->name);
  
-@@ -550,7 +550,7 @@ batadv_hardif_add_interface(struct net_device *net_dev)
- 	/* This can't be called via a bat_priv callback because
- 	 * we have no bat_priv yet.
- 	 */
--	atomic_set(&hard_iface->bat_iv.ogm_seqno, 1);
-+	atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, 1);
- 	hard_iface->bat_iv.ogm_buff = NULL;
- 
- 	return hard_iface;
 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index 819dfb0..226bacd 100644
+index 813db4e..847edac 100644
 --- a/net/batman-adv/soft-interface.c
 +++ b/net/batman-adv/soft-interface.c
-@@ -180,6 +180,9 @@ static int batadv_interface_tx(struct sk_buff *skb,
- 	if (batadv_bla_tx(bat_priv, skb, vid))
- 		goto dropped;
- 
-+	/* skb->data might have been reallocated by batadv_bla_tx() */
-+	ethhdr = (struct ethhdr *)skb->data;
-+
- 	/* Register the client MAC in the transtable */
- 	if (!is_multicast_ether_addr(ethhdr->h_source))
- 		batadv_tt_local_add(soft_iface, ethhdr->h_source, skb->skb_iif);
-@@ -220,6 +223,10 @@ static int batadv_interface_tx(struct sk_buff *skb,
- 		default:
- 			break;
- 		}
-+
-+		/* reminder: ethhdr might have become unusable from here on
-+		 * (batadv_gw_is_dhcp_target() might have reallocated skb data)
-+		 */
- 	}
- 
- 	/* ethernet packet should be broadcasted */
-@@ -253,7 +260,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
+@@ -263,7 +263,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
  		       primary_if->net_dev->dev_addr, ETH_ALEN);
  
  		/* set broadcast sequence number */
@@ -91861,16 +92132,7 @@ index 819dfb0..226bacd 100644
  		bcast_packet->seqno = htonl(seqno);
  
  		batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
-@@ -266,7 +273,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
- 	/* unicast packet */
- 	} else {
- 		if (atomic_read(&bat_priv->gw_mode) != BATADV_GW_MODE_OFF) {
--			ret = batadv_gw_out_of_range(bat_priv, skb, ethhdr);
-+			ret = batadv_gw_out_of_range(bat_priv, skb);
- 			if (ret)
- 				goto dropped;
- 		}
-@@ -472,7 +479,7 @@ static int batadv_softif_init_late(struct net_device *dev)
+@@ -483,7 +483,7 @@ static int batadv_softif_init_late(struct net_device *dev)
  	atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
  
  	atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
@@ -91880,7 +92142,7 @@ index 819dfb0..226bacd 100644
  	atomic_set(&bat_priv->tt.local_changes, 0);
  	atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
 diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
-index aba8364..50fcbb8 100644
+index b2c94e1..3d47e07 100644
 --- a/net/batman-adv/types.h
 +++ b/net/batman-adv/types.h
 @@ -51,7 +51,7 @@
@@ -91892,16 +92154,16 @@ index aba8364..50fcbb8 100644
  };
  
  /**
-@@ -75,7 +75,7 @@ struct batadv_hard_iface {
+@@ -76,7 +76,7 @@ struct batadv_hard_iface {
  	int16_t if_num;
  	char if_status;
  	struct net_device *net_dev;
 -	atomic_t frag_seqno;
 +	atomic_unchecked_t frag_seqno;
+ 	uint8_t num_bcasts;
  	struct kobject *hardif_obj;
  	atomic_t refcount;
- 	struct packet_type batman_adv_ptype;
-@@ -558,7 +558,7 @@ struct batadv_priv {
+@@ -560,7 +560,7 @@ struct batadv_priv {
  #ifdef CONFIG_BATMAN_ADV_DEBUG
  	atomic_t log_level;
  #endif
@@ -91911,10 +92173,10 @@ index aba8364..50fcbb8 100644
  	atomic_t batman_queue_left;
  	char num_ifaces;
 diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
-index 0bb3b59..0e3052e 100644
+index 48b31d3..62a0bcb 100644
 --- a/net/batman-adv/unicast.c
 +++ b/net/batman-adv/unicast.c
-@@ -270,7 +270,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
+@@ -272,7 +272,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
  	frag1->flags = BATADV_UNI_FRAG_HEAD | large_tail;
  	frag2->flags = large_tail;
  
@@ -91923,83 +92185,6 @@ index 0bb3b59..0e3052e 100644
  	frag1->seqno = htons(seqno - 1);
  	frag2->seqno = htons(seqno);
  
-@@ -326,7 +326,9 @@ static bool batadv_unicast_push_and_fill_skb(struct sk_buff *skb, int hdr_size,
-  * @skb: the skb containing the payload to encapsulate
-  * @orig_node: the destination node
-  *
-- * Returns false if the payload could not be encapsulated or true otherwise
-+ * Returns false if the payload could not be encapsulated or true otherwise.
-+ *
-+ * This call might reallocate skb data.
-  */
- static bool batadv_unicast_prepare_skb(struct sk_buff *skb,
- 				       struct batadv_orig_node *orig_node)
-@@ -343,7 +345,9 @@ static bool batadv_unicast_prepare_skb(struct sk_buff *skb,
-  * @orig_node: the destination node
-  * @packet_subtype: the batman 4addr packet subtype to use
-  *
-- * Returns false if the payload could not be encapsulated or true otherwise
-+ * Returns false if the payload could not be encapsulated or true otherwise.
-+ *
-+ * This call might reallocate skb data.
-  */
- bool batadv_unicast_4addr_prepare_skb(struct batadv_priv *bat_priv,
- 				      struct sk_buff *skb,
-@@ -401,7 +405,7 @@ int batadv_unicast_generic_send_skb(struct batadv_priv *bat_priv,
- 	struct batadv_neigh_node *neigh_node;
- 	int data_len = skb->len;
- 	int ret = NET_RX_DROP;
--	unsigned int dev_mtu;
-+	unsigned int dev_mtu, header_len;
- 
- 	/* get routing information */
- 	if (is_multicast_ether_addr(ethhdr->h_dest)) {
-@@ -429,10 +433,12 @@ find_router:
- 	switch (packet_type) {
- 	case BATADV_UNICAST:
- 		batadv_unicast_prepare_skb(skb, orig_node);
-+		header_len = sizeof(struct batadv_unicast_packet);
- 		break;
- 	case BATADV_UNICAST_4ADDR:
- 		batadv_unicast_4addr_prepare_skb(bat_priv, skb, orig_node,
- 						 packet_subtype);
-+		header_len = sizeof(struct batadv_unicast_4addr_packet);
- 		break;
- 	default:
- 		/* this function supports UNICAST and UNICAST_4ADDR only. It
-@@ -441,6 +447,7 @@ find_router:
- 		goto out;
- 	}
- 
-+	ethhdr = (struct ethhdr *)(skb->data + header_len);
- 	unicast_packet = (struct batadv_unicast_packet *)skb->data;
- 
- 	/* inform the destination node that we are still missing a correct route
-diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
-index 7c88f5f..b65befb 100644
---- a/net/bluetooth/hci_core.c
-+++ b/net/bluetooth/hci_core.c
-@@ -2222,16 +2222,16 @@ int hci_register_dev(struct hci_dev *hdev)
- 	list_add(&hdev->list, &hci_dev_list);
- 	write_unlock(&hci_dev_list_lock);
- 
--	hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND |
--					  WQ_MEM_RECLAIM, 1);
-+	hdev->workqueue = alloc_workqueue("%s", WQ_HIGHPRI | WQ_UNBOUND |
-+					  WQ_MEM_RECLAIM, 1, hdev->name);
- 	if (!hdev->workqueue) {
- 		error = -ENOMEM;
- 		goto err;
- 	}
- 
--	hdev->req_workqueue = alloc_workqueue(hdev->name,
-+	hdev->req_workqueue = alloc_workqueue("%s",
- 					      WQ_HIGHPRI | WQ_UNBOUND |
--					      WQ_MEM_RECLAIM, 1);
-+					      WQ_MEM_RECLAIM, 1, hdev->name);
- 	if (!hdev->req_workqueue) {
- 		destroy_workqueue(hdev->workqueue);
- 		error = -ENOMEM;
 diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
 index fa4bf66..e92948f 100644
 --- a/net/bluetooth/hci_sock.c
@@ -92014,10 +92199,10 @@ index fa4bf66..e92948f 100644
  			err = -EFAULT;
  			break;
 diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
-index 68843a2..30e9342 100644
+index 63fa111..b166ec6 100644
 --- a/net/bluetooth/l2cap_core.c
 +++ b/net/bluetooth/l2cap_core.c
-@@ -3507,8 +3507,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
+@@ -3511,8 +3511,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
  			break;
  
  		case L2CAP_CONF_RFC:
@@ -92031,7 +92216,7 @@ index 68843a2..30e9342 100644
  			if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
  			    rfc.mode != chan->mode)
 diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
-index 36fed40..be2eeb2 100644
+index 0098af8..fb5a31f 100644
 --- a/net/bluetooth/l2cap_sock.c
 +++ b/net/bluetooth/l2cap_sock.c
 @@ -485,7 +485,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
@@ -92104,46 +92289,69 @@ index c1c6028..17e8dcc 100644
  			err = -EFAULT;
  			break;
 diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
-index b6e44ad..5b0d514 100644
+index 84fcf9f..e389b27 100644
 --- a/net/bluetooth/rfcomm/tty.c
 +++ b/net/bluetooth/rfcomm/tty.c
-@@ -309,7 +309,7 @@ static void rfcomm_dev_del(struct rfcomm_dev *dev)
- 	BUG_ON(test_and_set_bit(RFCOMM_TTY_RELEASED, &dev->flags));
- 
- 	spin_lock_irqsave(&dev->port.lock, flags);
--	if (dev->port.count > 0) {
-+	if (atomic_read(&dev->port.count) > 0) {
- 		spin_unlock_irqrestore(&dev->port.lock, flags);
- 		return;
- 	}
-@@ -659,10 +659,10 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
- 		return -ENODEV;
+@@ -684,7 +684,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
+ 	BT_DBG("tty %p id %d", tty, tty->index);
  
  	BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
 -	       dev->channel, dev->port.count);
 +	       dev->channel, atomic_read(&dev->port.count));
  
- 	spin_lock_irqsave(&dev->port.lock, flags);
--	if (++dev->port.count > 1) {
-+	if (atomic_inc_return(&dev->port.count) > 1) {
- 		spin_unlock_irqrestore(&dev->port.lock, flags);
- 		return 0;
- 	}
-@@ -727,10 +727,10 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
- 		return;
+ 	err = tty_port_open(&dev->port, tty, filp);
+ 	if (err)
+@@ -707,7 +707,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
+ 	struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
  
  	BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
 -						dev->port.count);
 +						atomic_read(&dev->port.count));
  
- 	spin_lock_irqsave(&dev->port.lock, flags);
--	if (!--dev->port.count) {
-+	if (!atomic_dec_return(&dev->port.count)) {
- 		spin_unlock_irqrestore(&dev->port.lock, flags);
- 		if (dev->tty_dev->parent)
- 			device_move(dev->tty_dev, NULL, DPM_ORDER_DEV_LAST);
+ 	tty_port_close(&dev->port, tty, filp);
+ }
+diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
+index 5180938..7c470c3 100644
+--- a/net/bridge/netfilter/ebt_ulog.c
++++ b/net/bridge/netfilter/ebt_ulog.c
+@@ -181,6 +181,7 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
+ 	ub->qlen++;
+ 
+ 	pm = nlmsg_data(nlh);
++	memset(pm, 0, sizeof(*pm));
+ 
+ 	/* Fill in the ulog data */
+ 	pm->version = EBT_ULOG_VERSION;
+@@ -193,8 +194,6 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
+ 	pm->hook = hooknr;
+ 	if (uloginfo->prefix != NULL)
+ 		strcpy(pm->prefix, uloginfo->prefix);
+-	else
+-		*(pm->prefix) = '\0';
+ 
+ 	if (in) {
+ 		strcpy(pm->physindev, in->name);
+@@ -204,16 +203,14 @@ static void ebt_ulog_packet(struct net *net, unsigned int hooknr,
+ 			strcpy(pm->indev, br_port_get_rcu(in)->br->dev->name);
+ 		else
+ 			strcpy(pm->indev, in->name);
+-	} else
+-		pm->indev[0] = pm->physindev[0] = '\0';
++	}
+ 
+ 	if (out) {
+ 		/* If out exists, then out is a bridge port */
+ 		strcpy(pm->physoutdev, out->name);
+ 		/* rcu_read_lock()ed by nf_hook_slow */
+ 		strcpy(pm->outdev, br_port_get_rcu(out)->br->dev->name);
+-	} else
+-		pm->outdev[0] = pm->physoutdev[0] = '\0';
++	}
+ 
+ 	if (skb_copy_bits(skb, -ETH_HLEN, pm->data, copy_len) < 0)
+ 		BUG();
 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
-index 3d110c4..4e1b2eb 100644
+index ac78024..161a80c 100644
 --- a/net/bridge/netfilter/ebtables.c
 +++ b/net/bridge/netfilter/ebtables.c
 @@ -1525,7 +1525,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
@@ -92217,7 +92425,7 @@ index 0f45522..dab651f 100644
  			list_del(&p->list);
  			goto out;
 diff --git a/net/can/af_can.c b/net/can/af_can.c
-index c4e5085..aa9efdf 100644
+index 3ab8dd2..b9aef13 100644
 --- a/net/can/af_can.c
 +++ b/net/can/af_can.c
 @@ -862,7 +862,7 @@ static const struct net_proto_family can_family_ops = {
@@ -92230,7 +92438,7 @@ index c4e5085..aa9efdf 100644
  };
  
 diff --git a/net/can/gw.c b/net/can/gw.c
-index 3ee690e..00d581b 100644
+index 3f9b0f3..fc6d4fa 100644
 --- a/net/can/gw.c
 +++ b/net/can/gw.c
 @@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
@@ -92241,7 +92449,7 @@ index 3ee690e..00d581b 100644
  
  static struct kmem_cache *cgw_cache __read_mostly;
  
-@@ -927,6 +926,10 @@ static int cgw_remove_job(struct sk_buff *skb,  struct nlmsghdr *nlh)
+@@ -954,6 +953,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
  	return err;
  }
  
@@ -92252,7 +92460,7 @@ index 3ee690e..00d581b 100644
  static __init int cgw_module_init(void)
  {
  	/* sanitize given module parameter */
-@@ -942,7 +945,6 @@ static __init int cgw_module_init(void)
+@@ -969,7 +972,6 @@ static __init int cgw_module_init(void)
  		return -ENOMEM;
  
  	/* set notifier */
@@ -92261,7 +92469,7 @@ index 3ee690e..00d581b 100644
  
  	if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
 diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
-index eb0a46a..5f3bae8 100644
+index 4a5df7b..9ad1f1d 100644
 --- a/net/ceph/messenger.c
 +++ b/net/ceph/messenger.c
 @@ -186,7 +186,7 @@ static void con_fault(struct ceph_connection *con);
@@ -92423,10 +92631,10 @@ index dd32e34..6066f87 100644
  	a0 = a[0];
  	a1 = a[1];
 diff --git a/net/core/datagram.c b/net/core/datagram.c
-index b71423d..0360434 100644
+index af814e7..3d761de 100644
 --- a/net/core/datagram.c
 +++ b/net/core/datagram.c
-@@ -295,7 +295,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
+@@ -301,7 +301,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
  	}
  
  	kfree_skb(skb);
@@ -92436,10 +92644,10 @@ index b71423d..0360434 100644
  
  	return err;
 diff --git a/net/core/dev.c b/net/core/dev.c
-index 1283c84..60f0253 100644
+index 3d13874..6e78dc7 100644
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -1649,7 +1649,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
+@@ -1680,14 +1680,14 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
  {
  	if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
  		if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
@@ -92448,8 +92656,7 @@ index 1283c84..60f0253 100644
  			kfree_skb(skb);
  			return NET_RX_DROP;
  		}
-@@ -1658,7 +1658,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
- 	skb_orphan(skb);
+ 	}
  
  	if (unlikely(!is_skb_forwardable(dev, skb))) {
 -		atomic_long_inc(&dev->rx_dropped);
@@ -92457,7 +92664,7 @@ index 1283c84..60f0253 100644
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -2404,7 +2404,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
+@@ -2428,7 +2428,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
  
  struct dev_gso_cb {
  	void (*destructor)(struct sk_buff *skb);
@@ -92466,7 +92673,7 @@ index 1283c84..60f0253 100644
  
  #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
  
-@@ -3139,7 +3139,7 @@ enqueue:
+@@ -3203,7 +3203,7 @@ enqueue:
  
  	local_irq_restore(flags);
  
@@ -92475,16 +92682,16 @@ index 1283c84..60f0253 100644
  	kfree_skb(skb);
  	return NET_RX_DROP;
  }
-@@ -3211,7 +3211,7 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -3275,7 +3275,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
  
 -static void net_tx_action(struct softirq_action *h)
-+static void net_tx_action(void)
++static __latent_entropy void net_tx_action(void)
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  
-@@ -3545,7 +3545,7 @@ ncls:
+@@ -3609,7 +3609,7 @@ ncls:
  			ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
  	} else {
  drop:
@@ -92493,16 +92700,16 @@ index 1283c84..60f0253 100644
  		kfree_skb(skb);
  		/* Jamal, now you will not able to escape explaining
  		 * me how you were going to use this. :-)
-@@ -4153,7 +4153,7 @@ void netif_napi_del(struct napi_struct *napi)
+@@ -4269,7 +4269,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)
++static __latent_entropy void net_rx_action(void)
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  	unsigned long time_limit = jiffies + 2;
-@@ -5590,7 +5590,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
+@@ -5973,7 +5973,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
  	} else {
  		netdev_stats_to_stats64(storage, &dev->stats);
  	}
@@ -92529,50 +92736,8 @@ index 5b7d0e1..cb960fc 100644
  	}
  }
  EXPORT_SYMBOL(dev_load);
-diff --git a/net/core/ethtool.c b/net/core/ethtool.c
-index ce91766..3b71cdb 100644
---- a/net/core/ethtool.c
-+++ b/net/core/ethtool.c
-@@ -1319,10 +1319,19 @@ static int ethtool_get_dump_data(struct net_device *dev,
- 	if (ret)
- 		return ret;
- 
--	len = (tmp.len > dump.len) ? dump.len : tmp.len;
-+	len = min(tmp.len, dump.len);
- 	if (!len)
- 		return -EFAULT;
- 
-+	/* Don't ever let the driver think there's more space available
-+	 * than it requested with .get_dump_flag().
-+	 */
-+	dump.len = len;
-+
-+	/* Always allocate enough space to hold the whole thing so that the
-+	 * driver does not need to check the length and bother with partial
-+	 * dumping.
-+	 */
- 	data = vzalloc(tmp.len);
- 	if (!data)
- 		return -ENOMEM;
-@@ -1330,6 +1339,16 @@ static int ethtool_get_dump_data(struct net_device *dev,
- 	if (ret)
- 		goto out;
- 
-+	/* There are two sane possibilities:
-+	 * 1. The driver's .get_dump_data() does not touch dump.len.
-+	 * 2. Or it may set dump.len to how much it really writes, which
-+	 *    should be tmp.len (or len if it can do a partial dump).
-+	 * In any case respond to userspace with the actual length of data
-+	 * it's receiving.
-+	 */
-+	WARN_ON(dump.len != len && dump.len != tmp.len);
-+	dump.len = len;
-+
- 	if (copy_to_user(useraddr, &dump, sizeof(dump))) {
- 		ret = -EFAULT;
- 		goto out;
 diff --git a/net/core/flow.c b/net/core/flow.c
-index 7102f16..146b4bd 100644
+index dfa602c..3103d88 100644
 --- a/net/core/flow.c
 +++ b/net/core/flow.c
 @@ -61,7 +61,7 @@ struct flow_cache {
@@ -92612,7 +92777,7 @@ index 7102f16..146b4bd 100644
  			fle->object = flo;
  		else
 diff --git a/net/core/iovec.c b/net/core/iovec.c
-index 9a31515..4fd45a6 100644
+index 7d84ea1..55385ae 100644
 --- a/net/core/iovec.c
 +++ b/net/core/iovec.c
 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
@@ -92634,23 +92799,23 @@ index 9a31515..4fd45a6 100644
  
  	m->msg_iov = iov;
 diff --git a/net/core/neighbour.c b/net/core/neighbour.c
-index 0034b61..a74fbe7 100644
+index 6072610..7374c18 100644
 --- a/net/core/neighbour.c
 +++ b/net/core/neighbour.c
-@@ -2773,7 +2773,7 @@ static int proc_unres_qlen(ctl_table *ctl, int write, void __user *buffer,
- 			   size_t *lenp, loff_t *ppos)
+@@ -2774,7 +2774,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
+ 			   void __user *buffer, size_t *lenp, loff_t *ppos)
  {
  	int size, ret;
--	ctl_table tmp = *ctl;
+-	struct ctl_table tmp = *ctl;
 +	ctl_table_no_const tmp = *ctl;
  
  	tmp.extra1 = &zero;
  	tmp.extra2 = &unres_qlen_max;
 diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
-index 569d355..79cf2d0 100644
+index 2bf8329..7960607 100644
 --- a/net/core/net-procfs.c
 +++ b/net/core/net-procfs.c
-@@ -271,8 +271,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
+@@ -283,8 +283,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
  		else
  			seq_printf(seq, "%04x", ntohs(pt->type));
  
@@ -92665,10 +92830,10 @@ index 569d355..79cf2d0 100644
  
  	return 0;
 diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
-index 981fed3..536af34 100644
+index d954b56..b0a0f7a 100644
 --- a/net/core/net-sysfs.c
 +++ b/net/core/net-sysfs.c
-@@ -1311,7 +1311,7 @@ void netdev_class_remove_file(struct class_attribute *class_attr)
+@@ -1356,7 +1356,7 @@ void netdev_class_remove_file(struct class_attribute *class_attr)
  }
  EXPORT_SYMBOL(netdev_class_remove_file);
  
@@ -92678,7 +92843,7 @@ index 981fed3..536af34 100644
  	kobj_ns_type_register(&net_ns_type_operations);
  	return class_register(&net_class);
 diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
-index f9765203..9feaef8 100644
+index 81d3a9a..a0bd7a8 100644
 --- a/net/core/net_namespace.c
 +++ b/net/core/net_namespace.c
 @@ -443,7 +443,7 @@ static int __register_pernet_operations(struct list_head *list,
@@ -92718,7 +92883,7 @@ index f9765203..9feaef8 100644
  	return error;
  }
 diff --git a/net/core/netpoll.c b/net/core/netpoll.c
-index b04f738..452b054 100644
+index fc75c9e..8c8e9be 100644
 --- a/net/core/netpoll.c
 +++ b/net/core/netpoll.c
 @@ -428,7 +428,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
@@ -92740,7 +92905,7 @@ index b04f738..452b054 100644
  		iph->ttl      = 64;
  		iph->protocol = IPPROTO_UDP;
 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
-index fd01eca..502ca49 100644
+index 2a0e21d..6ad7642 100644
 --- a/net/core/rtnetlink.c
 +++ b/net/core/rtnetlink.c
 @@ -58,7 +58,7 @@ struct rtnl_link {
@@ -92779,7 +92944,7 @@ index fd01eca..502ca49 100644
  EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
  
 diff --git a/net/core/scm.c b/net/core/scm.c
-index b4da80b..98d6bdb 100644
+index b442e7e..6f5b5a2 100644
 --- a/net/core/scm.c
 +++ b/net/core/scm.c
 @@ -210,7 +210,7 @@ EXPORT_SYMBOL(__scm_send);
@@ -92819,10 +92984,10 @@ index b4da80b..98d6bdb 100644
  	{
  		struct socket *sock;
 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index d9e8736..6abcdf9 100644
+index c28c7fe..a399a6d 100644
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -3084,13 +3084,15 @@ void __init skb_init(void)
+@@ -3104,13 +3104,15 @@ void __init skb_init(void)
  	skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
  					      sizeof(struct sk_buff),
  					      0,
@@ -92840,11 +93005,19 @@ index d9e8736..6abcdf9 100644
  						NULL);
  }
  
+@@ -3541,6 +3543,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)
+ 	skb->tstamp.tv64 = 0;
+ 	skb->pkt_type = PACKET_HOST;
+ 	skb->skb_iif = 0;
++	skb->local_df = 0;
+ 	skb_dst_drop(skb);
+ 	skb->mark = 0;
+ 	secpath_reset(skb);
 diff --git a/net/core/sock.c b/net/core/sock.c
-index 6565431..4012941 100644
+index 0b39e7a..5e9f91e 100644
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -390,7 +390,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -393,7 +393,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
  	struct sk_buff_head *list = &sk->sk_receive_queue;
  
  	if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
@@ -92853,7 +93026,7 @@ index 6565431..4012941 100644
  		trace_sock_rcvqueue_full(sk, skb);
  		return -ENOMEM;
  	}
-@@ -400,7 +400,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -403,7 +403,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
  		return err;
  
  	if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
@@ -92862,7 +93035,7 @@ index 6565431..4012941 100644
  		return -ENOBUFS;
  	}
  
-@@ -420,7 +420,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -423,7 +423,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
  	skb_dst_force(skb);
  
  	spin_lock_irqsave(&list->lock, flags);
@@ -92871,7 +93044,7 @@ index 6565431..4012941 100644
  	__skb_queue_tail(list, skb);
  	spin_unlock_irqrestore(&list->lock, flags);
  
-@@ -440,7 +440,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -443,7 +443,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
  	skb->dev = NULL;
  
  	if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
@@ -92880,7 +93053,7 @@ index 6565431..4012941 100644
  		goto discard_and_relse;
  	}
  	if (nested)
-@@ -458,7 +458,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -461,7 +461,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
  		mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
  	} else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
  		bh_unlock_sock(sk);
@@ -92889,7 +93062,7 @@ index 6565431..4012941 100644
  		goto discard_and_relse;
  	}
  
-@@ -933,12 +933,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -949,12 +949,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
  		struct timeval tm;
  	} v;
  
@@ -92905,7 +93078,7 @@ index 6565431..4012941 100644
  		return -EINVAL;
  
  	memset(&v, 0, sizeof(v));
-@@ -1090,11 +1090,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -1106,11 +1106,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
  
  	case SO_PEERNAME:
  	{
@@ -92919,7 +93092,7 @@ index 6565431..4012941 100644
  			return -EINVAL;
  		if (copy_to_user(optval, address, len))
  			return -EFAULT;
-@@ -1161,7 +1161,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -1183,7 +1183,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
  
  	if (len > lv)
  		len = lv;
@@ -92928,7 +93101,7 @@ index 6565431..4012941 100644
  		return -EFAULT;
  lenout:
  	if (put_user(len, optlen))
-@@ -2278,7 +2278,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
+@@ -2326,7 +2326,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
  	 */
  	smp_wmb();
  	atomic_set(&sk->sk_refcnt, 1);
@@ -92937,6 +93110,24 @@ index 6565431..4012941 100644
  }
  EXPORT_SYMBOL(sock_init_data);
  
+@@ -2451,6 +2451,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
+ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
+ 		       int level, int type)
+ {
++	struct sock_extended_err ee;
+ 	struct sock_exterr_skb *serr;
+ 	struct sk_buff *skb, *skb2;
+ 	int copied, err;
+@@ -2472,7 +2473,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
+ 	sock_recv_timestamp(msg, sk, skb);
+ 
+ 	serr = SKB_EXT_ERR(skb);
+-	put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
++	ee = serr->ee;
++	put_cmsg(msg, level, type, sizeof ee, &ee);
+ 
+ 	msg->msg_flags |= MSG_ERRQUEUE;
+ 	err = copied;
 diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
 index a0e9cf6..ef7f9ed 100644
 --- a/net/core/sock_diag.c
@@ -93000,19 +93191,28 @@ index a0e9cf6..ef7f9ed 100644
  }
  EXPORT_SYMBOL_GPL(sock_diag_unregister);
 diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
-index 2ff093b..fde692b 100644
+index cca4441..5e616de 100644
 --- a/net/core/sysctl_net_core.c
 +++ b/net/core/sysctl_net_core.c
-@@ -30,7 +30,7 @@ static int rps_sock_flow_sysctl(ctl_table *table, int write,
+@@ -32,7 +32,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
  {
  	unsigned int orig_size, size;
  	int ret, i;
--	ctl_table tmp = {
+-	struct ctl_table tmp = {
 +	ctl_table_no_const tmp = {
  		.data = &size,
  		.maxlen = sizeof(size),
  		.mode = table->mode
-@@ -215,13 +215,12 @@ static struct ctl_table netns_core_table[] = {
+@@ -199,7 +199,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
+ 			     void __user *buffer, size_t *lenp, loff_t *ppos)
+ {
+ 	char id[IFNAMSIZ];
+-	struct ctl_table tbl = {
++	ctl_table_no_const tbl = {
+ 		.data = id,
+ 		.maxlen = IFNAMSIZ,
+ 	};
+@@ -378,13 +378,12 @@ static struct ctl_table netns_core_table[] = {
  
  static __net_init int sysctl_core_net_init(struct net *net)
  {
@@ -93028,7 +93228,7 @@ index 2ff093b..fde692b 100644
  		if (tbl == NULL)
  			goto err_dup;
  
-@@ -231,17 +230,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
+@@ -394,17 +393,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
  		if (net->user_ns != &init_user_ns) {
  			tbl[0].procname = NULL;
  		}
@@ -93050,7 +93250,7 @@ index 2ff093b..fde692b 100644
  err_dup:
  	return -ENOMEM;
  }
-@@ -256,7 +254,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
+@@ -419,7 +417,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
  	kfree(tbl);
  }
  
@@ -93060,7 +93260,7 @@ index 2ff093b..fde692b 100644
  	.exit = sysctl_core_net_exit,
  };
 diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
-index c21f200..bc4565b 100644
+index dd4d506..fb2fb87 100644
 --- a/net/decnet/af_decnet.c
 +++ b/net/decnet/af_decnet.c
 @@ -465,6 +465,7 @@ static struct proto dn_proto = {
@@ -93072,10 +93272,10 @@ index c21f200..bc4565b 100644
  
  static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
 diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
-index a55eecc..dd8428c 100644
+index 5325b54..a0d4d69 100644
 --- a/net/decnet/sysctl_net_decnet.c
 +++ b/net/decnet/sysctl_net_decnet.c
-@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
+@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
  
  	if (len > *lenp) len = *lenp;
  
@@ -93084,7 +93284,7 @@ index a55eecc..dd8428c 100644
  		return -EFAULT;
  
  	*lenp = len;
-@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
+@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
  
  	if (len > *lenp) len = *lenp;
  
@@ -93094,10 +93294,10 @@ index a55eecc..dd8428c 100644
  
  	*lenp = len;
 diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
-index 31b127e..627fdea 100644
+index 008f337..b03b8c9 100644
 --- a/net/ieee802154/6lowpan.c
 +++ b/net/ieee802154/6lowpan.c
-@@ -459,7 +459,7 @@ static int lowpan_header_create(struct sk_buff *skb,
+@@ -548,7 +548,7 @@ static int lowpan_header_create(struct sk_buff *skb,
  			hc06_ptr += 3;
  		} else {
  			/* compress nothing */
@@ -93107,10 +93307,10 @@ index 31b127e..627fdea 100644
  			*hc06_ptr = tmp;
  			hc06_ptr += 4;
 diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
-index c4adc31..ba1739f 100644
+index cfeb85c..385989a 100644
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c
-@@ -1701,13 +1701,9 @@ static int __init inet_init(void)
+@@ -1675,13 +1675,9 @@ static int __init inet_init(void)
  
  	BUILD_BUG_ON(sizeof(struct inet_skb_parm) > FIELD_SIZEOF(struct sk_buff, cb));
  
@@ -93125,7 +93325,7 @@ index c4adc31..ba1739f 100644
  
  	rc = proto_register(&udp_prot, 1);
  	if (rc)
-@@ -1816,8 +1812,6 @@ out_unregister_udp_proto:
+@@ -1790,8 +1786,6 @@ out_unregister_udp_proto:
  	proto_unregister(&udp_prot);
  out_unregister_tcp_proto:
  	proto_unregister(&tcp_prot);
@@ -93134,24 +93334,11 @@ index c4adc31..ba1739f 100644
  	goto out;
  }
  
-diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
-index 2e7f194..0fa4d6d 100644
---- a/net/ipv4/ah4.c
-+++ b/net/ipv4/ah4.c
-@@ -420,7 +420,7 @@ static void ah4_err(struct sk_buff *skb, u32 info)
- 		return;
- 
- 	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) {
--		atomic_inc(&flow_cache_genid);
-+		atomic_inc_unchecked(&flow_cache_genid);
- 		rt_genid_bump(net);
- 
- 		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_AH, 0);
 diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
-index 9e38217..0d4fa52 100644
+index a1b5bcb..62ec5c6 100644
 --- a/net/ipv4/devinet.c
 +++ b/net/ipv4/devinet.c
-@@ -1531,7 +1531,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
+@@ -1533,7 +1533,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
  		idx = 0;
  		head = &net->dev_index_head[h];
  		rcu_read_lock();
@@ -93160,7 +93347,7 @@ index 9e38217..0d4fa52 100644
  			  net->dev_base_seq;
  		hlist_for_each_entry_rcu(dev, head, index_hlist) {
  			if (idx < s_idx)
-@@ -1842,7 +1842,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
+@@ -1844,7 +1844,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
  		idx = 0;
  		head = &net->dev_index_head[h];
  		rcu_read_lock();
@@ -93169,7 +93356,7 @@ index 9e38217..0d4fa52 100644
  			  net->dev_base_seq;
  		hlist_for_each_entry_rcu(dev, head, index_hlist) {
  			if (idx < s_idx)
-@@ -2067,7 +2067,7 @@ static int ipv4_doint_and_flush(ctl_table *ctl, int write,
+@@ -2069,7 +2069,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
  #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
  	DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
  
@@ -93178,7 +93365,7 @@ index 9e38217..0d4fa52 100644
  	struct ctl_table_header *sysctl_header;
  	struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
  } devinet_sysctl = {
-@@ -2185,7 +2185,7 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2191,7 +2191,7 @@ static __net_init int devinet_init_net(struct net *net)
  	int err;
  	struct ipv4_devconf *all, *dflt;
  #ifdef CONFIG_SYSCTL
@@ -93187,7 +93374,7 @@ index 9e38217..0d4fa52 100644
  	struct ctl_table_header *forw_hdr;
  #endif
  
-@@ -2203,7 +2203,7 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2209,7 +2209,7 @@ static __net_init int devinet_init_net(struct net *net)
  			goto err_alloc_dflt;
  
  #ifdef CONFIG_SYSCTL
@@ -93196,7 +93383,7 @@ index 9e38217..0d4fa52 100644
  		if (tbl == NULL)
  			goto err_alloc_ctl;
  
-@@ -2223,7 +2223,10 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2229,7 +2229,10 @@ static __net_init int devinet_init_net(struct net *net)
  		goto err_reg_dflt;
  
  	err = -ENOMEM;
@@ -93208,7 +93395,7 @@ index 9e38217..0d4fa52 100644
  	if (forw_hdr == NULL)
  		goto err_reg_ctl;
  	net->ipv4.forw_hdr = forw_hdr;
-@@ -2239,8 +2242,7 @@ err_reg_ctl:
+@@ -2245,8 +2248,7 @@ err_reg_ctl:
  err_reg_dflt:
  	__devinet_sysctl_unregister(all);
  err_reg_all:
@@ -93218,30 +93405,8 @@ index 9e38217..0d4fa52 100644
  err_alloc_ctl:
  #endif
  	if (dflt != &ipv4_devconf_dflt)
-diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
-index 4cfe34d..d2fac8a 100644
---- a/net/ipv4/esp4.c
-+++ b/net/ipv4/esp4.c
-@@ -477,7 +477,7 @@ static u32 esp4_get_mtu(struct xfrm_state *x, int mtu)
- 	}
- 
- 	return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) -
--		 net_adj) & ~(align - 1)) + (net_adj - 2);
-+		 net_adj) & ~(align - 1)) + net_adj - 2;
- }
- 
- static void esp4_err(struct sk_buff *skb, u32 info)
-@@ -503,7 +503,7 @@ static void esp4_err(struct sk_buff *skb, u32 info)
- 		return;
- 
- 	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) {
--		atomic_inc(&flow_cache_genid);
-+		atomic_inc_unchecked(&flow_cache_genid);
- 		rt_genid_bump(net);
- 
- 		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_ESP, 0);
 diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
-index c7629a2..b62d139 100644
+index b3f627a..b0f3e99 100644
 --- a/net/ipv4/fib_frontend.c
 +++ b/net/ipv4/fib_frontend.c
 @@ -1017,12 +1017,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
@@ -93269,10 +93434,10 @@ index c7629a2..b62d139 100644
  		break;
  	case NETDEV_DOWN:
 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
-index 8f6cb7a..34507f9 100644
+index d5dbca5..6251d5f 100644
 --- a/net/ipv4/fib_semantics.c
 +++ b/net/ipv4/fib_semantics.c
-@@ -765,7 +765,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
+@@ -766,7 +766,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
  	nh->nh_saddr = inet_select_addr(nh->nh_dev,
  					nh->nh_gw,
  					nh->nh_parent->fib_scope);
@@ -93295,7 +93460,7 @@ index 6acb541..9ea617d 100644
  
  void inet_get_local_port_range(int *low, int *high)
 diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
-index c95848d..e561cbd 100644
+index 96da9c7..b956690 100644
 --- a/net/ipv4/inet_hashtables.c
 +++ b/net/ipv4/inet_hashtables.c
 @@ -18,12 +18,15 @@
@@ -93390,7 +93555,7 @@ index b66910a..cfe416e 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
-index 64e4e98..db77052 100644
+index d7aea4c..a8ee872 100644
 --- a/net/ipv4/ip_gre.c
 +++ b/net/ipv4/ip_gre.c
 @@ -115,7 +115,7 @@ static bool log_ecn_error = true;
@@ -93402,7 +93567,7 @@ index 64e4e98..db77052 100644
  static int ipgre_tunnel_init(struct net_device *dev);
  
  static int ipgre_net_id __read_mostly;
-@@ -919,7 +919,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
+@@ -731,7 +731,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
  	[IFLA_GRE_PMTUDISC]	= { .type = NLA_U8 },
  };
  
@@ -93411,7 +93576,7 @@ index 64e4e98..db77052 100644
  	.kind		= "gre",
  	.maxtype	= IFLA_GRE_MAX,
  	.policy		= ipgre_policy,
-@@ -933,7 +933,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
+@@ -745,7 +745,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
  	.fill_info	= ipgre_fill_info,
  };
  
@@ -93444,19 +93609,19 @@ index 23e6ab0..be67a57 100644
  		msg.msg_flags = flags;
  
 diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
-index feb19db..61aa09b 100644
+index 26847e1..75d2d2f 100644
 --- a/net/ipv4/ip_vti.c
 +++ b/net/ipv4/ip_vti.c
-@@ -47,7 +47,7 @@
- #define HASH_SIZE  16
- #define HASH(addr) (((__force u32)addr^((__force u32)addr>>4))&(HASH_SIZE-1))
+@@ -44,7 +44,7 @@
+ #include <net/net_namespace.h>
+ #include <net/netns/generic.h>
  
 -static struct rtnl_link_ops vti_link_ops __read_mostly;
 +static struct rtnl_link_ops vti_link_ops;
  
  static int vti_net_id __read_mostly;
- struct vti_net {
-@@ -849,7 +849,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
+ static int vti_tunnel_init(struct net_device *dev);
+@@ -425,7 +425,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
  	[IFLA_VTI_REMOTE]	= { .len = FIELD_SIZEOF(struct iphdr, daddr) },
  };
  
@@ -93465,19 +93630,6 @@ index feb19db..61aa09b 100644
  	.kind		= "vti",
  	.maxtype	= IFLA_VTI_MAX,
  	.policy		= vti_policy,
-diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c
-index 59cb8c7..a72160c 100644
---- a/net/ipv4/ipcomp.c
-+++ b/net/ipv4/ipcomp.c
-@@ -48,7 +48,7 @@ static void ipcomp4_err(struct sk_buff *skb, u32 info)
- 		return;
- 
- 	if (icmp_hdr(skb)->type == ICMP_DEST_UNREACH) {
--		atomic_inc(&flow_cache_genid);
-+		atomic_inc_unchecked(&flow_cache_genid);
- 		rt_genid_bump(net);
- 
- 		ipv4_update_pmtu(skb, net, info, 0, 0, IPPROTO_COMP, 0);
 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
 index efa1138..20dbba0 100644
 --- a/net/ipv4/ipconfig.c
@@ -93510,7 +93662,7 @@ index efa1138..20dbba0 100644
  	return res;
  }
 diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
-index f5cc7b3..33d7577 100644
+index 7f80fb4..b0328f6 100644
 --- a/net/ipv4/ipip.c
 +++ b/net/ipv4/ipip.c
 @@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
@@ -93522,7 +93674,7 @@ index f5cc7b3..33d7577 100644
  
  static int ipip_err(struct sk_buff *skb, u32 info)
  {
-@@ -406,7 +406,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
+@@ -408,7 +408,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
  	[IFLA_IPTUN_PMTUDISC]		= { .type = NLA_U8 },
  };
  
@@ -93629,11 +93781,100 @@ index d23118d..6ad7277 100644
  		break;
  
  	case IPT_SO_GET_ENTRIES:
+diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
+index cbc2215..9cb993c 100644
+--- a/net/ipv4/netfilter/ipt_ULOG.c
++++ b/net/ipv4/netfilter/ipt_ULOG.c
+@@ -220,6 +220,7 @@ static void ipt_ulog_packet(struct net *net,
+ 	ub->qlen++;
+ 
+ 	pm = nlmsg_data(nlh);
++	memset(pm, 0, sizeof(*pm));
+ 
+ 	/* We might not have a timestamp, get one */
+ 	if (skb->tstamp.tv64 == 0)
+@@ -238,8 +239,6 @@ static void ipt_ulog_packet(struct net *net,
+ 	}
+ 	else if (loginfo->prefix[0] != '\0')
+ 		strncpy(pm->prefix, loginfo->prefix, sizeof(pm->prefix));
+-	else
+-		*(pm->prefix) = '\0';
+ 
+ 	if (in && in->hard_header_len > 0 &&
+ 	    skb->mac_header != skb->network_header &&
+@@ -251,13 +250,9 @@ static void ipt_ulog_packet(struct net *net,
+ 
+ 	if (in)
+ 		strncpy(pm->indev_name, in->name, sizeof(pm->indev_name));
+-	else
+-		pm->indev_name[0] = '\0';
+ 
+ 	if (out)
+ 		strncpy(pm->outdev_name, out->name, sizeof(pm->outdev_name));
+-	else
+-		pm->outdev_name[0] = '\0';
+ 
+ 	/* copy_len <= skb->len, so can't fail. */
+ 	if (skb_copy_bits(skb, 0, pm->payload, copy_len) < 0)
 diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
-index 8cae28f..049d45a 100644
+index c482f7c..2784262 100644
 --- a/net/ipv4/ping.c
 +++ b/net/ipv4/ping.c
-@@ -842,7 +842,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
+@@ -55,7 +55,7 @@
+ 
+ 
+ struct ping_table ping_table;
+-struct pingv6_ops pingv6_ops;
++struct pingv6_ops *pingv6_ops;
+ EXPORT_SYMBOL_GPL(pingv6_ops);
+ 
+ static u16 ping_port_rover;
+@@ -335,7 +335,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
+ 				return -ENODEV;
+ 			}
+ 		}
+-		has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
++		has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
+ 						    scoped);
+ 		rcu_read_unlock();
+ 
+@@ -541,7 +541,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
+ 		}
+ #if IS_ENABLED(CONFIG_IPV6)
+ 	} else if (skb->protocol == htons(ETH_P_IPV6)) {
+-		harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
++		harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
+ #endif
+ 	}
+ 
+@@ -559,7 +559,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
+ 				      info, (u8 *)icmph);
+ #if IS_ENABLED(CONFIG_IPV6)
+ 		} else if (family == AF_INET6) {
+-			pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
++			pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
+ 						   info, (u8 *)icmph);
+ #endif
+ 		}
+@@ -841,7 +841,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+ 			return ip_recv_error(sk, msg, len, addr_len);
+ #if IS_ENABLED(CONFIG_IPV6)
+ 		} else if (family == AF_INET6) {
+-			return pingv6_ops.ipv6_recv_error(sk, msg, len,
++			return pingv6_ops->ipv6_recv_error(sk, msg, len,
+ 							  addr_len);
+ #endif
+ 		}
+@@ -900,7 +900,7 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+ 		}
+ 
+ 		if (inet6_sk(sk)->rxopt.all)
+-			pingv6_ops.ip6_datagram_recv_ctl(sk, msg, skb);
++			pingv6_ops->ip6_datagram_recv_ctl(sk, msg, skb);
+ #endif
+ 	} else {
+ 		BUG();
+@@ -1090,7 +1090,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
  		from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
  		0, sock_i_ino(sp),
  		atomic_read(&sp->sk_refcnt), sp,
@@ -93641,12 +93882,12 @@ index 8cae28f..049d45a 100644
 +		atomic_read_unchecked(&sp->sk_drops), len);
  }
  
- static int ping_seq_show(struct seq_file *seq, void *v)
+ static int ping_v4_seq_show(struct seq_file *seq, void *v)
 diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
-index 402870f..4651346 100644
+index 7d3db78..9fd511d 100644
 --- a/net/ipv4/raw.c
 +++ b/net/ipv4/raw.c
-@@ -309,7 +309,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
  int raw_rcv(struct sock *sk, struct sk_buff *skb)
  {
  	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
@@ -93655,7 +93896,7 @@ index 402870f..4651346 100644
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -744,16 +744,20 @@ static int raw_init(struct sock *sk)
+@@ -746,16 +746,20 @@ static int raw_init(struct sock *sk)
  
  static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
  {
@@ -93677,7 +93918,7 @@ index 402870f..4651346 100644
  
  	if (get_user(len, optlen))
  		goto out;
-@@ -763,8 +767,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
+@@ -765,8 +769,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
  	if (len > sizeof(struct icmp_filter))
  		len = sizeof(struct icmp_filter);
  	ret = -EFAULT;
@@ -93688,7 +93929,7 @@ index 402870f..4651346 100644
  		goto out;
  	ret = 0;
  out:	return ret;
-@@ -993,7 +997,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
+@@ -995,7 +999,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
  		0, 0L, 0,
  		from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
  		0, sock_i_ino(sp),
@@ -93698,10 +93939,10 @@ index 402870f..4651346 100644
  
  static int raw_seq_show(struct seq_file *seq, void *v)
 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index f6c6ab1..e0dae89 100644
+index 62290b5..f0d944f 100644
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
-@@ -2562,34 +2562,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
+@@ -2617,34 +2617,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
  		.maxlen		= sizeof(int),
  		.mode		= 0200,
  		.proc_handler	= ipv4_sysctl_rtcache_flush,
@@ -93744,69 +93985,71 @@ index f6c6ab1..e0dae89 100644
  err_dup:
  	return -ENOMEM;
  }
-@@ -2612,7 +2612,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
+@@ -2667,8 +2667,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
  
  static __net_init int rt_genid_init(struct net *net)
  {
--	atomic_set(&net->rt_genid, 0);
-+	atomic_set_unchecked(&net->rt_genid, 0);
+-	atomic_set(&net->ipv4.rt_genid, 0);
+-	atomic_set(&net->fnhe_genid, 0);
++	atomic_set_unchecked(&net->ipv4.rt_genid, 0);
++	atomic_set_unchecked(&net->fnhe_genid, 0);
  	get_random_bytes(&net->ipv4.dev_addr_genid,
  			 sizeof(net->ipv4.dev_addr_genid));
  	return 0;
 diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
-index 90b26be..268b217 100644
+index 540279f..9855b16 100644
 --- a/net/ipv4/sysctl_net_ipv4.c
 +++ b/net/ipv4/sysctl_net_ipv4.c
-@@ -58,7 +58,7 @@ static int ipv4_local_port_range(ctl_table *table, int write,
+@@ -58,7 +58,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
  {
  	int ret;
  	int range[2];
--	ctl_table tmp = {
+-	struct ctl_table tmp = {
 +	ctl_table_no_const tmp = {
  		.data = &range,
  		.maxlen = sizeof(range),
  		.mode = table->mode,
-@@ -111,7 +111,7 @@ static int ipv4_ping_group_range(ctl_table *table, int write,
+@@ -111,7 +111,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
  	int ret;
  	gid_t urange[2];
  	kgid_t low, high;
--	ctl_table tmp = {
+-	struct ctl_table tmp = {
 +	ctl_table_no_const tmp = {
  		.data = &urange,
  		.maxlen = sizeof(urange),
  		.mode = table->mode,
-@@ -142,7 +142,7 @@ static int proc_tcp_congestion_control(ctl_table *ctl, int write,
+@@ -142,7 +142,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
  				       void __user *buffer, size_t *lenp, loff_t *ppos)
  {
  	char val[TCP_CA_NAME_MAX];
--	ctl_table tbl = {
+-	struct ctl_table tbl = {
 +	ctl_table_no_const tbl = {
  		.data = val,
  		.maxlen = TCP_CA_NAME_MAX,
  	};
-@@ -161,7 +161,7 @@ static int proc_tcp_available_congestion_control(ctl_table *ctl,
+@@ -161,7 +161,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
  						 void __user *buffer, size_t *lenp,
  						 loff_t *ppos)
  {
--	ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
+-	struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
 +	ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
  	int ret;
  
  	tbl.data = kmalloc(tbl.maxlen, GFP_USER);
-@@ -178,7 +178,7 @@ static int proc_allowed_congestion_control(ctl_table *ctl,
+@@ -178,7 +178,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
  					   void __user *buffer, size_t *lenp,
  					   loff_t *ppos)
  {
--	ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
+-	struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
 +	ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
  	int ret;
  
  	tbl.data = kmalloc(tbl.maxlen, GFP_USER);
-@@ -204,15 +204,17 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
+@@ -204,15 +204,17 @@ static int ipv4_tcp_mem(struct ctl_table *ctl, int write,
  	struct mem_cgroup *memcg;
  #endif
  
--	ctl_table tmp = {
+-	struct ctl_table tmp = {
 +	ctl_table_no_const tmp = {
  		.data = &vec,
  		.maxlen = sizeof(vec),
@@ -93823,16 +94066,16 @@ index 90b26be..268b217 100644
  	}
  
  	ret = proc_doulongvec_minmax(&tmp, write, buffer, lenp, ppos);
-@@ -239,7 +241,7 @@ static int ipv4_tcp_mem(ctl_table *ctl, int write,
- static int proc_tcp_fastopen_key(ctl_table *ctl, int write, void __user *buffer,
- 				 size_t *lenp, loff_t *ppos)
+@@ -240,7 +242,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
+ 				 void __user *buffer, size_t *lenp,
+ 				 loff_t *ppos)
  {
--	ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
+-	struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
 +	ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
  	struct tcp_fastopen_context *ctxt;
  	int ret;
  	u32  user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
-@@ -482,7 +484,7 @@ static struct ctl_table ipv4_table[] = {
+@@ -483,7 +485,7 @@ static struct ctl_table ipv4_table[] = {
  	},
  	{
  		.procname	= "ip_local_reserved_ports",
@@ -93841,7 +94084,7 @@ index 90b26be..268b217 100644
  		.maxlen		= 65536,
  		.mode		= 0644,
  		.proc_handler	= proc_do_large_bitmap,
-@@ -856,11 +858,10 @@ static struct ctl_table ipv4_net_table[] = {
+@@ -864,11 +866,10 @@ static struct ctl_table ipv4_net_table[] = {
  
  static __net_init int ipv4_sysctl_init_net(struct net *net)
  {
@@ -93855,7 +94098,7 @@ index 90b26be..268b217 100644
  		if (table == NULL)
  			goto err_alloc;
  
-@@ -895,15 +896,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
+@@ -903,15 +904,17 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
  
  	tcp_init_mem(net);
  
@@ -93876,7 +94119,7 @@ index 90b26be..268b217 100644
  err_alloc:
  	return -ENOMEM;
  }
-@@ -925,16 +928,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
+@@ -933,16 +936,6 @@ static __net_initdata struct pernet_operations ipv4_sysctl_ops = {
  static __init int sysctl_ipv4_init(void)
  {
  	struct ctl_table_header *hdr;
@@ -93894,10 +94137,10 @@ index 90b26be..268b217 100644
  	hdr = register_net_sysctl(&init_net, "net/ipv4", ipv4_table);
  	if (hdr == NULL)
 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index e15d330..c93711a 100644
+index 068c8fb..a755c52 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -4472,7 +4472,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
+@@ -4435,7 +4435,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
   * simplifies code)
   */
  static void
@@ -93906,7 +94149,7 @@ index e15d330..c93711a 100644
  	     struct sk_buff *head, struct sk_buff *tail,
  	     u32 start, u32 end)
  {
-@@ -5558,6 +5558,7 @@ discard:
+@@ -5520,6 +5520,7 @@ discard:
  	    tcp_paws_reject(&tp->rx_opt, 0))
  		goto discard_and_undo;
  
@@ -93914,7 +94157,7 @@ index e15d330..c93711a 100644
  	if (th->syn) {
  		/* We see SYN without ACK. It is attempt of
  		 * simultaneous connect with crossed SYNs.
-@@ -5608,6 +5609,7 @@ discard:
+@@ -5570,6 +5571,7 @@ discard:
  		goto discard;
  #endif
  	}
@@ -93922,7 +94165,7 @@ index e15d330..c93711a 100644
  	/* "fifth, if neither of the SYN or RST bits is set then
  	 * drop the segment and return."
  	 */
-@@ -5652,7 +5654,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
+@@ -5616,7 +5618,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
  			goto discard;
  
  		if (th->syn) {
@@ -93932,10 +94175,10 @@ index e15d330..c93711a 100644
  			if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
  				return 1;
 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index 5d87806..1b9673a 100644
+index 5031f68..91569e2 100644
 --- a/net/ipv4/tcp_ipv4.c
 +++ b/net/ipv4/tcp_ipv4.c
-@@ -90,6 +90,10 @@ int sysctl_tcp_low_latency __read_mostly;
+@@ -91,6 +91,10 @@ int sysctl_tcp_low_latency __read_mostly;
  EXPORT_SYMBOL(sysctl_tcp_low_latency);
  
  
@@ -93946,7 +94189,7 @@ index 5d87806..1b9673a 100644
  #ifdef CONFIG_TCP_MD5SIG
  static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
  			       __be32 daddr, __be32 saddr, const struct tcphdr *th);
-@@ -1855,6 +1859,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1829,6 +1833,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
  	return 0;
  
  reset:
@@ -93956,7 +94199,7 @@ index 5d87806..1b9673a 100644
  	tcp_v4_send_reset(rsk, skb);
  discard:
  	kfree_skb(skb);
-@@ -2000,12 +2007,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1974,12 +1981,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);
@@ -93979,7 +94222,7 @@ index 5d87806..1b9673a 100644
  
  	if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
  		NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -2058,6 +2072,10 @@ csum_error:
+@@ -2033,6 +2047,10 @@ csum_error:
  bad_packet:
  		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
  	} else {
@@ -93991,7 +94234,7 @@ index 5d87806..1b9673a 100644
  	}
  
 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
-index 0f01788..d52a859 100644
+index 58a3e69..7f0626e 100644
 --- a/net/ipv4/tcp_minisocks.c
 +++ b/net/ipv4/tcp_minisocks.c
 @@ -27,6 +27,10 @@
@@ -94005,7 +94248,7 @@ index 0f01788..d52a859 100644
  int sysctl_tcp_syncookies __read_mostly = 1;
  EXPORT_SYMBOL(sysctl_tcp_syncookies);
  
-@@ -717,7 +721,10 @@ embryonic_reset:
+@@ -711,7 +715,10 @@ embryonic_reset:
  		 * avoid becoming vulnerable to outside attack aiming at
  		 * resetting legit local connections.
  		 */
@@ -94018,10 +94261,10 @@ index 0f01788..d52a859 100644
  		reqsk_fastopen_remove(sk, req, true);
  		tcp_reset(sk);
 diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
-index d4943f6..e7a74a5 100644
+index 611beab..c4b6e1d 100644
 --- a/net/ipv4/tcp_probe.c
 +++ b/net/ipv4/tcp_probe.c
-@@ -204,7 +204,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
+@@ -245,7 +245,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
  		if (cnt + width >= len)
  			break;
  
@@ -94060,7 +94303,7 @@ index 4b85e6f..22f9ac9 100644
  				  syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
  		/* Has it gone just too far? */
 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
-index c3075b5..6b23f6c 100644
+index 5e2c2f1..6473c22 100644
 --- a/net/ipv4/udp.c
 +++ b/net/ipv4/udp.c
 @@ -87,6 +87,7 @@
@@ -94071,8 +94314,8 @@ index c3075b5..6b23f6c 100644
  #include <linux/socket.h>
  #include <linux/sockios.h>
  #include <linux/igmp.h>
-@@ -111,6 +112,10 @@
- #include <trace/events/skb.h>
+@@ -112,6 +113,10 @@
+ #include <net/busy_poll.h>
  #include "udp_impl.h"
  
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
@@ -94082,7 +94325,7 @@ index c3075b5..6b23f6c 100644
  struct udp_table udp_table __read_mostly;
  EXPORT_SYMBOL(udp_table);
  
-@@ -594,6 +599,9 @@ found:
+@@ -595,6 +600,9 @@ found:
  	return s;
  }
  
@@ -94092,7 +94335,7 @@ index c3075b5..6b23f6c 100644
  /*
   * This routine is called by the ICMP module when it gets some
   * sort of error condition.  If err < 0 then the socket should
-@@ -890,9 +898,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+@@ -892,9 +900,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
  		dport = usin->sin_port;
  		if (dport == 0)
  			return -EINVAL;
@@ -94111,7 +94354,7 @@ index c3075b5..6b23f6c 100644
  		daddr = inet->inet_daddr;
  		dport = inet->inet_dport;
  		/* Open fast path for connected socket.
-@@ -1139,7 +1156,7 @@ static unsigned int first_packet_length(struct sock *sk)
+@@ -1141,7 +1158,7 @@ static unsigned int first_packet_length(struct sock *sk)
  				 IS_UDPLITE(sk));
  		UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
  				 IS_UDPLITE(sk));
@@ -94120,7 +94363,7 @@ index c3075b5..6b23f6c 100644
  		__skb_unlink(skb, rcvq);
  		__skb_queue_tail(&list_kill, skb);
  	}
-@@ -1219,6 +1236,10 @@ try_again:
+@@ -1221,6 +1238,10 @@ try_again:
  	if (!skb)
  		goto out;
  
@@ -94131,7 +94374,7 @@ index c3075b5..6b23f6c 100644
  	ulen = skb->len - sizeof(struct udphdr);
  	copied = len;
  	if (copied > ulen)
-@@ -1252,7 +1273,7 @@ try_again:
+@@ -1254,7 +1275,7 @@ try_again:
  	if (unlikely(err)) {
  		trace_kfree_skb(skb, udp_recvmsg);
  		if (!peeked) {
@@ -94140,7 +94383,7 @@ index c3075b5..6b23f6c 100644
  			UDP_INC_STATS_USER(sock_net(sk),
  					   UDP_MIB_INERRORS, is_udplite);
  		}
-@@ -1540,7 +1561,7 @@ csum_error:
+@@ -1542,7 +1563,7 @@ csum_error:
  	UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
  drop:
  	UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
@@ -94149,7 +94392,7 @@ index c3075b5..6b23f6c 100644
  	kfree_skb(skb);
  	return -1;
  }
-@@ -1559,7 +1580,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
+@@ -1561,7 +1582,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
  			skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
  
  		if (!skb1) {
@@ -94158,7 +94401,7 @@ index c3075b5..6b23f6c 100644
  			UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
  					 IS_UDPLITE(sk));
  			UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
-@@ -1728,6 +1749,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
+@@ -1733,6 +1754,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);
@@ -94168,7 +94411,7 @@ index c3075b5..6b23f6c 100644
  	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
  
  	/*
-@@ -2158,7 +2182,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
+@@ -2165,7 +2189,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
  		from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
  		0, sock_i_ino(sp),
  		atomic_read(&sp->sk_refcnt), sp,
@@ -94178,10 +94421,24 @@ index c3075b5..6b23f6c 100644
  
  int udp4_seq_show(struct seq_file *seq, void *v)
 diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
-index 9a459be..086b866 100644
+index adf9983..8e45d0a 100644
 --- a/net/ipv4/xfrm4_policy.c
 +++ b/net/ipv4/xfrm4_policy.c
-@@ -264,19 +264,18 @@ static struct ctl_table xfrm4_policy_table[] = {
+@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
+ 	fl4->flowi4_tos = iph->tos;
+ }
+ 
+-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
++static int xfrm4_garbage_collect(struct dst_ops *ops)
+ {
+ 	struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
+ 
+-	xfrm4_policy_afinfo.garbage_collect(net);
++	xfrm_garbage_collect_deferred(net);
+ 	return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
+ }
+ 
+@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
  
  static int __net_init xfrm4_net_init(struct net *net)
  {
@@ -94206,7 +94463,7 @@ index 9a459be..086b866 100644
  	if (!hdr)
  		goto err_reg;
  
-@@ -284,8 +283,7 @@ static int __net_init xfrm4_net_init(struct net *net)
+@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
  	return 0;
  
  err_reg:
@@ -94217,10 +94474,10 @@ index 9a459be..086b866 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index b78a3ee..8f5113c 100644
+index cd3fb30..b7dfef7 100644
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
-@@ -621,7 +621,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
+@@ -586,7 +586,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
  		idx = 0;
  		head = &net->dev_index_head[h];
  		rcu_read_lock();
@@ -94229,7 +94486,7 @@ index b78a3ee..8f5113c 100644
  			  net->dev_base_seq;
  		hlist_for_each_entry_rcu(dev, head, index_hlist) {
  			if (idx < s_idx)
-@@ -2405,7 +2405,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
+@@ -2364,7 +2364,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
  		p.iph.ihl = 5;
  		p.iph.protocol = IPPROTO_IPV6;
  		p.iph.ttl = 64;
@@ -94238,7 +94495,7 @@ index b78a3ee..8f5113c 100644
  
  		if (ops->ndo_do_ioctl) {
  			mm_segment_t oldfs = get_fs();
-@@ -4027,7 +4027,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
+@@ -3977,7 +3977,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
  	s_ip_idx = ip_idx = cb->args[2];
  
  	rcu_read_lock();
@@ -94247,51 +94504,62 @@ index b78a3ee..8f5113c 100644
  	for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
  		idx = 0;
  		head = &net->dev_index_head[h];
-@@ -4612,7 +4612,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
+@@ -4603,7 +4603,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
  			dst_free(&ifp->rt->dst);
  		break;
  	}
 -	atomic_inc(&net->ipv6.dev_addr_genid);
 +	atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
+ 	rt_genid_bump_ipv6(net);
  }
  
- static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
-@@ -4632,7 +4632,7 @@ int addrconf_sysctl_forward(ctl_table *ctl, int write,
+@@ -4624,7 +4624,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
  	int *valp = ctl->data;
  	int val = *valp;
  	loff_t pos = *ppos;
--	ctl_table lctl;
+-	struct ctl_table lctl;
 +	ctl_table_no_const lctl;
  	int ret;
  
  	/*
-@@ -4714,7 +4714,7 @@ int addrconf_sysctl_disable(ctl_table *ctl, int write,
+@@ -4709,7 +4709,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
  	int *valp = ctl->data;
  	int val = *valp;
  	loff_t pos = *ppos;
--	ctl_table lctl;
+-	struct ctl_table lctl;
 +	ctl_table_no_const lctl;
  	int ret;
  
  	/*
-diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
-index 40ffd72..aeac0dc 100644
---- a/net/ipv6/esp6.c
-+++ b/net/ipv6/esp6.c
-@@ -425,7 +425,7 @@ static u32 esp6_get_mtu(struct xfrm_state *x, int mtu)
- 		net_adj = 0;
- 
- 	return ((mtu - x->props.header_len - crypto_aead_authsize(esp->aead) -
--		 net_adj) & ~(align - 1)) + (net_adj - 2);
-+		 net_adj) & ~(align - 1)) + net_adj - 2;
+diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
+index 8132b44..b8eca70 100644
+--- a/net/ipv6/af_inet6.c
++++ b/net/ipv6/af_inet6.c
+@@ -767,7 +767,7 @@ static int __net_init inet6_net_init(struct net *net)
+ 
+ 	net->ipv6.sysctl.bindv6only = 0;
+ 	net->ipv6.sysctl.icmpv6_time = 1*HZ;
+-	atomic_set(&net->ipv6.rt_genid, 0);
++	atomic_set_unchecked(&net->ipv6.rt_genid, 0);
+ 
+ 	err = ipv6_init_mibs(net);
+ 	if (err)
+diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
+index c66c6df..f375d3c 100644
+--- a/net/ipv6/datagram.c
++++ b/net/ipv6/datagram.c
+@@ -908,5 +908,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
+ 		   0,
+ 		   sock_i_ino(sp),
+ 		   atomic_read(&sp->sk_refcnt), sp,
+-		   atomic_read(&sp->sk_drops));
++		   atomic_read_unchecked(&sp->sk_drops));
  }
- 
- static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
-index 70e704d..a4293c8 100644
+index eef8d94..cfa1852 100644
 --- a/net/ipv6/icmp.c
 +++ b/net/ipv6/icmp.c
-@@ -988,7 +988,7 @@ ctl_table ipv6_icmp_table_template[] = {
+@@ -997,7 +997,7 @@ struct ctl_table ipv6_icmp_table_template[] = {
  
  struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
  {
@@ -94301,7 +94569,7 @@ index 70e704d..a4293c8 100644
  	table = kmemdup(ipv6_icmp_table_template,
  			sizeof(ipv6_icmp_table_template),
 diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
-index 1f9a1a5..413e487 100644
+index bf4a9a0..e5f6ac5 100644
 --- a/net/ipv6/ip6_gre.c
 +++ b/net/ipv6/ip6_gre.c
 @@ -74,7 +74,7 @@ struct ip6gre_net {
@@ -94313,7 +94581,7 @@ index 1f9a1a5..413e487 100644
  static int ip6gre_tunnel_init(struct net_device *dev);
  static void ip6gre_tunnel_setup(struct net_device *dev);
  static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
-@@ -1283,7 +1283,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
+@@ -1286,7 +1286,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
  }
  
  
@@ -94322,7 +94590,7 @@ index 1f9a1a5..413e487 100644
  	.handler     = ip6gre_rcv,
  	.err_handler = ip6gre_err,
  	.flags       = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
-@@ -1617,7 +1617,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
+@@ -1622,7 +1622,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
  	[IFLA_GRE_FLAGS]       = { .type = NLA_U32 },
  };
  
@@ -94331,7 +94599,7 @@ index 1f9a1a5..413e487 100644
  	.kind		= "ip6gre",
  	.maxtype	= IFLA_GRE_MAX,
  	.policy		= ip6gre_policy,
-@@ -1630,7 +1630,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
+@@ -1635,7 +1635,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
  	.fill_info	= ip6gre_fill_info,
  };
  
@@ -94341,10 +94609,10 @@ index 1f9a1a5..413e487 100644
  	.maxtype	= IFLA_GRE_MAX,
  	.policy		= ip6gre_policy,
 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
-index 0516ebb..a5f065b 100644
+index c1e11b5..568e633 100644
 --- a/net/ipv6/ip6_tunnel.c
 +++ b/net/ipv6/ip6_tunnel.c
-@@ -88,7 +88,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
+@@ -89,7 +89,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
  
  static int ip6_tnl_dev_init(struct net_device *dev);
  static void ip6_tnl_dev_setup(struct net_device *dev);
@@ -94353,7 +94621,7 @@ index 0516ebb..a5f065b 100644
  
  static int ip6_tnl_net_id __read_mostly;
  struct ip6_tnl_net {
-@@ -1672,7 +1672,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
+@@ -1699,7 +1699,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
  	[IFLA_IPTUN_PROTO]		= { .type = NLA_U8 },
  };
  
@@ -94467,10 +94735,10 @@ index 253566a..9fa50c7 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv6/output_core.c b/net/ipv6/output_core.c
-index c2e73e6..12cca6f 100644
+index 827f795..7e28e82 100644
 --- a/net/ipv6/output_core.c
 +++ b/net/ipv6/output_core.c
-@@ -8,8 +8,8 @@
+@@ -9,8 +9,8 @@
  
  void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
  {
@@ -94481,7 +94749,7 @@ index c2e73e6..12cca6f 100644
  
  #if IS_ENABLED(CONFIG_IPV6)
  	if (rt && !(rt->dst.flags & DST_NOPEER)) {
-@@ -25,13 +25,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
+@@ -26,13 +26,10 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
  		}
  	}
  #endif
@@ -94499,20 +94767,64 @@ index c2e73e6..12cca6f 100644
  }
  EXPORT_SYMBOL(ipv6_select_ident);
  
+diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
+index 7856e96..75ebc7f 100644
+--- a/net/ipv6/ping.c
++++ b/net/ipv6/ping.c
+@@ -246,6 +246,22 @@ static struct pernet_operations ping_v6_net_ops = {
+ };
+ #endif
+ 
++static struct pingv6_ops real_pingv6_ops = {
++	.ipv6_recv_error	= ipv6_recv_error,
++	.ip6_datagram_recv_ctl	= ip6_datagram_recv_ctl,
++	.icmpv6_err_convert	= icmpv6_err_convert,
++	.ipv6_icmp_error	= ipv6_icmp_error,
++	.ipv6_chk_addr		= ipv6_chk_addr,
++};
++
++static struct pingv6_ops dummy_pingv6_ops = {
++	.ipv6_recv_error	= dummy_ipv6_recv_error,
++	.ip6_datagram_recv_ctl	= dummy_ip6_datagram_recv_ctl,
++	.icmpv6_err_convert	= dummy_icmpv6_err_convert,
++	.ipv6_icmp_error	= dummy_ipv6_icmp_error,
++	.ipv6_chk_addr		= dummy_ipv6_chk_addr,
++};
++
+ int __init pingv6_init(void)
+ {
+ #ifdef CONFIG_PROC_FS
+@@ -253,11 +269,7 @@ int __init pingv6_init(void)
+ 	if (ret)
+ 		return ret;
+ #endif
+-	pingv6_ops.ipv6_recv_error = ipv6_recv_error;
+-	pingv6_ops.ip6_datagram_recv_ctl = ip6_datagram_recv_ctl;
+-	pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
+-	pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
+-	pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
++	pingv6_ops = &real_pingv6_ops;
+ 	return inet6_register_protosw(&pingv6_protosw);
+ }
+ 
+@@ -266,11 +278,7 @@ int __init pingv6_init(void)
+  */
+ void pingv6_exit(void)
+ {
+-	pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
+-	pingv6_ops.ip6_datagram_recv_ctl = dummy_ip6_datagram_recv_ctl;
+-	pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
+-	pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
+-	pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
++	pingv6_ops = &dummy_pingv6_ops;
+ #ifdef CONFIG_PROC_FS
+ 	unregister_pernet_subsys(&ping_v6_net_ops);
+ #endif
 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
-index 464b1c9..673cedb 100644
+index 430067c..4adf088 100644
 --- a/net/ipv6/raw.c
 +++ b/net/ipv6/raw.c
-@@ -108,7 +108,7 @@ found:
-  */
- static int icmpv6_filter(const struct sock *sk, const struct sk_buff *skb)
- {
--	struct icmp6hdr *_hdr;
-+	struct icmp6hdr _hdr;
- 	const struct icmp6hdr *hdr;
- 
- 	hdr = skb_header_pointer(skb, skb_transport_offset(skb),
-@@ -378,7 +378,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -385,7 +385,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
  {
  	if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
  	    skb_checksum_complete(skb)) {
@@ -94521,7 +94833,7 @@ index 464b1c9..673cedb 100644
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -406,7 +406,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -413,7 +413,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
  	struct raw6_sock *rp = raw6_sk(sk);
  
  	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
@@ -94530,7 +94842,7 @@ index 464b1c9..673cedb 100644
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -430,7 +430,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -437,7 +437,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
  
  	if (inet->hdrincl) {
  		if (skb_checksum_complete(skb)) {
@@ -94539,7 +94851,7 @@ index 464b1c9..673cedb 100644
  			kfree_skb(skb);
  			return NET_RX_DROP;
  		}
-@@ -600,7 +600,7 @@ out:
+@@ -607,7 +607,7 @@ out:
  	return err;
  }
  
@@ -94548,7 +94860,7 @@ index 464b1c9..673cedb 100644
  			struct flowi6 *fl6, struct dst_entry **dstp,
  			unsigned int flags)
  {
-@@ -912,12 +912,15 @@ do_confirm:
+@@ -920,12 +920,15 @@ do_confirm:
  static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
  			       char __user *optval, int optlen)
  {
@@ -94565,7 +94877,7 @@ index 464b1c9..673cedb 100644
  		return 0;
  	default:
  		return -ENOPROTOOPT;
-@@ -930,6 +933,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
+@@ -938,6 +941,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
  			       char __user *optval, int __user *optlen)
  {
  	int len;
@@ -94573,7 +94885,7 @@ index 464b1c9..673cedb 100644
  
  	switch (optname) {
  	case ICMPV6_FILTER:
-@@ -941,7 +945,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
+@@ -949,7 +953,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
  			len = sizeof(struct icmp6_filter);
  		if (put_user(len, optlen))
  			return -EFAULT;
@@ -94583,15 +94895,6 @@ index 464b1c9..673cedb 100644
  			return -EFAULT;
  		return 0;
  	default:
-@@ -1249,7 +1254,7 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
- 		   from_kuid_munged(seq_user_ns(seq), 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), sp, atomic_read_unchecked(&sp->sk_drops));
- }
- 
- static int raw6_seq_show(struct seq_file *seq, void *v)
 diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
 index 1aeb473..bea761c 100644
 --- a/net/ipv6/reassembly.c
@@ -94635,10 +94938,10 @@ index 1aeb473..bea761c 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 5a8bf536..72b1d94 100644
+index 77308af..36ed509 100644
 --- a/net/ipv6/route.c
 +++ b/net/ipv6/route.c
-@@ -2937,7 +2937,7 @@ ctl_table ipv6_route_table_template[] = {
+@@ -3009,7 +3009,7 @@ struct ctl_table ipv6_route_table_template[] = {
  
  struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
  {
@@ -94648,7 +94951,7 @@ index 5a8bf536..72b1d94 100644
  	table = kmemdup(ipv6_route_table_template,
  			sizeof(ipv6_route_table_template),
 diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
-index 0491264..c403222 100644
+index b433884..3875266 100644
 --- a/net/ipv6/sit.c
 +++ b/net/ipv6/sit.c
 @@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
@@ -94660,9 +94963,9 @@ index 0491264..c403222 100644
  
  static int sit_net_id __read_mostly;
  struct sit_net {
-@@ -1507,7 +1507,7 @@ static const struct nla_policy ipip6_policy[IFLA_IPTUN_MAX + 1] = {
- #endif
- };
+@@ -1603,7 +1603,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
+ 		unregister_netdevice_queue(dev, head);
+ }
  
 -static struct rtnl_link_ops sit_link_ops __read_mostly = {
 +static struct rtnl_link_ops sit_link_ops = {
@@ -94670,10 +94973,10 @@ index 0491264..c403222 100644
  	.maxtype	= IFLA_IPTUN_MAX,
  	.policy		= ipip6_policy,
 diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
-index e85c48b..b8268d3 100644
+index 107b2f1..72741a9 100644
 --- a/net/ipv6/sysctl_net_ipv6.c
 +++ b/net/ipv6/sysctl_net_ipv6.c
-@@ -40,7 +40,7 @@ static ctl_table ipv6_rotable[] = {
+@@ -40,7 +40,7 @@ static struct ctl_table ipv6_rotable[] = {
  
  static int __net_init ipv6_sysctl_net_init(struct net *net)
  {
@@ -94683,10 +94986,10 @@ index e85c48b..b8268d3 100644
  	struct ctl_table *ipv6_icmp_table;
  	int err;
 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index 66c7188..5600868 100644
+index 5c71501..7e8d5d3 100644
 --- a/net/ipv6/tcp_ipv6.c
 +++ b/net/ipv6/tcp_ipv6.c
-@@ -103,6 +103,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
+@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
  		inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
  }
  
@@ -94697,7 +95000,7 @@ index 66c7188..5600868 100644
  static void tcp_v6_hash(struct sock *sk)
  {
  	if (sk->sk_state != TCP_CLOSE) {
-@@ -1398,6 +1402,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1397,6 +1401,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
  	return 0;
  
  reset:
@@ -94707,7 +95010,7 @@ index 66c7188..5600868 100644
  	tcp_v6_send_reset(sk, skb);
  discard:
  	if (opt_skb)
-@@ -1480,12 +1487,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
+@@ -1479,12 +1486,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);
@@ -94742,10 +95045,10 @@ index 66c7188..5600868 100644
  	}
  
 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
-index 6b298dc..c3e5995 100644
+index 3d2758d..626c422 100644
 --- a/net/ipv6/udp.c
 +++ b/net/ipv6/udp.c
-@@ -52,6 +52,10 @@
+@@ -53,6 +53,10 @@
  #include <trace/events/skb.h>
  #include "udp_impl.h"
  
@@ -94756,7 +95059,7 @@ index 6b298dc..c3e5995 100644
  int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
  {
  	const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
-@@ -416,7 +420,7 @@ try_again:
+@@ -417,7 +421,7 @@ try_again:
  	if (unlikely(err)) {
  		trace_kfree_skb(skb, udpv6_recvmsg);
  		if (!peeked) {
@@ -94765,7 +95068,7 @@ index 6b298dc..c3e5995 100644
  			if (is_udp4)
  				UDP_INC_STATS_USER(sock_net(sk),
  						   UDP_MIB_INERRORS,
-@@ -662,7 +666,7 @@ csum_error:
+@@ -665,7 +669,7 @@ csum_error:
  	UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
  drop:
  	UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
@@ -94774,7 +95077,7 @@ index 6b298dc..c3e5995 100644
  	kfree_skb(skb);
  	return -1;
  }
-@@ -720,7 +724,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
+@@ -723,7 +727,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
  		if (likely(skb1 == NULL))
  			skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
  		if (!skb1) {
@@ -94783,7 +95086,7 @@ index 6b298dc..c3e5995 100644
  			UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
  					  IS_UDPLITE(sk));
  			UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
-@@ -857,6 +861,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
+@@ -863,6 +867,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
  		goto csum_error;
  
  	UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -94793,20 +95096,25 @@ index 6b298dc..c3e5995 100644
  	icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
  
  	kfree_skb(skb);
-@@ -1389,7 +1396,7 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
- 		   0,
- 		   sock_i_ino(sp),
- 		   atomic_read(&sp->sk_refcnt), sp,
--		   atomic_read(&sp->sk_drops));
-+		   atomic_read_unchecked(&sp->sk_drops));
- }
- 
- int udp6_seq_show(struct seq_file *seq, void *v)
 diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
-index 23ed03d..465a71d 100644
+index 550b195..6acea83 100644
 --- a/net/ipv6/xfrm6_policy.c
 +++ b/net/ipv6/xfrm6_policy.c
-@@ -324,19 +324,19 @@ static struct ctl_table xfrm6_policy_table[] = {
+@@ -212,11 +212,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
+ 	}
+ }
+ 
+-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
++static int xfrm6_garbage_collect(struct dst_ops *ops)
+ {
+ 	struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
+ 
+-	xfrm6_policy_afinfo.garbage_collect(net);
++	xfrm_garbage_collect_deferred(net);
+ 	return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
+ }
+ 
+@@ -329,19 +329,19 @@ static struct ctl_table xfrm6_policy_table[] = {
  
  static int __net_init xfrm6_net_init(struct net *net)
  {
@@ -94831,7 +95139,7 @@ index 23ed03d..465a71d 100644
  	if (!hdr)
  		goto err_reg;
  
-@@ -344,8 +344,7 @@ static int __net_init xfrm6_net_init(struct net *net)
+@@ -349,8 +349,7 @@ static int __net_init xfrm6_net_init(struct net *net)
  	return 0;
  
  err_reg:
@@ -94917,7 +95225,7 @@ index 41ac7938..75e3bb1 100644
  	seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
-index 276aa86..aeb81c8 100644
+index c4b7218..3e83259 100644
 --- a/net/iucv/af_iucv.c
 +++ b/net/iucv/af_iucv.c
 @@ -773,10 +773,10 @@ static int iucv_sock_autobind(struct sock *sk)
@@ -94934,10 +95242,10 @@ index 276aa86..aeb81c8 100644
  
  	write_unlock_bh(&iucv_sk_list.lock);
 diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
-index 4fe76ff..426a904 100644
+index cd5b8ec..f205e6b 100644
 --- a/net/iucv/iucv.c
 +++ b/net/iucv/iucv.c
-@@ -690,7 +690,7 @@ static int __cpuinit iucv_cpu_notify(struct notifier_block *self,
+@@ -690,7 +690,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
  	return NOTIFY_OK;
  }
  
@@ -94947,10 +95255,10 @@ index 4fe76ff..426a904 100644
  };
  
 diff --git a/net/key/af_key.c b/net/key/af_key.c
-index 66f51c5..8f0eef1 100644
+index 545f047..9757a9d 100644
 --- a/net/key/af_key.c
 +++ b/net/key/af_key.c
-@@ -3048,10 +3048,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
+@@ -3041,10 +3041,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
  static u32 get_acqseq(void)
  {
  	u32 res;
@@ -94964,10 +95272,10 @@ index 66f51c5..8f0eef1 100644
  	return res;
  }
 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 5ab17b8..5b0aae4 100644
+index 629dee7..4bdd2c8 100644
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -806,7 +806,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
+@@ -826,7 +826,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
  			ret = ieee80211_vif_use_channel(sdata, chandef,
  					IEEE80211_CHANCTX_EXCLUSIVE);
  		}
@@ -94976,7 +95284,7 @@ index 5ab17b8..5b0aae4 100644
  		local->_oper_chandef = *chandef;
  		ieee80211_hw_config(local, 0);
  	}
-@@ -2922,7 +2922,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
+@@ -3125,7 +3125,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
  		else
  			local->probe_req_reg--;
  
@@ -94985,7 +95293,7 @@ index 5ab17b8..5b0aae4 100644
  			break;
  
  		ieee80211_queue_work(&local->hw, &local->reconfig_filter);
-@@ -3385,8 +3385,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
+@@ -3588,8 +3588,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
  	if (chanctx_conf) {
  		*chandef = chanctx_conf->def;
  		ret = 0;
@@ -94997,7 +95305,7 @@ index 5ab17b8..5b0aae4 100644
  		if (local->use_chanctx)
  			*chandef = local->monitor_chandef;
 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
-index 92ef04c..dab37ef3 100644
+index 611abfc..8c2c7e4 100644
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
 @@ -28,6 +28,7 @@
@@ -95008,7 +95316,7 @@ index 92ef04c..dab37ef3 100644
  #include "key.h"
  #include "sta_info.h"
  #include "debug.h"
-@@ -894,7 +895,7 @@ struct ieee80211_local {
+@@ -945,7 +946,7 @@ struct ieee80211_local {
  	/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
  	spinlock_t queue_stop_reason_lock;
  
@@ -95018,10 +95326,10 @@ index 92ef04c..dab37ef3 100644
  	/* number of interfaces with corresponding FIF_ flags */
  	int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 514e90f..56f22bf 100644
+index fcecd63..a404454 100644
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -502,7 +502,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -519,7 +519,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
  		break;
  	}
  
@@ -95030,16 +95338,16 @@ index 514e90f..56f22bf 100644
  		res = drv_start(local);
  		if (res)
  			goto err_del_bss;
-@@ -545,7 +545,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
- 			break;
- 		}
- 
--		if (local->monitors == 0 && local->open_count == 0) {
-+		if (local->monitors == 0 && local_read(&local->open_count) == 0) {
+@@ -566,7 +566,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+ 			res = drv_add_interface(local, sdata);
+ 			if (res)
+ 				goto err_stop;
+-		} else if (local->monitors == 0 && local->open_count == 0) {
++		} else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
  			res = ieee80211_add_virtual_monitor(local);
  			if (res)
  				goto err_stop;
-@@ -653,7 +653,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -675,7 +675,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
  		atomic_inc(&local->iff_promiscs);
  
  	if (coming_up)
@@ -95048,7 +95356,7 @@ index 514e90f..56f22bf 100644
  
  	if (hw_reconf_flags)
  		ieee80211_hw_config(local, hw_reconf_flags);
-@@ -691,7 +691,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -713,7 +713,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
   err_del_interface:
  	drv_remove_interface(local, sdata);
   err_stop:
@@ -95057,7 +95365,7 @@ index 514e90f..56f22bf 100644
  		drv_stop(local);
   err_del_bss:
  	sdata->bss = NULL;
-@@ -828,7 +828,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -852,7 +852,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
  	}
  
  	if (going_down)
@@ -95066,7 +95374,7 @@ index 514e90f..56f22bf 100644
  
  	switch (sdata->vif.type) {
  	case NL80211_IFTYPE_AP_VLAN:
-@@ -895,7 +895,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -919,7 +919,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
  	}
  	spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
  
@@ -95075,7 +95383,7 @@ index 514e90f..56f22bf 100644
  		ieee80211_clear_tx_pending(local);
  
  	/*
-@@ -931,7 +931,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -959,7 +959,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
  
  	ieee80211_recalc_ps(local, -1);
  
@@ -95084,7 +95392,7 @@ index 514e90f..56f22bf 100644
  		ieee80211_stop_device(local);
  
  		/* no reconfiguring after stop! */
-@@ -942,7 +942,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -970,7 +970,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
  	ieee80211_configure_filter(local);
  	ieee80211_hw_config(local, hw_reconf_flags);
  
@@ -95094,10 +95402,10 @@ index 514e90f..56f22bf 100644
  }
  
 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
-index 8a7bfc4..be07e86 100644
+index 21d5d44..4fee18a 100644
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
-@@ -181,7 +181,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
+@@ -172,7 +172,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
  		changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
  			     IEEE80211_CONF_CHANGE_POWER);
  
@@ -95106,15 +95414,6 @@ index 8a7bfc4..be07e86 100644
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
-@@ -921,7 +921,7 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
- 		hw->queues = IEEE80211_MAX_QUEUES;
- 
- 	local->workqueue =
--		alloc_ordered_workqueue(wiphy_name(local->hw.wiphy), 0);
-+		alloc_ordered_workqueue("%s", 0, wiphy_name(local->hw.wiphy));
- 	if (!local->workqueue) {
- 		result = -ENOMEM;
- 		goto fail_workqueue;
 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
 index 3401262..d5cd68d 100644
 --- a/net/mac80211/pm.c
@@ -95147,10 +95446,10 @@ index 3401262..d5cd68d 100644
  
   suspend:
 diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
-index a02bef3..f2f38dd 100644
+index e126605..73d2c39 100644
 --- a/net/mac80211/rate.c
 +++ b/net/mac80211/rate.c
-@@ -712,7 +712,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
+@@ -725,7 +725,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
  
  	ASSERT_RTNL();
  
@@ -95173,10 +95472,10 @@ index c97a065..ff61928 100644
  
  	return p;
 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
-index 5db8eb5..d0319e8 100644
+index 69e4ef5..e8e4b92 100644
 --- a/net/mac80211/util.c
 +++ b/net/mac80211/util.c
-@@ -1472,7 +1472,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+@@ -1470,7 +1470,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
  	}
  #endif
  	/* everything else happens only if HW was up & running */
@@ -95185,7 +95484,7 @@ index 5db8eb5..d0319e8 100644
  		goto wake_up;
  
  	/*
-@@ -1696,7 +1696,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+@@ -1695,7 +1695,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
  	local->in_reconfig = false;
  	barrier();
  
@@ -95195,10 +95494,10 @@ index 5db8eb5..d0319e8 100644
  
  	/*
 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
-index 56d22ca..87c778f 100644
+index 6e839b6..002a233 100644
 --- a/net/netfilter/Kconfig
 +++ b/net/netfilter/Kconfig
-@@ -958,6 +958,16 @@ config NETFILTER_XT_MATCH_ESP
+@@ -950,6 +950,16 @@ config NETFILTER_XT_MATCH_ESP
  
  	  To compile it as a module, choose M here.  If unsure, say N.
  
@@ -95216,7 +95515,7 @@ index 56d22ca..87c778f 100644
  	tristate '"hashlimit" match support'
  	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
-index a1abf87..dbcb7ee 100644
+index c3a0a12..90b587f 100644
 --- a/net/netfilter/Makefile
 +++ b/net/netfilter/Makefile
 @@ -112,6 +112,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
@@ -95228,10 +95527,10 @@ index a1abf87..dbcb7ee 100644
  obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
 diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
-index f771390..145b765 100644
+index f2e30fb..f131862 100644
 --- a/net/netfilter/ipset/ip_set_core.c
 +++ b/net/netfilter/ipset/ip_set_core.c
-@@ -1820,7 +1820,7 @@ done:
+@@ -1819,7 +1819,7 @@ done:
  	return ret;
  }
  
@@ -95241,7 +95540,7 @@ index f771390..145b765 100644
  	.get_optmin	= SO_IP_SET,
  	.get_optmax	= SO_IP_SET + 1,
 diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
-index a083bda..da661c3 100644
+index 4c8e5c0..5a79b4d 100644
 --- a/net/netfilter/ipvs/ip_vs_conn.c
 +++ b/net/netfilter/ipvs/ip_vs_conn.c
 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
@@ -95262,7 +95561,7 @@ index a083bda..da661c3 100644
  
  	cp->packet_xmit = NULL;
  	cp->app = NULL;
-@@ -1190,7 +1190,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
+@@ -1188,7 +1188,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
  
  	/* Don't drop the entry if its number of incoming packets is not
  	   located in [0, 8] */
@@ -95272,10 +95571,10 @@ index a083bda..da661c3 100644
  
  	if (!todrop_rate[i]) return 0;
 diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
-index 21a3a47..268e13e 100644
+index 3581736..c0453e9 100644
 --- a/net/netfilter/ipvs/ip_vs_core.c
 +++ b/net/netfilter/ipvs/ip_vs_core.c
-@@ -559,7 +559,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
+@@ -567,7 +567,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
  		ret = cp->packet_xmit(skb, cp, pd->pp, iph);
  		/* do not touch skb anymore */
  
@@ -95284,7 +95583,7 @@ index 21a3a47..268e13e 100644
  		ip_vs_conn_put(cp);
  		return ret;
  	}
-@@ -1698,7 +1698,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
+@@ -1706,7 +1706,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
  	if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
  		pkts = sysctl_sync_threshold(ipvs);
  	else
@@ -95294,10 +95593,10 @@ index 21a3a47..268e13e 100644
  	if (ipvs->sync_state & IP_VS_STATE_MASTER)
  		ip_vs_sync_conn(net, cp, pkts);
 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
-index 9e6c2a0..28552e2 100644
+index a3df9bd..895ae09 100644
 --- a/net/netfilter/ipvs/ip_vs_ctl.c
 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
-@@ -789,7 +789,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
+@@ -794,7 +794,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
  		 */
  		ip_vs_rs_hash(ipvs, dest);
  	}
@@ -95305,8 +95604,8 @@ index 9e6c2a0..28552e2 100644
 +	atomic_set_unchecked(&dest->conn_flags, conn_flags);
  
  	/* bind the service */
- 	if (!dest->svc) {
-@@ -1657,7 +1657,7 @@ proc_do_sync_ports(ctl_table *table, int write,
+ 	old_svc = rcu_dereference_protected(dest->svc, 1);
+@@ -1641,7 +1641,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
   *	align with netns init in ip_vs_control_net_init()
   */
  
@@ -95315,7 +95614,7 @@ index 9e6c2a0..28552e2 100644
  	{
  		.procname	= "amemthresh",
  		.maxlen		= sizeof(int),
-@@ -2060,7 +2060,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2062,7 +2062,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
  					   "      %-7s %-6d %-10d %-10d\n",
  					   &dest->addr.in6,
  					   ntohs(dest->port),
@@ -95324,7 +95623,7 @@ index 9e6c2a0..28552e2 100644
  					   atomic_read(&dest->weight),
  					   atomic_read(&dest->activeconns),
  					   atomic_read(&dest->inactconns));
-@@ -2071,7 +2071,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2073,7 +2073,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
  					   "%-7s %-6d %-10d %-10d\n",
  					   ntohl(dest->addr.ip),
  					   ntohs(dest->port),
@@ -95333,7 +95632,7 @@ index 9e6c2a0..28552e2 100644
  					   atomic_read(&dest->weight),
  					   atomic_read(&dest->activeconns),
  					   atomic_read(&dest->inactconns));
-@@ -2549,7 +2549,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
+@@ -2551,7 +2551,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
  
  			entry.addr = dest->addr.ip;
  			entry.port = dest->port;
@@ -95342,7 +95641,7 @@ index 9e6c2a0..28552e2 100644
  			entry.weight = atomic_read(&dest->weight);
  			entry.u_threshold = dest->u_threshold;
  			entry.l_threshold = dest->l_threshold;
-@@ -3092,7 +3092,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
+@@ -3094,7 +3094,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
  	if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
  	    nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
  	    nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
@@ -95351,7 +95650,7 @@ index 9e6c2a0..28552e2 100644
  			 IP_VS_CONN_F_FWD_MASK)) ||
  	    nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
  			atomic_read(&dest->weight)) ||
-@@ -3682,7 +3682,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
+@@ -3684,7 +3684,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
  {
  	int idx;
  	struct netns_ipvs *ipvs = net_ipvs(net);
@@ -95361,36 +95660,36 @@ index 9e6c2a0..28552e2 100644
  	atomic_set(&ipvs->dropentry, 0);
  	spin_lock_init(&ipvs->dropentry_lock);
 diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
-index 5ea26bd..c9bc65f 100644
+index eff13c9..c1aab3e 100644
 --- a/net/netfilter/ipvs/ip_vs_lblc.c
 +++ b/net/netfilter/ipvs/ip_vs_lblc.c
 @@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
   *      IPVS LBLC sysctl table
   */
  #ifdef CONFIG_SYSCTL
--static ctl_table vs_vars_table[] = {
+-static struct ctl_table vs_vars_table[] = {
 +static ctl_table_no_const vs_vars_table[] __read_only = {
  	{
  		.procname	= "lblc_expiration",
  		.data		= NULL,
 diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
-index 50123c2..067c773 100644
+index 0b85500..8513fa5 100644
 --- a/net/netfilter/ipvs/ip_vs_lblcr.c
 +++ b/net/netfilter/ipvs/ip_vs_lblcr.c
-@@ -299,7 +299,7 @@ struct ip_vs_lblcr_table {
+@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
   *      IPVS LBLCR sysctl table
   */
  
--static ctl_table vs_vars_table[] = {
+-static struct ctl_table vs_vars_table[] = {
 +static ctl_table_no_const vs_vars_table[] __read_only = {
  	{
  		.procname	= "lblcr_expiration",
  		.data		= NULL,
 diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
-index f6046d9..4f10cfd 100644
+index f448471..995f131 100644
 --- a/net/netfilter/ipvs/ip_vs_sync.c
 +++ b/net/netfilter/ipvs/ip_vs_sync.c
-@@ -596,7 +596,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
+@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
  	cp = cp->control;
  	if (cp) {
  		if (cp->flags & IP_VS_CONN_F_TEMPLATE)
@@ -95399,7 +95698,7 @@ index f6046d9..4f10cfd 100644
  		else
  			pkts = sysctl_sync_threshold(ipvs);
  		ip_vs_sync_conn(net, cp->control, pkts);
-@@ -758,7 +758,7 @@ control:
+@@ -771,7 +771,7 @@ control:
  	if (!cp)
  		return;
  	if (cp->flags & IP_VS_CONN_F_TEMPLATE)
@@ -95408,7 +95707,7 @@ index f6046d9..4f10cfd 100644
  	else
  		pkts = sysctl_sync_threshold(ipvs);
  	goto sloop;
-@@ -882,7 +882,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
+@@ -895,7 +895,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
  
  	if (opt)
  		memcpy(&cp->in_seq, opt, sizeof(*opt));
@@ -95453,10 +95752,10 @@ index 2d3030a..7ba1c0a 100644
  	table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
  			GFP_KERNEL);
 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
-index 0283bae..5febcb0 100644
+index 5d892fe..d2fc9d8 100644
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -1614,6 +1614,10 @@ void nf_conntrack_init_end(void)
+@@ -1600,6 +1600,10 @@ void nf_conntrack_init_end(void)
  #define DYING_NULLS_VAL		((1<<30)+1)
  #define TEMPLATE_NULLS_VAL	((1<<30)+2)
  
@@ -95467,7 +95766,7 @@ index 0283bae..5febcb0 100644
  int nf_conntrack_init_net(struct net *net)
  {
  	int ret;
-@@ -1628,7 +1632,11 @@ int nf_conntrack_init_net(struct net *net)
+@@ -1614,7 +1618,11 @@ int nf_conntrack_init_net(struct net *net)
  		goto err_stat;
  	}
  
@@ -95506,7 +95805,7 @@ index 974a2a4..52cc6ff 100644
  	table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
  			GFP_KERNEL);
 diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
-index 0ab9636..cea3c6a 100644
+index ce30041..3861b5d 100644
 --- a/net/netfilter/nf_conntrack_proto.c
 +++ b/net/netfilter/nf_conntrack_proto.c
 @@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
@@ -95567,54 +95866,11 @@ index a99b6c3..cb372f9 100644
  	return -NF_ACCEPT;
  }
  
-diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
-index 4d4d8f1..e0f9a32 100644
---- a/net/netfilter/nf_conntrack_proto_tcp.c
-+++ b/net/netfilter/nf_conntrack_proto_tcp.c
-@@ -526,7 +526,7 @@ static bool tcp_in_window(const struct nf_conn *ct,
- 	const struct nf_conntrack_tuple *tuple = &ct->tuplehash[dir].tuple;
- 	__u32 seq, ack, sack, end, win, swin;
- 	s16 receiver_offset;
--	bool res;
-+	bool res, in_recv_win;
- 
- 	/*
- 	 * Get the required data from the packet.
-@@ -649,14 +649,18 @@ static bool tcp_in_window(const struct nf_conn *ct,
- 		 receiver->td_end, receiver->td_maxend, receiver->td_maxwin,
- 		 receiver->td_scale);
- 
-+	/* Is the ending sequence in the receive window (if available)? */
-+	in_recv_win = !receiver->td_maxwin ||
-+		      after(end, sender->td_end - receiver->td_maxwin - 1);
-+
- 	pr_debug("tcp_in_window: I=%i II=%i III=%i IV=%i\n",
- 		 before(seq, sender->td_maxend + 1),
--		 after(end, sender->td_end - receiver->td_maxwin - 1),
-+		 (in_recv_win ? 1 : 0),
- 		 before(sack, receiver->td_end + 1),
- 		 after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1));
- 
- 	if (before(seq, sender->td_maxend + 1) &&
--	    after(end, sender->td_end - receiver->td_maxwin - 1) &&
-+	    in_recv_win &&
- 	    before(sack, receiver->td_end + 1) &&
- 	    after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1)) {
- 		/*
-@@ -725,7 +729,7 @@ static bool tcp_in_window(const struct nf_conn *ct,
- 			nf_log_packet(net, pf, 0, skb, NULL, NULL, NULL,
- 			"nf_ct_tcp: %s ",
- 			before(seq, sender->td_maxend + 1) ?
--			after(end, sender->td_end - receiver->td_maxwin - 1) ?
-+			in_recv_win ?
- 			before(sack, receiver->td_end + 1) ?
- 			after(sack, receiver->td_end - MAXACKWINDOW(sender) - 1) ? "BUG"
- 			: "ACK is under the lower bound (possible overly delayed ACK)"
 diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
-index bd700b4..4a3dc61 100644
+index f641751..d3c5b51 100644
 --- a/net/netfilter/nf_conntrack_standalone.c
 +++ b/net/netfilter/nf_conntrack_standalone.c
-@@ -471,7 +471,7 @@ static ctl_table nf_ct_netfilter_table[] = {
+@@ -471,7 +471,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
  
  static int nf_conntrack_standalone_init_sysctl(struct net *net)
  {
@@ -95637,7 +95893,7 @@ index 902fb0a..87f7fdb 100644
  	table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
  			GFP_KERNEL);
 diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
-index 3b18dd1..f79e0ca 100644
+index 85296d4..8becdec 100644
 --- a/net/netfilter/nf_log.c
 +++ b/net/netfilter/nf_log.c
 @@ -243,7 +243,7 @@ static const struct file_operations nflog_file_ops = {
@@ -95647,9 +95903,9 @@ index 3b18dd1..f79e0ca 100644
 -static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
 +static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
  
- static int nf_log_proc_dostring(ctl_table *table, int write,
+ static int nf_log_proc_dostring(struct ctl_table *table, int write,
  			 void __user *buffer, size_t *lenp, loff_t *ppos)
-@@ -274,14 +274,16 @@ static int nf_log_proc_dostring(ctl_table *table, int write,
+@@ -274,14 +274,16 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
  		rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
  		mutex_unlock(&nf_log_mutex);
  	} else {
@@ -95692,7 +95948,7 @@ index f042ae5..30ea486 100644
  }
  EXPORT_SYMBOL(nf_unregister_sockopt);
 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
-index 962e979..e46f350 100644
+index d92cc31..e46f350 100644
 --- a/net/netfilter/nfnetlink_log.c
 +++ b/net/netfilter/nfnetlink_log.c
 @@ -82,7 +82,7 @@ static int nfnl_log_net_id __read_mostly;
@@ -95704,27 +95960,7 @@ index 962e979..e46f350 100644
  };
  
  static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
-@@ -419,6 +419,7 @@ __build_packet_message(struct nfnl_log_net *log,
- 	nfmsg->version = NFNETLINK_V0;
- 	nfmsg->res_id = htons(inst->group_num);
- 
-+	memset(&pmsg, 0, sizeof(pmsg));
- 	pmsg.hw_protocol	= skb->protocol;
- 	pmsg.hook		= hooknum;
- 
-@@ -498,7 +499,10 @@ __build_packet_message(struct nfnl_log_net *log,
- 	if (indev && skb->dev &&
- 	    skb->mac_header != skb->network_header) {
- 		struct nfulnl_msg_packet_hw phw;
--		int len = dev_parse_header(skb, phw.hw_addr);
-+		int len;
-+
-+		memset(&phw, 0, sizeof(phw));
-+		len = dev_parse_header(skb, phw.hw_addr);
- 		if (len > 0) {
- 			phw.hw_addrlen = htons(len);
- 			if (nla_put(inst->skb, NFULA_HWADDR, sizeof(phw), &phw))
-@@ -559,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
+@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
  	/* global sequence number */
  	if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
  	    nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
@@ -95733,130 +95969,6 @@ index 962e979..e46f350 100644
  		goto nla_put_failure;
  
  	if (data_len) {
-diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c
-index 5352b2d..e0083ce 100644
---- a/net/netfilter/nfnetlink_queue_core.c
-+++ b/net/netfilter/nfnetlink_queue_core.c
-@@ -444,7 +444,10 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
- 	if (indev && entskb->dev &&
- 	    entskb->mac_header != entskb->network_header) {
- 		struct nfqnl_msg_packet_hw phw;
--		int len = dev_parse_header(entskb, phw.hw_addr);
-+		int len;
-+
-+		memset(&phw, 0, sizeof(phw));
-+		len = dev_parse_header(entskb, phw.hw_addr);
- 		if (len) {
- 			phw.hw_addrlen = htons(len);
- 			if (nla_put(skb, NFQA_HWADDR, sizeof(phw), &phw))
-diff --git a/net/netfilter/xt_TCPMSS.c b/net/netfilter/xt_TCPMSS.c
-index 7011c71..6113cc7 100644
---- a/net/netfilter/xt_TCPMSS.c
-+++ b/net/netfilter/xt_TCPMSS.c
-@@ -52,7 +52,8 @@ tcpmss_mangle_packet(struct sk_buff *skb,
- {
- 	const struct xt_tcpmss_info *info = par->targinfo;
- 	struct tcphdr *tcph;
--	unsigned int tcplen, i;
-+	int len, tcp_hdrlen;
-+	unsigned int i;
- 	__be16 oldval;
- 	u16 newmss;
- 	u8 *opt;
-@@ -64,11 +65,14 @@ tcpmss_mangle_packet(struct sk_buff *skb,
- 	if (!skb_make_writable(skb, skb->len))
- 		return -1;
- 
--	tcplen = skb->len - tcphoff;
-+	len = skb->len - tcphoff;
-+	if (len < (int)sizeof(struct tcphdr))
-+		return -1;
-+
- 	tcph = (struct tcphdr *)(skb_network_header(skb) + tcphoff);
-+	tcp_hdrlen = tcph->doff * 4;
- 
--	/* Header cannot be larger than the packet */
--	if (tcplen < tcph->doff*4)
-+	if (len < tcp_hdrlen)
- 		return -1;
- 
- 	if (info->mss == XT_TCPMSS_CLAMP_PMTU) {
-@@ -87,9 +91,8 @@ tcpmss_mangle_packet(struct sk_buff *skb,
- 		newmss = info->mss;
- 
- 	opt = (u_int8_t *)tcph;
--	for (i = sizeof(struct tcphdr); i < tcph->doff*4; i += optlen(opt, i)) {
--		if (opt[i] == TCPOPT_MSS && tcph->doff*4 - i >= TCPOLEN_MSS &&
--		    opt[i+1] == TCPOLEN_MSS) {
-+	for (i = sizeof(struct tcphdr); i <= tcp_hdrlen - TCPOLEN_MSS; i += optlen(opt, i)) {
-+		if (opt[i] == TCPOPT_MSS && opt[i+1] == TCPOLEN_MSS) {
- 			u_int16_t oldmss;
- 
- 			oldmss = (opt[i+2] << 8) | opt[i+3];
-@@ -112,9 +115,10 @@ tcpmss_mangle_packet(struct sk_buff *skb,
- 	}
- 
- 	/* There is data after the header so the option can't be added
--	   without moving it, and doing so may make the SYN packet
--	   itself too large. Accept the packet unmodified instead. */
--	if (tcplen > tcph->doff*4)
-+	 * without moving it, and doing so may make the SYN packet
-+	 * itself too large. Accept the packet unmodified instead.
-+	 */
-+	if (len > tcp_hdrlen)
- 		return 0;
- 
- 	/*
-@@ -143,10 +147,10 @@ tcpmss_mangle_packet(struct sk_buff *skb,
- 		newmss = min(newmss, (u16)1220);
- 
- 	opt = (u_int8_t *)tcph + sizeof(struct tcphdr);
--	memmove(opt + TCPOLEN_MSS, opt, tcplen - sizeof(struct tcphdr));
-+	memmove(opt + TCPOLEN_MSS, opt, len - sizeof(struct tcphdr));
- 
- 	inet_proto_csum_replace2(&tcph->check, skb,
--				 htons(tcplen), htons(tcplen + TCPOLEN_MSS), 1);
-+				 htons(len), htons(len + TCPOLEN_MSS), 1);
- 	opt[0] = TCPOPT_MSS;
- 	opt[1] = TCPOLEN_MSS;
- 	opt[2] = (newmss & 0xff00) >> 8;
-diff --git a/net/netfilter/xt_TCPOPTSTRIP.c b/net/netfilter/xt_TCPOPTSTRIP.c
-index b68fa19..625fa1d 100644
---- a/net/netfilter/xt_TCPOPTSTRIP.c
-+++ b/net/netfilter/xt_TCPOPTSTRIP.c
-@@ -38,7 +38,7 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb,
- 	struct tcphdr *tcph;
- 	u_int16_t n, o;
- 	u_int8_t *opt;
--	int len;
-+	int len, tcp_hdrlen;
- 
- 	/* This is a fragment, no TCP header is available */
- 	if (par->fragoff != 0)
-@@ -52,7 +52,9 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb,
- 		return NF_DROP;
- 
- 	tcph = (struct tcphdr *)(skb_network_header(skb) + tcphoff);
--	if (tcph->doff * 4 > len)
-+	tcp_hdrlen = tcph->doff * 4;
-+
-+	if (len < tcp_hdrlen)
- 		return NF_DROP;
- 
- 	opt  = (u_int8_t *)tcph;
-@@ -61,10 +63,10 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb,
- 	 * Walk through all TCP options - if we find some option to remove,
- 	 * set all octets to %TCPOPT_NOP and adjust checksum.
- 	 */
--	for (i = sizeof(struct tcphdr); i < tcp_hdrlen(skb); i += optl) {
-+	for (i = sizeof(struct tcphdr); i < tcp_hdrlen - 1; i += optl) {
- 		optl = optlen(opt, i);
- 
--		if (i + optl > tcp_hdrlen(skb))
-+		if (i + optl > tcp_hdrlen)
- 			break;
- 
- 		if (!tcpoptstrip_test_bit(info->strip_bmap, opt[i]))
 diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
 new file mode 100644
 index 0000000..c566332
@@ -95949,10 +96061,10 @@ index 4fe4fb4..87a89e5 100644
  	return 0;
  }
 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
-index c9c2a84..ae00c02 100644
+index 6135635..5bdc54a 100644
 --- a/net/netlink/af_netlink.c
 +++ b/net/netlink/af_netlink.c
-@@ -121,7 +121,7 @@ static void netlink_overrun(struct sock *sk)
+@@ -249,7 +249,7 @@ static void netlink_overrun(struct sock *sk)
  			sk->sk_error_report(sk);
  		}
  	}
@@ -95961,9 +96073,9 @@ index c9c2a84..ae00c02 100644
  }
  
  static void netlink_rcv_wake(struct sock *sk)
-@@ -2769,7 +2769,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
+@@ -2940,7 +2940,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
  			   sk_wmem_alloc_get(s),
- 			   nlk->cb,
+ 			   nlk->cb_running,
  			   atomic_read(&s->sk_refcnt),
 -			   atomic_read(&s->sk_drops),
 +			   atomic_read_unchecked(&s->sk_drops),
@@ -95971,7 +96083,7 @@ index c9c2a84..ae00c02 100644
  			);
  
 diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
-index 393f17e..a64232c 100644
+index 0c741ce..f8c8ca7 100644
 --- a/net/netlink/genetlink.c
 +++ b/net/netlink/genetlink.c
 @@ -310,18 +310,20 @@ int genl_register_ops(struct genl_family *family, struct genl_ops *ops)
@@ -96013,7 +96125,7 @@ index 393f17e..a64232c 100644
  		}
  	}
 diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
-index 13b92982..9ae9c97 100644
+index 53c19a3..b0ac04a 100644
 --- a/net/netrom/af_netrom.c
 +++ b/net/netrom/af_netrom.c
 @@ -850,7 +850,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
@@ -96025,10 +96137,10 @@ index 13b92982..9ae9c97 100644
  		*uaddr_len = sizeof(struct sockaddr_ax25);
  	}
 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index c503ad6..fbb6ef8 100644
+index ba2548b..1a4e98e 100644
 --- a/net/packet/af_packet.c
 +++ b/net/packet/af_packet.c
-@@ -1688,7 +1688,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+@@ -1699,7 +1699,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
  
  	spin_lock(&sk->sk_receive_queue.lock);
  	po->stats.stats1.tp_packets++;
@@ -96037,7 +96149,7 @@ index c503ad6..fbb6ef8 100644
  	__skb_queue_tail(&sk->sk_receive_queue, skb);
  	spin_unlock(&sk->sk_receive_queue.lock);
  	sk->sk_data_ready(sk, skb->len);
-@@ -1697,7 +1697,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+@@ -1708,7 +1708,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
  drop_n_acct:
  	spin_lock(&sk->sk_receive_queue.lock);
  	po->stats.stats1.tp_drops++;
@@ -96046,26 +96158,7 @@ index c503ad6..fbb6ef8 100644
  	spin_unlock(&sk->sk_receive_queue.lock);
  
  drop_n_restore:
-@@ -2653,6 +2653,7 @@ out:
- 
- static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
- {
-+	struct sock_extended_err ee;
- 	struct sock_exterr_skb *serr;
- 	struct sk_buff *skb, *skb2;
- 	int copied, err;
-@@ -2674,8 +2675,9 @@ static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
- 	sock_recv_timestamp(msg, sk, skb);
- 
- 	serr = SKB_EXT_ERR(skb);
-+	ee = serr->ee;
- 	put_cmsg(msg, SOL_PACKET, PACKET_TX_TIMESTAMP,
--		 sizeof(serr->ee), &serr->ee);
-+		 sizeof ee, &ee);
- 
- 	msg->msg_flags |= MSG_ERRQUEUE;
- 	err = copied;
-@@ -3294,7 +3296,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -3261,7 +3261,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
  	case PACKET_HDRLEN:
  		if (len > sizeof(int))
  			len = sizeof(int);
@@ -96074,7 +96167,7 @@ index c503ad6..fbb6ef8 100644
  			return -EFAULT;
  		switch (val) {
  		case TPACKET_V1:
-@@ -3337,7 +3339,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -3304,7 +3304,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
  		len = lv;
  	if (put_user(len, optlen))
  		return -EFAULT;
@@ -96083,19 +96176,6 @@ index c503ad6..fbb6ef8 100644
  		return -EFAULT;
  	return 0;
  }
-diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
-index 5a940db..d6a502d 100644
---- a/net/phonet/af_phonet.c
-+++ b/net/phonet/af_phonet.c
-@@ -469,7 +469,7 @@ int __init_or_module phonet_proto_register(unsigned 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/phonet/pep.c b/net/phonet/pep.c
 index e774117..900b8b7 100644
 --- a/net/phonet/pep.c
@@ -96128,7 +96208,7 @@ index e774117..900b8b7 100644
  			break;
  		}
 diff --git a/net/phonet/socket.c b/net/phonet/socket.c
-index 1afd138..0b42453 100644
+index 77e38f7..f4ef5c3 100644
 --- a/net/phonet/socket.c
 +++ b/net/phonet/socket.c
 @@ -612,7 +612,7 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
@@ -96141,14 +96221,14 @@ index 1afd138..0b42453 100644
  	seq_printf(seq, "%*s\n", 127 - len, "");
  	return 0;
 diff --git a/net/phonet/sysctl.c b/net/phonet/sysctl.c
-index d6bbbbd..61561e4 100644
+index c02a8c4..3c5b600 100644
 --- a/net/phonet/sysctl.c
 +++ b/net/phonet/sysctl.c
-@@ -67,7 +67,7 @@ static int proc_local_port_range(ctl_table *table, int write,
+@@ -67,7 +67,7 @@ static int proc_local_port_range(struct ctl_table *table, int write,
  {
  	int ret;
  	int range[2] = {local_port_range[0], local_port_range[1]};
--	ctl_table tmp = {
+-	struct ctl_table tmp = {
 +	ctl_table_no_const tmp = {
  		.data = &range,
  		.maxlen = sizeof(range),
@@ -96580,10 +96660,10 @@ index f226709..0e735a8 100644
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
 diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
-index 422d8bd..2a65859 100644
+index e7b2d4f..bb1efd0 100644
 --- a/net/sctp/ipv6.c
 +++ b/net/sctp/ipv6.c
-@@ -965,7 +965,7 @@ static const struct inet6_protocol sctpv6_protocol = {
+@@ -962,7 +962,7 @@ static const struct inet6_protocol sctpv6_protocol = {
  	.flags        = INET6_PROTO_NOPOLICY | INET6_PROTO_FINAL,
  };
  
@@ -96592,7 +96672,7 @@ index 422d8bd..2a65859 100644
  	.sa_family	   = AF_INET6,
  	.sctp_xmit	   = sctp_v6_xmit,
  	.setsockopt	   = ipv6_setsockopt,
-@@ -997,7 +997,7 @@ static struct sctp_af sctp_af_inet6 = {
+@@ -994,7 +994,7 @@ static struct sctp_af sctp_af_inet6 = {
  #endif
  };
  
@@ -96601,7 +96681,7 @@ index 422d8bd..2a65859 100644
  	.event_msgname = sctp_inet6_event_msgname,
  	.skb_msgname   = sctp_inet6_skb_msgname,
  	.af_supported  = sctp_inet6_af_supported,
-@@ -1022,7 +1022,7 @@ void sctp_v6_pf_init(void)
+@@ -1019,7 +1019,7 @@ void sctp_v6_pf_init(void)
  
  void sctp_v6_pf_exit(void)
  {
@@ -96610,25 +96690,11 @@ index 422d8bd..2a65859 100644
  }
  
  /* Initialize IPv6 support and register with socket layer.  */
-diff --git a/net/sctp/proc.c b/net/sctp/proc.c
-index 4e45ee3..e66a031 100644
---- a/net/sctp/proc.c
-+++ b/net/sctp/proc.c
-@@ -337,7 +337,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
- 		seq_printf(seq,
- 			   "%8pK %8pK %-3d %-3d %-2d %-4d "
- 			   "%4d %8d %8d %7d %5lu %-5d %5d ",
--			   assoc, sk, sctp_sk(sk)->type, sk->sk_state,
-+			   assoc, sk,
-+			   sctp_sk(sk)->type, sk->sk_state,
- 			   assoc->state, hash,
- 			   assoc->assoc_id,
- 			   assoc->sndbuf_used,
 diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
-index eaee00c..97c0afd 100644
+index 5e17092..19be1d4 100644
 --- a/net/sctp/protocol.c
 +++ b/net/sctp/protocol.c
-@@ -834,8 +834,10 @@ int sctp_register_af(struct sctp_af *af)
+@@ -832,8 +832,10 @@ int sctp_register_af(struct sctp_af *af)
  		return 0;
  	}
  
@@ -96640,7 +96706,7 @@ index eaee00c..97c0afd 100644
  	return 1;
  }
  
-@@ -966,7 +968,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb,
+@@ -963,7 +965,7 @@ static inline int sctp_v4_xmit(struct sk_buff *skb,
  
  static struct sctp_af sctp_af_inet;
  
@@ -96649,7 +96715,7 @@ index eaee00c..97c0afd 100644
  	.event_msgname = sctp_inet_event_msgname,
  	.skb_msgname   = sctp_inet_skb_msgname,
  	.af_supported  = sctp_inet_af_supported,
-@@ -1037,7 +1039,7 @@ static const struct net_protocol sctp_protocol = {
+@@ -1034,7 +1036,7 @@ static const struct net_protocol sctp_protocol = {
  };
  
  /* IPv4 address related functions.  */
@@ -96658,7 +96724,7 @@ index eaee00c..97c0afd 100644
  	.sa_family	   = AF_INET,
  	.sctp_xmit	   = sctp_v4_xmit,
  	.setsockopt	   = ip_setsockopt,
-@@ -1122,7 +1124,7 @@ static void sctp_v4_pf_init(void)
+@@ -1119,7 +1121,7 @@ static void sctp_v4_pf_init(void)
  
  static void sctp_v4_pf_exit(void)
  {
@@ -96668,10 +96734,10 @@ index eaee00c..97c0afd 100644
  
  static int sctp_v4_protosw_init(void)
 diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
-index 8aab894..f6b7e7d 100644
+index 1a6eef3..17e898f 100644
 --- a/net/sctp/sm_sideeffect.c
 +++ b/net/sctp/sm_sideeffect.c
-@@ -447,7 +447,7 @@ static void sctp_generate_sack_event(unsigned long data)
+@@ -440,7 +440,7 @@ static void sctp_generate_sack_event(unsigned long data)
  	sctp_generate_timeout_event(asoc, SCTP_EVENT_TIMEOUT_SACK);
  }
  
@@ -96681,10 +96747,10 @@ index 8aab894..f6b7e7d 100644
  	sctp_generate_t1_cookie_event,
  	sctp_generate_t1_init_event,
 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index 79bc251..4530ee0 100644
+index 911b71b..90ade0a 100644
 --- a/net/sctp/socket.c
 +++ b/net/sctp/socket.c
-@@ -2170,11 +2170,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
+@@ -2153,11 +2153,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
  {
  	struct sctp_association *asoc;
  	struct sctp_ulpevent *event;
@@ -96699,7 +96765,7 @@ index 79bc251..4530ee0 100644
  
  	/*
  	 * At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
-@@ -4225,13 +4227,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
+@@ -4213,13 +4215,16 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
  static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
  				  int __user *optlen)
  {
@@ -96717,7 +96783,7 @@ index 79bc251..4530ee0 100644
  		return -EFAULT;
  	return 0;
  }
-@@ -4249,6 +4254,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
+@@ -4237,6 +4242,8 @@ static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
   */
  static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optval, int __user *optlen)
  {
@@ -96726,7 +96792,7 @@ index 79bc251..4530ee0 100644
  	/* Applicable to UDP-style socket only */
  	if (sctp_style(sk, TCP))
  		return -EOPNOTSUPP;
-@@ -4257,7 +4264,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
+@@ -4245,7 +4252,8 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv
  	len = sizeof(int);
  	if (put_user(len, optlen))
  		return -EFAULT;
@@ -96736,7 +96802,7 @@ index 79bc251..4530ee0 100644
  		return -EFAULT;
  	return 0;
  }
-@@ -4629,12 +4637,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
+@@ -4617,12 +4625,15 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len,
   */
  static int sctp_getsockopt_initmsg(struct sock *sk, int len, char __user *optval, int __user *optlen)
  {
@@ -96753,7 +96819,7 @@ index 79bc251..4530ee0 100644
  		return -EFAULT;
  	return 0;
  }
-@@ -4675,6 +4686,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
+@@ -4663,6 +4674,8 @@ 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;
@@ -96763,19 +96829,19 @@ index 79bc251..4530ee0 100644
  			return -EFAULT;
  		to += addrlen;
 diff --git a/net/sctp/sysctl.c b/net/sctp/sysctl.c
-index bf3c6e8..376d8d0 100644
+index 6b36561..4f21064 100644
 --- a/net/sctp/sysctl.c
 +++ b/net/sctp/sysctl.c
-@@ -307,7 +307,7 @@ static int proc_sctp_do_hmac_alg(ctl_table *ctl,
+@@ -301,7 +301,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl,
  {
  	struct net *net = current->nsproxy->net_ns;
  	char tmp[8];
--	ctl_table tbl;
+-	struct ctl_table tbl;
 +	ctl_table_no_const tbl;
  	int ret;
  	int changed = 0;
  	char *none = "none";
-@@ -350,7 +350,7 @@ static int proc_sctp_do_hmac_alg(ctl_table *ctl,
+@@ -344,7 +344,7 @@ static int proc_sctp_do_hmac_alg(struct ctl_table *ctl,
  
  int sctp_sysctl_net_register(struct net *net)
  {
@@ -96784,27 +96850,8 @@ index bf3c6e8..376d8d0 100644
  	int i;
  
  	table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL);
-diff --git a/net/sctp/transport.c b/net/sctp/transport.c
-index 098f1d5f..60da2f7 100644
---- a/net/sctp/transport.c
-+++ b/net/sctp/transport.c
-@@ -178,12 +178,12 @@ static void sctp_transport_destroy(struct sctp_transport *transport)
- {
- 	SCTP_ASSERT(transport->dead, "Transport is not dead", return);
- 
--	call_rcu(&transport->rcu, sctp_transport_destroy_rcu);
--
- 	sctp_packet_free(&transport->packet);
- 
- 	if (transport->asoc)
- 		sctp_association_put(transport->asoc);
-+
-+	call_rcu(&transport->rcu, sctp_transport_destroy_rcu);
- }
- 
- /* Start T3_rtx timer if it is not already running and update the heartbeat
 diff --git a/net/socket.c b/net/socket.c
-index ac72efc..eac33e5 100644
+index e83c416..17afbfa 100644
 --- a/net/socket.c
 +++ b/net/socket.c
 @@ -88,6 +88,7 @@
@@ -96815,16 +96862,25 @@ index ac72efc..eac33e5 100644
  
  #include <asm/uaccess.h>
  #include <asm/unistd.h>
-@@ -105,6 +106,8 @@
- #include <linux/sockios.h>
- #include <linux/atalk.h>
+@@ -111,6 +112,8 @@ unsigned int sysctl_net_busy_read __read_mostly;
+ unsigned int sysctl_net_busy_poll __read_mostly;
+ #endif
  
 +#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);
-@@ -322,7 +325,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
+@@ -162,7 +165,7 @@ static const struct file_operations socket_file_ops = {
+  */
+ 
+ static DEFINE_SPINLOCK(net_family_lock);
+-static const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
++const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
+ 
+ /*
+  *	Statistics counters of the socket lists
+@@ -328,7 +331,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
  		&sockfs_dentry_operations, SOCKFS_MAGIC);
  }
  
@@ -96833,7 +96889,7 @@ index ac72efc..eac33e5 100644
  
  static struct file_system_type sock_fs_type = {
  	.name =		"sockfs",
-@@ -1247,6 +1250,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+@@ -1255,6 +1258,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
  		return -EAFNOSUPPORT;
  	if (type < 0 || type >= SOCK_MAX)
  		return -EINVAL;
@@ -96842,24 +96898,28 @@ index ac72efc..eac33e5 100644
  
  	/* Compatibility.
  
-@@ -1378,6 +1383,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
- 	if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
- 		flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
+@@ -1275,6 +1280,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+ 	if (err)
+ 		return err;
  
-+	if(!gr_search_socket(family, type, protocol)) {
-+		retval = -EACCES;
-+		goto out;
++	if(!kern && !gr_search_socket(family, type, protocol)) {
++		if (rcu_access_pointer(net_families[family]) == NULL)
++			return -EAFNOSUPPORT;
++		else
++			return -EACCES;
 +	}
 +
-+	if (gr_handle_sock_all(family, type, protocol)) {
-+		retval = -EACCES;
-+		goto out;
++	if (!kern && gr_handle_sock_all(family, type, protocol)) {
++		if (rcu_access_pointer(net_families[family]) == NULL)
++			return -EAFNOSUPPORT;
++		else
++			return -EACCES;
 +	}
 +
- 	retval = sock_create(family, type, protocol, &sock);
- 	if (retval < 0)
- 		goto out;
-@@ -1505,6 +1520,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+ 	/*
+ 	 *	Allocate the socket and allow the family to set things up. if
+ 	 *	the protocol is 0, the family is instructed to select an appropriate
+@@ -1513,6 +1532,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
  	if (sock) {
  		err = move_addr_to_kernel(umyaddr, addrlen, &address);
  		if (err >= 0) {
@@ -96874,7 +96934,7 @@ index ac72efc..eac33e5 100644
  			err = security_socket_bind(sock,
  						   (struct sockaddr *)&address,
  						   addrlen);
-@@ -1513,6 +1536,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1521,6 +1548,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
  						      (struct sockaddr *)
  						      &address, addrlen);
  		}
@@ -96882,7 +96942,7 @@ index ac72efc..eac33e5 100644
  		fput_light(sock->file, fput_needed);
  	}
  	return err;
-@@ -1536,10 +1560,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
+@@ -1544,10 +1572,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
  		if ((unsigned int)backlog > somaxconn)
  			backlog = somaxconn;
  
@@ -96903,7 +96963,7 @@ index ac72efc..eac33e5 100644
  		fput_light(sock->file, fput_needed);
  	}
  	return err;
-@@ -1583,6 +1617,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1591,6 +1629,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
  	newsock->type = sock->type;
  	newsock->ops = sock->ops;
  
@@ -96922,7 +96982,7 @@ index ac72efc..eac33e5 100644
  	/*
  	 * We don't need try_module_get here, as the listening socket (sock)
  	 * has the protocol module (sock->ops->owner) held.
-@@ -1628,6 +1674,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1636,6 +1686,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
  	fd_install(newfd, newfile);
  	err = newfd;
  
@@ -96931,7 +96991,7 @@ index ac72efc..eac33e5 100644
  out_put:
  	fput_light(sock->file, fput_needed);
  out:
-@@ -1660,6 +1708,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1668,6 +1720,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
  		int, addrlen)
  {
  	struct socket *sock;
@@ -96939,7 +96999,7 @@ index ac72efc..eac33e5 100644
  	struct sockaddr_storage address;
  	int err, fput_needed;
  
-@@ -1670,6 +1719,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1678,6 +1731,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
  	if (err < 0)
  		goto out_put;
  
@@ -96957,7 +97017,7 @@ index ac72efc..eac33e5 100644
  	err =
  	    security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
  	if (err)
-@@ -1751,6 +1811,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
+@@ -1759,6 +1823,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
   *	the protocol.
   */
  
@@ -96966,7 +97026,7 @@ index ac72efc..eac33e5 100644
  SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
  		unsigned int, flags, struct sockaddr __user *, addr,
  		int, addr_len)
-@@ -1817,7 +1879,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
+@@ -1825,7 +1891,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
  	struct socket *sock;
  	struct iovec iov;
  	struct msghdr msg;
@@ -96975,7 +97035,7 @@ index ac72efc..eac33e5 100644
  	int err, err2;
  	int fput_needed;
  
-@@ -2039,7 +2101,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2047,7 +2113,7 @@ static int ___sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
  		 * checking falls down on this.
  		 */
  		if (copy_from_user(ctl_buf,
@@ -96984,7 +97044,7 @@ index ac72efc..eac33e5 100644
  				   ctl_len))
  			goto out_freectl;
  		msg_sys->msg_control = ctl_buf;
-@@ -2190,7 +2252,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
+@@ -2198,7 +2264,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
  	int err, total_len, len;
  
  	/* kernel mode address */
@@ -96993,16 +97053,7 @@ index ac72efc..eac33e5 100644
  
  	/* user mode address pointers */
  	struct sockaddr __user *uaddr;
-@@ -2219,7 +2281,7 @@ static int ___sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
- 	/* Save the user-mode address (verify_iovec will change the
- 	 * kernel msghdr to use the kernel address space)
- 	 */
--	uaddr = (__force void __user *)msg_sys->msg_name;
-+	uaddr = (void __force_user *)msg_sys->msg_name;
- 	uaddr_len = COMPAT_NAMELEN(msg);
- 	if (MSG_CMSG_COMPAT & flags)
- 		err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
-@@ -2975,7 +3037,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
+@@ -2985,7 +3051,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
  		old_fs = get_fs();
  		set_fs(KERNEL_DS);
  		err = dev_ioctl(net, cmd,
@@ -97011,7 +97062,7 @@ index ac72efc..eac33e5 100644
  		set_fs(old_fs);
  
  		return err;
-@@ -3084,7 +3146,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
+@@ -3094,7 +3160,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
  
  	old_fs = get_fs();
  	set_fs(KERNEL_DS);
@@ -97020,8 +97071,8 @@ index ac72efc..eac33e5 100644
  	set_fs(old_fs);
  
  	if (cmd == SIOCGIFMAP && !err) {
-@@ -3189,7 +3251,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
- 		ret |= __get_user(rtdev, &(ur4->rt_dev));
+@@ -3199,7 +3265,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
+ 		ret |= get_user(rtdev, &(ur4->rt_dev));
  		if (rtdev) {
  			ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
 -			r4.rt_dev = (char __user __force *)devname;
@@ -97029,7 +97080,7 @@ index ac72efc..eac33e5 100644
  			devname[15] = 0;
  		} else
  			r4.rt_dev = NULL;
-@@ -3415,8 +3477,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
+@@ -3425,8 +3491,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
  	int __user *uoptlen;
  	int err;
  
@@ -97040,7 +97091,7 @@ index ac72efc..eac33e5 100644
  
  	set_fs(KERNEL_DS);
  	if (level == SOL_SOCKET)
-@@ -3436,7 +3498,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
+@@ -3446,7 +3512,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
  	char __user *uoptval;
  	int err;
  
@@ -97050,10 +97101,10 @@ index ac72efc..eac33e5 100644
  	set_fs(KERNEL_DS);
  	if (level == SOL_SOCKET)
 diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
-index 29b4ba9..f648ae7 100644
+index 09fb638..2e6a5c5 100644
 --- a/net/sunrpc/auth_gss/svcauth_gss.c
 +++ b/net/sunrpc/auth_gss/svcauth_gss.c
-@@ -1144,7 +1144,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
+@@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
  				uint64_t *handle)
  {
  	struct rsc rsci, *rscp = NULL;
@@ -97062,7 +97113,7 @@ index 29b4ba9..f648ae7 100644
  	long long ctxh;
  	struct gss_api_mech *gm = NULL;
  	time_t expiry;
-@@ -1155,7 +1155,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
+@@ -1151,7 +1151,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
  	status = -ENOMEM;
  	/* the handle needs to be just a unique id,
  	 * use a static counter */
@@ -97072,10 +97123,10 @@ index 29b4ba9..f648ae7 100644
  	/* make a copy for the caller */
  	*handle = ctxh;
 diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
-index 5b1bf7b..33f5f72 100644
+index 941d19f..c85ff07 100644
 --- a/net/sunrpc/clnt.c
 +++ b/net/sunrpc/clnt.c
-@@ -1288,7 +1288,9 @@ call_start(struct rpc_task *task)
+@@ -1319,7 +1319,9 @@ call_start(struct rpc_task *task)
  			(RPC_IS_ASYNC(task) ? "async" : "sync"));
  
  	/* Increment call count */
@@ -97087,11 +97138,11 @@ index 5b1bf7b..33f5f72 100644
  	task->tk_action = call_reserve;
  }
 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
-index 5356b12..c0f4c29 100644
+index ff3cc4b..7612a9e 100644
 --- a/net/sunrpc/sched.c
 +++ b/net/sunrpc/sched.c
 @@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(void *word)
- #ifdef RPC_DEBUG
+ #if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)
  static void rpc_task_set_debuginfo(struct rpc_task *task)
  {
 -	static atomic_t rpc_pid;
@@ -97103,18 +97154,9 @@ index 5356b12..c0f4c29 100644
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
 diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
-index 89a588b..678ed90 100644
+index b974571..678ed90 100644
 --- a/net/sunrpc/svc.c
 +++ b/net/sunrpc/svc.c
-@@ -740,7 +740,7 @@ svc_set_num_threads(struct svc_serv *serv, struct svc_pool *pool, int nrservs)
- 
- 		__module_get(serv->sv_module);
- 		task = kthread_create_on_node(serv->sv_function, rqstp,
--					      node, serv->sv_name);
-+					      node, "%s", serv->sv_name);
- 		if (IS_ERR(task)) {
- 			error = PTR_ERR(task);
- 			module_put(serv->sv_module);
 @@ -1160,7 +1160,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
  	svc_putnl(resv, RPC_SUCCESS);
  
@@ -97126,8 +97168,30 @@ index 89a588b..678ed90 100644
  
  	/* Initialize storage for argp and resp */
  	memset(rqstp->rq_argp, 0, procp->pc_argsize);
+diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
+index 621ca7b..59421dd 100644
+--- a/net/sunrpc/svcauth_unix.c
++++ b/net/sunrpc/svcauth_unix.c
+@@ -414,7 +414,7 @@ struct unix_gid {
+ 	struct group_info	*gi;
+ };
+ 
+-static int unix_gid_hash(kuid_t uid)
++static int __intentional_overflow(-1) unix_gid_hash(kuid_t uid)
+ {
+ 	return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS);
+ }
+@@ -470,7 +470,7 @@ static void unix_gid_request(struct cache_detail *cd,
+ 	(*bpp)[-1] = '\n';
+ }
+ 
+-static struct unix_gid *unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
++static struct unix_gid * __intentional_overflow(-1) unix_gid_lookup(struct cache_detail *cd, kuid_t uid);
+ 
+ static int unix_gid_parse(struct cache_detail *cd,
+ 			char *mesg, int mlen)
 diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
-index 8343737..677025e 100644
+index c1b6270..05089c1 100644
 --- a/net/sunrpc/xprtrdma/svc_rdma.c
 +++ b/net/sunrpc/xprtrdma/svc_rdma.c
 @@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
@@ -97155,7 +97219,7 @@ index 8343737..677025e 100644
  
  /* Temporary NFS request map and context caches */
  struct kmem_cache *svc_rdma_map_cachep;
-@@ -110,7 +110,7 @@ static int read_reset_stat(ctl_table *table, int write,
+@@ -110,7 +110,7 @@ static int read_reset_stat(struct ctl_table *table, int write,
  		len -= *ppos;
  		if (len > *lenp)
  			len = *lenp;
@@ -97164,7 +97228,7 @@ index 8343737..677025e 100644
  			return -EFAULT;
  		*lenp = len;
  		*ppos += len;
-@@ -151,63 +151,63 @@ static ctl_table svcrdma_parm_table[] = {
+@@ -151,63 +151,63 @@ static struct ctl_table svcrdma_parm_table[] = {
  	{
  		.procname	= "rdma_stat_read",
  		.data		= &rdma_stat_read,
@@ -97344,10 +97408,10 @@ index e7000be..e3b0ba7 100644
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
 diff --git a/net/tipc/link.c b/net/tipc/link.c
-index a80feee..2bbbe70 100644
+index 0cc3d90..cc42021 100644
 --- a/net/tipc/link.c
 +++ b/net/tipc/link.c
-@@ -1201,7 +1201,7 @@ static int link_send_sections_long(struct tipc_port *sender,
+@@ -1165,7 +1165,7 @@ static int link_send_sections_long(struct tipc_port *sender,
  	struct tipc_msg fragm_hdr;
  	struct sk_buff *buf, *buf_chain, *prev;
  	u32 fragm_crs, fragm_rest, hsz, sect_rest;
@@ -97355,8 +97419,8 @@ index a80feee..2bbbe70 100644
 +	const unchar __user *sect_crs;
  	int curr_sect;
  	u32 fragm_no;
- 
-@@ -1242,7 +1242,7 @@ again:
+ 	int res = 0;
+@@ -1207,7 +1207,7 @@ again:
  
  		if (!sect_rest) {
  			sect_rest = msg_sect[++curr_sect].iov_len;
@@ -97365,35 +97429,26 @@ index a80feee..2bbbe70 100644
  		}
  
  		if (sect_rest < fragm_rest)
-@@ -1261,7 +1261,7 @@ error:
- 			}
- 		} else
- 			skb_copy_to_linear_data_offset(buf, fragm_crs,
--						       sect_crs, sz);
-+						       (const void __force_kernel *)sect_crs, sz);
- 		sect_crs += sz;
- 		sect_rest -= sz;
- 		fragm_crs += sz;
 diff --git a/net/tipc/msg.c b/net/tipc/msg.c
-index f2db8a8..9245aa4 100644
+index ced60e2..54eab6c 100644
 --- a/net/tipc/msg.c
 +++ b/net/tipc/msg.c
-@@ -98,7 +98,7 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect,
- 					      msg_sect[cnt].iov_len);
- 		else
- 			skb_copy_to_linear_data_offset(*buf, pos,
--						       msg_sect[cnt].iov_base,
-+						       (const void __force_kernel *)msg_sect[cnt].iov_base,
- 						       msg_sect[cnt].iov_len);
+@@ -93,7 +93,7 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect,
+ 	skb_copy_to_linear_data(*buf, hdr, hsz);
+ 	for (res = 1, cnt = 0; res && (cnt < num_sect); cnt++) {
+ 		skb_copy_to_linear_data_offset(*buf, pos,
+-					       msg_sect[cnt].iov_base,
++					       (const void __force_kernel *)msg_sect[cnt].iov_base,
+ 					       msg_sect[cnt].iov_len);
  		pos += msg_sect[cnt].iov_len;
  	}
 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
-index 6b42d47..2ac24d5 100644
+index d38bb45..4fd6ac6 100644
 --- a/net/tipc/subscr.c
 +++ b/net/tipc/subscr.c
-@@ -96,7 +96,7 @@ static void subscr_send_event(struct tipc_subscription *sub,
- {
- 	struct iovec msg_sect;
+@@ -98,7 +98,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
+ 	struct kvec msg_sect;
+ 	int ret;
  
 -	msg_sect.iov_base = (void *)&sub->evt;
 +	msg_sect.iov_base = (void __force_user *)&sub->evt;
@@ -97401,10 +97456,10 @@ index 6b42d47..2ac24d5 100644
  
  	sub->evt.event = htohl(event, sub->swap);
 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
-index 8664ad0..afe30af 100644
+index 01625cc..d486b64 100644
 --- a/net/unix/af_unix.c
 +++ b/net/unix/af_unix.c
-@@ -783,6 +783,12 @@ static struct sock *unix_find_other(struct net *net,
+@@ -784,6 +784,12 @@ static struct sock *unix_find_other(struct net *net,
  		err = -ECONNREFUSED;
  		if (!S_ISSOCK(inode->i_mode))
  			goto put_fail;
@@ -97417,7 +97472,7 @@ index 8664ad0..afe30af 100644
  		u = unix_find_socket_byinode(inode);
  		if (!u)
  			goto put_fail;
-@@ -803,6 +809,13 @@ static struct sock *unix_find_other(struct net *net,
+@@ -804,6 +810,13 @@ static struct sock *unix_find_other(struct net *net,
  		if (u) {
  			struct dentry *dentry;
  			dentry = unix_sk(u)->path.dentry;
@@ -97431,7 +97486,7 @@ index 8664ad0..afe30af 100644
  			if (dentry)
  				touch_atime(&unix_sk(u)->path);
  		} else
-@@ -836,12 +849,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
+@@ -837,12 +850,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
  	 */
  	err = security_path_mknod(&path, dentry, mode, 0);
  	if (!err) {
@@ -97450,7 +97505,7 @@ index 8664ad0..afe30af 100644
  	done_path_create(&path, dentry);
  	return err;
  }
-@@ -2329,9 +2348,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2328,9 +2347,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
  		seq_puts(seq, "Num       RefCount Protocol Flags    Type St "
  			 "Inode Path\n");
  	else {
@@ -97465,7 +97520,7 @@ index 8664ad0..afe30af 100644
  
  		seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
  			s,
-@@ -2358,8 +2381,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2357,8 +2380,10 @@ static int unix_seq_show(struct seq_file *seq, void *v)
  			}
  			for ( ; i < len; i++)
  				seq_putc(seq, u->addr->name->sun_path[i]);
@@ -97479,10 +97534,10 @@ index 8664ad0..afe30af 100644
  	}
  
 diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
-index 8800604..0526440 100644
+index b3d5150..ff3a837 100644
 --- a/net/unix/sysctl_net_unix.c
 +++ b/net/unix/sysctl_net_unix.c
-@@ -28,7 +28,7 @@ static ctl_table unix_table[] = {
+@@ -28,7 +28,7 @@ static struct ctl_table unix_table[] = {
  
  int __net_init unix_sysctl_register(struct net *net)
  {
@@ -97491,19 +97546,6 @@ index 8800604..0526440 100644
  
  	table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
  	if (table == NULL)
-diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
-index 9b88693..e35cadb 100644
---- a/net/vmw_vsock/af_vsock.c
-+++ b/net/vmw_vsock/af_vsock.c
-@@ -335,7 +335,7 @@ void vsock_for_each_connected_socket(void (*fn)(struct sock *sk))
- 	for (i = 0; i < ARRAY_SIZE(vsock_connected_table); i++) {
- 		struct vsock_sock *vsk;
- 		list_for_each_entry(vsk, &vsock_connected_table[i],
--				    connected_table);
-+				    connected_table)
- 			fn(sk_vsock(vsk));
- 	}
- 
 diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
 index c8717c1..08539f5 100644
 --- a/net/wireless/wext-core.c
@@ -97542,28 +97584,28 @@ index c8717c1..08539f5 100644
  
  	iwp->length += essid_compat;
 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index ea970b8..c68edb9f 100644
+index 76e1873..4a12664 100644
 --- a/net/xfrm/xfrm_policy.c
 +++ b/net/xfrm/xfrm_policy.c
-@@ -334,7 +334,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
+@@ -332,7 +332,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
  {
  	policy->walk.dead = 1;
  
 -	atomic_inc(&policy->genid);
 +	atomic_inc_unchecked(&policy->genid);
  
- 	del_timer(&policy->polq.hold_timer);
- 	xfrm_queue_purge(&policy->polq.hold_queue);
-@@ -659,7 +659,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
+ 	if (del_timer(&policy->polq.hold_timer))
+ 		xfrm_pol_put(policy);
+@@ -660,7 +660,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
  		hlist_add_head(&policy->bydst, chain);
  	xfrm_pol_hold(policy);
  	net->xfrm.policy_count[dir]++;
 -	atomic_inc(&flow_cache_genid);
 +	atomic_inc_unchecked(&flow_cache_genid);
- 	rt_genid_bump(net);
- 	if (delpol) {
- 		xfrm_policy_requeue(delpol, policy);
-@@ -1629,7 +1629,7 @@ free_dst:
+ 
+ 	/* After previous checking, family can either be AF_INET or AF_INET6 */
+ 	if (policy->family == AF_INET)
+@@ -1636,7 +1636,7 @@ free_dst:
  	goto out;
  }
  
@@ -97572,7 +97614,7 @@ index ea970b8..c68edb9f 100644
  xfrm_dst_alloc_copy(void **target, const void *src, int size)
  {
  	if (!*target) {
-@@ -1641,7 +1641,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size)
+@@ -1648,7 +1648,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size)
  	return 0;
  }
  
@@ -97581,7 +97623,7 @@ index ea970b8..c68edb9f 100644
  xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1653,7 +1653,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
+@@ -1660,7 +1660,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
  #endif
  }
  
@@ -97590,7 +97632,7 @@ index ea970b8..c68edb9f 100644
  xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1747,7 +1747,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
+@@ -1754,7 +1754,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
  
  	xdst->num_pols = num_pols;
  	memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
@@ -97599,7 +97641,21 @@ index ea970b8..c68edb9f 100644
  
  	return xdst;
  }
-@@ -2618,7 +2618,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
+@@ -2575,11 +2575,12 @@ void xfrm_garbage_collect(struct net *net)
+ }
+ EXPORT_SYMBOL(xfrm_garbage_collect);
+ 
+-static void xfrm_garbage_collect_deferred(struct net *net)
++void xfrm_garbage_collect_deferred(struct net *net)
+ {
+ 	flow_cache_flush_deferred();
+ 	__xfrm_garbage_collect(net);
+ }
++EXPORT_SYMBOL(xfrm_garbage_collect_deferred);
+ 
+ static void xfrm_init_pmtu(struct dst_entry *dst)
+ {
+@@ -2629,7 +2630,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
  		if (xdst->xfrm_genid != dst->xfrm->genid)
  			return 0;
  		if (xdst->num_pols > 0 &&
@@ -97608,32 +97664,24 @@ index ea970b8..c68edb9f 100644
  			return 0;
  
  		mtu = dst_mtu(dst->child);
-@@ -2706,8 +2706,11 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
+@@ -2717,8 +2718,6 @@ int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
  			dst_ops->link_failure = xfrm_link_failure;
  		if (likely(dst_ops->neigh_lookup == NULL))
  			dst_ops->neigh_lookup = xfrm_neigh_lookup;
 -		if (likely(afinfo->garbage_collect == NULL))
 -			afinfo->garbage_collect = xfrm_garbage_collect_deferred;
-+		if (likely(afinfo->garbage_collect == NULL)) {
-+			pax_open_kernel();
-+			*(void **)&afinfo->garbage_collect = xfrm_garbage_collect_deferred;
-+			pax_close_kernel();
-+		}
  		rcu_assign_pointer(xfrm_policy_afinfo[afinfo->family], afinfo);
  	}
  	spin_unlock(&xfrm_policy_afinfo_lock);
-@@ -2761,7 +2764,9 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
+@@ -2772,7 +2771,6 @@ int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo)
  		dst_ops->check = NULL;
  		dst_ops->negative_advice = NULL;
  		dst_ops->link_failure = NULL;
 -		afinfo->garbage_collect = NULL;
-+		pax_open_kernel();
-+		*(void **)&afinfo->garbage_collect = NULL;
-+		pax_close_kernel();
  	}
  	return err;
  }
-@@ -3144,7 +3149,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
+@@ -3155,7 +3153,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 */
@@ -97643,10 +97691,10 @@ index ea970b8..c68edb9f 100644
  	}
  
 diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
-index 78f66fa..b93d547 100644
+index b9c3f9e..4767526 100644
 --- a/net/xfrm/xfrm_state.c
 +++ b/net/xfrm/xfrm_state.c
-@@ -177,12 +177,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
+@@ -174,12 +174,14 @@ int xfrm_register_type(const struct xfrm_type *type, unsigned short family)
  
  	if (unlikely(afinfo == NULL))
  		return -EAFNOSUPPORT;
@@ -97664,7 +97712,7 @@ index 78f66fa..b93d547 100644
  		err = -EEXIST;
  	spin_unlock_bh(&xfrm_type_lock);
  	xfrm_state_put_afinfo(afinfo);
-@@ -198,13 +200,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
+@@ -195,13 +197,16 @@ int xfrm_unregister_type(const struct xfrm_type *type, unsigned short family)
  
  	if (unlikely(afinfo == NULL))
  		return -EAFNOSUPPORT;
@@ -97683,7 +97731,7 @@ index 78f66fa..b93d547 100644
  	spin_unlock_bh(&xfrm_type_lock);
  	xfrm_state_put_afinfo(afinfo);
  	return err;
-@@ -214,7 +219,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
+@@ -211,7 +216,6 @@ EXPORT_SYMBOL(xfrm_unregister_type);
  static const struct xfrm_type *xfrm_get_type(u8 proto, unsigned short family)
  {
  	struct xfrm_state_afinfo *afinfo;
@@ -97691,7 +97739,7 @@ index 78f66fa..b93d547 100644
  	const struct xfrm_type *type;
  	int modload_attempted = 0;
  
-@@ -222,9 +226,8 @@ retry:
+@@ -219,9 +223,8 @@ retry:
  	afinfo = xfrm_state_get_afinfo(family);
  	if (unlikely(afinfo == NULL))
  		return NULL;
@@ -97702,7 +97750,7 @@ index 78f66fa..b93d547 100644
  	if (unlikely(type && !try_module_get(type->owner)))
  		type = NULL;
  	if (!type && !modload_attempted) {
-@@ -258,7 +261,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
+@@ -255,7 +258,7 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
  		return -EAFNOSUPPORT;
  
  	err = -EEXIST;
@@ -97711,7 +97759,7 @@ index 78f66fa..b93d547 100644
  	spin_lock_bh(&xfrm_mode_lock);
  	if (modemap[mode->encap])
  		goto out;
-@@ -267,8 +270,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
+@@ -264,8 +267,10 @@ int xfrm_register_mode(struct xfrm_mode *mode, int family)
  	if (!try_module_get(afinfo->owner))
  		goto out;
  
@@ -97723,7 +97771,7 @@ index 78f66fa..b93d547 100644
  	err = 0;
  
  out:
-@@ -292,10 +297,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
+@@ -289,10 +294,12 @@ int xfrm_unregister_mode(struct xfrm_mode *mode, int family)
  		return -EAFNOSUPPORT;
  
  	err = -ENOENT;
@@ -97932,10 +97980,10 @@ index 0000000..5e0222d
 +	[[ "$plugincc" =~ "$2" ]] && echo "$2"
 +fi
 diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
-index 643764f..6cc0137 100644
+index 5de5660..d3deb89 100644
 --- a/scripts/headers_install.sh
 +++ b/scripts/headers_install.sh
-@@ -29,6 +29,7 @@ do
+@@ -32,6 +32,7 @@ do
  	FILE="$(basename "$i")"
  	sed -r \
  		-e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
@@ -97943,64 +97991,22 @@ index 643764f..6cc0137 100644
  		-e 's/__attribute_const__([ \t]|$)/\1/g' \
  		-e 's@^#include <linux/compiler.h>@@' \
  		-e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
-diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
-index 9a11f9f..487ac6f 100644
---- a/scripts/kallsyms.c
-+++ b/scripts/kallsyms.c
-@@ -55,7 +55,6 @@ static struct sym_entry *table;
- static unsigned int table_size, table_cnt;
- static int all_symbols = 0;
- static char symbol_prefix_char = '\0';
--static unsigned long long kernel_start_addr = 0;
- 
- int token_profit[0x10000];
- 
-@@ -66,10 +65,7 @@ unsigned char best_table_len[256];
- 
- static void usage(void)
- {
--	fprintf(stderr, "Usage: kallsyms [--all-symbols] "
--			"[--symbol-prefix=<prefix char>] "
--			"[--page-offset=<CONFIG_PAGE_OFFSET>] "
--			"< in.map > out.S\n");
-+	fprintf(stderr, "Usage: kallsyms [--all-symbols] [--symbol-prefix=<prefix char>] < in.map > out.S\n");
- 	exit(1);
- }
- 
-@@ -198,9 +194,6 @@ static int symbol_valid(struct sym_entry *s)
- 	int i;
- 	int offset = 1;
- 
--	if (s->addr < kernel_start_addr)
--		return 0;
--
- 	/* skip prefix char */
- 	if (symbol_prefix_char && *(s->sym + 1) == symbol_prefix_char)
- 		offset++;
-@@ -653,9 +646,6 @@ int main(int argc, char **argv)
- 				if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\''))
- 					p++;
- 				symbol_prefix_char = *p;
--			} else if (strncmp(argv[i], "--page-offset=", 14) == 0) {
--				const char *p = &argv[i][14];
--				kernel_start_addr = strtoull(p, NULL, 16);
- 			} else
- 				usage();
- 		}
 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
-index 32b10f5..d482a0d 100644
+index 32b10f5..64eeb30 100644
 --- a/scripts/link-vmlinux.sh
 +++ b/scripts/link-vmlinux.sh
-@@ -82,8 +82,6 @@ kallsyms()
+@@ -82,7 +82,9 @@ kallsyms()
  		kallsymopt="${kallsymopt} --all-symbols"
  	fi
  
 -	kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
--
++	if [ -z "${CONFIG_X86_32}" ] || [ -z "${CONFIG_PAX_KERNEXEC}" ]; then
++		kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
++	fi
+ 
  	local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
  		      ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
- 
-@@ -160,7 +158,7 @@ else
+@@ -160,7 +162,7 @@ else
  fi;
  
  # final build of init/
@@ -98010,10 +98016,10 @@ index 32b10f5..d482a0d 100644
  kallsymso=""
  kallsyms_vmlinux=""
 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
-index 45f9a33..e4194b3 100644
+index 2370863..212fbca 100644
 --- a/scripts/mod/file2alias.c
 +++ b/scripts/mod/file2alias.c
-@@ -140,7 +140,7 @@ static void device_id_check(const char *modname, const char *device_id,
+@@ -142,7 +142,7 @@ static void device_id_check(const char *modname, const char *device_id,
  			    unsigned long size, unsigned long id_size,
  			    void *symval)
  {
@@ -98022,7 +98028,7 @@ index 45f9a33..e4194b3 100644
  
  	if (size % id_size || size < id_size) {
  		fatal("%s: sizeof(struct %s_device_id)=%lu is not a modulo "
-@@ -168,7 +168,7 @@ static void device_id_check(const char *modname, const char *device_id,
+@@ -170,7 +170,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:vNpNdNdcNdscNdpNicNiscNipNinN" */
  static void do_usb_entry(void *symval,
@@ -98031,7 +98037,7 @@ index 45f9a33..e4194b3 100644
  			 unsigned char range_lo, unsigned char range_hi,
  			 unsigned char max, struct module *mod)
  {
-@@ -278,7 +278,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
+@@ -280,7 +280,7 @@ static void do_usb_entry_multi(void *symval, struct module *mod)
  {
  	unsigned int devlo, devhi;
  	unsigned char chi, clo, max;
@@ -98040,7 +98046,7 @@ index 45f9a33..e4194b3 100644
  
  	DEF_FIELD(symval, usb_device_id, match_flags);
  	DEF_FIELD(symval, usb_device_id, idVendor);
-@@ -531,7 +531,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
+@@ -533,7 +533,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
  	for (i = 0; i < count; i++) {
  		DEF_FIELD_ADDR(symval + i*id_size, pnp_device_id, id);
  		char acpi_id[sizeof(*id)];
@@ -98049,7 +98055,7 @@ index 45f9a33..e4194b3 100644
  
  		buf_printf(&mod->dev_table_buf,
  			   "MODULE_ALIAS(\"pnp:d%s*\");\n", *id);
-@@ -560,7 +560,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
+@@ -562,7 +562,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
  
  		for (j = 0; j < PNP_MAX_DEVICES; j++) {
  			const char *id = (char *)(*devs)[j].id;
@@ -98058,7 +98064,7 @@ index 45f9a33..e4194b3 100644
  			int dup = 0;
  
  			if (!id[0])
-@@ -586,7 +586,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
+@@ -588,7 +588,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[PNP_ID_LEN];
@@ -98067,7 +98073,7 @@ index 45f9a33..e4194b3 100644
  
  				buf_printf(&mod->dev_table_buf,
  					   "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
-@@ -938,7 +938,7 @@ static void dmi_ascii_filter(char *d, const char *s)
+@@ -940,7 +940,7 @@ static void dmi_ascii_filter(char *d, const char *s)
  static int do_dmi_entry(const char *filename, void *symval,
  			char *alias)
  {
@@ -98077,10 +98083,10 @@ index 45f9a33..e4194b3 100644
  	sprintf(alias, "dmi*");
  
 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index a4be8e1..6e8a5fb 100644
+index 8247979..815ec76 100644
 --- a/scripts/mod/modpost.c
 +++ b/scripts/mod/modpost.c
-@@ -933,6 +933,7 @@ enum mismatch {
+@@ -931,6 +931,7 @@ enum mismatch {
  	ANY_INIT_TO_ANY_EXIT,
  	ANY_EXIT_TO_ANY_INIT,
  	EXPORT_TO_INIT_EXIT,
@@ -98088,7 +98094,7 @@ index a4be8e1..6e8a5fb 100644
  };
  
  struct sectioncheck {
-@@ -1047,6 +1048,12 @@ const struct sectioncheck sectioncheck[] = {
+@@ -1017,6 +1018,12 @@ const struct sectioncheck sectioncheck[] = {
  	.tosec   = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
  	.mismatch = EXPORT_TO_INIT_EXIT,
  	.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
@@ -98101,7 +98107,7 @@ index a4be8e1..6e8a5fb 100644
  }
  };
  
-@@ -1169,10 +1176,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
+@@ -1137,10 +1144,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;
@@ -98114,7 +98120,7 @@ index a4be8e1..6e8a5fb 100644
  		if (d < 0)
  			d = addr - sym->st_value;
  		if (d < distance) {
-@@ -1451,6 +1458,14 @@ static void report_sec_mismatch(const char *modname,
+@@ -1418,6 +1425,14 @@ static void report_sec_mismatch(const char *modname,
  		tosym, prl_to, prl_to, tosym);
  		free(prl_to);
  		break;
@@ -98129,7 +98135,7 @@ index a4be8e1..6e8a5fb 100644
  	}
  	fprintf(stderr, "\n");
  }
-@@ -1685,7 +1700,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
+@@ -1652,7 +1667,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
  static void check_sec_ref(struct module *mod, const char *modname,
                            struct elf_info *elf)
  {
@@ -98138,7 +98144,7 @@ index a4be8e1..6e8a5fb 100644
  	Elf_Shdr *sechdrs = elf->sechdrs;
  
  	/* Walk through all sections */
-@@ -1804,7 +1819,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
+@@ -1771,7 +1786,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
  	va_end(ap);
  }
  
@@ -98147,7 +98153,7 @@ index a4be8e1..6e8a5fb 100644
  {
  	if (buf->size - buf->pos < len) {
  		buf->size += len + SZ;
-@@ -2023,7 +2038,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
+@@ -1990,7 +2005,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
  	if (fstat(fileno(file), &st) < 0)
  		goto close_write;
  
@@ -98192,14 +98198,29 @@ index 9dfcd6d..099068e 100644
  		warn("writing sum in %s failed: %s\n",
  			filename, strerror(errno));
  		goto out;
+diff --git a/scripts/module-common.lds b/scripts/module-common.lds
+index 0865b3e..7235dd4 100644
+--- a/scripts/module-common.lds
++++ b/scripts/module-common.lds
+@@ -6,6 +6,10 @@
+ SECTIONS {
+ 	/DISCARD/ : { *(.discard) }
+ 
++	.rodata : {
++		*(.rodata) *(.rodata.*)
++		*(.data..read_only)
++	}
+ 	__ksymtab		: { *(SORT(___ksymtab+*)) }
+ 	__ksymtab_gpl		: { *(SORT(___ksymtab_gpl+*)) }
+ 	__ksymtab_unused	: { *(SORT(___ksymtab_unused+*)) }
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index acb8650..b8c5f02 100644
+index 90e521f..e9eaf8f 100644
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
-@@ -246,6 +246,7 @@ fi
+@@ -281,6 +281,7 @@ fi
  (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
  (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
- (cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
+ (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
 +(cd $objtree; find tools/gcc -name \*.so >> "$objtree/debian/hdrobjfiles")
  destdir=$kernel_headers_dir/usr/src/linux-headers-$version
  mkdir -p "$destdir"
@@ -98252,10 +98273,10 @@ index f5eb43d..1814de8 100644
  	shdr = (Elf_Shdr *)((char *)ehdr + _r(&ehdr->e_shoff));
  	shstrtab_sec = shdr + r2(&ehdr->e_shstrndx);
 diff --git a/security/Kconfig b/security/Kconfig
-index e9c6ac7..c5d45c8 100644
+index e9c6ac7..031a726 100644
 --- a/security/Kconfig
 +++ b/security/Kconfig
-@@ -4,6 +4,959 @@
+@@ -4,6 +4,960 @@
  
  menu "Security options"
  
@@ -98290,6 +98311,7 @@ index e9c6ac7..c5d45c8 100644
 +	select PROC_FS
 +	select STOP_MACHINE
 +	select TTY
++	select DEBUG_LIST
 +	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
@@ -99181,14 +99203,14 @@ index e9c6ac7..c5d45c8 100644
 +	  headers explicitly in addition to the normal gcc package.
 +
 +config PAX_LATENT_ENTROPY
-+	bool "Generate some entropy during boot"
++	bool "Generate some entropy during boot and runtime"
 +	default y if GRKERNSEC_CONFIG_AUTO
 +	help
-+	  By saying Y here the kernel will instrument early boot code to
++	  By saying Y here the kernel will instrument some kernel code to
 +	  extract some entropy from both original and artificially created
 +	  program state.  This will help especially embedded systems where
 +	  there is little 'natural' source of entropy normally.  The cost
-+	  is some slowdown of the boot process.
++	  is some slowdown of the boot process and fork and irq processing.
 +
 +	  When pax_extra_latent_entropy is passed on the kernel command line,
 +	  entropy will be extracted from up to the first 4GB of RAM while the
@@ -99215,7 +99237,7 @@ index e9c6ac7..c5d45c8 100644
  source security/keys/Kconfig
  
  config SECURITY_DMESG_RESTRICT
-@@ -103,7 +1056,7 @@ config INTEL_TXT
+@@ -103,7 +1057,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
@@ -99224,277 +99246,11 @@ index e9c6ac7..c5d45c8 100644
  	default 65536
  	help
  	  This is the portion of low virtual memory which should be protected
-diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
-index 9b9013b..51ebf96 100644
---- a/security/apparmor/Kconfig
-+++ b/security/apparmor/Kconfig
-@@ -29,3 +29,12 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE
- 	  boot.
- 
- 	  If you are unsure how to answer this question, answer 1.
-+
-+config SECURITY_APPARMOR_COMPAT_24
-+	bool "Enable AppArmor 2.4 compatability"
-+	depends on SECURITY_APPARMOR
-+	default y
-+	help
-+	  This option enables compatability with AppArmor 2.4.  It is
-+          recommended if compatability with older versions of AppArmor
-+          is desired.
-diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
-index 16c15ec..42b7c9f 100644
---- a/security/apparmor/apparmorfs.c
-+++ b/security/apparmor/apparmorfs.c
-@@ -182,6 +182,234 @@ const struct file_operations aa_fs_seq_file_ops = {
- 	.release	= single_release,
- };
- 
-+#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
-+/**
-+ * __next_namespace - find the next namespace to list
-+ * @root: root namespace to stop search at (NOT NULL)
-+ * @ns: current ns position (NOT NULL)
-+ *
-+ * Find the next namespace from @ns under @root and handle all locking needed
-+ * while switching current namespace.
-+ *
-+ * Returns: next namespace or NULL if at last namespace under @root
-+ * NOTE: will not unlock root->lock
-+ */
-+static struct aa_namespace *__next_namespace(struct aa_namespace *root,
-+					     struct aa_namespace *ns)
-+{
-+	struct aa_namespace *parent;
-+
-+	/* is next namespace a child */
-+	if (!list_empty(&ns->sub_ns)) {
-+		struct aa_namespace *next;
-+		next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list);
-+		read_lock(&next->lock);
-+		return next;
-+	}
-+
-+	/* check if the next ns is a sibling, parent, gp, .. */
-+	parent = ns->parent;
-+	while (parent) {
-+		read_unlock(&ns->lock);
-+		list_for_each_entry_continue(ns, &parent->sub_ns, base.list) {
-+			read_lock(&ns->lock);
-+			return ns;
-+		}
-+		if (parent == root)
-+			return NULL;
-+		ns = parent;
-+		parent = parent->parent;
-+	}
-+
-+	return NULL;
-+}
-+
-+/**
-+ * __first_profile - find the first profile in a namespace
-+ * @root: namespace that is root of profiles being displayed (NOT NULL)
-+ * @ns: namespace to start in   (NOT NULL)
-+ *
-+ * Returns: unrefcounted profile or NULL if no profile
-+ */
-+static struct aa_profile *__first_profile(struct aa_namespace *root,
-+					  struct aa_namespace *ns)
-+{
-+	for ( ; ns; ns = __next_namespace(root, ns)) {
-+		if (!list_empty(&ns->base.profiles))
-+			return list_first_entry(&ns->base.profiles,
-+						struct aa_profile, base.list);
-+	}
-+	return NULL;
-+}
-+
-+/**
-+ * __next_profile - step to the next profile in a profile tree
-+ * @profile: current profile in tree (NOT NULL)
-+ *
-+ * Perform a depth first taversal on the profile tree in a namespace
-+ *
-+ * Returns: next profile or NULL if done
-+ * Requires: profile->ns.lock to be held
-+ */
-+static struct aa_profile *__next_profile(struct aa_profile *p)
-+{
-+	struct aa_profile *parent;
-+	struct aa_namespace *ns = p->ns;
-+
-+	/* is next profile a child */
-+	if (!list_empty(&p->base.profiles))
-+		return list_first_entry(&p->base.profiles, typeof(*p),
-+					base.list);
-+
-+	/* is next profile a sibling, parent sibling, gp, subling, .. */
-+	parent = p->parent;
-+	while (parent) {
-+		list_for_each_entry_continue(p, &parent->base.profiles,
-+					     base.list)
-+				return p;
-+		p = parent;
-+		parent = parent->parent;
-+	}
-+
-+	/* is next another profile in the namespace */
-+	list_for_each_entry_continue(p, &ns->base.profiles, base.list)
-+		return p;
-+
-+	return NULL;
-+}
-+
-+/**
-+ * next_profile - step to the next profile in where ever it may be
-+ * @root: root namespace  (NOT NULL)
-+ * @profile: current profile  (NOT NULL)
-+ *
-+ * Returns: next profile or NULL if there isn't one
-+ */
-+static struct aa_profile *next_profile(struct aa_namespace *root,
-+				       struct aa_profile *profile)
-+{
-+	struct aa_profile *next = __next_profile(profile);
-+	if (next)
-+		return next;
-+
-+	/* finished all profiles in namespace move to next namespace */
-+	return __first_profile(root, __next_namespace(root, profile->ns));
-+}
-+
-+/**
-+ * p_start - start a depth first traversal of profile tree
-+ * @f: seq_file to fill
-+ * @pos: current position
-+ *
-+ * Returns: first profile under current namespace or NULL if none found
-+ *
-+ * acquires first ns->lock
-+ */
-+static void *p_start(struct seq_file *f, loff_t *pos)
-+	__acquires(root->lock)
-+{
-+	struct aa_profile *profile = NULL;
-+	struct aa_namespace *root = aa_current_profile()->ns;
-+	loff_t l = *pos;
-+	f->private = aa_get_namespace(root);
-+
-+
-+	/* find the first profile */
-+	read_lock(&root->lock);
-+	profile = __first_profile(root, root);
-+
-+	/* skip to position */
-+	for (; profile && l > 0; l--)
-+		profile = next_profile(root, profile);
-+
-+	return profile;
-+}
-+
-+/**
-+ * p_next - read the next profile entry
-+ * @f: seq_file to fill
-+ * @p: profile previously returned
-+ * @pos: current position
-+ *
-+ * Returns: next profile after @p or NULL if none
-+ *
-+ * may acquire/release locks in namespace tree as necessary
-+ */
-+static void *p_next(struct seq_file *f, void *p, loff_t *pos)
-+{
-+	struct aa_profile *profile = p;
-+	struct aa_namespace *root = f->private;
-+	(*pos)++;
-+
-+	return next_profile(root, profile);
-+}
-+
-+/**
-+ * p_stop - stop depth first traversal
-+ * @f: seq_file we are filling
-+ * @p: the last profile writen
-+ *
-+ * Release all locking done by p_start/p_next on namespace tree
-+ */
-+static void p_stop(struct seq_file *f, void *p)
-+	__releases(root->lock)
-+{
-+	struct aa_profile *profile = p;
-+	struct aa_namespace *root = f->private, *ns;
-+
-+	if (profile) {
-+		for (ns = profile->ns; ns && ns != root; ns = ns->parent)
-+			read_unlock(&ns->lock);
-+	}
-+	read_unlock(&root->lock);
-+	aa_put_namespace(root);
-+}
-+
-+/**
-+ * seq_show_profile - show a profile entry
-+ * @f: seq_file to file
-+ * @p: current position (profile)    (NOT NULL)
-+ *
-+ * Returns: error on failure
-+ */
-+static int seq_show_profile(struct seq_file *f, void *p)
-+{
-+	struct aa_profile *profile = (struct aa_profile *)p;
-+	struct aa_namespace *root = f->private;
-+
-+	if (profile->ns != root)
-+		seq_printf(f, ":%s://", aa_ns_name(root, profile->ns));
-+	seq_printf(f, "%s (%s)\n", profile->base.hname,
-+		   COMPLAIN_MODE(profile) ? "complain" : "enforce");
-+
-+	return 0;
-+}
-+
-+static const struct seq_operations aa_fs_profiles_op = {
-+	.start = p_start,
-+	.next = p_next,
-+	.stop = p_stop,
-+	.show = seq_show_profile,
-+};
-+
-+static int profiles_open(struct inode *inode, struct file *file)
-+{
-+	return seq_open(file, &aa_fs_profiles_op);
-+}
-+
-+static int profiles_release(struct inode *inode, struct file *file)
-+{
-+	return seq_release(inode, file);
-+}
-+
-+const struct file_operations aa_fs_profiles_fops = {
-+	.open = profiles_open,
-+	.read = seq_read,
-+	.llseek = seq_lseek,
-+	.release = profiles_release,
-+};
-+#endif /* CONFIG_SECURITY_APPARMOR_COMPAT_24 */
-+
- /** Base file system setup **/
- 
- static struct aa_fs_entry aa_fs_entry_file[] = {
-@@ -210,6 +438,9 @@ static struct aa_fs_entry aa_fs_entry_apparmor[] = {
- 	AA_FS_FILE_FOPS(".load", 0640, &aa_fs_profile_load),
- 	AA_FS_FILE_FOPS(".replace", 0640, &aa_fs_profile_replace),
- 	AA_FS_FILE_FOPS(".remove", 0640, &aa_fs_profile_remove),
-+#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
-+	AA_FS_FILE_FOPS("profiles", 0640, &aa_fs_profiles_fops),
-+#endif
- 	AA_FS_DIR("features", aa_fs_entry_features),
- 	{ }
- };
 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index b21830e..a7d1a17 100644
+index fb99e18..b3e0bbb 100644
 --- a/security/apparmor/lsm.c
 +++ b/security/apparmor/lsm.c
-@@ -614,7 +614,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
+@@ -615,7 +615,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
  	return error;
  }
  
@@ -99504,7 +99260,7 @@ index b21830e..a7d1a17 100644
  
  	.ptrace_access_check =		apparmor_ptrace_access_check,
 diff --git a/security/commoncap.c b/security/commoncap.c
-index c44b6fe..932df30 100644
+index b9d613e..f68305c 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
 @@ -424,6 +424,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
@@ -99551,10 +99307,10 @@ index c44b6fe..932df30 100644
  		if (bprm->cap_effective)
  			return 1;
 diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
-index a41c9c1..83da6dd 100644
+index b3dd616..4bb17f3 100644
 --- a/security/integrity/ima/ima.h
 +++ b/security/integrity/ima/ima.h
-@@ -97,8 +97,8 @@ int ima_init_crypto(void);
+@@ -83,8 +83,8 @@ int ima_init_crypto(void);
  extern spinlock_t ima_queue_lock;
  
  struct ima_h_table {
@@ -99778,48 +99534,34 @@ index f728728..6457a0c 100644
  
  /*
 diff --git a/security/security.c b/security/security.c
-index a3dce87..04178a1 100644
+index 4dc31f4..eabcf41 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -20,6 +20,7 @@
- #include <linux/ima.h>
- #include <linux/evm.h>
- #include <linux/fsnotify.h>
-+#include <linux/mm.h>
- #include <linux/mman.h>
- #include <linux/mount.h>
- #include <linux/personality.h>
-@@ -32,8 +33,8 @@
+@@ -33,8 +33,8 @@
  static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
  	CONFIG_DEFAULT_SECURITY;
  
 -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 = {
++struct security_operations *security_ops __read_only;
++struct security_operations default_security_ops __read_only = {
  	.name	= "default",
  };
  
-@@ -72,11 +73,17 @@ int __init security_init(void)
+@@ -73,11 +73,6 @@ int __init security_init(void)
  	return 0;
  }
  
-+#ifdef CONFIG_SECURITY_SELINUX_DISABLE
-+
- void reset_security_ops(void)
- {
-+	pax_open_kernel();
- 	security_ops = &default_security_ops;
-+	pax_close_kernel();
- }
- 
-+#endif
-+
+-void reset_security_ops(void)
+-{
+-	security_ops = &default_security_ops;
+-}
+-
  /* Save user chosen LSM */
  static int __init choose_lsm(char *str)
  {
 diff --git a/security/selinux/avc.c b/security/selinux/avc.c
-index dad36a6..7e5ffbf 100644
+index fc3e662..7844c60 100644
 --- a/security/selinux/avc.c
 +++ b/security/selinux/avc.c
 @@ -59,7 +59,7 @@ struct avc_node {
@@ -99850,19 +99592,10 @@ index dad36a6..7e5ffbf 100644
  		lock = &avc_cache.slots_lock[hvalue];
  
 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 5c6f2cd..b4f945c 100644
+index 5b52310..da3bf8e 100644
 --- a/security/selinux/hooks.c
 +++ b/security/selinux/hooks.c
-@@ -96,8 +96,6 @@
- 
- #define NUM_SEL_MNT_OPTS 5
- 
--extern struct security_operations *security_ops;
--
- /* SECMARK reference count */
- static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
- 
-@@ -5529,7 +5527,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
+@@ -5603,7 +5603,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
  
  #endif
  
@@ -99871,24 +99604,45 @@ index 5c6f2cd..b4f945c 100644
  	.name =				"selinux",
  
  	.ptrace_access_check =		selinux_ptrace_access_check,
+@@ -5955,6 +5955,9 @@ static void selinux_nf_ip_exit(void)
+ #ifdef CONFIG_SECURITY_SELINUX_DISABLE
+ static int selinux_disabled;
+ 
++extern struct security_operations *security_ops;
++extern struct security_operations default_security_ops;
++
+ int selinux_disable(void)
+ {
+ 	if (ss_initialized) {
+@@ -5972,7 +5975,9 @@ int selinux_disable(void)
+ 	selinux_disabled = 1;
+ 	selinux_enabled = 0;
+ 
+-	reset_security_ops();
++	pax_open_kernel();
++	security_ops = &default_security_ops;
++	pax_close_kernel();
+ 
+ 	/* Try to destroy the avc node cache */
+ 	avc_disable();
 diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
-index 65f67cb..3f141ef 100644
+index 6713f04..c57ecef 100644
 --- a/security/selinux/include/xfrm.h
 +++ b/security/selinux/include/xfrm.h
-@@ -50,7 +50,7 @@ int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
- 
- static inline void selinux_xfrm_notify_policyload(void)
+@@ -52,7 +52,7 @@ static inline void selinux_xfrm_notify_policyload(void)
  {
+ 	struct net *net;
+ 
 -	atomic_inc(&flow_cache_genid);
 +	atomic_inc_unchecked(&flow_cache_genid);
- 	rt_genid_bump(&init_net);
- }
- #else
+ 	rtnl_lock();
+ 	for_each_net(net)
+ 		rt_genid_bump_all(net);
 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index d52c780..6431349 100644
+index 8825375..97a623b 100644
 --- a/security/smack/smack_lsm.c
 +++ b/security/smack/smack_lsm.c
-@@ -3392,7 +3392,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
+@@ -3726,7 +3726,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
  	return 0;
  }
  
@@ -100120,10 +99874,10 @@ index af49721..e85058e 100644
  	if (err < 0)
  		return err;
 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
-index f928181..33fb83d 100644
+index a68d4c6..72af3cf 100644
 --- a/sound/core/pcm_native.c
 +++ b/sound/core/pcm_native.c
-@@ -2819,11 +2819,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
+@@ -2809,11 +2809,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
  	switch (substream->stream) {
  	case SNDRV_PCM_STREAM_PLAYBACK:
  		result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
@@ -100307,10 +100061,10 @@ index ea995af..f1bfa37 100644
  }
  EXPORT_SYMBOL(amdtp_out_stream_update);
 diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
-index b680c5e..061b7a0 100644
+index f6103d6..4843fbf 100644
 --- a/sound/firewire/amdtp.h
 +++ b/sound/firewire/amdtp.h
-@@ -139,7 +139,7 @@ static inline bool amdtp_out_streaming_error(struct amdtp_out_stream *s)
+@@ -138,7 +138,7 @@ static inline bool amdtp_out_streaming_error(struct amdtp_out_stream *s)
  static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
  						struct snd_pcm_substream *pcm)
  {
@@ -100320,7 +100074,7 @@ index b680c5e..061b7a0 100644
  
  static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
 diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
-index d428ffe..751ef78 100644
+index 58a5afe..af5bd64 100644
 --- a/sound/firewire/isight.c
 +++ b/sound/firewire/isight.c
 @@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
@@ -100364,7 +100118,7 @@ index d428ffe..751ef78 100644
  	default:
  		return -EINVAL;
 diff --git a/sound/firewire/scs1x.c b/sound/firewire/scs1x.c
-index 844a555..985ab83 100644
+index 505fc81..62e569e 100644
 --- a/sound/firewire/scs1x.c
 +++ b/sound/firewire/scs1x.c
 @@ -74,7 +74,7 @@ static void scs_output_trigger(struct snd_rawmidi_substream *stream, int up)
@@ -100385,7 +100139,7 @@ index 844a555..985ab83 100644
  }
  
  static void scs_input_escaped_byte(struct snd_rawmidi_substream *stream,
-@@ -457,8 +457,8 @@ static int scs_remove(struct device *dev)
+@@ -469,8 +469,8 @@ static void scs_remove(struct fw_unit *unit)
  
  	snd_card_disconnect(scs->card);
  
@@ -100448,10 +100202,10 @@ index 7d8803a..559f8d0 100644
                  list_add(&s->list, &cs4297a_devs);
  
 diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
-index aeefec7..60de854 100644
+index e938a68..2a728ad 100644
 --- a/sound/pci/hda/hda_codec.c
 +++ b/sound/pci/hda/hda_codec.c
-@@ -916,14 +916,10 @@ find_codec_preset(struct hda_codec *codec)
+@@ -976,14 +976,10 @@ find_codec_preset(struct hda_codec *codec)
  	mutex_unlock(&preset_mutex);
  
  	if (mod_requested < HDA_MODREQ_MAX_COUNT) {
@@ -100482,7 +100236,7 @@ index 4631a23..001ae57 100644
  	const struct firmware *dsp_microcode;
  	const struct firmware *controller_microcode;
 diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
-index 22056c5..25d3244 100644
+index d591c15..8cb8f94 100644
 --- a/sound/pci/ymfpci/ymfpci_main.c
 +++ b/sound/pci/ymfpci/ymfpci_main.c
 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
@@ -100526,10 +100280,10 @@ index 22056c5..25d3244 100644
  	chip->pci = pci;
  	chip->irq = -1;
 diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
-index 0f0bed6..c161e28 100644
+index 6b81d0c..031c056 100644
 --- a/sound/soc/fsl/fsl_ssi.c
 +++ b/sound/soc/fsl/fsl_ssi.c
-@@ -657,7 +657,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
+@@ -864,7 +864,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
  {
  	struct fsl_ssi_private *ssi_private;
  	int ret = 0;
@@ -100538,19 +100292,23 @@ index 0f0bed6..c161e28 100644
  	struct device_node *np = pdev->dev.of_node;
  	const char *p, *sprop;
  	const uint32_t *iprop;
-diff --git a/sound/sound_core.c b/sound/sound_core.c
-index 359753f..45759f4 100644
---- a/sound/sound_core.c
-+++ b/sound/sound_core.c
-@@ -292,7 +292,7 @@ retry:
- 	}
+diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
+index 1a38be0..66809d1 100644
+--- a/sound/soc/soc-core.c
++++ b/sound/soc/soc-core.c
+@@ -2248,8 +2248,10 @@ int snd_soc_set_ac97_ops_of_reset(struct snd_ac97_bus_ops *ops,
+ 	if (ret)
+ 		return ret;
  
- 	device_create(sound_class, dev, MKDEV(SOUND_MAJOR, s->unit_minor),
--		      NULL, s->name+6);
-+		      NULL, "%s", s->name+6);
- 	return s->unit_minor;
+-	ops->warm_reset = snd_soc_ac97_warm_reset;
+-	ops->reset = snd_soc_ac97_reset;
++	pax_open_kernel();
++	*(void **)&ops->warm_reset = snd_soc_ac97_warm_reset;
++	*(void **)&ops->reset = snd_soc_ac97_reset;
++	pax_close_kernel();
  
- fail:
+ 	snd_ac97_rst_cfg = cfg;
+ 	return 0;
 diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
 new file mode 100644
 index 0000000..50f2f2f
@@ -100946,10 +100704,10 @@ index 0000000..414fe5e
 +}
 diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
 new file mode 100644
-index 0000000..c17312d
+index 0000000..ba59e50
 --- /dev/null
 +++ b/tools/gcc/constify_plugin.c
-@@ -0,0 +1,560 @@
+@@ -0,0 +1,558 @@
 +/*
 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
 + * Copyright 2011-2013 by PaX Team <pageexec@freemail.hu>
@@ -100996,7 +100754,7 @@ index 0000000..c17312d
 +int plugin_is_GPL_compatible;
 +
 +static struct plugin_info const_plugin_info = {
-+	.version	= "201305231310",
++	.version	= "201312032345",
 +	.help		= "no-constify\tturn off constification\n",
 +};
 +
@@ -101161,17 +100919,17 @@ index 0000000..c17312d
 +
 +	*no_add_attrs = true;
 +	if (TREE_CODE(*node) == FUNCTION_DECL) {
-+		error("%qE attribute does not apply to functions", name);
++		error("%qE attribute does not apply to functions (%qF)", name, *node);
 +		return NULL_TREE;
 +	}
 +
 +	if (TREE_CODE(*node) == PARM_DECL) {
-+		error("%qE attribute does not apply to function parameters", name);
++		error("%qE attribute does not apply to function parameters (%qD)", name, *node);
 +		return NULL_TREE;
 +	}
 +
 +	if (TREE_CODE(*node) == VAR_DECL) {
-+		error("%qE attribute does not apply to variables", name);
++		error("%qE attribute does not apply to variables (%qD)", name, *node);
 +		return NULL_TREE;
 +	}
 +
@@ -101184,18 +100942,18 @@ index 0000000..c17312d
 +	}
 +
 +	if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
-+		error("%qE attribute applies to struct and union types only", name);
++		error("%qE attribute used on %qT applies to struct and union types only", name, type);
 +		return NULL_TREE;
 +	}
 +
 +	if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
-+		error("%qE attribute is already applied to the type", name);
++		error("%qE attribute is already applied to the type %qT", name, type);
 +		return NULL_TREE;
 +	}
 +
 +	if (TYPE_P(*node)) {
 +		if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
-+			error("%qE attribute is incompatible with 'do_const'", name);
++			error("%qE attribute used on type %qT is incompatible with 'do_const'", name, type);
 +		return NULL_TREE;
 +	}
 +
@@ -101206,7 +100964,7 @@ index 0000000..c17312d
 +		return NULL_TREE;
 +	}
 +
-+	error("%qE attribute used on type that is not constified", name);
++	error("%qE attribute used on type %qT that is not constified", name, type);
 +	return NULL_TREE;
 +}
 +
@@ -101222,22 +100980,22 @@ index 0000000..c17312d
 +{
 +	*no_add_attrs = true;
 +	if (!TYPE_P(*node)) {
-+		error("%qE attribute applies to types only", name);
++		error("%qE attribute applies to types only (%qD)", name, *node);
 +		return NULL_TREE;
 +	}
 +
 +	if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
-+		error("%qE attribute applies to struct and union types only", name);
++		error("%qE attribute used on %qT applies to struct and union types only", name, *node);
 +		return NULL_TREE;
 +	}
 +
 +	if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(*node))) {
-+		error("%qE attribute is already applied to the type", name);
++		error("%qE attribute used on %qT is already applied to the type", name, *node);
 +		return NULL_TREE;
 +	}
 +
 +	if (lookup_attribute("no_const", TYPE_ATTRIBUTES(*node))) {
-+		error("%qE attribute is incompatible with 'no_const'", name);
++		error("%qE attribute used on %qT is incompatible with 'no_const'", name, *node);
 +		return NULL_TREE;
 +	}
 +
@@ -101295,30 +101053,29 @@ index 0000000..c17312d
 +
 +	constifiable(type, &cinfo);
 +
-+	if (TYPE_READONLY(type) && C_TYPE_FIELDS_READONLY(type)) {
-+		if (!lookup_attribute("do_const", TYPE_ATTRIBUTES(type)))
-+			return;
-+		if (cinfo.has_writable_field)
-+			return;
-+		error("'do_const' attribute used on type that is%sconstified", cinfo.has_fptr_field ? " " : " not ");
-+		return;
-+	}
-+
 +	if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type))) {
 +		if ((cinfo.has_fptr_field && !cinfo.has_writable_field) || cinfo.has_do_const_field) {
 +			deconstify_type(type);
 +			TYPE_CONSTIFY_VISITED(type) = 1;
 +		} else
-+			error("'no_const' attribute used on type that is not constified");
++			error("'no_const' attribute used on type %qT that is not constified", type);
 +		return;
 +	}
 +
 +	if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
++		if (!cinfo.has_writable_field) {
++			error("'do_const' attribute used on type %qT that is%sconstified", type, cinfo.has_fptr_field ? " " : " not ");
++			return;
++		}
 +		constify_type(type);
 +		return;
 +	}
 +
 +	if (cinfo.has_fptr_field && !cinfo.has_writable_field) {
++		if (lookup_attribute("do_const", TYPE_ATTRIBUTES(type))) {
++			error("'do_const' attribute used on type %qT that is constified", type);
++			return;
++		}
 +		constify_type(type);
 +		return;
 +	}
@@ -101406,7 +101163,6 @@ index 0000000..c17312d
 +	return check_local_variables();
 +}
 +
-+	unsigned int ret = 0;
 +static struct gimple_opt_pass pass_local_variable = {
 +	{
 +		.type			= GIMPLE_PASS,
@@ -101788,7 +101544,7 @@ index 0000000..568b360
 +}
 diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
 new file mode 100644
-index 0000000..257529f
+index 0000000..698da67
 --- /dev/null
 +++ b/tools/gcc/kernexec_plugin.c
 @@ -0,0 +1,471 @@
@@ -102059,9 +101815,9 @@ index 0000000..257529f
 +	new_fptr = make_ssa_name(new_fptr, NULL);
 +
 +	// build asm volatile("orq %%r10, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
-+	input = build_tree_list(NULL_TREE, build_string(2, "0"));
++	input = build_tree_list(NULL_TREE, build_string(1, "0"));
 +	input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
-+	output = build_tree_list(NULL_TREE, build_string(3, "=r"));
++	output = build_tree_list(NULL_TREE, build_string(2, "=r"));
 +	output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
 +#if BUILDING_GCC_VERSION <= 4007
 +	VEC_safe_push(tree, gc, inputs, input);
@@ -102265,10 +102021,10 @@ index 0000000..257529f
 +}
 diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c
 new file mode 100644
-index 0000000..2ef6fd9
+index 0000000..679b9ef
 --- /dev/null
 +++ b/tools/gcc/latent_entropy_plugin.c
-@@ -0,0 +1,321 @@
+@@ -0,0 +1,335 @@
 +/*
 + * Copyright 2012-2013 by the PaX Team <pageexec@freemail.hu>
 + * Licensed under the GPL v2
@@ -102348,12 +102104,34 @@ index 0000000..2ef6fd9
 +	}
 +};
 +
++static unsigned HOST_WIDE_INT seed;
++static unsigned HOST_WIDE_INT get_random_const(void)
++{
++	seed = (seed >> 1U) ^ (-(seed & 1ULL) & 0xD800000000000000ULL);
++	return seed;
++}
++
 +static tree handle_latent_entropy_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
 +{
-+	if (TREE_CODE(*node) != FUNCTION_DECL) {
++	switch (TREE_CODE(*node)) {
++	default:
 +		*no_add_attrs = true;
-+		error("%qE attribute only applies to functions", name);
++		error("%qE attribute only applies to functions and variables", name);
++		break;
++
++	case VAR_DECL:
++		if (DECL_INITIAL(*node)) {
++			*no_add_attrs = true;
++			error("variable %qD with %qE attribute must not be initialized", *node, name);
++			break;
++		}
++		DECL_INITIAL(*node) = build_int_cstu(long_long_unsigned_type_node, get_random_const());
++		break;
++
++	case FUNCTION_DECL:
++		break;
 +	}
++
 +	return NULL_TREE;
 +}
 +
@@ -102383,13 +102161,6 @@ index 0000000..2ef6fd9
 +	return latent_entropy_attr != NULL_TREE;
 +}
 +
-+static unsigned HOST_WIDE_INT seed;
-+static unsigned HOST_WIDE_INT get_random_const(void)
-+{
-+	seed = (seed >> 1U) ^ (-(seed & 1ULL) & 0xD800000000000000ULL);
-+	return seed;
-+}
-+
 +static enum tree_code get_op(tree *rhs)
 +{
 +	static enum tree_code op;
@@ -102561,7 +102332,6 @@ index 0000000..2ef6fd9
 +	TREE_THIS_VOLATILE(latent_entropy_decl) = 1;
 +	DECL_EXTERNAL(latent_entropy_decl) = 1;
 +	DECL_ARTIFICIAL(latent_entropy_decl) = 1;
-+	DECL_INITIAL(latent_entropy_decl) = NULL;
 +	lang_hooks.decls.pushdecl(latent_entropy_decl);
 +//	DECL_ASSEMBLER_NAME(latent_entropy_decl);
 +//	varpool_finalize_decl(latent_entropy_decl);
@@ -102592,114 +102362,137 @@ index 0000000..2ef6fd9
 +}
 diff --git a/tools/gcc/size_overflow_hash.data b/tools/gcc/size_overflow_hash.data
 new file mode 100644
-index 0000000..9a7096d
+index 0000000..3a5b4b5
 --- /dev/null
 +++ b/tools/gcc/size_overflow_hash.data
-@@ -0,0 +1,6400 @@
+@@ -0,0 +1,7687 @@
 +intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL
++ocfs2_get_refcount_tree_3 ocfs2_get_refcount_tree 0 3 NULL
 +batadv_orig_node_del_if_4 batadv_orig_node_del_if 2 4 NULL
 +storvsc_connect_to_vsp_22 storvsc_connect_to_vsp 2 22 NULL
 +compat_sock_setsockopt_23 compat_sock_setsockopt 5 23 NULL
 +carl9170_alloc_27 carl9170_alloc 1 27 NULL
-+padzero_55 padzero 1 55 NULL nohasharray
-+sel_read_policyvers_55 sel_read_policyvers 3 55 &padzero_55
++sel_read_policyvers_55 sel_read_policyvers 3 55 NULL nohasharray
++padzero_55 padzero 1 55 &sel_read_policyvers_55
 +cfg80211_disconnected_57 cfg80211_disconnected 4 57 NULL
 +__skb_to_sgvec_72 __skb_to_sgvec 0 72 NULL
 +crypto_authenc_setkey_80 crypto_authenc_setkey 3 80 NULL
 +snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL
 +load_msg_95 load_msg 2 95 NULL
 +device_flush_iotlb_115 device_flush_iotlb 2-3 115 NULL
++ipath_verbs_send_117 ipath_verbs_send 5-3 117 NULL nohasharray
++write_all_supers_117 write_all_supers 0 117 &ipath_verbs_send_117
 +init_q_132 init_q 4 132 NULL
++ocfs2_local_alloc_slide_window_134 ocfs2_local_alloc_slide_window 0 134 NULL
 +memstick_alloc_host_142 memstick_alloc_host 1 142 NULL
 +hva_to_gfn_memslot_149 hva_to_gfn_memslot 0-1 149 NULL
-+tracing_trace_options_write_153 tracing_trace_options_write 3 153 NULL
++ping_v6_sendmsg_152 ping_v6_sendmsg 4 152 NULL
++ext4_ext_get_actual_len_153 ext4_ext_get_actual_len 0 153 NULL nohasharray
++tracing_trace_options_write_153 tracing_trace_options_write 3 153 &ext4_ext_get_actual_len_153
 +nvme_create_queue_170 nvme_create_queue 3 170 NULL
 +xfs_buf_item_get_format_189 xfs_buf_item_get_format 2 189 NULL
 +iscsi_session_setup_196 iscsi_session_setup 4-5 196 NULL
-+virtblk_add_req_197 virtblk_add_req 2-3 197 NULL
-+proc_scsi_write_proc_267 proc_scsi_write_proc 3 267 NULL
++device_add_bin_attributes_205 device_add_bin_attributes 0 205 NULL
 +br_port_info_size_268 br_port_info_size 0 268 NULL
 +generic_file_direct_write_291 generic_file_direct_write 0 291 NULL
 +read_file_war_stats_292 read_file_war_stats 3 292 NULL
 +SYSC_connect_304 SYSC_connect 3 304 NULL
 +syslog_print_307 syslog_print 2 307 NULL
-+platform_device_add_data_310 platform_device_add_data 3 310 NULL
 +dn_setsockopt_314 dn_setsockopt 5 314 NULL
-+next_node_allowed_318 next_node_allowed 1 318 NULL
-+compat_sys_ioctl_333 compat_sys_ioctl 3 333 NULL
-+btmrvl_txdnldready_read_413 btmrvl_txdnldready_read 3 413 NULL
++next_node_allowed_318 next_node_allowed 1-0 318 NULL
++mlx5_core_access_reg_361 mlx5_core_access_reg 5-3 361 NULL
++xfs_get_blocks_364 xfs_get_blocks 2 364 NULL
++get_more_blocks_367 get_more_blocks 0 367 NULL
++sysfs_create_dir_398 sysfs_create_dir 0 398 NULL
++hw_device_state_409 hw_device_state 0 409 NULL
++aio_read_events_ring_410 aio_read_events_ring 3 410 NULL
 +lbs_rdmac_read_418 lbs_rdmac_read 3 418 NULL
 +snd_ca0106_ptr_read_467 snd_ca0106_ptr_read 0 467 NULL
-+_alloc_get_attr_desc_470 _alloc_get_attr_desc 2 470 NULL
-+dccp_manip_pkt_476 dccp_manip_pkt 4 476 NULL
++sparse_index_init_482 sparse_index_init 2 482 NULL
++cfs_trace_set_debug_mb_usrstr_486 cfs_trace_set_debug_mb_usrstr 2 486 NULL
 +nvme_trans_modesel_data_488 nvme_trans_modesel_data 4 488 NULL
-+pidlist_resize_496 pidlist_resize 2 496 NULL
-+read_vbt_r0_503 read_vbt_r0 1 503 NULL
++iwl_dbgfs_protection_mode_write_502 iwl_dbgfs_protection_mode_write 3 502 NULL
 +rx_rx_defrag_end_read_505 rx_rx_defrag_end_read 3 505 NULL
++_snd_pcm_hw_param_first_516 _snd_pcm_hw_param_first 0 516 NULL
 +ocfs2_validate_meta_ecc_bhs_527 ocfs2_validate_meta_ecc_bhs 0 527 NULL
-+zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0 537 NULL
++zlib_deflate_workspacesize_537 zlib_deflate_workspacesize 0-1-2 537 NULL
 +iwl_dbgfs_wowlan_sram_read_540 iwl_dbgfs_wowlan_sram_read 3 540 NULL
-+dle_count_543 dle_count 0 543 NULL
-+devres_alloc_551 devres_alloc 2 551 NULL
++sco_sock_setsockopt_552 sco_sock_setsockopt 5 552 NULL
++lpfc_nlp_state_name_556 lpfc_nlp_state_name 2 556 NULL
 +snd_aw2_saa7146_get_hw_ptr_playback_558 snd_aw2_saa7146_get_hw_ptr_playback 0 558 NULL
 +dev_hard_header_565 dev_hard_header 0 565 NULL nohasharray
 +start_isoc_chain_565 start_isoc_chain 2 565 &dev_hard_header_565
-+compat_sys_preadv_583 compat_sys_preadv 3 583 NULL
++ocfs2_refcounted_xattr_delete_need_584 ocfs2_refcounted_xattr_delete_need 0 584 NULL
 +smk_write_load_self2_591 smk_write_load_self2 3 591 NULL
++cl_page_own0_599 cl_page_own0 0 599 NULL
++btrfs_stack_file_extent_offset_607 btrfs_stack_file_extent_offset 0 607 NULL
 +ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
 +fuse_request_alloc_nofs_617 fuse_request_alloc_nofs 1 617 NULL
-+compat_sys_shmat_620 compat_sys_shmat 3 620 NULL
-+isp1760_register_628 isp1760_register 1-2 628 NULL
++ptlrpc_lprocfs_nrs_seq_write_621 ptlrpc_lprocfs_nrs_seq_write 3 621 NULL
++viafb_dfpl_proc_write_627 viafb_dfpl_proc_write 3 627 NULL
++ocfs2_num_free_extents_632 ocfs2_num_free_extents 0 632 NULL
 +clone_split_bio_633 clone_split_bio 6 633 NULL
 +ceph_osdc_new_request_635 ceph_osdc_new_request 6 635 NULL
 +remap_to_cache_640 remap_to_cache 3 640 NULL
-+drbd_bm_find_next_643 drbd_bm_find_next 2 643 NULL
-+unlink_queued_645 unlink_queued 3-4 645 NULL
++cfs_hash_bkt_size_643 cfs_hash_bkt_size 0 643 NULL nohasharray
++drbd_bm_find_next_643 drbd_bm_find_next 2 643 &cfs_hash_bkt_size_643
++unlink_queued_645 unlink_queued 4 645 NULL
 +dtim_interval_read_654 dtim_interval_read 3 654 NULL
++div_u64_rem_672 div_u64_rem 0 672 NULL
 +mem_rx_free_mem_blks_read_675 mem_rx_free_mem_blks_read 3 675 NULL
-+rtl8169_try_rx_copy_705 rtl8169_try_rx_copy 3 705 NULL
 +persistent_ram_vmap_709 persistent_ram_vmap 1-2 709 NULL
 +ipath_resize_cq_712 ipath_resize_cq 2 712 NULL
 +disk_max_parts_719 disk_max_parts 0 719 NULL
 +sctp_setsockopt_peer_addr_params_734 sctp_setsockopt_peer_addr_params 3 734 NULL
 +dvb_video_write_754 dvb_video_write 3 754 NULL
++cfs_trace_allocate_string_buffer_781 cfs_trace_allocate_string_buffer 2 781 NULL
++jbd2_journal_dirty_metadata_784 jbd2_journal_dirty_metadata 0 784 NULL
++ath6kl_disconnect_timeout_write_794 ath6kl_disconnect_timeout_write 3 794 NULL
++__vmalloc_node_range_811 __vmalloc_node_range 7 811 NULL nohasharray
++snd_pcm_drain_811 snd_pcm_drain 0 811 &__vmalloc_node_range_811
 +if_writecmd_815 if_writecmd 2 815 NULL
 +aac_change_queue_depth_825 aac_change_queue_depth 2 825 NULL
-+read_fifo_826 read_fifo 3 826 NULL
++SyS_write_846 SyS_write 3 846 NULL
 +um_idi_read_850 um_idi_read 3 850 NULL
-+ieee80211_if_fmt_rc_rateidx_mcs_mask_5ghz_856 ieee80211_if_fmt_rc_rateidx_mcs_mask_5ghz 3 856 NULL
++error_state_read_859 error_state_read 6 859 NULL
 +o2net_send_message_vec_879 o2net_send_message_vec 4 879 NULL nohasharray
 +iwl_dbgfs_fh_reg_read_879 iwl_dbgfs_fh_reg_read 3 879 &o2net_send_message_vec_879
++intel_alloc_iova_883 intel_alloc_iova 3 883 NULL
 +snd_pcm_action_single_905 snd_pcm_action_single 0 905 NULL
-+btmrvl_hsstate_read_920 btmrvl_hsstate_read 3 920 NULL
++readw_931 readw 0 931 NULL
 +carl9170_cmd_buf_950 carl9170_cmd_buf 3 950 NULL
-+get_ramdisk_size_954 get_ramdisk_size 0 954 NULL
 +__nodes_weight_956 __nodes_weight 2-0 956 NULL
-+sys_msgrcv_959 sys_msgrcv 3 959 NULL
-+pte_prefetch_gfn_to_pfn_997 pte_prefetch_gfn_to_pfn 2 997 NULL nohasharray
-+hdlcdev_rx_997 hdlcdev_rx 3 997 &pte_prefetch_gfn_to_pfn_997
++bnx2x_fill_fw_str_968 bnx2x_fill_fw_str 3 968 NULL
++memcmp_990 memcmp 0 990 NULL
++pte_prefetch_gfn_to_pfn_997 pte_prefetch_gfn_to_pfn 2 997 NULL
++free_ind_block_999 free_ind_block 0 999 NULL
 +dm_cache_set_dirty_1016 dm_cache_set_dirty 2 1016 NULL
++readreg_1017 readreg 0-1 1017 NULL
 +_do_truncate_1019 _do_truncate 2 1019 NULL
 +smk_write_cipso2_1021 smk_write_cipso2 3 1021 NULL
 +gigaset_initdriver_1060 gigaset_initdriver 2 1060 NULL
-+Read_hfc16_1070 Read_hfc16 0 1070 NULL
 +mce_request_packet_1073 mce_request_packet 3 1073 NULL
 +agp_create_memory_1075 agp_create_memory 1 1075 NULL
++ext4_orphan_add_1080 ext4_orphan_add 0 1080 NULL
 +_scsih_adjust_queue_depth_1083 _scsih_adjust_queue_depth 2 1083 NULL
-+nfs_pgarray_set_1085 nfs_pgarray_set 2 1085 NULL
 +llcp_sock_sendmsg_1092 llcp_sock_sendmsg 4 1092 NULL
++inode_ref_info_1094 inode_ref_info 0 1094 NULL nohasharray
++llc_mac_hdr_init_1094 llc_mac_hdr_init 0 1094 &inode_ref_info_1094
 +nfs4_init_nonuniform_client_string_1097 nfs4_init_nonuniform_client_string 3 1097 NULL
-+sys_mremap_1107 sys_mremap 5-1-2 1107 NULL
++utf8s_to_utf16s_1115 utf8s_to_utf16s 0 1115 NULL
++__btrfs_cow_block_1125 __btrfs_cow_block 7-0 1125 NULL nohasharray
++__ext4_journal_stop_1125 __ext4_journal_stop 0 1125 &__btrfs_cow_block_1125
 +cfg80211_report_obss_beacon_1133 cfg80211_report_obss_beacon 3 1133 NULL
 +vmalloc_32_1135 vmalloc_32 1 1135 NULL
-+dec_zcache_eph_zpages_1138 dec_zcache_eph_zpages 1 1138 NULL
 +i2400m_rx_ctl_1157 i2400m_rx_ctl 4 1157 NULL
++find_free_extent_1173 find_free_extent 4-0 1173 NULL
 +ipc_alloc_1192 ipc_alloc 1 1192 NULL
 +ib_create_send_mad_1196 ib_create_send_mad 5 1196 NULL
++pstore_ftrace_knob_write_1198 pstore_ftrace_knob_write 3 1198 NULL
 +i2400m_rx_ctl_ack_1199 i2400m_rx_ctl_ack 3 1199 NULL
 +dgrp_dpa_read_1204 dgrp_dpa_read 3 1204 NULL
 +i2cdev_read_1206 i2cdev_read 3 1206 NULL
-+ipw_packet_received_skb_1230 ipw_packet_received_skb 2 1230 NULL
++lov_ost_pool_init_1215 lov_ost_pool_init 2 1215 NULL
 +acpi_battery_write_alarm_1240 acpi_battery_write_alarm 3 1240 NULL
 +nested_get_page_1252 nested_get_page 2 1252 NULL
 +ocfs2_extend_file_1266 ocfs2_extend_file 3 1266 NULL
@@ -102708,14 +102501,13 @@ index 0000000..9a7096d
 +batadv_tt_prepare_packet_buff_1280 batadv_tt_prepare_packet_buff 4 1280 NULL
 +SyS_flistxattr_1287 SyS_flistxattr 3 1287 NULL
 +tx_frag_in_process_called_read_1290 tx_frag_in_process_called_read 3 1290 NULL
-+wm_adsp_buf_alloc_1317 wm_adsp_buf_alloc 2 1317 NULL
-+compat_put_u64_1319 compat_put_u64 1 1319 NULL
++ocfs2_append_rec_to_path_1321 ocfs2_append_rec_to_path 0 1321 NULL
 +ffs_1322 ffs 0 1322 NULL
-+qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL
-+carl9170_rx_stream_1334 carl9170_rx_stream 3 1334 NULL
++qlcnic_pci_sriov_configure_1327 qlcnic_pci_sriov_configure 2 1327 NULL nohasharray
++push_node_left_1327 push_node_left 0 1327 &qlcnic_pci_sriov_configure_1327
 +btrfs_submit_compressed_write_1347 btrfs_submit_compressed_write 5 1347 NULL
 +gen_pool_best_fit_1348 gen_pool_best_fit 2-3-4 1348 NULL
-+io_mapping_create_wc_1354 io_mapping_create_wc 1-2 1354 NULL
++btrfs_alloc_logged_file_extent_1354 btrfs_alloc_logged_file_extent 0 1354 NULL
 +snd_pcm_lib_write1_1358 snd_pcm_lib_write1 0-3 1358 NULL
 +ipx_sendmsg_1362 ipx_sendmsg 4 1362 NULL
 +iov_num_pages_1364 iov_num_pages 0 1364 NULL
@@ -102723,8 +102515,12 @@ index 0000000..9a7096d
 +ocfs2_prepare_inode_for_write_1372 ocfs2_prepare_inode_for_write 3 1372 NULL
 +sctp_setsockopt_initmsg_1383 sctp_setsockopt_initmsg 3 1383 NULL
 +do_msgsnd_1387 do_msgsnd 4 1387 NULL
++SYSC_io_getevents_1392 SYSC_io_getevents 3 1392 NULL
 +zone_page_state_1393 zone_page_state 0 1393 NULL
 +file_read_actor_1401 file_read_actor 4 1401 NULL
++vb2_vmalloc_alloc_1402 vb2_vmalloc_alloc 2 1402 NULL
++cfs_trace_copyout_string_1416 cfs_trace_copyout_string 2 1416 NULL
++init_rs_internal_1436 init_rs_internal 1 1436 NULL
 +vb2_dc_get_user_pages_1442 vb2_dc_get_user_pages 1-3 1442 NULL
 +stack_max_size_read_1445 stack_max_size_read 3 1445 NULL
 +tx_queue_len_read_1463 tx_queue_len_read 3 1463 NULL
@@ -102732,372 +102528,445 @@ index 0000000..9a7096d
 +SYSC_syslog_1477 SYSC_syslog 3 1477 NULL
 +sta_num_ps_buf_frames_read_1488 sta_num_ps_buf_frames_read 3 1488 NULL
 +posix_acl_permission_1495 posix_acl_permission 0 1495 NULL
++fpregs_set_1497 fpregs_set 4 1497 NULL
++ocfs2_alloc_dinode_update_counts_1507 ocfs2_alloc_dinode_update_counts 0 1507 NULL
 +tomoyo_round2_1518 tomoyo_round2 0 1518 NULL
-+__vfio_dma_map_1523 __vfio_dma_map 3 1523 NULL
 +alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL
 +ath6kl_init_get_fwcaps_1557 ath6kl_init_get_fwcaps 3 1557 NULL
++extent_from_logical_1585 extent_from_logical 0 1585 NULL
 +ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime_1589 ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 NULL
-+fc_frame_alloc_1596 fc_frame_alloc 2 1596 NULL
++ipath_ht_handle_hwerrors_1592 ipath_ht_handle_hwerrors 3 1592 NULL
 +packet_buffer_init_1607 packet_buffer_init 2 1607 NULL
 +btmrvl_hscmd_read_1614 btmrvl_hscmd_read 3 1614 NULL
 +v9fs_fid_xattr_get_1618 v9fs_fid_xattr_get 0 1618 NULL
-+btmrvl_hsmode_read_1647 btmrvl_hsmode_read 3 1647 NULL
++run_delayed_extent_op_1637 run_delayed_extent_op 0 1637 NULL
 +ikconfig_read_current_1658 ikconfig_read_current 3 1658 NULL
++qgroup_rescan_init_1664 qgroup_rescan_init 0 1664 NULL
 +mei_cl_recv_1665 mei_cl_recv 3 1665 NULL
-+netdev_feature_string_1667 netdev_feature_string 0 1667 NULL
-+compat_x25_ioctl_1674 compat_x25_ioctl 3 1674 NULL
 +rmap_add_1677 rmap_add 3 1677 NULL
 +configfs_read_file_1683 configfs_read_file 3 1683 NULL
-+coda_psdev_write_1711 coda_psdev_write 3 1711 NULL
++pdu_write_u_1710 pdu_write_u 3 1710 NULL
++coda_psdev_write_1711 coda_psdev_write 3 1711 NULL nohasharray
++gfn_to_hva_prot_1711 gfn_to_hva_prot 2 1711 &coda_psdev_write_1711
 +btrfs_dir_data_len_1714 btrfs_dir_data_len 0 1714 NULL
 +dma_memcpy_pg_to_iovec_1725 dma_memcpy_pg_to_iovec 6 1725 NULL
++internal_create_group_1733 internal_create_group 0 1733 NULL
++dev_irnet_read_1741 dev_irnet_read 3 1741 NULL
 +tx_frag_called_read_1748 tx_frag_called_read 3 1748 NULL
-+compat_cdrom_generic_command_1756 compat_cdrom_generic_command 4 1756 NULL
-+ieee80211_new_mesh_header_1761 ieee80211_new_mesh_header 0 1761 NULL
 +ebt_size_mwt_1768 ebt_size_mwt 0 1768 NULL
 +cosa_write_1774 cosa_write 3 1774 NULL
-+update_macheader_1775 update_macheader 7 1775 NULL
-+dec_zcache_pers_zbytes_1779 dec_zcache_pers_zbytes 1 1779 NULL
 +fcoe_ctlr_device_add_1793 fcoe_ctlr_device_add 3 1793 NULL
-+__nodelist_scnprintf_1815 __nodelist_scnprintf 0-2-4 1815 NULL
-+alloc_pages_exact_1892 alloc_pages_exact 1 1892 NULL
++__nodelist_scnprintf_1815 __nodelist_scnprintf 4-2-0 1815 NULL
++sb_issue_zeroout_1884 sb_issue_zeroout 3-0 1884 NULL
 +rx_defrag_called_read_1897 rx_defrag_called_read 3 1897 NULL
 +nfs_parse_server_name_1899 nfs_parse_server_name 2 1899 NULL
 +SyS_add_key_1900 SyS_add_key 4 1900 NULL
-+isku_sysfs_write_keys_media_1910 isku_sysfs_write_keys_media 6 1910 NULL
++uhid_char_read_1920 uhid_char_read 3 1920 NULL
 +tx_tx_retry_data_read_1926 tx_tx_retry_data_read 3 1926 NULL
-+memblock_alloc_base_1938 memblock_alloc_base 1-2 1938 NULL
++bdev_erase_1933 bdev_erase 3 1933 NULL
++ext3_fiemap_1936 ext3_fiemap 4 1936 NULL
 +cyttsp_probe_1940 cyttsp_probe 4 1940 NULL
 +ieee80211_if_fmt_dot11MeshConfirmTimeout_1945 ieee80211_if_fmt_dot11MeshConfirmTimeout 3 1945 NULL
 +read_swap_header_1957 read_swap_header 0 1957 NULL
 +ivtv_v4l2_read_1964 ivtv_v4l2_read 3 1964 NULL
 +sel_read_avc_hash_stats_1984 sel_read_avc_hash_stats 3 1984 NULL
-+__alloc_bootmem_node_1992 __alloc_bootmem_node 2-3 1992 NULL
++gpio_power_write_1991 gpio_power_write 3 1991 NULL
++__alloc_bootmem_node_1992 __alloc_bootmem_node 2 1992 NULL
 +atomic_read_unchecked_1995 atomic_read_unchecked 0 1995 NULL
++sb_min_blocksize_2004 sb_min_blocksize 0-2 2004 NULL
 +batadv_tt_commit_changes_2008 batadv_tt_commit_changes 4 2008 NULL
 +sep_prepare_input_dma_table_2009 sep_prepare_input_dma_table 2-3 2009 NULL
 +rx_rx_defrag_read_2010 rx_rx_defrag_read 3 2010 NULL
++ksm_madvise_2012 ksm_madvise 0 2012 NULL
 +ocfs2_global_qinit_alloc_2018 ocfs2_global_qinit_alloc 0 2018 NULL
 +write_flush_pipefs_2021 write_flush_pipefs 3 2021 NULL
-+BcmCopySection_2035 BcmCopySection 5 2035 NULL
-+devm_ioremap_nocache_2036 devm_ioremap_nocache 2-3 2036 NULL
++BcmCopySection_2035 BcmCopySection 5-0 2035 NULL
 +ath6kl_fwlog_mask_read_2050 ath6kl_fwlog_mask_read 3 2050 NULL
 +ocfs2_expand_inline_dir_2063 ocfs2_expand_inline_dir 3 2063 NULL
-+subbuf_read_actor_2071 subbuf_read_actor 3 2071 NULL
++__generic_copy_from_user_intel_2073 __generic_copy_from_user_intel 0-3 2073 NULL
++diva_set_driver_dbg_mask_2077 diva_set_driver_dbg_mask 0 2077 NULL nohasharray
++alloc_retstack_tasklist_2077 alloc_retstack_tasklist 0 2077 &diva_set_driver_dbg_mask_2077
 +iwl_dbgfs_current_sleep_command_read_2081 iwl_dbgfs_current_sleep_command_read 3 2081 NULL
++get_unaligned_le32_2092 get_unaligned_le32 0 2092 NULL
 +idetape_chrdev_read_2097 idetape_chrdev_read 3 2097 NULL
-+audit_expand_2098 audit_expand 2 2098 NULL
++audit_expand_2098 audit_expand 0 2098 NULL
 +num_pages_spanned_2105 num_pages_spanned 0 2105 NULL
++shrd128_2106 shrd128 0-1-3-2 2106 NULL
 +iwl_dbgfs_log_event_read_2107 iwl_dbgfs_log_event_read 3 2107 NULL
 +ecryptfs_encrypt_and_encode_filename_2109 ecryptfs_encrypt_and_encode_filename 6 2109 NULL
-+__find_xattr_2117 __find_xattr 6 2117 NULL nohasharray
-+enable_read_2117 enable_read 3 2117 &__find_xattr_2117
++enable_read_2117 enable_read 3 2117 NULL
 +pcf50633_write_block_2124 pcf50633_write_block 2-3 2124 NULL
++snd_interval_refine_last_2127 snd_interval_refine_last 0 2127 NULL
 +check_load_and_stores_2143 check_load_and_stores 2 2143 NULL
 +lp_gpio_irq_map_2149 lp_gpio_irq_map 2 2149 NULL
-+mlx4_init_icm_table_2151 mlx4_init_icm_table 5-4 2151 NULL
 +iov_iter_count_2152 iov_iter_count 0 2152 NULL
-+_ore_get_io_state_2166 _ore_get_io_state 3-4-5 2166 NULL
++__copy_to_user_ll_2157 __copy_to_user_ll 0-3 2157 NULL
++ocfs2_et_sanity_check_2164 ocfs2_et_sanity_check 0 2164 NULL
++_ore_get_io_state_2166 _ore_get_io_state 5-3-4 2166 NULL
 +bio_integrity_alloc_2194 bio_integrity_alloc 3 2194 NULL
-+ssb_bus_ssbbus_register_2217 ssb_bus_ssbbus_register 2 2217 NULL
++picolcd_debug_reset_write_2195 picolcd_debug_reset_write 3 2195 NULL
 +mei_dbgfs_read_meclients_2219 mei_dbgfs_read_meclients 3 2219 NULL nohasharray
 +u32_array_read_2219 u32_array_read 3 2219 &mei_dbgfs_read_meclients_2219
 +vhci_write_2224 vhci_write 3 2224 NULL
-+efx_tsoh_page_count_2225 efx_tsoh_page_count 0 2225 NULL
-+lowpan_get_mac_header_length_2231 lowpan_get_mac_header_length 0 2231 NULL
++__ocfs2_journal_access_2241 __ocfs2_journal_access 0 2241 NULL
 +ieee80211_if_read_dot11MeshHWMPRannInterval_2249 ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 NULL
 +netlbl_secattr_catmap_walk_2255 netlbl_secattr_catmap_walk 0-2 2255 NULL
 +sel_write_avc_cache_threshold_2256 sel_write_avc_cache_threshold 3 2256 NULL
 +do_update_counters_2259 do_update_counters 4 2259 NULL
 +ath6kl_wmi_bssinfo_event_rx_2275 ath6kl_wmi_bssinfo_event_rx 3 2275 NULL
 +debug_debug5_read_2291 debug_debug5_read 3 2291 NULL
-+kvm_clear_guest_page_2308 kvm_clear_guest_page 4-2 2308 NULL
++ocfs2_shift_tree_depth_2292 ocfs2_shift_tree_depth 0 2292 NULL
++kvm_clear_guest_page_2308 kvm_clear_guest_page 2-4 2308 NULL
 +intel_sdvo_set_value_2311 intel_sdvo_set_value 4 2311 NULL
-+picolcd_fb_write_2318 picolcd_fb_write 3 2318 NULL
-+gart_map_page_2325 gart_map_page 3-4 2325 NULL
++picolcd_fb_write_2318 picolcd_fb_write 3 2318 NULL nohasharray
++hfsplus_find_init_2318 hfsplus_find_init 0 2318 &picolcd_fb_write_2318
++gart_map_page_2325 gart_map_page 4-3 2325 NULL
 +__erst_read_to_erange_2341 __erst_read_to_erange 0 2341 NULL
 +zr364xx_read_2354 zr364xx_read 3 2354 NULL
 +viafb_iga2_odev_proc_write_2363 viafb_iga2_odev_proc_write 3 2363 NULL
-+SyS_mremap_2367 SyS_mremap 1-2-5 2367 NULL
-+xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL
++SyS_mremap_2367 SyS_mremap 2-3-1-5 2367 NULL
++xfs_buf_map_from_irec_2368 xfs_buf_map_from_irec 5 2368 NULL nohasharray
++rose_recvmsg_2368 rose_recvmsg 4 2368 &xfs_buf_map_from_irec_2368
 +il_dbgfs_sensitivity_read_2370 il_dbgfs_sensitivity_read 3 2370 NULL
-+rtl_port_map_2385 rtl_port_map 1-2 2385 NULL
 +rxpipe_rx_prep_beacon_drop_read_2403 rxpipe_rx_prep_beacon_drop_read 3 2403 NULL
-+SYSC_mlock_2415 SYSC_mlock 1 2415 NULL
++SYSC_mlock_2415 SYSC_mlock 1-2 2415 NULL
 +isdn_v110_open_2418 isdn_v110_open 3 2418 NULL
 +raid1_size_2419 raid1_size 0-2 2419 NULL
-+roccat_common2_send_2422 roccat_common2_send 4 2422 NULL
-+hfcpci_empty_fifo_2427 hfcpci_empty_fifo 4 2427 NULL
-+ioremap_nocache_2439 ioremap_nocache 1-2 2439 NULL
++timespec_to_jiffies_timeout_2428 timespec_to_jiffies_timeout 0 2428 NULL
 +tty_buffer_find_2443 tty_buffer_find 2 2443 NULL
-+ath6kl_usb_bmi_write_2454 ath6kl_usb_bmi_write 3 2454 NULL
 +b43legacy_debugfs_read_2473 b43legacy_debugfs_read 3 2473 NULL
-+update_pmkid_2481 update_pmkid 4 2481 NULL
 +wiphy_new_2482 wiphy_new 2 2482 NULL
 +bio_alloc_bioset_2484 bio_alloc_bioset 2 2484 NULL
++hfsplus_user_setxattr_2485 hfsplus_user_setxattr 4 2485 NULL
 +lookup_cache_entry_2494 lookup_cache_entry 2 2494 NULL
 +squashfs_read_fragment_index_table_2506 squashfs_read_fragment_index_table 4 2506 NULL
-+dm_write_2513 dm_write 3 2513 NULL
 +v9fs_cached_file_read_2514 v9fs_cached_file_read 3 2514 NULL
 +ext4_get_inode_loc_2516 ext4_get_inode_loc 0 2516 NULL
 +gspca_dev_probe_2570 gspca_dev_probe 4 2570 NULL
-+i915_next_seqno_write_2572 i915_next_seqno_write 3 2572 NULL
 +pcm_sanity_check_2574 pcm_sanity_check 0 2574 NULL
++mdc_max_rpcs_in_flight_seq_write_2594 mdc_max_rpcs_in_flight_seq_write 3 2594 NULL
 +slot_bytes_2609 slot_bytes 0 2609 NULL
 +smk_write_logging_2618 smk_write_logging 3 2618 NULL
++switch_status_2629 switch_status 5 2629 NULL
++tlv_put_string_2631 tlv_put_string 0 2631 NULL
 +kvm_gfn_to_hva_cache_init_2636 kvm_gfn_to_hva_cache_init 3 2636 NULL
-+lro_gen_skb_2644 lro_gen_skb 6 2644 NULL
++tcp_xmit_size_goal_2661 tcp_xmit_size_goal 2 2661 NULL
++osc_build_ppga_2670 osc_build_ppga 2 2670 NULL
++ffs_ep0_read_2672 ffs_ep0_read 3 2672 NULL
++ocfs2_rotate_subtree_right_2674 ocfs2_rotate_subtree_right 0 2674 NULL
++oti6858_write_2692 oti6858_write 4 2692 NULL
 +nfc_llcp_send_ui_frame_2702 nfc_llcp_send_ui_frame 5 2702 NULL
-+memcpy_fromiovecend_2707 memcpy_fromiovecend 3-4 2707 NULL
-+__xip_file_write_2733 __xip_file_write 4-3 2733 NULL
-+hid_report_raw_event_2762 hid_report_raw_event 4 2762 NULL
++memcpy_fromiovecend_2707 memcpy_fromiovecend 4-3 2707 NULL
++SyS_pwrite64_2708 SyS_pwrite64 3 2708 NULL nohasharray
++lprocfs_stats_counter_size_2708 lprocfs_stats_counter_size 0 2708 &SyS_pwrite64_2708
++__xip_file_write_2733 __xip_file_write 3-4 2733 NULL
++can_nocow_extent_2744 can_nocow_extent 3 2744 NULL
++xfs_readdir_2767 xfs_readdir 3 2767 NULL
 +mon_bin_ioctl_2771 mon_bin_ioctl 3 2771 NULL nohasharray
 +bictcp_update_2771 bictcp_update 2 2771 &mon_bin_ioctl_2771
-+__next_cpu_2782 __next_cpu 1 2782 NULL
++__next_cpu_2782 __next_cpu 1-0 2782 NULL
 +set_msr_hyperv_pw_2785 set_msr_hyperv_pw 3 2785 NULL
++device_add_attrs_2789 device_add_attrs 0 2789 NULL
++iwl_dbgfs_clear_ucode_statistics_write_2804 iwl_dbgfs_clear_ucode_statistics_write 3 2804 NULL
 +sel_read_enforce_2828 sel_read_enforce 3 2828 NULL
-+vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL
++vb2_dc_get_userptr_2829 vb2_dc_get_userptr 2-3 2829 NULL nohasharray
++snd_pcm_reset_2829 snd_pcm_reset 0 2829 &vb2_dc_get_userptr_2829
++sock_create_2838 sock_create 0 2838 NULL
 +wait_for_avail_2847 wait_for_avail 0 2847 NULL
 +ufs_free_fragments_2857 ufs_free_fragments 2 2857 NULL
 +sfq_alloc_2861 sfq_alloc 1 2861 NULL
++irnet_ctrl_read_2863 irnet_ctrl_read 4 2863 NULL
 +move_addr_to_user_2868 move_addr_to_user 2 2868 NULL
 +mq_map_2871 mq_map 2 2871 NULL
++__swab64p_2875 __swab64p 0 2875 NULL
 +nla_padlen_2883 nla_padlen 1 2883 NULL
 +cmm_write_2896 cmm_write 3 2896 NULL
 +alloc_page_cgroup_2919 alloc_page_cgroup 1 2919 NULL
++osc_import_seq_write_2923 osc_import_seq_write 3 2923 NULL
 +xfs_trans_get_buf_map_2927 xfs_trans_get_buf_map 4 2927 NULL
 +nes_read_indexed_2946 nes_read_indexed 0 2946 NULL
 +tm6000_i2c_recv_regs16_2949 tm6000_i2c_recv_regs16 5 2949 NULL
++i40e_dbg_prep_dump_buf_2951 i40e_dbg_prep_dump_buf 2 2951 NULL
 +set_fast_connectable_2952 set_fast_connectable 4 2952 NULL
-+ppp_cp_event_2965 ppp_cp_event 6 2965 NULL
++free_area_init_core_2962 free_area_init_core 2-3 2962 NULL
 +do_strnlen_user_2976 do_strnlen_user 0-2 2976 NULL
++ocfs2_find_branch_target_2989 ocfs2_find_branch_target 0 2989 NULL
 +p9_nr_pages_2992 p9_nr_pages 0-2 2992 NULL
++lov_stripetype_seq_write_3013 lov_stripetype_seq_write 3 3013 NULL
++btrfs_add_block_group_cache_3016 btrfs_add_block_group_cache 0 3016 NULL
 +do_dmabuf_dirty_sou_3017 do_dmabuf_dirty_sou 7 3017 NULL
 +depth_write_3021 depth_write 3 3021 NULL
 +snd_azf3328_codec_inl_3022 snd_azf3328_codec_inl 0 3022 NULL
++kvm_unmap_hva_3028 kvm_unmap_hva 2 3028 NULL
 +xfrm_dst_alloc_copy_3034 xfrm_dst_alloc_copy 3 3034 NULL
-+iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 NULL
++lpfc_idiag_mbxacc_write_3038 lpfc_idiag_mbxacc_write 3 3038 NULL nohasharray
++iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3 3038 &lpfc_idiag_mbxacc_write_3038
 +nr_free_buffer_pages_3044 nr_free_buffer_pages 0 3044 NULL
 +il3945_ucode_rx_stats_read_3048 il3945_ucode_rx_stats_read 3 3048 NULL
 +qp_alloc_ppn_set_3068 qp_alloc_ppn_set 2-4 3068 NULL
-+__blk_end_bidi_request_3070 __blk_end_bidi_request 3-4 3070 NULL
++__blk_end_bidi_request_3070 __blk_end_bidi_request 4-3 3070 NULL
 +dac960_user_command_proc_write_3071 dac960_user_command_proc_write 3 3071 NULL
++read_file_antenna_diversity_3077 read_file_antenna_diversity 3 3077 NULL
 +free_coherent_3082 free_coherent 4-2 3082 NULL
++ocfs2_get_right_path_3097 ocfs2_get_right_path 0 3097 NULL
 +clone_bio_3100 clone_bio 6 3100 NULL nohasharray
 +ttusb2_msg_3100 ttusb2_msg 4 3100 &clone_bio_3100
 +rb_alloc_3102 rb_alloc 1 3102 NULL
-+simple_write_to_buffer_3122 simple_write_to_buffer 5-2 3122 NULL
++simple_write_to_buffer_3122 simple_write_to_buffer 2-5 3122 NULL
 +print_time_3132 print_time 0 3132 NULL
 +fill_write_buffer_3142 fill_write_buffer 3 3142 NULL
++find_free_extent_3153 find_free_extent 5 3153 NULL
 +CIFSSMBSetPosixACL_3154 CIFSSMBSetPosixACL 5 3154 NULL
 +compat_sys_migrate_pages_3157 compat_sys_migrate_pages 2 3157 NULL
++i915_gem_obj_ggtt_offset_3162 i915_gem_obj_ggtt_offset 0 3162 NULL
 +uv_num_possible_blades_3177 uv_num_possible_blades 0 3177 NULL
 +uvc_video_stats_dump_3181 uvc_video_stats_dump 3 3181 NULL
 +compat_do_ip6t_set_ctl_3184 compat_do_ip6t_set_ctl 4 3184 NULL
-+mempool_create_node_3191 mempool_create_node 1 3191 NULL
++wait_table_bits_3187 wait_table_bits 1 3187 NULL
++mempool_create_node_3191 mempool_create_node 1-6 3191 NULL
 +alloc_context_3194 alloc_context 1 3194 NULL
-+shmem_pread_slow_3198 shmem_pread_slow 3 3198 NULL
++shmem_pread_slow_3198 shmem_pread_slow 3-2 3198 NULL
++codec_reg_write_file_3204 codec_reg_write_file 3 3204 NULL
 +SyS_sendto_3219 SyS_sendto 6 3219 NULL
++btrfs_prealloc_file_range_3227 btrfs_prealloc_file_range 3 3227 NULL
++btrfs_next_leaf_3232 btrfs_next_leaf 0 3232 NULL
 +kimage_crash_alloc_3233 kimage_crash_alloc 3 3233 NULL
++write_adapter_mem_3234 write_adapter_mem 3 3234 NULL
 +do_read_log_to_user_3236 do_read_log_to_user 4 3236 NULL
 +ext3_xattr_find_entry_3237 ext3_xattr_find_entry 0 3237 NULL
 +key_key_read_3241 key_key_read 3 3241 NULL
-+number_3243 number 0 3243 NULL
-+check_vendor_extension_3254 check_vendor_extension 1 3254 NULL
++mmap_piobufs_3244 mmap_piobufs 4 3244 NULL
++did_overwrite_first_ref_3259 did_overwrite_first_ref 0 3259 NULL
 +__ilog2_u64_3284 __ilog2_u64 0 3284 NULL
-+arvo_sysfs_write_3311 arvo_sysfs_write 6 3311 NULL
++__iovec_copy_from_user_inatomic_3314 __iovec_copy_from_user_inatomic 0-4-3 3314 NULL
 +dbDiscardAG_3322 dbDiscardAG 3 3322 NULL
 +compat_sys_setsockopt_3326 compat_sys_setsockopt 5 3326 NULL
-+aac_rkt_ioremap_3333 aac_rkt_ioremap 2 3333 NULL
 +read_from_oldmem_3337 read_from_oldmem 2 3337 NULL
++sysfs_create_group_3339 sysfs_create_group 0 3339 NULL
 +tty_port_register_device_attr_3341 tty_port_register_device_attr 3 3341 NULL
 +il_dbgfs_interrupt_read_3351 il_dbgfs_interrupt_read 3 3351 NULL
 +gsm_control_rls_3353 gsm_control_rls 3 3353 NULL
 +scnprintf_3360 scnprintf 0-2 3360 NULL
++ReadByteAmd7930_3365 ReadByteAmd7930 0 3365 NULL
++sr_read_3366 sr_read 3 3366 NULL
++count_inode_refs_3375 count_inode_refs 0 3375 NULL
 +x86_emulate_instruction_3389 x86_emulate_instruction 2 3389 NULL
 +mtdchar_writeoob_3393 mtdchar_writeoob 4 3393 NULL
 +send_stream_3397 send_stream 4 3397 NULL
 +isdn_readbchan_3401 isdn_readbchan 0-5 3401 NULL
-+msix_map_region_3411 msix_map_region 3 3411 NULL
 +mei_io_cb_alloc_resp_buf_3414 mei_io_cb_alloc_resp_buf 2 3414 NULL
++zone_to_nid_3415 zone_to_nid 0 3415 NULL
 +pci_add_cap_save_buffer_3426 pci_add_cap_save_buffer 3 3426 NULL
 +crystalhd_create_dio_pool_3427 crystalhd_create_dio_pool 2 3427 NULL
 +SyS_msgsnd_3436 SyS_msgsnd 3 3436 NULL
++send_unlink_3438 send_unlink 0 3438 NULL
 +pipe_iov_copy_to_user_3447 pipe_iov_copy_to_user 3 3447 NULL
-+percpu_modalloc_3448 percpu_modalloc 2-3 3448 NULL
-+map_single_3449 map_single 0-2 3449 NULL
++map_single_3449 map_single 0 3449 NULL
++softsynth_write_3455 softsynth_write 3 3455 NULL
 +jffs2_acl_setxattr_3464 jffs2_acl_setxattr 4 3464 NULL nohasharray
-+snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 4-2-5 3464 &jffs2_acl_setxattr_3464
-+alloc_skb_fclone_3467 alloc_skb_fclone 1 3467 NULL
++snd_pcm_lib_readv_transfer_3464 snd_pcm_lib_readv_transfer 5-4-2 3464 &jffs2_acl_setxattr_3464
 +security_context_to_sid_default_3492 security_context_to_sid_default 2 3492 NULL
 +xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 1 3496 NULL
-+kvm_handle_bad_page_3503 kvm_handle_bad_page 2 3503 NULL
-+mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL nohasharray
-+ieee80211_wx_set_gen_ie_rsl_3521 ieee80211_wx_set_gen_ie_rsl 3 3521 &mem_tx_free_mem_blks_read_3521
++run_one_delayed_ref_3503 run_one_delayed_ref 0 3503 NULL nohasharray
++kvm_handle_bad_page_3503 kvm_handle_bad_page 2 3503 &run_one_delayed_ref_3503
++mem_tx_free_mem_blks_read_3521 mem_tx_free_mem_blks_read 3 3521 NULL
 +SyS_semtimedop_3532 SyS_semtimedop 3 3532 NULL
 +SyS_readv_3539 SyS_readv 3 3539 NULL
 +btrfs_dir_name_len_3549 btrfs_dir_name_len 0 3549 NULL
-+b43legacy_read16_3561 b43legacy_read16 0 3561 NULL
++iommu_map_3554 iommu_map 3-2 3554 NULL
++btrfs_delayed_update_inode_3557 btrfs_delayed_update_inode 0 3557 NULL
++i915_gem_execbuffer_reserve_3558 i915_gem_execbuffer_reserve 0 3558 NULL
 +alloc_smp_resp_3566 alloc_smp_resp 1 3566 NULL
 +evtchn_read_3569 evtchn_read 3 3569 NULL
-+vc_resize_3585 vc_resize 2-3 3585 NULL
-+compat_sys_semtimedop_3606 compat_sys_semtimedop 3 3606 NULL
++ll_track_ppid_seq_write_3582 ll_track_ppid_seq_write 3 3582 NULL
++vc_resize_3585 vc_resize 3-2 3585 NULL
++kvm_mmu_notifier_change_pte_3596 kvm_mmu_notifier_change_pte 3 3596 NULL
 +sctp_getsockopt_events_3607 sctp_getsockopt_events 2 3607 NULL
 +edac_mc_alloc_3611 edac_mc_alloc 4 3611 NULL
 +tx_tx_starts_read_3617 tx_tx_starts_read 3 3617 NULL
 +aligned_kmalloc_3628 aligned_kmalloc 1 3628 NULL
-+x86_swiotlb_alloc_coherent_3649 x86_swiotlb_alloc_coherent 2 3649 NULL nohasharray
-+cm_copy_private_data_3649 cm_copy_private_data 2 3649 &x86_swiotlb_alloc_coherent_3649
++x86_swiotlb_alloc_coherent_3649 x86_swiotlb_alloc_coherent 2 3649 NULL
 +ath6kl_disconnect_timeout_read_3650 ath6kl_disconnect_timeout_read 3 3650 NULL
 +i915_compat_ioctl_3656 i915_compat_ioctl 2 3656 NULL
-+btmrvl_psmode_write_3703 btmrvl_psmode_write 3 3703 NULL nohasharray
-+create_irq_3703 create_irq 0 3703 &btmrvl_psmode_write_3703 nohasharray
-+snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 &create_irq_3703
++replace_pin_at_irq_node_3687 replace_pin_at_irq_node 2 3687 NULL
++ntfs_attr_make_non_resident_3694 ntfs_attr_make_non_resident 0 3694 NULL
++snd_m3_assp_read_3703 snd_m3_assp_read 0 3703 NULL nohasharray
++create_irq_3703 create_irq 0 3703 &snd_m3_assp_read_3703
 +videobuf_pages_to_sg_3708 videobuf_pages_to_sg 2 3708 NULL
 +ci_ll_write_3740 ci_ll_write 4 3740 NULL nohasharray
 +ath6kl_mgmt_tx_3740 ath6kl_mgmt_tx 7 3740 &ci_ll_write_3740
++uar_index2pfn_3741 uar_index2pfn 0-2 3741 NULL
 +sctp_setsockopt_auth_key_3793 sctp_setsockopt_auth_key 3 3793 NULL
++btrfs_alloc_chunk_3808 btrfs_alloc_chunk 0 3808 NULL
 +ncp_file_write_3813 ncp_file_write 3 3813 NULL
-+read_file_tx_chainmask_3829 read_file_tx_chainmask 3 3829 NULL
++llc_ui_recvmsg_3826 llc_ui_recvmsg 4 3826 NULL
++btrfs_uuid_iter_rem_3831 btrfs_uuid_iter_rem 0 3831 NULL
++hfsplus_direct_IO_3835 hfsplus_direct_IO 4 3835 NULL
 +stringify_nodemap_3842 stringify_nodemap 2 3842 NULL
 +ubi_eba_read_leb_3847 ubi_eba_read_leb 0 3847 NULL
 +create_one_cdev_3852 create_one_cdev 2 3852 NULL
 +smk_read_onlycap_3855 smk_read_onlycap 3 3855 NULL
 +get_fd_set_3866 get_fd_set 1 3866 NULL
++apei_res_sub_3873 apei_res_sub 0 3873 NULL
 +garp_attr_create_3883 garp_attr_create 3 3883 NULL
-+uea_send_modem_cmd_3888 uea_send_modem_cmd 3 3888 NULL
 +efivarfs_file_read_3893 efivarfs_file_read 3 3893 NULL
 +nvram_write_3894 nvram_write 3 3894 NULL
 +pipeline_pre_proc_swi_read_3898 pipeline_pre_proc_swi_read 3 3898 NULL
 +comedi_buf_read_n_available_3899 comedi_buf_read_n_available 0 3899 NULL
 +vcs_write_3910 vcs_write 3 3910 NULL
 +SyS_move_pages_3920 SyS_move_pages 2 3920 NULL
++hdlc_irq_one_3944 hdlc_irq_one 2 3944 NULL
 +brcmf_debugfs_fws_stats_read_3947 brcmf_debugfs_fws_stats_read 3 3947 NULL
-+atalk_compat_ioctl_3991 atalk_compat_ioctl 3 3991 NULL
++mite_bytes_written_to_memory_lb_3987 mite_bytes_written_to_memory_lb 0 3987 NULL
 +do_add_counters_3992 do_add_counters 3 3992 NULL
++obd_alloc_memmd_4002 obd_alloc_memmd 0 4002 NULL
 +userspace_status_4004 userspace_status 4 4004 NULL
 +mei_write_4005 mei_write 3 4005 NULL nohasharray
 +xfs_check_block_4005 xfs_check_block 4 4005 &mei_write_4005
 +snd_hdsp_capture_copy_4011 snd_hdsp_capture_copy 5 4011 NULL
-+mm_populate_4016 mm_populate 1 4016 NULL
++mm_populate_4016 mm_populate 1-2 4016 NULL nohasharray
++i915_gem_object_unbind_4016 i915_gem_object_unbind 0 4016 &mm_populate_4016
 +blk_end_request_4024 blk_end_request 3 4024 NULL
 +ext4_xattr_find_entry_4025 ext4_xattr_find_entry 0 4025 NULL
-+usbnet_write_cmd_async_4035 usbnet_write_cmd_async 7 4035 NULL
++mtip_hw_read_registers_4037 mtip_hw_read_registers 3 4037 NULL
++i915_gpu_idle_4062 i915_gpu_idle 0 4062 NULL
 +read_file_queues_4078 read_file_queues 3 4078 NULL
 +fbcon_do_set_font_4079 fbcon_do_set_font 2-3 4079 NULL
++btrfs_inc_ref_4084 btrfs_inc_ref 0 4084 NULL
 +da9052_free_irq_4090 da9052_free_irq 2 4090 NULL
-+C_SYSC_rt_sigpending_4114 C_SYSC_rt_sigpending 2 4114 NULL
-+ntb_netdev_change_mtu_4147 ntb_netdev_change_mtu 2 4147 NULL
 +tm6000_read_4151 tm6000_read 3 4151 NULL
 +mpt_raid_phys_disk_get_num_paths_4155 mpt_raid_phys_disk_get_num_paths 0 4155 NULL
 +msg_bits_4158 msg_bits 0-3-4 4158 NULL
 +get_alua_req_4166 get_alua_req 3 4166 NULL
 +blk_dropped_read_4168 blk_dropped_read 3 4168 NULL
 +read_file_bool_4180 read_file_bool 3 4180 NULL
++ocfs2_find_cpos_for_right_leaf_4194 ocfs2_find_cpos_for_right_leaf 0 4194 NULL
 +f1x_determine_channel_4202 f1x_determine_channel 2 4202 NULL
 +_osd_req_list_objects_4204 _osd_req_list_objects 6 4204 NULL
 +__snd_gf1_read_addr_4210 __snd_gf1_read_addr 0 4210 NULL
++ath6kl_force_roam_write_4282 ath6kl_force_roam_write 3 4282 NULL
 +goldfish_audio_write_4284 goldfish_audio_write 3 4284 NULL
++msb_do_write_request_4286 msb_do_write_request 2 4286 NULL
 +paging32_page_fault_4288 paging32_page_fault 2 4288 NULL
 +xt_compat_add_offset_4289 xt_compat_add_offset 0 4289 NULL
 +__usbnet_read_cmd_4299 __usbnet_read_cmd 7 4299 NULL
 +dvb_ringbuffer_pkt_read_user_4303 dvb_ringbuffer_pkt_read_user 3-2-5 4303 NULL
++__pool_find_4308 __pool_find 3 4308 NULL
++count_strings_4315 count_strings 0 4315 NULL
 +nouveau_fifo_create__4327 nouveau_fifo_create_ 5-6 4327 NULL
 +snd_rawmidi_kernel_read_4328 snd_rawmidi_kernel_read 3 4328 NULL
-+__copy_from_user_inatomic_4365 __copy_from_user_inatomic 3 4365 NULL
-+sys_setdomainname_4373 sys_setdomainname 2 4373 NULL
++kvm_apic_get_reg_4354 kvm_apic_get_reg 0 4354 NULL
++__copy_from_user_inatomic_4365 __copy_from_user_inatomic 0-3 4365 NULL nohasharray
++lookup_string_4365 lookup_string 0 4365 &__copy_from_user_inatomic_4365
++btrfs_set_disk_extent_flags_4374 btrfs_set_disk_extent_flags 0 4374 NULL
 +irda_sendmsg_4388 irda_sendmsg 4 4388 NULL
-+access_process_vm_4412 access_process_vm 0-2-4 4412 NULL nohasharray
++access_process_vm_4412 access_process_vm 0-4-2 4412 NULL nohasharray
 +cxacru_cm_get_array_4412 cxacru_cm_get_array 4 4412 &access_process_vm_4412
 +libfc_vport_create_4415 libfc_vport_create 2 4415 NULL
++rtw_android_get_rssi_4421 rtw_android_get_rssi 0 4421 NULL
 +do_pages_stat_4437 do_pages_stat 2 4437 NULL
 +memparse_4444 memparse 0 4444 NULL
++tcp_dma_try_early_copy_4457 tcp_dma_try_early_copy 3 4457 NULL
 +at76_set_card_command_4471 at76_set_card_command 4 4471 NULL
-+snd_seq_expand_var_event_4481 snd_seq_expand_var_event 0-5 4481 NULL
-+sys_semtimedop_4486 sys_semtimedop 3 4486 NULL
++snd_seq_expand_var_event_4481 snd_seq_expand_var_event 5-0 4481 NULL
++ocfs2_grow_tree_4492 ocfs2_grow_tree 0 4492 NULL
 +vmbus_establish_gpadl_4495 vmbus_establish_gpadl 3 4495 NULL
 +set_link_security_4502 set_link_security 4 4502 NULL
 +dm_cache_remove_mapping_4513 dm_cache_remove_mapping 2 4513 NULL
-+__gfn_to_pfn_memslot_4530 __gfn_to_pfn_memslot 2 4530 NULL
-+sys_llistxattr_4532 sys_llistxattr 3 4532 NULL
++__gfn_to_pfn_memslot_4530 __gfn_to_pfn_memslot 2-0 4530 NULL
++ll_max_readahead_per_file_mb_seq_write_4531 ll_max_readahead_per_file_mb_seq_write 3 4531 NULL
 +da9052_group_write_4534 da9052_group_write 2-3 4534 NULL
 +tty_register_device_4544 tty_register_device 2 4544 NULL
 +videobuf_vmalloc_to_sg_4548 videobuf_vmalloc_to_sg 2 4548 NULL
 +btrfs_file_extent_inline_item_len_4575 btrfs_file_extent_inline_item_len 0 4575 NULL
 +xfs_buf_get_maps_4581 xfs_buf_get_maps 2 4581 NULL
++iommu_map_page_4588 iommu_map_page 5 4588 NULL
 +bch_alloc_4593 bch_alloc 1 4593 NULL
++ocfs2_refcount_lock_4595 ocfs2_refcount_lock 0 4595 NULL
 +__wb_force_remove_mapping_4622 __wb_force_remove_mapping 2 4622 NULL
++ll_rw_extents_stats_seq_write_4633 ll_rw_extents_stats_seq_write 3 4633 NULL
 +iwl_dbgfs_tx_queue_read_4635 iwl_dbgfs_tx_queue_read 3 4635 NULL
++ext3_orphan_add_4665 ext3_orphan_add 0 4665 NULL
 +skb_add_data_nocache_4682 skb_add_data_nocache 4 4682 NULL
 +cx18_read_pos_4683 cx18_read_pos 3 4683 NULL
 +short_retry_limit_read_4687 short_retry_limit_read 3 4687 NULL
 +kone_receive_4690 kone_receive 4 4690 NULL
-+round_pipe_size_4701 round_pipe_size 0 4701 NULL
++link_to_fixup_dir_4699 link_to_fixup_dir 0 4699 NULL
 +cxgbi_alloc_big_mem_4707 cxgbi_alloc_big_mem 1 4707 NULL
 +konepure_sysfs_read_4709 konepure_sysfs_read 6 4709 NULL
-+btmrvl_gpiogap_read_4718 btmrvl_gpiogap_read 3 4718 NULL
 +ati_create_gatt_pages_4722 ati_create_gatt_pages 1 4722 NULL nohasharray
 +show_header_4722 show_header 3 4722 &ati_create_gatt_pages_4722
++gfs2_bit_search_4728 gfs2_bit_search 0-2 4728 NULL
++ll_rw_offset_stats_seq_write_4736 ll_rw_offset_stats_seq_write 3 4736 NULL nohasharray
++bitmap_startwrite_4736 bitmap_startwrite 2 4736 &ll_rw_offset_stats_seq_write_4736
 +__find_free_cblock_4741 __find_free_cblock 2 4741 NULL
-+memblock_find_in_range_4759 memblock_find_in_range 3-4 4759 NULL
-+pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 NULL
-+create_subvol_4791 create_subvol 4 4791 NULL
++lu_buf_alloc_4753 lu_buf_alloc 2 4753 NULL
++find_next_best_node_4774 find_next_best_node 1-0 4774 NULL nohasharray
++pwr_rcvd_bcns_cnt_read_4774 pwr_rcvd_bcns_cnt_read 3 4774 &find_next_best_node_4774
++btrfs_del_items_4791 btrfs_del_items 0 4791 NULL nohasharray
++create_subvol_4791 create_subvol 4 4791 &btrfs_del_items_4791
 +ncp__vol2io_4804 ncp__vol2io 5 4804 NULL
-+repair_io_failure_4815 repair_io_failure 4 4815 NULL
++repair_io_failure_4815 repair_io_failure 4-3 4815 NULL
++comedi_buf_write_free_4847 comedi_buf_write_free 2 4847 NULL
 +gigaset_if_receive_4861 gigaset_if_receive 3 4861 NULL
 +key_tx_spec_read_4862 key_tx_spec_read 3 4862 NULL
-+ocfs2_defrag_extent_4873 ocfs2_defrag_extent 3 4873 NULL
++get_new_location_4866 get_new_location 0 4866 NULL
++ocfs2_defrag_extent_4873 ocfs2_defrag_extent 3-2 4873 NULL
 +hid_register_field_4874 hid_register_field 2-3 4874 NULL
 +vga_arb_read_4886 vga_arb_read 3 4886 NULL
-+sys_ipc_4889 sys_ipc 3 4889 NULL
-+sys_process_vm_writev_4928 sys_process_vm_writev 3-5 4928 NULL
-+ntfs_rl_insert_4931 ntfs_rl_insert 2-4 4931 NULL
++ntfs_rl_insert_4931 ntfs_rl_insert 4-2 4931 NULL
 +ieee80211_if_fmt_ave_beacon_4941 ieee80211_if_fmt_ave_beacon 3 4941 NULL
-+devm_kzalloc_4966 devm_kzalloc 2 4966 NULL
++ocfs2_should_refresh_lock_res_4958 ocfs2_should_refresh_lock_res 0 4958 NULL
 +compat_rawv6_setsockopt_4967 compat_rawv6_setsockopt 5 4967 NULL
 +skb_network_header_len_4971 skb_network_header_len 0 4971 NULL
 +ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval_4976 ieee80211_if_fmt_dot11MeshHWMPconfirmationInterval 3 4976 NULL
++do_sync_read_4977 do_sync_read 0 4977 NULL
 +vmw_surface_define_size_4993 vmw_surface_define_size 0 4993 NULL
-+compat_SyS_ipc_5000 compat_SyS_ipc 3-4-5-6 5000 NULL
-+qla82xx_pci_mem_write_direct_5008 qla82xx_pci_mem_write_direct 2 5008 NULL
-+do_mincore_5018 do_mincore 0-1 5018 NULL
-+mtd_device_parse_register_5024 mtd_device_parse_register 5 5024 NULL
-+ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 2-3 5066 NULL
++compat_SyS_ipc_5000 compat_SyS_ipc 3 5000 NULL
++do_mincore_5018 do_mincore 0-2-1 5018 NULL
++btrfs_punch_hole_5041 btrfs_punch_hole 2 5041 NULL
++cfg80211_rx_mgmt_5056 cfg80211_rx_mgmt 5 5056 NULL
++ocfs2_check_range_for_holes_5066 ocfs2_check_range_for_holes 3-2 5066 NULL
 +snd_mixart_BA1_read_5082 snd_mixart_BA1_read 5 5082 NULL
 +snd_emu10k1_ptr20_read_5087 snd_emu10k1_ptr20_read 0 5087 NULL
 +get_random_bytes_5091 get_random_bytes 2 5091 NULL nohasharray
-+kfifo_copy_from_user_5091 kfifo_copy_from_user 3 5091 &get_random_bytes_5091 nohasharray
++kfifo_copy_from_user_5091 kfifo_copy_from_user 4-3-0 5091 &get_random_bytes_5091 nohasharray
 +blk_rq_sectors_5091 blk_rq_sectors 0 5091 &kfifo_copy_from_user_5091
-+mpol_to_str_5093 mpol_to_str 2 5093 NULL
 +sound_write_5102 sound_write 3 5102 NULL
 +clear_dirty_5105 clear_dirty 3 5105 NULL
++i40e_dbg_netdev_ops_write_5117 i40e_dbg_netdev_ops_write 3 5117 NULL
++qib_7220_handle_hwerrors_5142 qib_7220_handle_hwerrors 3 5142 NULL
 +ufs_add_fragments_5144 ufs_add_fragments 2 5144 NULL
-+compat_ptr_5159 compat_ptr 0-1 5159 NULL
++ocfs2_inode_lock_full_nested_5148 ocfs2_inode_lock_full_nested 0 5148 NULL
 +__uwb_addr_print_5161 __uwb_addr_print 2 5161 NULL
 +iwl_dbgfs_status_read_5171 iwl_dbgfs_status_read 3 5171 NULL
 +acpi_pcc_get_sqty_5176 acpi_pcc_get_sqty 0 5176 NULL
-+sfi_map_memory_5183 sfi_map_memory 1-2 5183 NULL
-+skb_network_header_5203 skb_network_header 0 5203 NULL
-+pipe_set_size_5204 pipe_set_size 2 5204 NULL
-+ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL
++ppp_cp_parse_cr_5214 ppp_cp_parse_cr 4 5214 NULL nohasharray
++r600_mip_minify_5214 r600_mip_minify 2-1-0 5214 &ppp_cp_parse_cr_5214
 +dwc2_hcd_urb_alloc_5217 dwc2_hcd_urb_alloc 2 5217 NULL
 +ath6kl_debug_roam_tbl_event_5224 ath6kl_debug_roam_tbl_event 3 5224 NULL
-+ssb_ioremap_5228 ssb_ioremap 2 5228 NULL nohasharray
-+konepure_sysfs_write_5228 konepure_sysfs_write 6 5228 &ssb_ioremap_5228
-+isdn_ppp_skb_push_5236 isdn_ppp_skb_push 2 5236 NULL
-+do_atmif_sioc_5247 do_atmif_sioc 3 5247 NULL
++nouveau_fb_create__5244 nouveau_fb_create_ 5 5244 NULL
 +gfn_to_hva_memslot_5265 gfn_to_hva_memslot 2 5265 NULL
++btrfs_alloc_reserved_file_extent_5274 btrfs_alloc_reserved_file_extent 0 5274 NULL
++iommu_domain_identity_map_5284 iommu_domain_identity_map 2-3 5284 NULL
 +alloc_cache_blocks_with_hash_5285 alloc_cache_blocks_with_hash 2 5285 NULL
++usb_descriptor_fillbuf_5302 usb_descriptor_fillbuf 0 5302 NULL
 +__gfn_to_hva_memslot_5304 __gfn_to_hva_memslot 0-2 5304 NULL
++r592_write_fifo_pio_5315 r592_write_fifo_pio 3 5315 NULL
 +sbc_get_write_same_sectors_5317 sbc_get_write_same_sectors 0 5317 NULL
 +pwr_elp_enter_read_5324 pwr_elp_enter_read 3 5324 NULL
 +allocate_cnodes_5329 allocate_cnodes 1 5329 NULL
++vm_insert_pfn_5341 vm_insert_pfn 3-0 5341 NULL
++cq_free_res_5355 cq_free_res 5 5355 NULL
 +ps_pspoll_utilization_read_5361 ps_pspoll_utilization_read 3 5361 NULL
-+cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 3-2 5368 NULL
-+kvm_pin_pages_5369 kvm_pin_pages 2 5369 NULL
++cciss_allocate_sg_chain_blocks_5368 cciss_allocate_sg_chain_blocks 2-3 5368 NULL
++kvm_pin_pages_5369 kvm_pin_pages 2-0 5369 NULL
 +bitmap_fold_5396 bitmap_fold 4 5396 NULL
++security_inode_init_security_5408 security_inode_init_security 0 5408 NULL
++__resolve_indirect_refs_5409 __resolve_indirect_refs 0 5409 NULL
 +nilfs_palloc_entries_per_group_5418 nilfs_palloc_entries_per_group 0 5418 NULL
-+sfi_map_table_5462 sfi_map_table 1 5462 NULL
++check_item_in_log_5440 check_item_in_log 0 5440 NULL
++__split_bvec_across_targets_5454 __split_bvec_across_targets 3 5454 NULL
 +xfs_efd_init_5463 xfs_efd_init 3 5463 NULL
 +xfs_efi_init_5476 xfs_efi_init 2 5476 NULL
 +ubi_leb_write_5478 ubi_leb_write 4-5 5478 NULL
@@ -103106,291 +102975,352 @@ index 0000000..9a7096d
 +tomoyo_update_domain_5498 tomoyo_update_domain 2 5498 NULL nohasharray
 +ieee80211_if_fmt_last_beacon_5498 ieee80211_if_fmt_last_beacon 3 5498 &tomoyo_update_domain_5498
 +__max_nr_grant_frames_5505 __max_nr_grant_frames 0 5505 NULL
-+spidev_message_5518 spidev_message 3 5518 NULL
 +ieee80211_if_fmt_auto_open_plinks_5534 ieee80211_if_fmt_auto_open_plinks 3 5534 NULL
++iommu_prepare_identity_map_5540 iommu_prepare_identity_map 2-3 5540 NULL
 +get_entry_msg_len_5552 get_entry_msg_len 0 5552 NULL
-+brcmu_pkt_buf_get_skb_5556 brcmu_pkt_buf_get_skb 1 5556 NULL
 +le_readq_5557 le_readq 0 5557 NULL
 +inw_5558 inw 0 5558 NULL
-+fir16_create_5574 fir16_create 3 5574 NULL
 +bioset_create_5580 bioset_create 1 5580 NULL
-+oz_ep_alloc_5587 oz_ep_alloc 2 5587 NULL
-+usb_dump_device_descriptor_5599 usb_dump_device_descriptor 0 5599 NULL
++domain_sg_mapping_5586 domain_sg_mapping 4 5586 NULL
++oz_ep_alloc_5587 oz_ep_alloc 1 5587 NULL
 +ldm_frag_add_5611 ldm_frag_add 2 5611 NULL
 +compat_copy_entries_5617 compat_copy_entries 0 5617 NULL
++SYSC_init_module_5626 SYSC_init_module 2 5626 NULL
++iterate_extent_inodes_5631 iterate_extent_inodes 0 5631 NULL
 +SYSC_fsetxattr_5639 SYSC_fsetxattr 4 5639 NULL
 +ext4_xattr_get_5661 ext4_xattr_get 0 5661 NULL
 +posix_clock_register_5662 posix_clock_register 2 5662 NULL
-+mthca_map_reg_5664 mthca_map_reg 2-3 5664 NULL
-+__videobuf_alloc_vb_5665 __videobuf_alloc_vb 1 5665 NULL
++kgdb_arch_pc_5673 kgdb_arch_pc 0 5673 NULL
 +wb_clear_dirty_5684 wb_clear_dirty 2 5684 NULL
 +get_arg_5694 get_arg 3 5694 NULL
 +subbuf_read_actor_5708 subbuf_read_actor 3 5708 NULL
++ntfs_attr_record_resize_5720 ntfs_attr_record_resize 0 5720 NULL
 +vmw_kms_readback_5727 vmw_kms_readback 6 5727 NULL
-+reexecute_instruction_5733 reexecute_instruction 2 5733 NULL
 +rts51x_transfer_data_partial_5735 rts51x_transfer_data_partial 6 5735 NULL
-+ubi_cdev_compat_ioctl_5746 ubi_cdev_compat_ioctl 3 5746 NULL
-+sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL nohasharray
-+qlcnic_83xx_sysfs_flash_read_handler_5775 qlcnic_83xx_sysfs_flash_read_handler 6 5775 &sctp_setsockopt_autoclose_5775
-+compat_sys_writev_5784 compat_sys_writev 3 5784 NULL
++ubi_calc_fm_size_5749 ubi_calc_fm_size 0 5749 NULL
++sctp_setsockopt_autoclose_5775 sctp_setsockopt_autoclose 3 5775 NULL
 +__vxge_hw_blockpool_malloc_5786 __vxge_hw_blockpool_malloc 2 5786 NULL
++nvme_trans_bdev_char_page_5797 nvme_trans_bdev_char_page 3 5797 NULL
 +skb_copy_datagram_iovec_5806 skb_copy_datagram_iovec 2-4 5806 NULL
 +nv50_disp_pioc_create__5812 nv50_disp_pioc_create_ 5 5812 NULL
 +ceph_x_encrypt_buflen_5829 ceph_x_encrypt_buflen 0-1 5829 NULL
-+autofs4_root_compat_ioctl_5838 autofs4_root_compat_ioctl 3 5838 NULL
 +ceph_msg_new_5846 ceph_msg_new 2 5846 NULL
-+ixgb_check_copybreak_5847 ixgb_check_copybreak 3 5847 NULL
 +setup_req_5848 setup_req 3 5848 NULL
++ria_page_count_5849 ria_page_count 0 5849 NULL
 +rx_filter_max_arp_queue_dep_read_5851 rx_filter_max_arp_queue_dep_read 3 5851 NULL
-+compat_sys_move_pages_5861 compat_sys_move_pages 2 5861 NULL nohasharray
-+uinput_compat_ioctl_5861 uinput_compat_ioctl 3 5861 &compat_sys_move_pages_5861
++config_buf_5862 config_buf 0 5862 NULL
++ext4_ext_correct_indexes_5865 ext4_ext_correct_indexes 0 5865 NULL
 +paging64_walk_addr_5887 paging64_walk_addr 3 5887 NULL
++scan_bitmap_5888 scan_bitmap 3 5888 NULL
++lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL
 +port_show_regs_5904 port_show_regs 3 5904 NULL
 +rbd_segment_length_5907 rbd_segment_length 0-3-2 5907 NULL
 +uhci_debug_read_5911 uhci_debug_read 3 5911 NULL
-+qla82xx_pci_mem_read_2M_5912 qla82xx_pci_mem_read_2M 2 5912 NULL
-+ttm_bo_kmap_ttm_5922 ttm_bo_kmap_ttm 3 5922 NULL
 +lbs_highsnr_read_5931 lbs_highsnr_read 3 5931 NULL
 +ps_poll_ps_poll_timeouts_read_5934 ps_poll_ps_poll_timeouts_read 3 5934 NULL
 +edac_device_alloc_ctl_info_5941 edac_device_alloc_ctl_info 1 5941 NULL
-+tipc_subseq_alloc_5957 tipc_subseq_alloc 1 5957 NULL
++find_parent_nodes_5948 find_parent_nodes 0 5948 NULL
++ll_statahead_one_5962 ll_statahead_one 3 5962 NULL
 +__apu_get_register_5967 __apu_get_register 0 5967 NULL
 +ieee80211_if_fmt_rc_rateidx_mask_5ghz_5971 ieee80211_if_fmt_rc_rateidx_mask_5ghz 3 5971 NULL
 +native_pte_val_5978 native_pte_val 0 5978 NULL
-+SyS_semop_5980 SyS_semop 3 5980 NULL
-+ntfs_rl_append_6037 ntfs_rl_append 2-4 6037 NULL
-+da9052_request_irq_6058 da9052_request_irq 2 6058 NULL
++jbd2_journal_stop_5979 jbd2_journal_stop 0 5979 NULL
++ntfs_rl_append_6037 ntfs_rl_append 4-2 6037 NULL
++da9052_request_irq_6058 da9052_request_irq 2 6058 NULL nohasharray
++device_add_attributes_6058 device_add_attributes 0 6058 &da9052_request_irq_6058
++alloc_msg_6072 alloc_msg 1 6072 NULL
 +sctp_setsockopt_connectx_6073 sctp_setsockopt_connectx 3 6073 NULL
 +rts51x_ms_rw_multi_sector_6076 rts51x_ms_rw_multi_sector 3-4 6076 NULL
 +md_trim_bio_6078 md_trim_bio 2 6078 NULL
++finish_inode_if_needed_6098 finish_inode_if_needed 0 6098 NULL
 +ipmi_addr_length_6110 ipmi_addr_length 0 6110 NULL
 +dfs_global_file_write_6112 dfs_global_file_write 3 6112 NULL
-+matrix_keypad_build_keymap_6129 matrix_keypad_build_keymap 3 6129 NULL
 +nouveau_parent_create__6131 nouveau_parent_create_ 7 6131 NULL
++__btrfs_commit_inode_delayed_items_6150 __btrfs_commit_inode_delayed_items 0 6150 NULL
 +ieee80211_if_fmt_beacon_timeout_6153 ieee80211_if_fmt_beacon_timeout 3 6153 NULL
 +ivtv_copy_buf_to_user_6159 ivtv_copy_buf_to_user 4 6159 NULL
 +vdma_mem_alloc_6171 vdma_mem_alloc 1 6171 NULL
 +wl1251_cmd_template_set_6172 wl1251_cmd_template_set 4 6172 NULL
 +paging64_walk_addr_generic_6180 paging64_walk_addr_generic 4 6180 NULL
 +SyS_setgroups_6182 SyS_setgroups 1 6182 NULL
++__add_pin_to_irq_node_6188 __add_pin_to_irq_node 2 6188 NULL
 +qp_host_get_user_memory_6189 qp_host_get_user_memory 1-2 6189 NULL
++cl_sync_io_wait_6196 cl_sync_io_wait 0 6196 NULL
++i915_gem_execbuffer_move_to_gpu_6197 i915_gem_execbuffer_move_to_gpu 0 6197 NULL
 +mxt_show_instance_6207 mxt_show_instance 2-0 6207 NULL
 +v4l2_ctrl_new_std_menu_6221 v4l2_ctrl_new_std_menu 4 6221 NULL
 +mqueue_read_file_6228 mqueue_read_file 3 6228 NULL
 +f_hidg_read_6238 f_hidg_read 3 6238 NULL
++changed_ref_6242 changed_ref 0 6242 NULL
 +fbcon_prepare_logo_6246 fbcon_prepare_logo 5 6246 NULL
++ext4_ext_split_6249 ext4_ext_split 0 6249 NULL
 +pcpu_next_pop_6277 pcpu_next_pop 4 6277 NULL
 +tx_tx_start_null_frame_read_6281 tx_tx_start_null_frame_read 3 6281 NULL
-+snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3 6282 NULL nohasharray
++snd_hda_override_conn_list_6282 snd_hda_override_conn_list 3-0 6282 NULL nohasharray
 +xenbus_file_write_6282 xenbus_file_write 3 6282 &snd_hda_override_conn_list_6282
 +posix_acl_fix_xattr_to_user_6283 posix_acl_fix_xattr_to_user 2 6283 NULL
 +paging64_gva_to_gpa_nested_6287 paging64_gva_to_gpa_nested 2 6287 NULL
-+nf_nat_ipv6_manip_pkt_6289 nf_nat_ipv6_manip_pkt 2 6289 NULL
-+nf_nat_sack_adjust_6297 nf_nat_sack_adjust 2 6297 NULL
-+mid_get_vbt_data_r10_6308 mid_get_vbt_data_r10 2 6308 NULL
 +qlcnic_sriov_alloc_bc_msg_6309 qlcnic_sriov_alloc_bc_msg 2 6309 NULL
-+SyS_mincore_6329 SyS_mincore 1 6329 NULL
++exclude_super_stripes_6326 exclude_super_stripes 0 6326 NULL
++SyS_mincore_6329 SyS_mincore 2-1 6329 NULL nohasharray
++hfa384x_inw_6329 hfa384x_inw 0 6329 &SyS_mincore_6329
 +fuse_get_req_for_background_6337 fuse_get_req_for_background 2 6337 NULL
 +ucs2_strnlen_6342 ucs2_strnlen 0 6342 NULL
++regcache_sync_block_raw_6350 regcache_sync_block_raw 5-4 6350 NULL
 +mei_dbgfs_read_devstate_6352 mei_dbgfs_read_devstate 3 6352 NULL
 +_proc_do_string_6376 _proc_do_string 2 6376 NULL
 +osd_req_read_sg_kern_6378 osd_req_read_sg_kern 5 6378 NULL
-+isku_sysfs_write_light_6406 isku_sysfs_write_light 6 6406 NULL
++msb_write_block_6379 msb_write_block 3 6379 NULL
++BcmFlash2xBulkRead_6395 BcmFlash2xBulkRead 0 6395 NULL
 +posix_acl_fix_xattr_userns_6420 posix_acl_fix_xattr_userns 4 6420 NULL
++add_transaction_credits_6422 add_transaction_credits 2-3 6422 NULL
 +ipr_change_queue_depth_6431 ipr_change_queue_depth 2 6431 NULL
-+__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2-3 6432 NULL
++__alloc_bootmem_node_nopanic_6432 __alloc_bootmem_node_nopanic 2 6432 NULL
++add_to_list_6433 add_to_list 0 6433 NULL
 +paging32_gva_to_gpa_nested_6442 paging32_gva_to_gpa_nested 2 6442 NULL
-+mlx4_ib_reg_user_mr_6471 mlx4_ib_reg_user_mr 2-3 6471 NULL nohasharray
-+ext4_compat_ioctl_6471 ext4_compat_ioctl 3 6471 &mlx4_ib_reg_user_mr_6471
++i915_gem_object_wait_rendering_6446 i915_gem_object_wait_rendering 0 6446 NULL
++mlx4_ib_reg_user_mr_6471 mlx4_ib_reg_user_mr 2-3 6471 NULL
 +ieee80211_if_fmt_dot11MeshMaxRetries_6476 ieee80211_if_fmt_dot11MeshMaxRetries 3 6476 NULL
-+qp_memcpy_from_queue_6479 qp_memcpy_from_queue 4-5 6479 NULL
++qp_memcpy_from_queue_6479 qp_memcpy_from_queue 5-4 6479 NULL
 +cipso_v4_map_lvl_hton_6490 cipso_v4_map_lvl_hton 0 6490 NULL
 +dbg_intr_buf_6501 dbg_intr_buf 2 6501 NULL
 +mei_read_6507 mei_read 3 6507 NULL
-+read_file_disable_ani_6536 read_file_disable_ani 3 6536 NULL
++__start_delalloc_inodes_6528 __start_delalloc_inodes 0 6528 NULL
 +rndis_set_oid_6547 rndis_set_oid 4 6547 NULL
 +wdm_read_6549 wdm_read 3 6549 NULL
-+isku_sysfs_write_keys_easyzone_6553 isku_sysfs_write_keys_easyzone 6 6553 NULL
++dm_stats_create_6551 dm_stats_create 4-2-3 6551 NULL
 +fb_alloc_cmap_6554 fb_alloc_cmap 2 6554 NULL
 +SyS_semtimedop_6563 SyS_semtimedop 3 6563 NULL
 +SyS_fcntl64_6582 SyS_fcntl64 3 6582 NULL
++snd_pcm_hw_refine_old_user_6586 snd_pcm_hw_refine_old_user 0 6586 NULL
++btrfs_start_all_delalloc_inodes_6596 btrfs_start_all_delalloc_inodes 0 6596 NULL
 +snmp_mib_init_6604 snmp_mib_init 2-3 6604 NULL
 +ecryptfs_filldir_6622 ecryptfs_filldir 3 6622 NULL
-+compat_SyS_shmat_6642 compat_SyS_shmat 2 6642 NULL
-+virtscsi_alloc_tgt_6643 virtscsi_alloc_tgt 2 6643 NULL
-+aac_srcv_ioremap_6659 aac_srcv_ioremap 2 6659 NULL
++xfs_do_div_6649 xfs_do_div 0-2 6649 NULL
++journal_dirty_metadata_6658 journal_dirty_metadata 0 6658 NULL
 +process_rcvd_data_6679 process_rcvd_data 3 6679 NULL
-+ql_process_mac_rx_skb_6689 ql_process_mac_rx_skb 4 6689 NULL
-+btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2 6696 NULL
++btrfs_lookup_csums_range_6696 btrfs_lookup_csums_range 2-3-0 6696 NULL
 +ps_pspoll_max_apturn_read_6699 ps_pspoll_max_apturn_read 3 6699 NULL
 +bnad_debugfs_write_regrd_6706 bnad_debugfs_write_regrd 3 6706 NULL
 +mpeg_read_6708 mpeg_read 3 6708 NULL
++ibmpex_query_sensor_count_6709 ibmpex_query_sensor_count 0 6709 NULL
 +set_orig_insn_6712 set_orig_insn 3 6712 NULL
 +video_proc_write_6724 video_proc_write 3 6724 NULL
 +posix_acl_xattr_count_6725 posix_acl_xattr_count 0-1 6725 NULL
-+rds_rdma_pages_6735 rds_rdma_pages 0 6735 NULL
-+sfi_check_table_6772 sfi_check_table 1 6772 NULL
++ocfs2_insert_extent_6737 ocfs2_insert_extent 0 6737 NULL
++btrfs_inode_delayed_dir_index_count_6759 btrfs_inode_delayed_dir_index_count 0 6759 NULL
++kobject_add_varg_6781 kobject_add_varg 0 6781 NULL
 +iwl_dbgfs_channels_read_6784 iwl_dbgfs_channels_read 3 6784 NULL
 +ieee80211_if_read_6785 ieee80211_if_read 3 6785 NULL
++zone_spanned_pages_in_node_6787 zone_spanned_pages_in_node 0-3-4 6787 NULL
 +hdlcdrv_register_6792 hdlcdrv_register 2 6792 NULL
 +tx_tx_done_data_read_6799 tx_tx_done_data_read 3 6799 NULL
++ocfs2_calc_refcount_meta_credits_6802 ocfs2_calc_refcount_meta_credits 0 6802 NULL
++lbs_rdrf_write_6826 lbs_rdrf_write 3 6826 NULL
 +make_8259A_irq_6828 make_8259A_irq 1 6828 NULL
 +calc_pages_for_6838 calc_pages_for 0-1-2 6838 NULL
 +mon_bin_read_6841 mon_bin_read 3 6841 NULL
 +snd_cs4281_BA0_read_6847 snd_cs4281_BA0_read 5 6847 NULL
++ecryptfs_write_lower_6870 ecryptfs_write_lower 4 6870 NULL
++dio_complete_6879 dio_complete 0-2-3 6879 NULL
 +ieee80211_if_fmt_path_refresh_time_6888 ieee80211_if_fmt_path_refresh_time 3 6888 NULL nohasharray
 +raw_seticmpfilter_6888 raw_seticmpfilter 3 6888 &ieee80211_if_fmt_path_refresh_time_6888
 +dlmfs_file_write_6892 dlmfs_file_write 3 6892 NULL
-+proc_sessionid_read_6911 proc_sessionid_read 3 6911 NULL nohasharray
-+acm_alloc_minor_6911 acm_alloc_minor 0 6911 &proc_sessionid_read_6911 nohasharray
-+spi_show_regs_6911 spi_show_regs 3 6911 &acm_alloc_minor_6911
++ext4_inode_bitmap_6902 ext4_inode_bitmap 0 6902 NULL
++spi_show_regs_6911 spi_show_regs 3 6911 NULL nohasharray
++proc_sessionid_read_6911 proc_sessionid_read 3 6911 &spi_show_regs_6911 nohasharray
++acm_alloc_minor_6911 acm_alloc_minor 0 6911 &proc_sessionid_read_6911
 +__kfifo_dma_in_finish_r_6913 __kfifo_dma_in_finish_r 2-3 6913 NULL
 +do_msgrcv_6921 do_msgrcv 3 6921 NULL
++__vxge_hw_mempool_create_6923 __vxge_hw_mempool_create 3-2-6 6923 NULL
 +cache_do_downcall_6926 cache_do_downcall 3 6926 NULL
-+qsfp_cks_6945 qsfp_cks 0-2 6945 NULL
++ipath_verbs_send_dma_6929 ipath_verbs_send_dma 6 6929 NULL
++qsfp_cks_6945 qsfp_cks 2-0 6945 NULL
++tg3_nvram_write_block_unbuffered_6955 tg3_nvram_write_block_unbuffered 3 6955 NULL
 +pch_uart_hal_read_6961 pch_uart_hal_read 0 6961 NULL
 +videobuf_dma_init_kernel_6963 videobuf_dma_init_kernel 3 6963 NULL
-+rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 NULL
++i40e_dbg_dump_write_6973 i40e_dbg_dump_write 3 6973 NULL nohasharray
++rsa_extract_mpi_6973 rsa_extract_mpi 5 6973 &i40e_dbg_dump_write_6973
 +crypto_authenc_esn_setkey_6985 crypto_authenc_esn_setkey 3 6985 NULL
 +request_key_async_6990 request_key_async 4 6990 NULL
 +tpl_write_6998 tpl_write 3 6998 NULL
 +r871x_set_wpa_ie_7000 r871x_set_wpa_ie 3 7000 NULL
++log_wait_commit_7005 log_wait_commit 0 7005 NULL
 +cipso_v4_gentag_enum_7006 cipso_v4_gentag_enum 0 7006 NULL
 +tracing_cpumask_read_7010 tracing_cpumask_read 3 7010 NULL
++ld_usb_write_7022 ld_usb_write 3 7022 NULL
 +wimax_msg_7030 wimax_msg 4 7030 NULL
 +ipath_get_base_info_7043 ipath_get_base_info 3 7043 NULL
 +snd_pcm_oss_bytes_7051 snd_pcm_oss_bytes 2 7051 NULL
++hci_sock_recvmsg_7072 hci_sock_recvmsg 4 7072 NULL
 +event_enable_read_7074 event_enable_read 3 7074 NULL
++ip_vs_sync_conn_7075 ip_vs_sync_conn 3 7075 NULL
 +beacon_interval_read_7091 beacon_interval_read 3 7091 NULL
-+lp_compat_ioctl_7098 lp_compat_ioctl 3 7098 NULL
 +pipeline_enc_rx_stat_fifo_int_read_7107 pipeline_enc_rx_stat_fifo_int_read 3 7107 NULL
 +check_header_7108 check_header 0 7108 NULL
++osc_resend_count_seq_write_7120 osc_resend_count_seq_write 3 7120 NULL
++qib_format_hwerrors_7133 qib_format_hwerrors 5 7133 NULL
++kvm_mmu_notifier_test_young_7139 kvm_mmu_notifier_test_young 3 7139 NULL
++ipv6_recv_rxpmtu_7142 ipv6_recv_rxpmtu 3 7142 NULL
 +qlcnic_enable_msix_7144 qlcnic_enable_msix 2 7144 NULL
++ocfs2_get_left_path_7159 ocfs2_get_left_path 0 7159 NULL
++core_alua_write_tpg_metadata_7168 core_alua_write_tpg_metadata 3 7168 NULL
++ext3_xattr_ibody_list_7201 ext3_xattr_ibody_list 3-0 7201 NULL
 +__alloc_objio_seg_7203 __alloc_objio_seg 1 7203 NULL
-+batadv_check_unicast_ttvn_7206 batadv_check_unicast_ttvn 3 7206 NULL
-+sys32_ipc_7238 sys32_ipc 3-5-6 7238 NULL
 +get_param_h_7247 get_param_h 0 7247 NULL
-+af_alg_make_sg_7254 af_alg_make_sg 3 7254 NULL
++af_alg_make_sg_7254 af_alg_make_sg 3-0 7254 NULL
++hdlc_loop_7255 hdlc_loop 0 7255 NULL
 +vm_mmap_pgoff_7259 vm_mmap_pgoff 0 7259 NULL
-+dma_ops_alloc_addresses_7272 dma_ops_alloc_addresses 3-4-5 7272 NULL
++snd_mask_refine_7267 snd_mask_refine 0 7267 NULL
++f_midi_start_ep_7270 f_midi_start_ep 0 7270 NULL
++dma_ops_alloc_addresses_7272 dma_ops_alloc_addresses 3-4-5-0 7272 NULL
 +rx_rate_rx_frames_per_rates_read_7282 rx_rate_rx_frames_per_rates_read 3 7282 NULL
-+isku_sysfs_write_macro_7293 isku_sysfs_write_macro 6 7293 NULL
++get_string_7302 get_string 0 7302 NULL
 +wb_remove_mapping_7307 wb_remove_mapping 2 7307 NULL
++wait_on_sync_kiocb_7327 wait_on_sync_kiocb 0 7327 NULL
 +mgmt_control_7349 mgmt_control 3 7349 NULL
-+ext3_free_blocks_7362 ext3_free_blocks 3-4 7362 NULL
++max8998_irq_domain_map_7359 max8998_irq_domain_map 2 7359 NULL
++i915_gem_do_execbuffer_7362 i915_gem_do_execbuffer 0 7362 NULL nohasharray
++ext3_free_blocks_7362 ext3_free_blocks 3-4 7362 &i915_gem_do_execbuffer_7362
++at_est2timeout_7365 at_est2timeout 0-1 7365 NULL
 +ieee80211_if_read_dot11MeshHWMPactivePathTimeout_7368 ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 NULL
-+hweight_long_7388 hweight_long 0-1 7388 NULL
-+vhost_scsi_compat_ioctl_7393 vhost_scsi_compat_ioctl 3 7393 NULL
++schedule_timeout_7371 schedule_timeout 0 7371 NULL
++ath10k_read_fw_stats_7387 ath10k_read_fw_stats 3 7387 NULL
++hweight_long_7388 hweight_long 1-0 7388 NULL
 +sl_change_mtu_7396 sl_change_mtu 2 7396 NULL
++_ore_add_stripe_unit_7399 _ore_add_stripe_unit 6-3 7399 NULL
 +readb_7401 readb 0 7401 NULL
 +drm_property_create_blob_7414 drm_property_create_blob 2 7414 NULL
 +ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL
 +SYSC_setgroups_7454 SYSC_setgroups 1 7454 NULL
-+numa_emulation_7466 numa_emulation 2 7466 NULL
-+__mutex_lock_common_7469 __mutex_lock_common 0 7469 NULL
-+garp_request_join_7471 garp_request_join 4 7471 NULL
-+compat_sys_msgrcv_7482 compat_sys_msgrcv 2 7482 NULL
++rt2x00debug_read_queue_stats_7455 rt2x00debug_read_queue_stats 3 7455 NULL
++l2tp_ip6_sendmsg_7461 l2tp_ip6_sendmsg 4 7461 NULL
++ReadHSCX_7471 ReadHSCX 0 7471 NULL nohasharray
++garp_request_join_7471 garp_request_join 4 7471 &ReadHSCX_7471
 +snd_pcm_lib_read1_7491 snd_pcm_lib_read1 0-3 7491 NULL
++iwl_mvm_power_dbgfs_read_7502 iwl_mvm_power_dbgfs_read 0 7502 NULL
 +sdhci_alloc_host_7509 sdhci_alloc_host 2 7509 NULL nohasharray
 +ahash_instance_headroom_7509 ahash_instance_headroom 0 7509 &sdhci_alloc_host_7509
-+array_zalloc_7519 array_zalloc 1-2 7519 NULL
++array_zalloc_7519 array_zalloc 2-1 7519 NULL
++btrfs_insert_xattr_item_7545 btrfs_insert_xattr_item 0 7545 NULL
 +goal_in_my_reservation_7553 goal_in_my_reservation 3 7553 NULL
 +smk_read_mapped_7562 smk_read_mapped 3 7562 NULL
-+btrfs_block_rsv_add_7579 btrfs_block_rsv_add 3 7579 NULL
-+ext3_try_to_allocate_7590 ext3_try_to_allocate 5-3 7590 NULL
-+groups_alloc_7614 groups_alloc 1 7614 NULL
-+sg_virt_7616 sg_virt 0 7616 NULL
-+skb_copy_expand_7685 skb_copy_expand 2-3 7685 NULL nohasharray
-+acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 2-1 7685 &skb_copy_expand_7685
++cfs_cpt_num_estimate_7571 cfs_cpt_num_estimate 0 7571 NULL
++ext4_ext_insert_extent_7576 ext4_ext_insert_extent 0 7576 NULL
++btrfs_block_rsv_add_7579 btrfs_block_rsv_add 3-0 7579 NULL
++ext3_try_to_allocate_7590 ext3_try_to_allocate 5-3-0 7590 NULL
++ocfs2_lock_create_7612 ocfs2_lock_create 0 7612 NULL
++create_dir_7614 create_dir 0 7614 NULL nohasharray
++groups_alloc_7614 groups_alloc 1 7614 &create_dir_7614
++_rtw_zmalloc_7636 _rtw_zmalloc 1 7636 NULL
++fault_inject_write_7662 fault_inject_write 3 7662 NULL
++acpi_ex_allocate_name_string_7685 acpi_ex_allocate_name_string 1-2 7685 NULL
 +acpi_ns_get_pathname_length_7699 acpi_ns_get_pathname_length 0 7699 NULL
 +dev_write_7708 dev_write 3 7708 NULL
 +unmap_region_7709 unmap_region 1 7709 NULL
-+brcmf_sdcard_send_buf_7713 brcmf_sdcard_send_buf 6 7713 NULL
-+set_bypass_pwup_pfs_7742 set_bypass_pwup_pfs 3 7742 NULL
++dbg_check_cats_7713 dbg_check_cats 0 7713 NULL
++pci_raw_set_power_state_7729 pci_raw_set_power_state 0 7729 NULL
 +vxge_device_register_7752 vxge_device_register 4 7752 NULL
-+osdv2_attr_list_elem_size_7763 osdv2_attr_list_elem_size 0-1 7763 NULL
 +ubi_io_read_vid_hdr_7766 ubi_io_read_vid_hdr 0 7766 NULL
-+ioread32be_7773 ioread32be 0 7773 NULL
++paths_from_inode_7774 paths_from_inode 0 7774 NULL
 +alloc_candev_7776 alloc_candev 1-2 7776 NULL
 +dfs_global_file_read_7787 dfs_global_file_read 3 7787 NULL
-+bnx2_nvram_write_7790 bnx2_nvram_write 4-2 7790 NULL
-+diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL
++bnx2_nvram_write_7790 bnx2_nvram_write 2-4 7790 NULL
++diva_os_copy_from_user_7792 diva_os_copy_from_user 4 7792 NULL nohasharray
++lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 &diva_os_copy_from_user_7792
 +ubifs_leb_read_7828 ubifs_leb_read 0 7828 NULL
++cfs_trace_dump_debug_buffer_usrstr_7861 cfs_trace_dump_debug_buffer_usrstr 2 7861 NULL
++tipc_alloc_entry_7875 tipc_alloc_entry 2 7875 NULL
++btrfs_find_space_for_alloc_7876 btrfs_find_space_for_alloc 2 7876 NULL
++config_desc_7878 config_desc 0 7878 NULL
 +dvb_dmxdev_read_sec_7892 dvb_dmxdev_read_sec 4 7892 NULL
 +xfs_trans_get_efi_7898 xfs_trans_get_efi 2 7898 NULL
-+gfs2_tune_get_i_7903 gfs2_tune_get_i 0 7903 NULL
 +ext3_group_extend_7911 ext3_group_extend 3 7911 NULL
 +libfc_host_alloc_7917 libfc_host_alloc 2 7917 NULL
 +f_hidg_write_7932 f_hidg_write 3 7932 NULL
-+io_apic_setup_irq_pin_once_7934 io_apic_setup_irq_pin_once 1 7934 NULL
++io_apic_setup_irq_pin_once_7934 io_apic_setup_irq_pin_once 1-2 7934 NULL
++compare_refs_7938 compare_refs 0 7938 NULL
++fsnotify_7943 fsnotify 0 7943 NULL
 +hash_netiface6_expire_7944 hash_netiface6_expire 3 7944 NULL
 +integrity_digsig_verify_7956 integrity_digsig_verify 3 7956 NULL
 +smk_write_load_self_7958 smk_write_load_self 3 7958 NULL
-+sys_mbind_7990 sys_mbind 5 7990 NULL
++bch_btree_to_text_7960 bch_btree_to_text 2 7960 NULL
++fixup_inode_link_count_8002 fixup_inode_link_count 0 8002 NULL
++extend_or_restart_transaction_8008 extend_or_restart_transaction 0 8008 NULL
 +tt3650_ci_msg_locked_8013 tt3650_ci_msg_locked 4 8013 NULL
 +vcs_read_8017 vcs_read 3 8017 NULL
-+normalize_up_8037 normalize_up 0-1-2 8037 NULL
 +vhost_add_used_and_signal_n_8038 vhost_add_used_and_signal_n 4 8038 NULL
 +ms_read_multiple_pages_8052 ms_read_multiple_pages 5-4 8052 NULL
 +dgrp_mon_read_8065 dgrp_mon_read 3 8065 NULL
 +leb_read_lock_8070 leb_read_lock 0 8070 NULL
++spi_write_then_read_8073 spi_write_then_read 5-3 8073 NULL
 +alloc_targets_8074 alloc_targets 2 8074 NULL nohasharray
 +qla4xxx_post_ping_evt_work_8074 qla4xxx_post_ping_evt_work 4 8074 &alloc_targets_8074
++ext4_ext_map_blocks_8078 ext4_ext_map_blocks 0 8078 NULL
 +venus_lookup_8121 venus_lookup 4 8121 NULL
 +ieee80211_if_fmt_num_buffered_multicast_8127 ieee80211_if_fmt_num_buffered_multicast 3 8127 NULL
-+dma_map_area_8178 dma_map_area 5-2-3 8178 NULL
++xfs_iomap_prealloc_size_8141 xfs_iomap_prealloc_size 3 8141 NULL
++dma_map_area_8178 dma_map_area 3-2-5-0 8178 NULL
 +ore_truncate_8181 ore_truncate 3 8181 NULL
 +__sk_mem_schedule_8185 __sk_mem_schedule 2 8185 NULL
 +ieee80211_if_fmt_dot11MeshHoldingTimeout_8187 ieee80211_if_fmt_dot11MeshHoldingTimeout 3 8187 NULL
++update_cowonly_root_8200 update_cowonly_root 0 8200 NULL
 +recent_mt_proc_write_8206 recent_mt_proc_write 3 8206 NULL
++__ocfs2_lock_refcount_tree_8207 __ocfs2_lock_refcount_tree 0 8207 NULL
 +rt2x00debug_write_bbp_8212 rt2x00debug_write_bbp 3 8212 NULL
 +ad7879_spi_multi_read_8218 ad7879_spi_multi_read 3 8218 NULL
 +play_iframe_8219 play_iframe 3 8219 NULL
-+kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 NULL nohasharray
-+create_log_8225 create_log 2 8225 &kvm_mmu_page_set_gfn_8225
++create_log_8225 create_log 2 8225 NULL nohasharray
++kvm_mmu_page_set_gfn_8225 kvm_mmu_page_set_gfn 2 8225 &create_log_8225
 +sctp_ssnmap_size_8228 sctp_ssnmap_size 0-1-2 8228 NULL
 +ceph_sync_write_8233 ceph_sync_write 4 8233 NULL
 +bnx2x_iov_get_max_queue_count_8235 bnx2x_iov_get_max_queue_count 0 8235 NULL
 +check_xattr_ref_inode_8244 check_xattr_ref_inode 0 8244 NULL
-+add_rx_skb_8257 add_rx_skb 3 8257 NULL
 +t3_init_l2t_8261 t3_init_l2t 1 8261 NULL
 +init_cdev_8274 init_cdev 1 8274 NULL
 +rproc_recovery_write_8281 rproc_recovery_write 3 8281 NULL
 +qib_decode_7220_err_8315 qib_decode_7220_err 3 8315 NULL
++snd_pcm_update_state_8320 snd_pcm_update_state 0 8320 NULL
 +construct_key_and_link_8321 construct_key_and_link 4 8321 NULL
 +ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
 +tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
 +ieee80211_if_fmt_ht_opmode_8347 ieee80211_if_fmt_ht_opmode 3 8347 NULL
-+isku_sysfs_write_talk_8360 isku_sysfs_write_talk 6 8360 NULL nohasharray
-+ping_getfrag_8360 ping_getfrag 4-3 8360 &isku_sysfs_write_talk_8360
-+uvc_v4l2_compat_ioctl32_8375 uvc_v4l2_compat_ioctl32 3 8375 NULL
++generic_write_sync_8358 generic_write_sync 0 8358 NULL
++ping_getfrag_8360 ping_getfrag 4-3 8360 NULL
++ath6kl_lrssi_roam_write_8362 ath6kl_lrssi_roam_write 3 8362 NULL
++ocfs2_decrease_refcount_rec_8385 ocfs2_decrease_refcount_rec 0 8385 NULL
 +xdi_copy_from_user_8395 xdi_copy_from_user 4 8395 NULL
 +zd_rf_scnprint_id_8406 zd_rf_scnprint_id 0-3 8406 NULL
 +smk_write_change_rule_8411 smk_write_change_rule 3 8411 NULL nohasharray
 +uvc_v4l2_ioctl_8411 uvc_v4l2_ioctl 2 8411 &smk_write_change_rule_8411
 +pca953x_gpio_to_irq_8424 pca953x_gpio_to_irq 2 8424 NULL
-+snd_usb_ctl_msg_8436 snd_usb_ctl_msg 8 8436 NULL
-+irq_create_mapping_8437 irq_create_mapping 2 8437 NULL
++irq_create_mapping_8437 irq_create_mapping 2-0 8437 NULL
++generic_bin_search_8440 generic_bin_search 0 8440 NULL
++ring_wait_for_space_8457 ring_wait_for_space 0 8457 NULL
++dir_changed_8471 dir_changed 0 8471 NULL
 +afs_cell_lookup_8482 afs_cell_lookup 2 8482 NULL
++fore200e_chunk_alloc_8501 fore200e_chunk_alloc 4-3 8501 NULL
 +batadv_tt_len_8502 batadv_tt_len 0-1 8502 NULL
 +dev_config_8506 dev_config 3 8506 NULL
 +ACL_to_cifs_posix_8509 ACL_to_cifs_posix 3 8509 NULL
 +opticon_process_data_packet_8524 opticon_process_data_packet 3 8524 NULL
-+pnp_resource_len_8532 pnp_resource_len 0 8532 NULL
 +alloc_pg_vec_8533 alloc_pg_vec 2 8533 NULL
 +ocfs2_read_virt_blocks_8538 ocfs2_read_virt_blocks 2-3 8538 NULL
 +user_on_off_8552 user_on_off 2 8552 NULL
 +profile_remove_8556 profile_remove 3 8556 NULL
++remove_extent_backref_8559 remove_extent_backref 0 8559 NULL
 +cache_slow_downcall_8570 cache_slow_downcall 2 8570 NULL
-+mga_ioremap_8571 mga_ioremap 1-2 8571 NULL
 +isr_dma0_done_read_8574 isr_dma0_done_read 3 8574 NULL
 +tower_write_8580 tower_write 3 8580 NULL
-+rtllib_MFIE_rate_len_8606 rtllib_MFIE_rate_len 0 8606 NULL
++ocfs2_reserve_local_alloc_bits_8581 ocfs2_reserve_local_alloc_bits 0 8581 NULL
++cfs_cpt_number_8618 cfs_cpt_number 0 8618 NULL
 +shash_setkey_unaligned_8620 shash_setkey_unaligned 3 8620 NULL
++iommu_unmap_8624 iommu_unmap 2-0 8624 NULL
 +it821x_firmware_command_8628 it821x_firmware_command 3 8628 NULL
 +scsi_dma_map_8632 scsi_dma_map 0 8632 NULL
 +fuse_send_write_pages_8636 fuse_send_write_pages 0-5 8636 NULL
 +generic_acl_set_8658 generic_acl_set 4 8658 NULL
++mlx5_vzalloc_8663 mlx5_vzalloc 1 8663 NULL
 +dio_bio_alloc_8677 dio_bio_alloc 5 8677 NULL
 +lbs_bcnmiss_read_8678 lbs_bcnmiss_read 3 8678 NULL
 +tc3589x_gpio_irq_unmap_8680 tc3589x_gpio_irq_unmap 2 8680 NULL
@@ -103399,34 +103329,47 @@ index 0000000..9a7096d
 +arcfb_write_8702 arcfb_write 3 8702 NULL
 +i_size_read_8703 i_size_read 0 8703 NULL nohasharray
 +init_header_8703 init_header 0 8703 &i_size_read_8703
-+ctrl_out_8712 ctrl_out 3-5 8712 NULL
++HDLC_irq_8709 HDLC_irq 2 8709 NULL
++ctrl_out_8712 ctrl_out 5-3 8712 NULL
++__create_free_space_inode_8724 __create_free_space_inode 0 8724 NULL
++tracing_max_lat_write_8728 tracing_max_lat_write 3 8728 NULL
 +jffs2_acl_count_8729 jffs2_acl_count 0-1 8729 NULL
 +f_dupfd_8730 f_dupfd 1 8730 NULL
-+__create_irqs_8733 __create_irqs 2-1 8733 NULL
++__create_irqs_8733 __create_irqs 2-1-0-3 8733 NULL
 +pca953x_gpio_irq_map_8737 pca953x_gpio_irq_map 2 8737 NULL
 +tx_tx_exch_expiry_read_8749 tx_tx_exch_expiry_read 3 8749 NULL
++compound_order_8750 compound_order 0 8750 NULL
++ocfs2_find_path_8754 ocfs2_find_path 0 8754 NULL
++yurex_write_8761 yurex_write 3 8761 NULL
 +joydev_compat_ioctl_8765 joydev_compat_ioctl 2 8765 NULL
-+sys_prctl_8766 sys_prctl 4 8766 NULL
-+x32_arch_ptrace_8767 x32_arch_ptrace 3-4 8767 NULL
++x32_arch_ptrace_8767 x32_arch_ptrace 3 8767 NULL
++kstrtoint_from_user_8778 kstrtoint_from_user 2 8778 NULL
 +paging32_prefetch_gpte_8783 paging32_prefetch_gpte 4 8783 NULL
 +ext4_try_to_write_inline_data_8785 ext4_try_to_write_inline_data 3-4 8785 NULL
++aligned_nrpages_8791 aligned_nrpages 0-1-2 8791 NULL
 +__bitmap_weight_8796 __bitmap_weight 0-2 8796 NULL
 +cpuset_common_file_read_8800 cpuset_common_file_read 5 8800 NULL
++intel_ring_begin_8808 intel_ring_begin 0 8808 NULL
 +metronomefb_write_8823 metronomefb_write 3 8823 NULL
 +SyS_llistxattr_8824 SyS_llistxattr 3 8824 NULL
-+icmpv6_manip_pkt_8833 icmpv6_manip_pkt 4 8833 NULL nohasharray
-+get_queue_depth_8833 get_queue_depth 0 8833 &icmpv6_manip_pkt_8833
++get_queue_depth_8833 get_queue_depth 0 8833 NULL
 +dvb_ringbuffer_pkt_next_8834 dvb_ringbuffer_pkt_next 0-2 8834 NULL
 +usb_ep_queue_8839 usb_ep_queue 0 8839 NULL
 +clear_bitset_8840 clear_bitset 2 8840 NULL
 +debug_debug1_read_8856 debug_debug1_read 3 8856 NULL
 +wa_nep_queue_8858 wa_nep_queue 2 8858 NULL
++sk_memory_allocated_8882 sk_memory_allocated 0 8882 NULL
 +compressed_bio_size_8887 compressed_bio_size 0-2 8887 NULL
-+tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 NULL
++ab3100_get_set_reg_8890 ab3100_get_set_reg 3 8890 NULL nohasharray
++tracing_max_lat_read_8890 tracing_max_lat_read 3 8890 &ab3100_get_set_reg_8890
++xfs_contig_bits_8904 xfs_contig_bits 3-0 8904 NULL
 +sdio_max_byte_size_8907 sdio_max_byte_size 0 8907 NULL
++sysfs_merge_group_8917 sysfs_merge_group 0 8917 NULL
++write_file_ani_8918 write_file_ani 3 8918 NULL
 +layout_commit_8926 layout_commit 3 8926 NULL
 +adjust_priv_size_8935 adjust_priv_size 0-1 8935 NULL
 +driver_stats_read_8944 driver_stats_read 3 8944 NULL
++lookup_zone_8956 lookup_zone 2 8956 NULL
 +read_file_tgt_stats_8959 read_file_tgt_stats 3 8959 NULL
 +seq_bitmap_list_8963 seq_bitmap_list 3 8963 NULL
 +usb_allocate_stream_buffers_8964 usb_allocate_stream_buffers 3 8964 NULL
@@ -103435,105 +103378,126 @@ index 0000000..9a7096d
 +seq_open_net_8968 seq_open_net 4 8968 NULL nohasharray
 +vol_cdev_read_8968 vol_cdev_read 3 8968 &seq_open_net_8968
 +bio_integrity_get_tag_8974 bio_integrity_get_tag 3 8974 NULL
-+btrfs_alloc_free_block_8986 btrfs_alloc_free_block 3 8986 NULL
++btrfs_alloc_free_block_8986 btrfs_alloc_free_block 3-8 8986 NULL
++jbd2_journal_blocks_per_page_9004 jbd2_journal_blocks_per_page 0 9004 NULL
++il_dbgfs_clear_ucode_stats_write_9016 il_dbgfs_clear_ucode_stats_write 3 9016 NULL
++sparse_index_alloc_9021 sparse_index_alloc 1 9021 NULL
 +snd_emu10k1_ptr_read_9026 snd_emu10k1_ptr_read 0-2 9026 NULL
-+__pskb_copy_9038 __pskb_copy 2 9038 NULL
++fd_ioctl_9028 fd_ioctl 3 9028 NULL
 +nla_put_9042 nla_put 3 9042 NULL
-+snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 3-5 9061 NULL
++offset_il_node_9059 offset_il_node 0 9059 NULL
++snd_emu10k1_synth_copy_from_user_9061 snd_emu10k1_synth_copy_from_user 5-3 9061 NULL
 +snd_gus_dram_peek_9062 snd_gus_dram_peek 4 9062 NULL
 +fib_info_hash_alloc_9075 fib_info_hash_alloc 1 9075 NULL
-+string_9080 string 0 9080 NULL
-+create_queues_9088 create_queues 2-3 9088 NULL
++create_queues_9088 create_queues 3-2 9088 NULL
 +ftdi_prepare_write_buffer_9093 ftdi_prepare_write_buffer 3 9093 NULL
++adxl34x_spi_read_block_9108 adxl34x_spi_read_block 3 9108 NULL
++alloc_slabmgmt_9109 alloc_slabmgmt 5 9109 NULL
 +caif_stream_sendmsg_9110 caif_stream_sendmsg 4 9110 NULL nohasharray
-+gfn_to_rmap_9110 gfn_to_rmap 2-3 9110 &caif_stream_sendmsg_9110
++gfn_to_rmap_9110 gfn_to_rmap 3-2 9110 &caif_stream_sendmsg_9110
++udf_direct_IO_9111 udf_direct_IO 4 9111 NULL
 +pmcraid_change_queue_depth_9116 pmcraid_change_queue_depth 2 9116 NULL
-+isku_sysfs_write_keys_macro_9120 isku_sysfs_write_keys_macro 6 9120 NULL
 +mq_remove_mapping_9124 mq_remove_mapping 2 9124 NULL
 +mlx4_alloc_resize_umem_9132 mlx4_alloc_resize_umem 3 9132 NULL
 +ext4_list_backups_9138 ext4_list_backups 0 9138 NULL
++apei_resources_merge_9149 apei_resources_merge 0 9149 NULL
++vb2_dma_sg_alloc_9157 vb2_dma_sg_alloc 2 9157 NULL
 +dbg_command_buf_9165 dbg_command_buf 2 9165 NULL
++__btrfs_add_delayed_deletion_item_9177 __btrfs_add_delayed_deletion_item 0 9177 NULL
 +isr_irqs_read_9181 isr_irqs_read 3 9181 NULL
 +count_leading_zeros_9183 count_leading_zeros 0 9183 NULL
-+alloc_group_attrs_9194 alloc_group_attrs 2 9194 NULL nohasharray
-+altera_swap_ir_9194 altera_swap_ir 2 9194 &alloc_group_attrs_9194
-+gx1_gx_base_9198 gx1_gx_base 0 9198 NULL
++altera_swap_ir_9194 altera_swap_ir 2 9194 NULL
 +snd_m3_get_pointer_9206 snd_m3_get_pointer 0 9206 NULL
 +get_pfn_9207 get_pfn 1 9207 NULL
-+virtqueue_add_9217 virtqueue_add 5-4 9217 NULL
++virtqueue_add_9217 virtqueue_add 4-5 9217 NULL
 +tx_tx_prepared_descs_read_9221 tx_tx_prepared_descs_read 3 9221 NULL
 +sctp_getsockopt_delayed_ack_9232 sctp_getsockopt_delayed_ack 2 9232 NULL
-+ocfs2_clear_ext_refcount_9256 ocfs2_clear_ext_refcount 4 9256 NULL
-+tcf_csum_ipv4_icmp_9258 tcf_csum_ipv4_icmp 3 9258 NULL
++ext4_mark_iloc_dirty_9239 ext4_mark_iloc_dirty 0 9239 NULL
++ocfs2_clear_ext_refcount_9256 ocfs2_clear_ext_refcount 4-0 9256 NULL
++hfsplus_bnode_read_u16_9262 hfsplus_bnode_read_u16 0 9262 NULL
++btrfs_search_slot_9264 btrfs_search_slot 0 9264 NULL
++ocfs2_merge_rec_right_9267 ocfs2_merge_rec_right 0 9267 NULL
 +sparse_early_usemaps_alloc_node_9269 sparse_early_usemaps_alloc_node 4 9269 NULL
 +hdpvr_read_9273 hdpvr_read 3 9273 NULL
 +flakey_status_9274 flakey_status 5 9274 NULL
-+qla82xx_pci_set_window_9303 qla82xx_pci_set_window 0-2 9303 NULL
 +iwl_dbgfs_stations_read_9309 iwl_dbgfs_stations_read 3 9309 NULL
 +ceph_sync_setxattr_9310 ceph_sync_setxattr 4 9310 NULL
-+memblock_find_in_range_node_9328 memblock_find_in_range_node 0-3-4 9328 NULL
 +ieee80211_if_fmt_txpower_9334 ieee80211_if_fmt_txpower 3 9334 NULL
 +nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL
 +ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 4 9342 NULL
++ll_direct_rw_pages_9361 ll_direct_rw_pages 0 9361 NULL
++of_node_to_nid_9367 of_node_to_nid 0 9367 NULL
 +sta_beacon_loss_count_read_9370 sta_beacon_loss_count_read 3 9370 NULL
++get_request_type_9393 get_request_type 0 9393 NULL nohasharray
++mlx4_bitmap_init_9393 mlx4_bitmap_init 5-2 9393 &get_request_type_9393
 +virtqueue_add_outbuf_9395 virtqueue_add_outbuf 3 9395 NULL
 +read_9397 read 3 9397 NULL
-+nf_nat_sip_expect_9418 nf_nat_sip_expect 8 9418 NULL
++btrfs_drop_extents_9423 btrfs_drop_extents 4-0 9423 NULL
 +bm_realloc_pages_9431 bm_realloc_pages 2 9431 NULL
 +ffs_ep0_write_9438 ffs_ep0_write 3 9438 NULL
-+kmalloc_array_9444 kmalloc_array 1-2 9444 NULL
 +ieee80211_if_fmt_fwded_unicast_9454 ieee80211_if_fmt_fwded_unicast 3 9454 NULL
-+mcs_unwrap_mir_9455 mcs_unwrap_mir 3 9455 NULL
 +ext3_xattr_set_acl_9467 ext3_xattr_set_acl 4 9467 NULL
-+agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 NULL
-+__alloc_preds_9492 __alloc_preds 2 9492 NULL nohasharray
-+crypt_status_9492 crypt_status 5 9492 &__alloc_preds_9492
++agp_generic_alloc_user_9470 agp_generic_alloc_user 1 9470 NULL nohasharray
++get_registers_9470 get_registers 4 9470 &agp_generic_alloc_user_9470
++btrfs_csum_file_blocks_9491 btrfs_csum_file_blocks 0 9491 NULL
++crypt_status_9492 crypt_status 5 9492 NULL
++lbs_threshold_write_9502 lbs_threshold_write 5 9502 NULL
++btrfs_add_delayed_data_ref_9508 btrfs_add_delayed_data_ref 0 9508 NULL
 +lp_write_9511 lp_write 3 9511 NULL
-+xen_remap_exchanged_ptes_9513 xen_remap_exchanged_ptes 1 9513 NULL
++mext_calc_swap_extents_9517 mext_calc_swap_extents 4 9517 NULL
 +scsi_tgt_kspace_exec_9522 scsi_tgt_kspace_exec 8 9522 NULL
++ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL
 +read_file_dma_9530 read_file_dma 3 9530 NULL
 +ext3_alloc_branch_9534 ext3_alloc_branch 5 9534 NULL
-+audit_log_n_untrustedstring_9548 audit_log_n_untrustedstring 3 9548 NULL nohasharray
-+compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 &audit_log_n_untrustedstring_9548
++iwl_dbgfs_bf_params_read_9542 iwl_dbgfs_bf_params_read 3 9542 NULL
++il_dbgfs_missed_beacon_write_9546 il_dbgfs_missed_beacon_write 3 9546 NULL
++compat_SyS_pwritev64_9548 compat_SyS_pwritev64 3 9548 NULL
++readl_9557 readl 0 9557 NULL
 +fw_node_create_9559 fw_node_create 2 9559 NULL
 +ipath_get_user_pages_9561 ipath_get_user_pages 1-2 9561 NULL
-+kobj_map_9566 kobj_map 2-3 9566 NULL
++kobj_map_9566 kobj_map 3-2 9566 NULL
 +f2fs_read_data_pages_9574 f2fs_read_data_pages 4 9574 NULL
-+biovec_create_pools_9575 biovec_create_pools 2 9575 NULL
-+ieee80211_tdls_mgmt_9581 ieee80211_tdls_mgmt 8 9581 NULL
 +use_block_rsv_9597 use_block_rsv 3 9597 NULL
-+do_sync_9604 do_sync 1 9604 NULL
 +snd_emu10k1_fx8010_read_9605 snd_emu10k1_fx8010_read 5-6 9605 NULL
++ocfs2_claim_suballoc_bits_9615 ocfs2_claim_suballoc_bits 0 9615 NULL
++lov_ost_pool_add_9626 lov_ost_pool_add 3 9626 NULL
 +saa7164_buffer_alloc_user_9627 saa7164_buffer_alloc_user 2 9627 NULL
-+ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 4-3 9635 NULL
-+compat_sys_keyctl_9639 compat_sys_keyctl 4-2-3 9639 NULL
++ceph_copy_user_to_page_vector_9635 ceph_copy_user_to_page_vector 3-4 9635 NULL
++acpi_ex_insert_into_field_9638 acpi_ex_insert_into_field 3 9638 NULL
++compat_sys_keyctl_9639 compat_sys_keyctl 4 9639 NULL
++ll_checksum_seq_write_9648 ll_checksum_seq_write 3 9648 NULL
 +ocfs2_xattr_get_rec_9652 ocfs2_xattr_get_rec 0 9652 NULL
-+uvc_alloc_buffers_9656 uvc_alloc_buffers 2-3 9656 NULL
 +queue_received_packet_9657 queue_received_packet 5 9657 NULL
 +snd_opl4_mem_proc_write_9670 snd_opl4_mem_proc_write 5 9670 NULL
-+ks8842_read16_9676 ks8842_read16 0 9676 NULL nohasharray
-+dns_query_9676 dns_query 3 9676 &ks8842_read16_9676
++dns_query_9676 dns_query 3 9676 NULL
 +qib_7322_handle_hwerrors_9678 qib_7322_handle_hwerrors 3 9678 NULL
 +__erst_read_from_storage_9690 __erst_read_from_storage 0 9690 NULL
-+x25_asy_compat_ioctl_9694 x25_asy_compat_ioctl 4 9694 NULL nohasharray
-+is_hole_9694 is_hole 2 9694 &x25_asy_compat_ioctl_9694
-+fnb_9703 fnb 2-3 9703 NULL
-+ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 NULL nohasharray
-+fuse_iter_npages_9705 fuse_iter_npages 0 9705 &ieee80211_if_read_aid_9705
++vx_transfer_end_9701 vx_transfer_end 0 9701 NULL
++fnb_9703 fnb 2-3-0 9703 NULL
++fuse_iter_npages_9705 fuse_iter_npages 0 9705 NULL nohasharray
++ieee80211_if_read_aid_9705 ieee80211_if_read_aid 3 9705 &fuse_iter_npages_9705
++cfg80211_tx_mlme_mgmt_9715 cfg80211_tx_mlme_mgmt 3 9715 NULL
++btrfs_stack_file_extent_num_bytes_9720 btrfs_stack_file_extent_num_bytes 0 9720 NULL
++SYSC_ppoll_9721 SYSC_ppoll 2 9721 NULL
 +nla_get_u8_9736 nla_get_u8 0 9736 NULL
 +ieee80211_if_fmt_num_mcast_sta_9738 ieee80211_if_fmt_num_mcast_sta 3 9738 NULL
-+ddb_input_read_9743 ddb_input_read 3 9743 NULL
++shmem_replace_page_9740 shmem_replace_page 0 9740 NULL
++ddb_input_read_9743 ddb_input_read 3-0 9743 NULL
 +sta_last_ack_signal_read_9751 sta_last_ack_signal_read 3 9751 NULL
++ni_calculate_power_boost_limit_9757 ni_calculate_power_boost_limit 3 9757 NULL
 +btrfs_super_root_9763 btrfs_super_root 0 9763 NULL
-+__alloc_percpu_9764 __alloc_percpu 1-2 9764 NULL
++__alloc_percpu_9764 __alloc_percpu 2-1 9764 NULL
++btrfs_write_and_wait_transaction_9768 btrfs_write_and_wait_transaction 0 9768 NULL
 +__blk_queue_init_tags_9778 __blk_queue_init_tags 2 9778 NULL
 +snd_mem_proc_write_9786 snd_mem_proc_write 3 9786 NULL
++kvm_age_hva_9795 kvm_age_hva 2 9795 NULL
++parse_uac2_sample_rate_range_9801 parse_uac2_sample_rate_range 0 9801 NULL
++tpm_data_in_9802 tpm_data_in 0 9802 NULL
 +ttm_bo_fbdev_io_9805 ttm_bo_fbdev_io 4 9805 NULL
-+ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 NULL
-+pnp_mem_start_9817 pnp_mem_start 0 9817 NULL
-+kernel_physical_mapping_init_9818 kernel_physical_mapping_init 0-2-1 9818 NULL
++udpv6_recvmsg_9813 udpv6_recvmsg 4 9813 NULL nohasharray
++ieee80211_if_read_state_9813 ieee80211_if_read_state 3 9813 &udpv6_recvmsg_9813
++svc_pool_map_get_node_9817 svc_pool_map_get_node 0 9817 NULL
 +dvb_dvr_set_buffer_size_9840 dvb_dvr_set_buffer_size 2 9840 NULL
-+cfg80211_send_deauth_9862 cfg80211_send_deauth 3 9862 NULL
 +pmcraid_alloc_sglist_9864 pmcraid_alloc_sglist 1 9864 NULL
 +btrfs_free_reserved_extent_9867 btrfs_free_reserved_extent 2 9867 NULL
 +f1x_translate_sysaddr_to_cs_9868 f1x_translate_sysaddr_to_cs 2 9868 NULL
@@ -103541,46 +103505,48 @@ index 0000000..9a7096d
 +wil_read_file_ioblob_9878 wil_read_file_ioblob 3 9878 NULL
 +bm_register_write_9893 bm_register_write 3 9893 NULL nohasharray
 +snd_midi_event_new_9893 snd_midi_event_new 1 9893 &bm_register_write_9893
-+snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 3-5 9895 NULL
++snd_gf1_pcm_playback_copy_9895 snd_gf1_pcm_playback_copy 5-3 9895 NULL
 +nonpaging_page_fault_9908 nonpaging_page_fault 2 9908 NULL
-+gen6_get_total_gtt_size_9913 gen6_get_total_gtt_size 0-1 9913 NULL
++ext4_map_blocks_9916 ext4_map_blocks 0 9916 NULL
++root_nfs_parse_options_9937 root_nfs_parse_options 3 9937 NULL
++tc3589x_reg_read_9940 tc3589x_reg_read 0 9940 NULL
 +pstore_ftrace_knob_read_9947 pstore_ftrace_knob_read 3 9947 NULL
 +read_file_misc_9948 read_file_misc 3 9948 NULL
-+set_rxd_buffer_pointer_9950 set_rxd_buffer_pointer 8 9950 NULL
-+ext2_new_blocks_9954 ext2_new_blocks 2 9954 NULL
-+csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 3-4 9957 NULL
++ext2_new_blocks_9954 ext2_new_blocks 2-0 9954 NULL
++csum_partial_copy_fromiovecend_9957 csum_partial_copy_fromiovecend 4-3 9957 NULL
 +SyS_gethostname_9964 SyS_gethostname 2 9964 NULL
 +get_free_serial_index_9969 get_free_serial_index 0 9969 NULL
-+btrfs_add_link_9973 btrfs_add_link 5 9973 NULL
-+ath6kl_usb_submit_ctrl_out_9978 ath6kl_usb_submit_ctrl_out 6 9978 NULL
++btrfs_add_link_9973 btrfs_add_link 5-0 9973 NULL
 +SYSC_move_pages_9986 SYSC_move_pages 2 9986 NULL
 +aat2870_dump_reg_10019 aat2870_dump_reg 0 10019 NULL
-+handle_request_10024 handle_request 9 10024 NULL
 +batadv_orig_hash_add_if_10033 batadv_orig_hash_add_if 2 10033 NULL
-+ieee80211_probereq_get_10040 ieee80211_probereq_get 4-5 10040 NULL
-+xen_destroy_contiguous_region_10054 xen_destroy_contiguous_region 1 10054 NULL
-+vfio_pci_write_10063 vfio_pci_write 3 10063 NULL
++iterate_inodes_from_logical_10037 iterate_inodes_from_logical 0 10037 NULL
++vm_iomap_memory_10038 vm_iomap_memory 2 10038 NULL
 +ieee80211_set_probe_resp_10077 ieee80211_set_probe_resp 3 10077 NULL
 +ufs_bitmap_search_10105 ufs_bitmap_search 0-3 10105 NULL
 +get_elem_size_10110 get_elem_size 0-2 10110 NULL nohasharray
 +dynamic_ps_timeout_read_10110 dynamic_ps_timeout_read 3 10110 &get_elem_size_10110
-+jbd_alloc_10112 jbd_alloc 0 10112 NULL nohasharray
-+gfs2_meta_read_10112 gfs2_meta_read 0 10112 &jbd_alloc_10112
-+offset_to_bit_10134 offset_to_bit 0 10134 NULL nohasharray
-+SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 &offset_to_bit_10134
++gfs2_meta_read_10112 gfs2_meta_read 0 10112 NULL
++SyS_migrate_pages_10134 SyS_migrate_pages 2 10134 NULL nohasharray
++offset_to_bit_10134 offset_to_bit 0-2-1-3 10134 &SyS_migrate_pages_10134
 +aes_decrypt_packets_read_10155 aes_decrypt_packets_read 3 10155 NULL
 +rx_out_of_mem_read_10157 rx_out_of_mem_read 3 10157 NULL
 +hidg_alloc_ep_req_10159 hidg_alloc_ep_req 2 10159 NULL nohasharray
 +ol_chunk_entries_10159 ol_chunk_entries 0 10159 &hidg_alloc_ep_req_10159
 +stmpe_irq_unmap_10164 stmpe_irq_unmap 2 10164 NULL
 +asd_store_update_bios_10165 asd_store_update_bios 4 10165 NULL
++kstrtol_from_user_10168 kstrtol_from_user 2 10168 NULL
 +proc_pid_attr_read_10173 proc_pid_attr_read 3 10173 NULL
 +jffs2_user_setxattr_10182 jffs2_user_setxattr 4 10182 NULL
-+do_ioctl_trans_10194 do_ioctl_trans 3 10194 NULL
++register_ftrace_function_10218 register_ftrace_function 0 10218 NULL
++hdlc_rpr_irq_10240 hdlc_rpr_irq 2 10240 NULL
++mutex_lock_killable_10244 mutex_lock_killable 0 10244 NULL
++insert_orphan_item_10249 insert_orphan_item 0 10249 NULL
 +cciss_proc_write_10259 cciss_proc_write 3 10259 NULL
++gpiochip_add_to_list_10262 gpiochip_add_to_list 0 10262 NULL
 +__qlcnic_pci_sriov_enable_10281 __qlcnic_pci_sriov_enable 2 10281 NULL
 +snd_rme9652_capture_copy_10287 snd_rme9652_capture_copy 5 10287 NULL
-+ubi_leb_change_10289 ubi_leb_change 4 10289 NULL
++ubi_leb_change_10289 ubi_leb_change 0-4 10289 NULL
 +read_emulate_10310 read_emulate 2-4 10310 NULL
 +read_file_spectral_count_10320 read_file_spectral_count 3 10320 NULL
 +ttm_object_device_init_10321 ttm_object_device_init 2 10321 NULL
@@ -103589,6 +103555,7 @@ index 0000000..9a7096d
 +tun_sendmsg_10337 tun_sendmsg 4 10337 NULL
 +get_dump_page_10338 get_dump_page 1 10338 NULL
 +ufx_alloc_urb_list_10349 ufx_alloc_urb_list 3 10349 NULL
++whci_add_cap_10350 whci_add_cap 0 10350 NULL
 +dbAllocAny_10354 dbAllocAny 0 10354 NULL
 +ath6kl_listen_int_read_10355 ath6kl_listen_int_read 3 10355 NULL
 +ms_write_multiple_pages_10362 ms_write_multiple_pages 6-5 10362 NULL
@@ -103597,269 +103564,317 @@ index 0000000..9a7096d
 +do_compat_pselect_10398 do_compat_pselect 1 10398 NULL
 +fwtty_rx_10434 fwtty_rx 3 10434 NULL
 +event_phy_transmit_error_read_10471 event_phy_transmit_error_read 3 10471 NULL
-+ca91cx42_alloc_resource_10502 ca91cx42_alloc_resource 2 10502 NULL
++ext4_itable_unused_count_10501 ext4_itable_unused_count 0 10501 NULL
 +qib_alloc_fast_reg_page_list_10507 qib_alloc_fast_reg_page_list 2 10507 NULL
 +sel_write_disable_10511 sel_write_disable 3 10511 NULL
 +osd_req_write_sg_kern_10514 osd_req_write_sg_kern 5 10514 NULL
 +rds_message_alloc_10517 rds_message_alloc 1 10517 NULL
 +qlcnic_pci_sriov_enable_10519 qlcnic_pci_sriov_enable 2 10519 NULL nohasharray
 +hash_netiface4_expire_10519 hash_netiface4_expire 3 10519 &qlcnic_pci_sriov_enable_10519
++snd_pcm_hw_params_user_10520 snd_pcm_hw_params_user 0 10520 NULL
 +ocfs2_add_refcounted_extent_10526 ocfs2_add_refcounted_extent 6 10526 NULL
-+get_vm_area_caller_10527 get_vm_area_caller 1 10527 NULL
-+snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 NULL
-+ieee80211_send_probe_req_10539 ieee80211_send_probe_req 4-6 10539 NULL
++snd_pcm_lib_read_10536 snd_pcm_lib_read 0-3 10536 NULL nohasharray
++kstrtouint_from_user_10536 kstrtouint_from_user 2 10536 &snd_pcm_lib_read_10536
++SYSC_read_10545 SYSC_read 3 10545 NULL
 +ext4_write_begin_10576 ext4_write_begin 3-4 10576 NULL
 +scrub_remap_extent_10588 scrub_remap_extent 2 10588 NULL
-+otp_read_10594 otp_read 2-4-5 10594 NULL
++otp_read_10594 otp_read 5-4-2 10594 NULL
 +supply_map_read_file_10608 supply_map_read_file 3 10608 NULL
 +ima_show_htable_violations_10619 ima_show_htable_violations 3 10619 NULL
 +alloc_coherent_10632 alloc_coherent 2 10632 NULL
-+nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 NULL
++ubi_io_write_vid_hdr_10660 ubi_io_write_vid_hdr 0 10660 NULL nohasharray
++nfs_idmap_lookup_id_10660 nfs_idmap_lookup_id 2 10660 &ubi_io_write_vid_hdr_10660
++efx_max_tx_len_10662 efx_max_tx_len 0-2 10662 NULL
 +dtf_read_device_10663 dtf_read_device 3 10663 NULL
 +parport_write_10669 parport_write 0 10669 NULL
-+selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 NULL nohasharray
-+inl_10708 inl 0 10708 &selinux_inode_setxattr_10708
-+shash_async_setkey_10720 shash_async_setkey 3 10720 NULL nohasharray
-+pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 &shash_async_setkey_10720
++alloc_vmap_area_10682 alloc_vmap_area 5 10682 NULL
++edge_write_10692 edge_write 4 10692 NULL
++ubi_wl_get_peb_10699 ubi_wl_get_peb 0 10699 NULL
++inl_10708 inl 0 10708 NULL nohasharray
++selinux_inode_setxattr_10708 selinux_inode_setxattr 4 10708 &inl_10708
++pvr2_ioread_read_10720 pvr2_ioread_read 3 10720 NULL nohasharray
++shash_async_setkey_10720 shash_async_setkey 3 10720 &pvr2_ioread_read_10720
 +spi_sync_10731 spi_sync 0 10731 NULL
 +sctp_getsockopt_maxseg_10737 sctp_getsockopt_maxseg 2 10737 NULL nohasharray
 +apu_get_register_10737 apu_get_register 0 10737 &sctp_getsockopt_maxseg_10737
-+compat_sys_msgsnd_10738 compat_sys_msgsnd 2 10738 NULL
-+sys_syslog_10746 sys_syslog 3 10746 NULL
 +alloc_one_pg_vec_page_10747 alloc_one_pg_vec_page 1 10747 NULL
++ttm_ref_object_add_10748 ttm_ref_object_add 0 10748 NULL
++SyS_io_getevents_10756 SyS_io_getevents 3 10756 NULL
 +vhost_add_used_n_10760 vhost_add_used_n 3 10760 NULL
-+kvm_read_guest_atomic_10765 kvm_read_guest_atomic 4-2 10765 NULL
++kvm_read_guest_atomic_10765 kvm_read_guest_atomic 2-4 10765 NULL
 +wb_set_dirty_10778 wb_set_dirty 2 10778 NULL
 +__qp_memcpy_to_queue_10779 __qp_memcpy_to_queue 2-4 10779 NULL
-+sys_bind_10799 sys_bind 3 10799 NULL
-+compat_put_int_10828 compat_put_int 1 10828 NULL
++i915_gem_wait_for_error_10791 i915_gem_wait_for_error 0 10791 NULL
++snd_mask_value_10794 snd_mask_value 0 10794 NULL
++diva_set_trace_filter_10820 diva_set_trace_filter 0-1 10820 NULL
 +lbs_sleepparams_read_10840 lbs_sleepparams_read 3 10840 NULL
-+ida_get_new_above_10853 ida_get_new_above 2 10853 NULL
++ida_get_new_above_10853 ida_get_new_above 2-0 10853 NULL
 +fuse_conn_max_background_read_10855 fuse_conn_max_background_read 3 10855 NULL
 +ol_chunk_blocks_10864 ol_chunk_blocks 0 10864 NULL
 +snd_pcm_oss_write1_10872 snd_pcm_oss_write1 3 10872 NULL
-+mid_get_vbt_data_r0_10876 mid_get_vbt_data_r0 2 10876 NULL
-+bl_mark_for_commit_10879 bl_mark_for_commit 2-3 10879 NULL
++drm_ht_insert_item_10877 drm_ht_insert_item 0 10877 NULL
++wiidebug_drm_write_10879 wiidebug_drm_write 3 10879 NULL
 +get_scq_10897 get_scq 2 10897 NULL
 +cgroup_write_string_10900 cgroup_write_string 5 10900 NULL
 +tifm_alloc_adapter_10903 tifm_alloc_adapter 1 10903 NULL
-+__copy_from_user_10918 __copy_from_user 3 10918 NULL
++lprocfs_wr_atomic_10912 lprocfs_wr_atomic 3 10912 NULL
++__copy_from_user_10918 __copy_from_user 3-0 10918 NULL
++kobject_add_10919 kobject_add 0 10919 NULL
 +da9052_map_irq_10952 da9052_map_irq 2 10952 NULL
 +ci_port_test_write_10962 ci_port_test_write 3 10962 NULL
 +bm_entry_read_10976 bm_entry_read 3 10976 NULL
-+i915_min_freq_write_10981 i915_min_freq_write 3 10981 NULL
 +sched_autogroup_write_10984 sched_autogroup_write 3 10984 NULL
 +__hci_num_ctrl_10985 __hci_num_ctrl 0 10985 NULL
++lz4_compress_10986 lz4_compress 2 10986 NULL
++do_switch_10994 do_switch 0 10994 NULL
 +xfrm_hash_alloc_10997 xfrm_hash_alloc 1 10997 NULL
++btrfs_add_delayed_extent_op_11000 btrfs_add_delayed_extent_op 0 11000 NULL
 +rx_filter_accum_arp_pend_requests_read_11003 rx_filter_accum_arp_pend_requests_read 3 11003 NULL
 +SetLineNumber_11023 SetLineNumber 0 11023 NULL
-+mb_find_next_bit_11037 mb_find_next_bit 2-3-0 11037 NULL
++btrfs_find_space_for_alloc_11028 btrfs_find_space_for_alloc 2 11028 NULL
++mb_find_next_bit_11037 mb_find_next_bit 0-2-3 11037 NULL
 +tda10048_writeregbulk_11050 tda10048_writeregbulk 4 11050 NULL
++insert_inline_extent_backref_11063 insert_inline_extent_backref 8-0 11063 NULL
 +tcp_send_mss_11079 tcp_send_mss 0 11079 NULL
++snd_pcm_delay_11081 snd_pcm_delay 0 11081 NULL
 +count_argc_11083 count_argc 0 11083 NULL
 +kvm_write_guest_cached_11106 kvm_write_guest_cached 4 11106 NULL
 +stmpe_gpio_to_irq_11110 stmpe_gpio_to_irq 2 11110 NULL
 +tw_change_queue_depth_11116 tw_change_queue_depth 2 11116 NULL
 +page_offset_11120 page_offset 0 11120 NULL
-+cea_db_payload_len_11124 cea_db_payload_len 0 11124 NULL nohasharray
-+tracing_buffers_read_11124 tracing_buffers_read 3 11124 &cea_db_payload_len_11124
-+alloc_alien_cache_11127 alloc_alien_cache 2 11127 NULL
-+acpi_os_map_memory_11161 acpi_os_map_memory 1-2 11161 NULL
-+ioat2_alloc_ring_11172 ioat2_alloc_ring 2 11172 NULL nohasharray
-+snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 3-4 11172 &ioat2_alloc_ring_11172
-+__swab16p_11220 __swab16p 0 11220 NULL
++tracing_buffers_read_11124 tracing_buffers_read 3 11124 NULL nohasharray
++cea_db_payload_len_11124 cea_db_payload_len 0 11124 &tracing_buffers_read_11124
++alloc_alien_cache_11127 alloc_alien_cache 2-1 11127 NULL
++eb_lookup_objects_11163 eb_lookup_objects 0 11163 NULL
++snd_gf1_pcm_playback_silence_11172 snd_gf1_pcm_playback_silence 4-3 11172 NULL
 +il_dbgfs_rx_queue_read_11221 il_dbgfs_rx_queue_read 3 11221 NULL
++comedi_alloc_spriv_11234 comedi_alloc_spriv 2 11234 NULL
 +mmap_region_11247 mmap_region 0-2 11247 NULL
 +ubifs_write_node_11258 ubifs_write_node 5-3 11258 NULL
 +dm_cache_discard_bitset_resize_11262 dm_cache_discard_bitset_resize 3 11262 NULL
 +hugetlbfs_read_11268 hugetlbfs_read 3 11268 NULL
-+cru_detect_11272 cru_detect 1 11272 NULL
++ath6kl_power_params_write_11274 ath6kl_power_params_write 3 11274 NULL
++__proc_daemon_file_11305 __proc_daemon_file 5 11305 NULL
++split_vma_11312 split_vma 0 11312 NULL
++btrfs_update_inode_fallback_11313 btrfs_update_inode_fallback 0 11313 NULL
 +ext4_xattr_check_names_11314 ext4_xattr_check_names 0 11314 NULL
-+tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 NULL
++sk_filter_size_11316 sk_filter_size 0 11316 NULL nohasharray
++tcp_send_rcvq_11316 tcp_send_rcvq 3 11316 &sk_filter_size_11316
++shmem_radix_tree_replace_11325 shmem_radix_tree_replace 0 11325 NULL
 +construct_key_11329 construct_key 3 11329 NULL nohasharray
 +__kfifo_out_peek_11329 __kfifo_out_peek 0-3 11329 &construct_key_11329
 +next_segment_11330 next_segment 0-2-1 11330 NULL
-+persistent_ram_buffer_map_11332 persistent_ram_buffer_map 1-2 11332 NULL
++persistent_ram_buffer_map_11332 persistent_ram_buffer_map 2-1 11332 NULL
 +ext4_get_inline_size_11349 ext4_get_inline_size 0 11349 NULL
-+i915_max_freq_write_11350 i915_max_freq_write 3 11350 NULL
-+sel_write_create_11353 sel_write_create 3 11353 NULL
-+handle_unit_11355 handle_unit 0-1 11355 NULL
-+batadv_skb_head_push_11360 batadv_skb_head_push 2 11360 NULL
++nl80211_send_mgmt_11353 nl80211_send_mgmt 7 11353 NULL nohasharray
++sel_write_create_11353 sel_write_create 3 11353 &nl80211_send_mgmt_11353
 +drm_vblank_init_11362 drm_vblank_init 2 11362 NULL
 +qib_get_base_info_11369 qib_get_base_info 3 11369 NULL
 +isku_sysfs_read_keys_capslock_11392 isku_sysfs_read_keys_capslock 6 11392 NULL
 +dev_irnet_write_11398 dev_irnet_write 3 11398 NULL
-+___alloc_bootmem_11410 ___alloc_bootmem 1-2 11410 NULL
++__btrfs_add_delayed_insertion_item_11400 __btrfs_add_delayed_insertion_item 0 11400 NULL
++lprocfs_wr_evict_client_11402 lprocfs_wr_evict_client 3 11402 NULL
++___alloc_bootmem_11410 ___alloc_bootmem 1 11410 NULL
 +str_to_user_11411 str_to_user 2 11411 NULL
 +mem_fw_gen_free_mem_blks_read_11413 mem_fw_gen_free_mem_blks_read 3 11413 NULL
 +ath6kl_wmi_test_rx_11414 ath6kl_wmi_test_rx 3 11414 NULL
++relocate_entry_gtt_11416 relocate_entry_gtt 0 11416 NULL
 +adis16480_show_firmware_revision_11417 adis16480_show_firmware_revision 3 11417 NULL
 +trace_options_read_11419 trace_options_read 3 11419 NULL
-+xd_read_multiple_pages_11422 xd_read_multiple_pages 5-4 11422 NULL
++i40e_dbg_command_write_11421 i40e_dbg_command_write 3 11421 NULL
++__irq_set_trigger_11422 __irq_set_trigger 0 11422 NULL nohasharray
++xd_read_multiple_pages_11422 xd_read_multiple_pages 5-4 11422 &__irq_set_trigger_11422
 +prepare_image_11424 prepare_image 0 11424 NULL
-+vring_size_11426 vring_size 0-1-2 11426 NULL
++ext3_xattr_block_list_11428 ext3_xattr_block_list 3 11428 NULL
 +bttv_read_11432 bttv_read 3 11432 NULL
 +create_zero_mask_11453 create_zero_mask 0-1 11453 NULL
++do_blockdev_direct_IO_11455 do_blockdev_direct_IO 0-6 11455 NULL
 +swp_offset_11475 swp_offset 0 11475 NULL
-+sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 NULL
++st_sensors_write_data_with_mask_11476 st_sensors_write_data_with_mask 3 11476 NULL
++pci_set_power_state_11479 pci_set_power_state 0 11479 NULL nohasharray
++sca3000_read_first_n_hw_rb_11479 sca3000_read_first_n_hw_rb 2 11479 &pci_set_power_state_11479
 +xfs_file_buffered_aio_write_11492 xfs_file_buffered_aio_write 4 11492 NULL
 +sd_do_mode_sense_11507 sd_do_mode_sense 5 11507 NULL
 +kmem_zalloc_11510 kmem_zalloc 1 11510 NULL
++ll_direct_IO_26_seg_11518 ll_direct_IO_26_seg 0 11518 NULL
 +twl_direction_in_11527 twl_direction_in 2 11527 NULL
 +setup_IO_APIC_irq_extra_11537 setup_IO_APIC_irq_extra 1 11537 NULL
-+skb_cow_data_11565 skb_cow_data 0-2 11565 NULL
-+mlx4_init_cmpt_table_11569 mlx4_init_cmpt_table 3 11569 NULL
++radix_tree_extend_11555 radix_tree_extend 0 11555 NULL
++skb_cow_data_11565 skb_cow_data 0 11565 NULL
++posix_acl_create_masq_11567 posix_acl_create_masq 0 11567 NULL
++qgroup_account_ref_step2_11575 qgroup_account_ref_step2 0 11575 NULL
++lpfc_idiag_ctlacc_write_11576 lpfc_idiag_ctlacc_write 3 11576 NULL
 +oprofilefs_ulong_to_user_11582 oprofilefs_ulong_to_user 3 11582 NULL
 +snd_pcm_action_11589 snd_pcm_action 0 11589 NULL
 +fw_device_op_ioctl_11595 fw_device_op_ioctl 2 11595 NULL
++btrfs_uuid_tree_add_11598 btrfs_uuid_tree_add 0 11598 NULL
 +SYSC_mq_timedsend_11607 SYSC_mq_timedsend 3 11607 NULL
++i915_gem_object_pin_11630 i915_gem_object_pin 0 11630 NULL
 +add_new_bitmap_11644 add_new_bitmap 3 11644 NULL
 +sisusb_send_bridge_packet_11649 sisusb_send_bridge_packet 2 11649 NULL
 +nla_total_size_11658 nla_total_size 0-1 11658 NULL
++slab_ksize_11664 slab_ksize 0 11664 NULL
++__btrfs_run_delayed_items_11671 __btrfs_run_delayed_items 0 11671 NULL
 +ide_queue_pc_tail_11673 ide_queue_pc_tail 5 11673 NULL
-+compat_SyS_msgsnd_11675 compat_SyS_msgsnd 2-3 11675 NULL
++compat_SyS_msgsnd_11675 compat_SyS_msgsnd 3 11675 NULL
 +btrfs_alloc_delayed_item_11678 btrfs_alloc_delayed_item 1 11678 NULL
 +dsp_buffer_alloc_11684 dsp_buffer_alloc 2 11684 NULL
 +sctp_setsockopt_hmac_ident_11687 sctp_setsockopt_hmac_ident 3 11687 NULL
 +split_11691 split 2 11691 NULL
 +snd_ctl_elem_user_tlv_11695 snd_ctl_elem_user_tlv 3 11695 NULL
 +blk_rq_cur_bytes_11723 blk_rq_cur_bytes 0 11723 NULL
-+tcf_csum_ipv6_icmp_11738 tcf_csum_ipv6_icmp 4 11738 NULL
-+nfsd4_get_drc_mem_11748 nfsd4_get_drc_mem 0-1-2 11748 NULL
 +dm_bio_prison_create_11749 dm_bio_prison_create 1 11749 NULL
 +iwl_dbgfs_qos_read_11753 iwl_dbgfs_qos_read 3 11753 NULL
++intel_map_page_11762 intel_map_page 4-3 11762 NULL
++ocfs2_relink_block_group_11769 ocfs2_relink_block_group 0 11769 NULL
 +ps_pspoll_timeouts_read_11776 ps_pspoll_timeouts_read 3 11776 NULL
 +ebt_buf_add_11779 ebt_buf_add 0 11779 NULL
 +btrfs_key_blockptr_11786 btrfs_key_blockptr 0 11786 NULL
-+pcpu_fc_alloc_11818 pcpu_fc_alloc 2-3 11818 NULL
++rtw_alloc_etherdev_11792 rtw_alloc_etherdev 1 11792 NULL
++pcpu_fc_alloc_11818 pcpu_fc_alloc 2 11818 NULL
++umc_device_register_11824 umc_device_register 0 11824 NULL
 +zerocopy_sg_from_iovec_11828 zerocopy_sg_from_iovec 3 11828 NULL
 +sctp_setsockopt_maxseg_11829 sctp_setsockopt_maxseg 3 11829 NULL
 +rts51x_read_status_11830 rts51x_read_status 4 11830 NULL
 +unix_stream_connect_11844 unix_stream_connect 3 11844 NULL
-+nf_nat_sdp_media_11863 nf_nat_sdp_media 9 11863 NULL
 +ecryptfs_copy_filename_11868 ecryptfs_copy_filename 4 11868 NULL
 +ieee80211_rx_bss_info_11887 ieee80211_rx_bss_info 3 11887 NULL
-+kmalloc_slab_11917 kmalloc_slab 1 11917 NULL
++mdc_rename_11899 mdc_rename 4-6 11899 NULL
++xstateregs_get_11906 xstateregs_get 4 11906 NULL
++ti_write_11916 ti_write 4 11916 NULL
 +fs_devrw_entry_11924 fs_devrw_entry 3 11924 NULL
 +bitmap_remap_11929 bitmap_remap 5 11929 NULL
 +atomic_sub_return_11939 atomic_sub_return 0-1 11939 NULL
-+dccp_feat_clone_sp_val_11942 dccp_feat_clone_sp_val 3 11942 NULL
++r1_sync_page_io_11963 r1_sync_page_io 3 11963 NULL
 +f1x_swap_interleaved_region_11970 f1x_swap_interleaved_region 0-2 11970 NULL
-+atmel_read16_11981 atmel_read16 0 11981 NULL
++usc_InReg_11976 usc_InReg 0 11976 NULL nohasharray
++split_node_11976 split_node 0 11976 &usc_InReg_11976
++BeceemFlashBulkRead_11979 BeceemFlashBulkRead 0 11979 NULL
 +read_and_add_raw_conns_11987 read_and_add_raw_conns 0 11987 NULL
++i40e_pci_sriov_configure_12011 i40e_pci_sriov_configure 2 12011 NULL
++intel_init_ring_buffer_12016 intel_init_ring_buffer 0 12016 NULL
 +ftdi_elan_total_command_size_12045 ftdi_elan_total_command_size 0 12045 NULL
++did_overwrite_ref_12046 did_overwrite_ref 0 12046 NULL
 +ieee80211_if_read_user_power_level_12050 ieee80211_if_read_user_power_level 3 12050 NULL
 +il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3 12064 NULL
 +ptc_proc_write_12076 ptc_proc_write 3 12076 NULL
 +ubifs_recover_log_leb_12079 ubifs_recover_log_leb 3 12079 NULL
 +pse36_gfn_delta_12087 pse36_gfn_delta 0-1 12087 NULL
++rtw_malloc2d_12102 rtw_malloc2d 1-2-3 12102 NULL
++twl6030_irq_map_12105 twl6030_irq_map 2 12105 NULL
++i915_gem_evict_something_12118 i915_gem_evict_something 0 12118 NULL
 +alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
 +set_powered_12129 set_powered 4 12129 NULL
-+nfs_writedata_alloc_12133 nfs_writedata_alloc 2 12133 NULL
 +ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
 +xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL
-+batadv_add_packet_12136 batadv_add_packet 3 12136 NULL
 +rawv6_seticmpfilter_12137 rawv6_seticmpfilter 5 12137 NULL
 +vmw_fifo_reserve_12141 vmw_fifo_reserve 2 12141 NULL
++rawsock_recvmsg_12144 rawsock_recvmsg 4 12144 NULL
 +get_idx_gc_leb_12148 get_idx_gc_leb 0 12148 NULL
 +btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL
++ocfs2_local_alloc_new_window_12153 ocfs2_local_alloc_new_window 0 12153 NULL
 +vmbus_open_12154 vmbus_open 2-3 12154 NULL
-+wil_rxdesc_phy_length_12165 wil_rxdesc_phy_length 0 12165 NULL
 +dma_memcpy_to_iovec_12173 dma_memcpy_to_iovec 5 12173 NULL
++LNetEQAlloc_12178 LNetEQAlloc 1 12178 NULL
 +ddp_make_gl_12179 ddp_make_gl 1 12179 NULL
 +compat_do_arpt_set_ctl_12184 compat_do_arpt_set_ctl 4 12184 NULL
 +ip_generic_getfrag_12187 ip_generic_getfrag 3-4 12187 NULL
-+bl_is_sector_init_12199 bl_is_sector_init 2 12199 NULL
-+scaled_div_12201 scaled_div 1-2 12201 NULL
-+free_initrd_mem_12203 free_initrd_mem 1 12203 NULL
-+receive_copy_12216 receive_copy 3 12216 NULL
++scaled_div_12201 scaled_div 2-1-0 12201 NULL
 +snd_pcm_kernel_ioctl_12219 snd_pcm_kernel_ioctl 0 12219 NULL
 +fuse_get_req_12221 fuse_get_req 2 12221 NULL nohasharray
 +aat2870_reg_read_file_12221 aat2870_reg_read_file 3 12221 &fuse_get_req_12221
-+__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1-2 12235 NULL
++__alloc_bootmem_low_nopanic_12235 __alloc_bootmem_low_nopanic 1 12235 NULL
++kvirt_to_pa_12247 kvirt_to_pa 0 12247 NULL
 +ib_uverbs_unmarshall_recv_12251 ib_uverbs_unmarshall_recv 5 12251 NULL
-+ath_descdma_setup_12257 ath_descdma_setup 5 12257 NULL
 +shash_compat_setkey_12267 shash_compat_setkey 3 12267 NULL
 +add_sctp_bind_addr_12269 add_sctp_bind_addr 3 12269 NULL
 +note_last_dentry_12285 note_last_dentry 3 12285 NULL
 +il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3 12288 NULL nohasharray
 +roundup_to_multiple_of_64_12288 roundup_to_multiple_of_64 0-1 12288 &il_dbgfs_nvm_read_12288
-+vxge_get_num_vfs_12302 vxge_get_num_vfs 0 12302 NULL
 +wrap_min_12303 wrap_min 0-1-2 12303 NULL
-+tipc_msg_build_12326 tipc_msg_build 4 12326 NULL
++bt_sock_recvmsg_12316 bt_sock_recvmsg 4 12316 NULL
 +pcbit_writecmd_12332 pcbit_writecmd 2 12332 NULL
++btrfs_lookup_file_extent_12341 btrfs_lookup_file_extent 0 12341 NULL
 +mptctl_ioctl_12355 mptctl_ioctl 2 12355 NULL
 +paging32_walk_addr_12359 paging32_walk_addr 3 12359 NULL
 +__nf_ct_ext_add_length_12364 __nf_ct_ext_add_length 3 12364 NULL
 +xfs_iext_inline_to_direct_12384 xfs_iext_inline_to_direct 2 12384 NULL
-+btrfs_file_extent_ram_bytes_12391 btrfs_file_extent_ram_bytes 0 12391 NULL
++btrfs_file_extent_ram_bytes_12391 btrfs_file_extent_ram_bytes 0 12391 NULL nohasharray
++populate_dir_12391 populate_dir 0 12391 &btrfs_file_extent_ram_bytes_12391
++ntfs_get_size_for_mapping_pairs_12413 ntfs_get_size_for_mapping_pairs 0 12413 NULL nohasharray
++ext4_bg_num_gdb_nometa_12413 ext4_bg_num_gdb_nometa 0 12413 &ntfs_get_size_for_mapping_pairs_12413
 +hbucket_elem_add_12416 hbucket_elem_add 3 12416 NULL
 +ieee80211_if_read_num_mcast_sta_12419 ieee80211_if_read_num_mcast_sta 3 12419 NULL
++cfs_array_alloc_12441 cfs_array_alloc 2 12441 NULL
 +skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5 12465 NULL
-+qla4_82xx_pci_mem_write_direct_12479 qla4_82xx_pci_mem_write_direct 2 12479 NULL
 +x25_sendmsg_12487 x25_sendmsg 4 12487 NULL
-+rtllib_auth_challenge_12493 rtllib_auth_challenge 3 12493 NULL
 +fnic_trace_ctrl_read_12497 fnic_trace_ctrl_read 3 12497 NULL
-+nfs_readdir_make_qstr_12509 nfs_readdir_make_qstr 3 12509 NULL
 +qib_alloc_fast_reg_mr_12526 qib_alloc_fast_reg_mr 2 12526 NULL
++xfs_get_extsz_hint_12531 xfs_get_extsz_hint 0 12531 NULL
 +kvm_setup_async_pf_12555 kvm_setup_async_pf 3 12555 NULL
 +ib_umem_get_12557 ib_umem_get 2-3 12557 NULL
++ceph_osdc_wait_request_12572 ceph_osdc_wait_request 0 12572 NULL
 +hvc_alloc_12579 hvc_alloc 4 12579 NULL
 +snd_pcm_plugin_alloc_12580 snd_pcm_plugin_alloc 2 12580 NULL
-+macvtap_compat_ioctl_12587 macvtap_compat_ioctl 3 12587 NULL
 +pcpu_extend_area_map_12589 pcpu_extend_area_map 2 12589 NULL
-+ipv6_get_l4proto_12600 ipv6_get_l4proto 2 12600 NULL
++tlbflush_write_file_12598 tlbflush_write_file 3 12598 NULL
 +vhci_put_user_12604 vhci_put_user 4 12604 NULL
-+fc_fcp_frame_alloc_12624 fc_fcp_frame_alloc 2 12624 NULL
++ipath_mmap_mem_12625 ipath_mmap_mem 3 12625 NULL
++sdhci_pltfm_init_12627 sdhci_pltfm_init 3 12627 NULL
 +pwr_rcvd_awake_bcns_cnt_read_12632 pwr_rcvd_awake_bcns_cnt_read 3 12632 NULL
-+ctrl_cdev_compat_ioctl_12634 ctrl_cdev_compat_ioctl 3 12634 NULL
 +pn_sendmsg_12640 pn_sendmsg 4 12640 NULL
 +dwc3_link_state_write_12641 dwc3_link_state_write 3 12641 NULL
++nr_recvmsg_12649 nr_recvmsg 4 12649 NULL
 +wb_create_12651 wb_create 1 12651 NULL
++rtw_android_get_link_speed_12655 rtw_android_get_link_speed 0 12655 NULL
 +ocfs2_read_block_12659 ocfs2_read_block 0 12659 NULL
 +sel_read_class_12669 sel_read_class 3 12669 NULL nohasharray
 +sparse_mem_maps_populate_node_12669 sparse_mem_maps_populate_node 4 12669 &sel_read_class_12669
++ext4_writepage_trans_blocks_12674 ext4_writepage_trans_blocks 0 12674 NULL
++ext4_bg_num_gdb_meta_12702 ext4_bg_num_gdb_meta 0 12702 NULL
++iwl_dbgfs_calib_disabled_write_12707 iwl_dbgfs_calib_disabled_write 3 12707 NULL
 +ieee80211_if_read_num_buffered_multicast_12716 ieee80211_if_read_num_buffered_multicast 3 12716 NULL
 +ivtv_write_12721 ivtv_write 3 12721 NULL
 +key_rx_spec_read_12736 key_rx_spec_read 3 12736 NULL
 +__mei_cl_async_send_12737 __mei_cl_async_send 3 12737 NULL
-+__videobuf_alloc_cached_12740 __videobuf_alloc_cached 1 12740 NULL
++run_delayed_data_ref_12749 run_delayed_data_ref 0 12749 NULL
 +ieee80211_if_read_dot11MeshMaxRetries_12756 ieee80211_if_read_dot11MeshMaxRetries 3 12756 NULL
 +listxattr_12769 listxattr 3 12769 NULL
 +sctp_ssnmap_init_12772 sctp_ssnmap_init 2-3 12772 NULL
-+ieee80211_rx_mgmt_beacon_12780 ieee80211_rx_mgmt_beacon 3 12780 NULL
-+platform_create_bundle_12785 platform_create_bundle 4-6 12785 NULL
-+btrfs_remove_free_space_12793 btrfs_remove_free_space 2 12793 NULL
++btrfs_remove_free_space_12793 btrfs_remove_free_space 2-0 12793 NULL
 +scsi_adjust_queue_depth_12802 scsi_adjust_queue_depth 3 12802 NULL
 +xfs_inumbers_fmt_12817 xfs_inumbers_fmt 3 12817 NULL
++tlv_put_uuid_12824 tlv_put_uuid 0 12824 NULL
 +readq_12825 readq 0 12825 NULL
 +SyS_add_key_12834 SyS_add_key 4 12834 NULL
 +TSS_authhmac_12839 TSS_authhmac 3 12839 NULL
-+ath6kl_wmi_add_wow_pattern_cmd_12842 ath6kl_wmi_add_wow_pattern_cmd 4 12842 NULL nohasharray
-+spidev_sync_12842 spidev_sync 0 12842 &ath6kl_wmi_add_wow_pattern_cmd_12842
++spidev_sync_12842 spidev_sync 0 12842 NULL
 +spidev_ioctl_12846 spidev_ioctl 2 12846 NULL
 +get_leb_cnt_12892 get_leb_cnt 0-2 12892 NULL
 +ocfs2_hamming_encode_block_12904 ocfs2_hamming_encode_block 2 12904 NULL
 +get_virtual_node_size_12908 get_virtual_node_size 0 12908 NULL
 +rds_pages_in_vec_12922 rds_pages_in_vec 0 12922 NULL
++free_tind_blocks_12926 free_tind_blocks 0 12926 NULL
 +ci_ll_init_12930 ci_ll_init 3 12930 NULL
++SYSC_sendfile_12936 SYSC_sendfile 4 12936 NULL
 +do_inode_permission_12946 do_inode_permission 0 12946 NULL
 +bm_status_write_12964 bm_status_write 3 12964 NULL
-+_drbd_md_first_sector_12984 _drbd_md_first_sector 0 12984 NULL
 +raid56_parity_recover_12987 raid56_parity_recover 5 12987 NULL
-+acpi_tb_install_table_12988 acpi_tb_install_table 1 12988 NULL
 +TransmitTcb_12989 TransmitTcb 4 12989 NULL
 +sk_peek_offset_12991 sk_peek_offset 0 12991 NULL
 +subsystem_filter_write_13022 subsystem_filter_write 3 13022 NULL
++btrfs_write_dirty_block_groups_13030 btrfs_write_dirty_block_groups 0 13030 NULL
 +generic_segment_checks_13041 generic_segment_checks 0 13041 NULL
++SyS_sendfile64_13043 SyS_sendfile64 4 13043 NULL
 +ocfs2_write_begin_13045 ocfs2_write_begin 3-4 13045 NULL
-+__dn_setsockopt_13060 __dn_setsockopt 5 13060 NULL
++ptlrpc_lprocfs_threads_min_seq_write_13060 ptlrpc_lprocfs_threads_min_seq_write 3 13060 NULL nohasharray
++__dn_setsockopt_13060 __dn_setsockopt 5 13060 &ptlrpc_lprocfs_threads_min_seq_write_13060
 +biovec_create_pool_13079 biovec_create_pool 2 13079 NULL
++_ocfs2_free_suballoc_bits_13085 _ocfs2_free_suballoc_bits 0 13085 NULL
 +irq_set_chip_and_handler_13088 irq_set_chip_and_handler 1 13088 NULL
 +xattr_getsecurity_13090 xattr_getsecurity 0 13090 NULL
-+blk_rq_map_sg_13092 blk_rq_map_sg 0 13092 NULL
-+mb_find_next_zero_bit_13100 mb_find_next_zero_bit 2-3 13100 NULL
-+ubifs_compat_ioctl_13108 ubifs_compat_ioctl 3 13108 NULL
++mb_find_next_zero_bit_13100 mb_find_next_zero_bit 2-3-0 13100 NULL
++ttm_dma_pool_alloc_new_pages_13105 ttm_dma_pool_alloc_new_pages 3 13105 NULL
 +SyS_msgrcv_13109 SyS_msgrcv 3 13109 NULL
 +snd_rme96_playback_copy_13111 snd_rme96_playback_copy 5 13111 NULL
 +xen_allocate_irq_dynamic_13116 xen_allocate_irq_dynamic 0 13116 NULL
@@ -103870,224 +103885,266 @@ index 0000000..9a7096d
 +ucs2_strlen_13178 ucs2_strlen 0 13178 NULL
 +dgrp_net_ioctl_13183 dgrp_net_ioctl 2 13183 NULL
 +create_trace_uprobe_13184 create_trace_uprobe 1 13184 NULL
-+compat_put_ulong_13186 compat_put_ulong 1 13186 NULL
 +__cmpxchg64_13187 __cmpxchg64 0 13187 NULL
 +comedi_read_13199 comedi_read 3 13199 NULL
 +mmc_ext_csd_read_13205 mmc_ext_csd_read 3 13205 NULL
 +__nodes_fold_13215 __nodes_fold 4 13215 NULL
++get_unaligned_le64_13219 get_unaligned_le64 0 13219 NULL
 +svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL
 +fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3 13229 NULL
 +asix_read_cmd_13245 asix_read_cmd 5 13245 NULL
-+kvm_lapic_enable_pv_eoi_13249 kvm_lapic_enable_pv_eoi 2 13249 NULL nohasharray
-+fw_download_code_13249 fw_download_code 3 13249 &kvm_lapic_enable_pv_eoi_13249
++kvm_lapic_enable_pv_eoi_13249 kvm_lapic_enable_pv_eoi 2 13249 NULL
 +init_tid_tabs_13252 init_tid_tabs 2-3-4 13252 NULL
-+hostap_80211_get_hdrlen_13255 hostap_80211_get_hdrlen 0 13255 NULL
 +bio_integrity_trim_13259 bio_integrity_trim 3 13259 NULL
++simple_attr_write_13260 simple_attr_write 3 13260 NULL
 +c4iw_reg_user_mr_13269 c4iw_reg_user_mr 2-3 13269 NULL
-+carl9170_rx_13272 carl9170_rx 3 13272 NULL
 +pmcraid_notify_aen_13274 pmcraid_notify_aen 3 13274 NULL
 +il4965_stats_flag_13281 il4965_stats_flag 0-3 13281 NULL
 +lpfc_idiag_mbxacc_get_setup_13282 lpfc_idiag_mbxacc_get_setup 0 13282 NULL
-+platform_device_add_resources_13289 platform_device_add_resources 3 13289 NULL
-+i915_drop_caches_write_13308 i915_drop_caches_write 3 13308 NULL
++sd_major_13294 sd_major 0-1 13294 NULL
++kempld_read16_13297 kempld_read16 0 13297 NULL
 +reexecute_instruction_13321 reexecute_instruction 2 13321 NULL
-+us122l_ctl_msg_13330 us122l_ctl_msg 8 13330 NULL
 +__clone_and_map_data_bio_13334 __clone_and_map_data_bio 4-8 13334 NULL
 +kvm_read_nested_guest_page_13337 kvm_read_nested_guest_page 5-2 13337 NULL
-+cache_ctr_13364 cache_ctr 2 13364 NULL
-+mthca_alloc_mtt_range_13371 mthca_alloc_mtt_range 2 13371 NULL
++get_bits_13353 get_bits 0-2 13353 NULL
++hscx_empty_fifo_13360 hscx_empty_fifo 2 13360 NULL
 +iso_sched_alloc_13377 iso_sched_alloc 1 13377 NULL nohasharray
 +wep_key_not_found_read_13377 wep_key_not_found_read 3 13377 &iso_sched_alloc_13377
-+dis_bypass_write_13388 dis_bypass_write 3 13388 NULL
-+carl9170_rx_untie_data_13405 carl9170_rx_untie_data 3 13405 NULL
-+sky2_receive_13407 sky2_receive 2 13407 NULL
++ext4_meta_trans_blocks_13380 ext4_meta_trans_blocks 0-3-2 13380 NULL
++lov_mds_md_size_13388 lov_mds_md_size 0-1 13388 NULL nohasharray
++dis_bypass_write_13388 dis_bypass_write 3 13388 &lov_mds_md_size_13388
++BcmSetActiveSection_13389 BcmSetActiveSection 0 13389 NULL
++ocfs2_inode_lock_update_13414 ocfs2_inode_lock_update 0 13414 NULL
 +netxen_alloc_sds_rings_13417 netxen_alloc_sds_rings 2 13417 NULL
++compat_SyS_sendfile64_13420 compat_SyS_sendfile64 4 13420 NULL
 +keyring_read_13438 keyring_read 3 13438 NULL
-+set_tap_pwup_pfs_13440 set_tap_pwup_pfs 3 13440 NULL nohasharray
-+sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 &set_tap_pwup_pfs_13440
++sctp_setsockopt_peer_primary_addr_13440 sctp_setsockopt_peer_primary_addr 3 13440 NULL
 +ath6kl_cfg80211_connect_event_13443 ath6kl_cfg80211_connect_event 8-9-7 13443 NULL
-+mthca_buddy_alloc_13454 mthca_buddy_alloc 2 13454 NULL
-+ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 2 13512 NULL
++sb_init_dio_done_wq_13482 sb_init_dio_done_wq 0 13482 NULL
++data_read_13494 data_read 3 13494 NULL
++i915_switch_context_13498 i915_switch_context 0 13498 NULL
++ioat_chansts_32_13506 ioat_chansts_32 0 13506 NULL
++ocfs2_align_bytes_to_blocks_13512 ocfs2_align_bytes_to_blocks 2-0 13512 NULL
 +core_status_13515 core_status 4 13515 NULL
 +smk_write_mapped_13519 smk_write_mapped 3 13519 NULL
 +bm_init_13529 bm_init 2 13529 NULL
-+SYSC_remap_file_pages_13540 SYSC_remap_file_pages 1 13540 NULL nohasharray
++kvm_get_cr8_13538 kvm_get_cr8 0 13538 NULL
++SYSC_remap_file_pages_13540 SYSC_remap_file_pages 1-2 13540 NULL nohasharray
 +non_atomic_pte_lookup_13540 non_atomic_pte_lookup 2 13540 &SYSC_remap_file_pages_13540
++__btrfs_alloc_chunk_13554 __btrfs_alloc_chunk 0 13554 NULL
++llcp_sock_recvmsg_13556 llcp_sock_recvmsg 4 13556 NULL
 +ieee80211_if_read_ap_power_level_13558 ieee80211_if_read_ap_power_level 3 13558 NULL
 +ubifs_get_idx_gc_leb_13566 ubifs_get_idx_gc_leb 0 13566 NULL
-+sys_madvise_13569 sys_madvise 1 13569 NULL
 +read_file_antenna_13574 read_file_antenna 3 13574 NULL
 +cache_write_13589 cache_write 3 13589 NULL
-+mpt_lan_receive_post_turbo_13592 mpt_lan_receive_post_turbo 2 13592 NULL
-+aac_sa_ioremap_13596 aac_sa_ioremap 2 13596 NULL nohasharray
-+irias_new_octseq_value_13596 irias_new_octseq_value 2 13596 &aac_sa_ioremap_13596
-+usb_dump_interface_descriptor_13603 usb_dump_interface_descriptor 0 13603 NULL
++Rd_Indx_13602 Rd_Indx 3-2 13602 NULL
 +swap_cgroup_swapon_13614 swap_cgroup_swapon 2 13614 NULL
 +wm8994_bulk_write_13615 wm8994_bulk_write 2-3 13615 NULL
 +pmcraid_get_minor_13619 pmcraid_get_minor 0 13619 NULL
-+iio_device_add_event_sysfs_13627 iio_device_add_event_sysfs 0 13627 NULL
 +packet_snd_13634 packet_snd 3 13634 NULL
 +blk_msg_write_13655 blk_msg_write 3 13655 NULL
 +cache_downcall_13666 cache_downcall 3 13666 NULL
++ext3_xattr_list_entries_13682 ext3_xattr_list_entries 0-4 13682 NULL
++nv94_aux_13689 nv94_aux 2-5 13689 NULL
++usb_get_string_13693 usb_get_string 0 13693 NULL
++atomic_cmpxchg_13700 atomic_cmpxchg 0 13700 NULL
 +fw_iso_buffer_alloc_13704 fw_iso_buffer_alloc 2 13704 NULL
++ocfs2_cache_block_dealloc_13731 ocfs2_cache_block_dealloc 0 13731 NULL
++netdev_queue_numa_node_read_13732 netdev_queue_numa_node_read 0 13732 NULL
 +audit_unpack_string_13748 audit_unpack_string 3 13748 NULL
 +ufs_dtog_13750 ufs_dtog 0-2 13750 NULL
 +ieee802154_alloc_device_13767 ieee802154_alloc_device 1 13767 NULL
 +fb_sys_read_13778 fb_sys_read 3 13778 NULL
 +ath6kl_mgmt_powersave_ap_13791 ath6kl_mgmt_powersave_ap 6 13791 NULL
 +random_read_13815 random_read 3 13815 NULL
++mutex_lock_interruptible_nested_13817 mutex_lock_interruptible_nested 0 13817 NULL
 +hsi_register_board_info_13820 hsi_register_board_info 2 13820 NULL
 +___mei_cl_send_13821 ___mei_cl_send 3 13821 NULL
-+evdev_ioctl_compat_13851 evdev_ioctl_compat 2-3 13851 NULL
-+compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL nohasharray
-+alloc_trace_uprobe_13870 alloc_trace_uprobe 3 13870 &compat_ip_setsockopt_13870
-+qp_memcpy_to_queue_13886 qp_memcpy_to_queue 2-5 13886 NULL
++enc_pools_insert_13849 enc_pools_insert 3 13849 NULL
++evdev_ioctl_compat_13851 evdev_ioctl_compat 2 13851 NULL
++compat_ip_setsockopt_13870 compat_ip_setsockopt 5 13870 NULL
++btrfs_insert_empty_item_13885 btrfs_insert_empty_item 0 13885 NULL
++qp_memcpy_to_queue_13886 qp_memcpy_to_queue 5-2 13886 NULL nohasharray
++__fsnotify_parent_13886 __fsnotify_parent 0 13886 &qp_memcpy_to_queue_13886
++window_alignment_13895 window_alignment 0 13895 NULL
 +snd_pcm_aio_read_13900 snd_pcm_aio_read 3 13900 NULL
++is_inode_existent_13913 is_inode_existent 0 13913 NULL
++cfg80211_inform_bss_width_13933 cfg80211_inform_bss_width 9 13933 NULL
 +ext3_xattr_block_get_13936 ext3_xattr_block_get 0 13936 NULL
 +ieee80211_if_read_dot11MeshForwarding_13940 ieee80211_if_read_dot11MeshForwarding 3 13940 NULL nohasharray
 +ocfs2_xa_value_truncate_13940 ocfs2_xa_value_truncate 2 13940 &ieee80211_if_read_dot11MeshForwarding_13940
 +iwl_dbgfs_protection_mode_read_13943 iwl_dbgfs_protection_mode_read 3 13943 NULL
-+compat_chaninfo_13945 compat_chaninfo 2 13945 NULL
 +ieee80211_if_read_min_discovery_timeout_13946 ieee80211_if_read_min_discovery_timeout 3 13946 NULL
++qib_mmap_mem_13947 qib_mmap_mem 3 13947 NULL
 +lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3 13950 NULL
++osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL
++ocfs2_refresh_slot_info_13957 ocfs2_refresh_slot_info 0 13957 NULL
 +snd_pcm_plug_slave_size_13967 snd_pcm_plug_slave_size 0-2 13967 NULL
-+com90xx_found_13974 com90xx_found 3 13974 NULL
 +qcam_read_13977 qcam_read 3 13977 NULL
 +dsp_read_13980 dsp_read 2 13980 NULL
-+dvb_demux_read_13981 dvb_demux_read 3 13981 NULL nohasharray
-+bm_block_bits_13981 bm_block_bits 0 13981 &dvb_demux_read_13981
++bm_block_bits_13981 bm_block_bits 0 13981 NULL nohasharray
++dvb_demux_read_13981 dvb_demux_read 3 13981 &bm_block_bits_13981
++create_files_14003 create_files 0 14003 NULL
++sddr09_write_data_14014 sddr09_write_data 3 14014 NULL
 +btrfs_get_blocks_direct_14016 btrfs_get_blocks_direct 2 14016 NULL
 +dmi_format_ids_14018 dmi_format_ids 2 14018 NULL
-+_rtl92s_firmware_downloadcode_14021 _rtl92s_firmware_downloadcode 3 14021 NULL
 +iscsi_create_flashnode_conn_14022 iscsi_create_flashnode_conn 4 14022 NULL
 +dvb_usercopy_14036 dvb_usercopy 2 14036 NULL
 +read_def_modal_eeprom_14041 read_def_modal_eeprom 3 14041 NULL
 +ieee80211_if_fmt_aid_14055 ieee80211_if_fmt_aid 3 14055 NULL
 +sta_agg_status_read_14058 sta_agg_status_read 3 14058 NULL
-+i915_drop_caches_read_14060 i915_drop_caches_read 3 14060 NULL
++ovs_flow_actions_alloc_14072 ovs_flow_actions_alloc 1 14072 NULL
++lov_stripeoffset_seq_write_14078 lov_stripeoffset_seq_write 3 14078 NULL
 +do_proc_readlink_14096 do_proc_readlink 3 14096 NULL
 +compat_sys_pselect6_14105 compat_sys_pselect6 1 14105 NULL
-+nlmsg_len_14115 nlmsg_len 0 14115 NULL
-+vfio_fops_compat_ioctl_14130 vfio_fops_compat_ioctl 3 14130 NULL
-+ntfs_rl_replace_14136 ntfs_rl_replace 2-4 14136 NULL
++intel_ring_wait_seqno_14107 intel_ring_wait_seqno 0 14107 NULL
++ext4_journal_blocks_per_page_14127 ext4_journal_blocks_per_page 0 14127 NULL
++ntfs_rl_replace_14136 ntfs_rl_replace 4-2 14136 NULL
++qfq_ffs_14139 qfq_ffs 2 14139 NULL
 +isku_sysfs_read_light_14140 isku_sysfs_read_light 6 14140 NULL
 +em_canid_change_14150 em_canid_change 3 14150 NULL
 +gsm_dlci_data_14155 gsm_dlci_data 3 14155 NULL
 +print_input_mask_14168 print_input_mask 3-0 14168 NULL
++ocfs2_split_and_insert_14171 ocfs2_split_and_insert 0 14171 NULL
 +ocfs2_xattr_value_truncate_14183 ocfs2_xattr_value_truncate 3 14183 NULL
++datafab_read_data_14186 datafab_read_data 4 14186 NULL
++do_splice_14196 do_splice 5 14196 NULL
++hfsplus_brec_find_14200 hfsplus_brec_find 0 14200 NULL
 +alloc_async_14208 alloc_async 1 14208 NULL
-+sys_kexec_load_14222 sys_kexec_load 2 14222 NULL
++ath6kl_regread_write_14220 ath6kl_regread_write 3 14220 NULL
 +ieee80211_if_write_uapsd_max_sp_len_14233 ieee80211_if_write_uapsd_max_sp_len 3 14233 NULL
-+dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4-2 14244 NULL
++dma_declare_coherent_memory_14244 dma_declare_coherent_memory 4 14244 NULL
 +snd_soc_hw_bulk_write_raw_14245 snd_soc_hw_bulk_write_raw 2-4 14245 NULL
-+reiserfs_compat_ioctl_14265 reiserfs_compat_ioctl 3 14265 NULL
-+ath6kl_connect_event_14267 ath6kl_connect_event 8-9-7 14267 NULL
-+add_numbered_child_14273 add_numbered_child 5 14273 NULL
-+OS_mem_token_alloc_14276 OS_mem_token_alloc 1 14276 NULL
-+snd_seq_oss_readq_new_14283 snd_seq_oss_readq_new 2 14283 NULL
++ext4_journal_restart_14251 ext4_journal_restart 0 14251 NULL
++will_overwrite_ref_14252 will_overwrite_ref 0 14252 NULL
++ath6kl_connect_event_14267 ath6kl_connect_event 7-8-9 14267 NULL
++numa_mem_id_14279 numa_mem_id 0 14279 NULL
 +rr_status_14293 rr_status 5 14293 NULL
 +read_default_ldt_14302 read_default_ldt 2 14302 NULL
++__readl_14308 __readl 0 14308 NULL
++send_chown_14309 send_chown 0 14309 NULL
++i915_gem_object_finish_gpu_14312 i915_gem_object_finish_gpu 0 14312 NULL
 +oo_objects_14319 oo_objects 0 14319 NULL
++ww_mutex_deadlock_injection_14321 ww_mutex_deadlock_injection 0 14321 NULL
++ll_get_user_pages_14328 ll_get_user_pages 2-3-0 14328 NULL
++down_write_failed_14331 down_write_failed 2 14331 NULL
 +p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
-+scsi2int_14358 scsi2int 0 14358 NULL
++alloc_tx_struct_14349 alloc_tx_struct 1 14349 NULL
 +snd_pcm_lib_readv_14363 snd_pcm_lib_readv 0-3 14363 NULL
++btrfs_set_inode_index_14379 btrfs_set_inode_index 0 14379 NULL
 +acpi_get_override_irq_14381 acpi_get_override_irq 1 14381 NULL
 +ath6kl_regdump_read_14393 ath6kl_regdump_read 3 14393 NULL
 +smk_write_onlycap_14400 smk_write_onlycap 3 14400 NULL
++first_logical_byte_14403 first_logical_byte 0 14403 NULL
 +mtd_concat_create_14416 mtd_concat_create 2 14416 NULL
 +get_kcore_size_14425 get_kcore_size 0 14425 NULL
++qib_user_sdma_page_length_14432 qib_user_sdma_page_length 0-2-1 14432 NULL
 +check_lpt_crc_14442 check_lpt_crc 0 14442 NULL
 +block_size_14443 block_size 0 14443 NULL
-+ci13xxx_add_device_14456 ci13xxx_add_device 3 14456 NULL
++lmv_user_md_size_14456 lmv_user_md_size 0-1 14456 NULL
 +snd_emu10k1_proc_spdif_status_14457 snd_emu10k1_proc_spdif_status 4-5 14457 NULL
++lustre_msg_size_v2_14470 lustre_msg_size_v2 0 14470 NULL
++dma_transfer_size_14473 dma_transfer_size 0 14473 NULL
 +udplite_getfrag_14479 udplite_getfrag 3-4 14479 NULL
-+ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 NULL
++efx_mdio_check_mmds_14486 efx_mdio_check_mmds 2 14486 NULL nohasharray
++ieee80211_if_read_dot11MeshGateAnnouncementProtocol_14486 ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 &efx_mdio_check_mmds_14486
 +ocfs2_debug_read_14507 ocfs2_debug_read 3 14507 NULL
 +ep0_write_14536 ep0_write 3 14536 NULL nohasharray
-+dataflash_read_user_otp_14536 dataflash_read_user_otp 2-3 14536 &ep0_write_14536
++dataflash_read_user_otp_14536 dataflash_read_user_otp 3-2 14536 &ep0_write_14536
++register_trace_sched_switch_14545 register_trace_sched_switch 0 14545 NULL
 +picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3 14549 NULL
 +drm_vmalloc_dma_14550 drm_vmalloc_dma 1 14550 NULL
-+usb_dump_desc_14553 usb_dump_desc 0 14553 NULL
 +qp_host_alloc_queue_14566 qp_host_alloc_queue 1 14566 NULL
 +SyS_setdomainname_14569 SyS_setdomainname 2 14569 NULL
 +remap_to_origin_then_cache_14583 remap_to_origin_then_cache 3 14583 NULL
 +idmap_pipe_downcall_14591 idmap_pipe_downcall 3 14591 NULL
 +ceph_osdc_alloc_request_14597 ceph_osdc_alloc_request 3 14597 NULL
++ocfs2_steal_meta_14602 ocfs2_steal_meta 0 14602 NULL
 +ocfs2_trim_group_14641 ocfs2_trim_group 4-3 14641 NULL
 +dbJoin_14644 dbJoin 0 14644 NULL
 +profile_replace_14652 profile_replace 3 14652 NULL
++add_to_page_cache_locked_14668 add_to_page_cache_locked 0 14668 NULL
++min_bytes_needed_14675 min_bytes_needed 0 14675 NULL
++nvme_trans_log_info_exceptions_14677 nvme_trans_log_info_exceptions 3 14677 NULL
 +pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3 14680 NULL
 +ieee80211_if_fmt_rc_rateidx_mask_2ghz_14683 ieee80211_if_fmt_rc_rateidx_mask_2ghz 3 14683 NULL
-+tsi148_master_set_14685 tsi148_master_set 4 14685 NULL
 +SyS_fsetxattr_14702 SyS_fsetxattr 4 14702 NULL
 +persistent_ram_ecc_string_14704 persistent_ram_ecc_string 0 14704 NULL
 +u_audio_playback_14709 u_audio_playback 3 14709 NULL
++rtw_cbuf_alloc_14710 rtw_cbuf_alloc 1 14710 NULL
++cgroup_path_14713 cgroup_path 3 14713 NULL
 +get_bio_block_14714 get_bio_block 0 14714 NULL
 +vfd_write_14717 vfd_write 3 14717 NULL
++SyS_sendfile_14718 SyS_sendfile 4 14718 NULL
 +__blk_end_request_14729 __blk_end_request 3 14729 NULL
 +raid1_resize_14740 raid1_resize 2 14740 NULL
++i915_error_state_buf_init_14742 i915_error_state_buf_init 2 14742 NULL
 +btrfs_inode_extref_name_len_14752 btrfs_inode_extref_name_len 0 14752 NULL
 +rx_rx_cmplt_read_14753 rx_rx_cmplt_read 3 14753 NULL
-+qla82xx_pci_mem_write_2M_14765 qla82xx_pci_mem_write_2M 2 14765 NULL
 +regmap_range_read_file_14775 regmap_range_read_file 3 14775 NULL
 +sta_dev_read_14782 sta_dev_read 3 14782 NULL
++keys_proc_write_14792 keys_proc_write 3 14792 NULL
 +ext4_kvmalloc_14796 ext4_kvmalloc 1 14796 NULL
-+snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 NULL nohasharray
-+hpet_readl_14801 hpet_readl 0 14801 &snd_als300_gcr_read_14801
-+bcma_scan_read32_14802 bcma_scan_read32 0 14802 NULL
++__kfifo_in_14797 __kfifo_in 3-0 14797 NULL
++hpet_readl_14801 hpet_readl 0 14801 NULL nohasharray
++snd_als300_gcr_read_14801 snd_als300_gcr_read 0 14801 &hpet_readl_14801
++changed_cb_14819 changed_cb 0 14819 NULL
 +do_tune_cpucache_14828 do_tune_cpucache 2 14828 NULL
-+__mutex_fastpath_lock_retval_14844 __mutex_fastpath_lock_retval 0 14844 NULL
 +mrp_attr_create_14853 mrp_attr_create 3 14853 NULL
-+lcd_write_14857 lcd_write 3 14857 NULL nohasharray
-+__krealloc_14857 __krealloc 2 14857 &lcd_write_14857
++lcd_write_14857 lcd_write 3 14857 NULL
 +get_user_cpu_mask_14861 get_user_cpu_mask 2 14861 NULL
-+sriov_enable_migration_14889 sriov_enable_migration 2 14889 NULL
++gmux_index_read8_14890 gmux_index_read8 0 14890 NULL
 +acpi_os_allocate_14892 acpi_os_allocate 1 14892 NULL
-+unifi_read_14899 unifi_read 3 14899 NULL
 +SYSC_readv_14901 SYSC_readv 3 14901 NULL
-+krealloc_14908 krealloc 2 14908 NULL
-+regmap_irq_get_virq_14910 regmap_irq_get_virq 2 14910 NULL
-+qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 2-5 14923 NULL nohasharray
-+__arch_hweight64_14923 __arch_hweight64 0 14923 &qp_memcpy_to_queue_iov_14923
++regmap_irq_get_virq_14910 regmap_irq_get_virq 2-0 14910 NULL
++__arch_hweight64_14923 __arch_hweight64 0 14923 NULL nohasharray
++qp_memcpy_to_queue_iov_14923 qp_memcpy_to_queue_iov 5-2 14923 &__arch_hweight64_14923
 +ocfs2_expand_nonsparse_inode_14936 ocfs2_expand_nonsparse_inode 3-4 14936 NULL
++range_to_mtrr_14940 range_to_mtrr 2 14940 NULL
 +queue_cnt_14951 queue_cnt 0 14951 NULL
++unix_dgram_recvmsg_14952 unix_dgram_recvmsg 4 14952 NULL
++i915_vma_unbind_14954 i915_vma_unbind 0 14954 NULL
 +videobuf_read_stream_14956 videobuf_read_stream 3 14956 NULL
 +mce_flush_rx_buffer_14976 mce_flush_rx_buffer 2 14976 NULL
 +setkey_14987 setkey 3 14987 NULL nohasharray
 +gpio_twl4030_write_14987 gpio_twl4030_write 1 14987 &setkey_14987
 +xfs_dinode_size_14996 xfs_dinode_size 0 14996 NULL
-+vmap_15025 vmap 2 15025 NULL
 +blk_integrity_tuple_size_15027 blk_integrity_tuple_size 0 15027 NULL
-+irq_get_next_irq_15053 irq_get_next_irq 1 15053 NULL
++irq_get_next_irq_15053 irq_get_next_irq 1-0 15053 NULL
 +cld_pipe_downcall_15058 cld_pipe_downcall 3 15058 NULL
 +ieee80211_if_read_uapsd_max_sp_len_15067 ieee80211_if_read_uapsd_max_sp_len 3 15067 NULL
 +nfs4_write_cached_acl_15070 nfs4_write_cached_acl 4 15070 NULL
-+ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5 15072 NULL
-+compat_SyS_preadv_15105 compat_SyS_preadv 3 15105 NULL
-+compat_SyS_pwritev_15118 compat_SyS_pwritev 3 15118 NULL
++ntfs_copy_from_user_15072 ntfs_copy_from_user 3-5-0 15072 NULL
++pppoe_recvmsg_15073 pppoe_recvmsg 4 15073 NULL
++ceph_calc_ceph_pg_15075 ceph_calc_ceph_pg 0 15075 NULL
++perf_trace_sched_stat_runtime_15115 perf_trace_sched_stat_runtime 3 15115 NULL
 +hex_dump_to_buffer_15121 hex_dump_to_buffer 6 15121 NULL
 +start_port_15124 start_port 0 15124 NULL
-+memchr_15126 memchr 0 15126 NULL
 +ipwireless_ppp_mru_15153 ipwireless_ppp_mru 0 15153 NULL
++iwl_dbgfs_sta_drain_write_15167 iwl_dbgfs_sta_drain_write 3 15167 NULL
 +self_check_not_bad_15175 self_check_not_bad 0 15175 NULL
 +SYSC_setdomainname_15180 SYSC_setdomainname 2 15180 NULL
 +iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL
 +reserve_resources_15194 reserve_resources 3 15194 NULL
++mtt_alloc_res_15211 mtt_alloc_res 5 15211 NULL
 +bfad_debugfs_write_regrd_15218 bfad_debugfs_write_regrd 3 15218 NULL
++iwl_dbgfs_sram_write_15239 iwl_dbgfs_sram_write 3 15239 NULL
 +il_dbgfs_rx_stats_read_15243 il_dbgfs_rx_stats_read 3 15243 NULL
 +div64_u64_15263 div64_u64 0-1-2 15263 NULL
-+compat_raw_ioctl_15290 compat_raw_ioctl 3 15290 NULL
-+sys_connect_15291 sys_connect 3 15291 NULL nohasharray
-+xlate_dev_mem_ptr_15291 xlate_dev_mem_ptr 1 15291 &sys_connect_15291
++simple_strtol_15273 simple_strtol 0 15273 NULL
++fw_realloc_buffer_15280 fw_realloc_buffer 2 15280 NULL
 +arch_enable_uv_irq_15294 arch_enable_uv_irq 2 15294 NULL
 +acpi_ev_create_gpe_block_15297 acpi_ev_create_gpe_block 5 15297 NULL
-+tpm_tis_init_15304 tpm_tis_init 2-3 15304 NULL
-+fcoe_ctlr_send_keep_alive_15308 fcoe_ctlr_send_keep_alive 3 15308 NULL
-+__ocfs2_remove_xattr_range_15330 __ocfs2_remove_xattr_range 4-5-3 15330 NULL
++ocfs2_read_refcount_block_15305 ocfs2_read_refcount_block 0 15305 NULL
++__ocfs2_remove_xattr_range_15330 __ocfs2_remove_xattr_range 4-3-5 15330 NULL
++bfloat_mantissa_15334 bfloat_mantissa 0 15334 NULL
++xlog_ticket_alloc_15335 xlog_ticket_alloc 2 15335 NULL
 +kovaplus_sysfs_read_15337 kovaplus_sysfs_read 6 15337 NULL
 +ioread16_15342 ioread16 0 15342 NULL
-+alloc_ring_15345 alloc_ring 2-4 15345 NULL
++ept_prefetch_gpte_15348 ept_prefetch_gpte 4 15348 NULL
 +acpi_ut_create_string_object_15360 acpi_ut_create_string_object 1 15360 NULL
++count_inode_extrefs_15366 count_inode_extrefs 0 15366 NULL
++ext4_direct_IO_15369 ext4_direct_IO 4 15369 NULL
 +graph_depth_read_15371 graph_depth_read 3 15371 NULL
 +compat_sys_process_vm_readv_15374 compat_sys_process_vm_readv 3-5 15374 NULL
 +fq_codel_zalloc_15378 fq_codel_zalloc 1 15378 NULL
@@ -104096,68 +104153,73 @@ index 0000000..9a7096d
 +btrfs_level_size_15392 btrfs_level_size 0 15392 NULL
 +pipeline_csum_to_rx_xfer_swi_read_15403 pipeline_csum_to_rx_xfer_swi_read 3 15403 NULL
 +get_modalias_15406 get_modalias 2 15406 NULL
++blockdev_direct_IO_15408 blockdev_direct_IO 0-5 15408 NULL
 +dm_cache_resize_15422 dm_cache_resize 2 15422 NULL
-+__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4 15423 NULL
-+tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2 15438 NULL
++__videobuf_copy_to_user_15423 __videobuf_copy_to_user 4-0 15423 NULL
++tcp_mtu_to_mss_15438 tcp_mtu_to_mss 2-0 15438 NULL
 +hpsa_change_queue_depth_15449 hpsa_change_queue_depth 2 15449 NULL
 +memweight_15450 memweight 2 15450 NULL
 +vmalloc_15464 vmalloc 1 15464 NULL
++__mutex_lock_killable_slowpath_15472 __mutex_lock_killable_slowpath 0 15472 NULL
++insert_old_idx_znode_15500 insert_old_idx_znode 0 15500 NULL
 +zd_chip_is_zd1211b_15518 zd_chip_is_zd1211b 0 15518 NULL
++ifx_spi_write_15531 ifx_spi_write 3 15531 NULL
 +da9052_bat_irq_15533 da9052_bat_irq 1 15533 NULL
 +p9_check_zc_errors_15534 p9_check_zc_errors 4 15534 NULL
-+ql_process_mac_rx_page_15543 ql_process_mac_rx_page 4 15543 NULL
-+ieee80211_amsdu_to_8023s_15561 ieee80211_amsdu_to_8023s 5 15561 NULL
++xfrm_state_mtu_15548 xfrm_state_mtu 0-2 15548 NULL
++snd_pcm_channel_info_15572 snd_pcm_channel_info 0 15572 NULL
 +persistent_status_15574 persistent_status 4 15574 NULL
 +bnx2fc_process_unsol_compl_15576 bnx2fc_process_unsol_compl 2 15576 NULL
++cl_io_submit_sync_15579 cl_io_submit_sync 0 15579 NULL
 +vme_user_write_15587 vme_user_write 3 15587 NULL
-+ocfs2_truncate_rec_15595 ocfs2_truncate_rec 7 15595 NULL
++ocfs2_truncate_rec_15595 ocfs2_truncate_rec 7-0 15595 NULL
 +sx150x_install_irq_chip_15609 sx150x_install_irq_chip 3 15609 NULL
-+compat_fillonedir_15620 compat_fillonedir 3 15620 NULL nohasharray
-+iommu_device_max_index_15620 iommu_device_max_index 0-3-2-1 15620 &compat_fillonedir_15620
-+set_dis_tap_pfs_15621 set_dis_tap_pfs 3 15621 NULL
++iommu_device_max_index_15620 iommu_device_max_index 0-3-2-1 15620 NULL nohasharray
++compat_fillonedir_15620 compat_fillonedir 3 15620 &iommu_device_max_index_15620
 +proc_loginuid_read_15631 proc_loginuid_read 3 15631 NULL
-+tomoyo_scan_bprm_15642 tomoyo_scan_bprm 2-4 15642 NULL nohasharray
-+pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &tomoyo_scan_bprm_15642 nohasharray
-+sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &pipeline_hs_tx_stat_fifo_int_read_15642
-+fs_path_add_15648 fs_path_add 3 15648 NULL
++tomoyo_scan_bprm_15642 tomoyo_scan_bprm 4-2 15642 NULL nohasharray
++sk_memory_allocated_add_15642 sk_memory_allocated_add 2 15642 &tomoyo_scan_bprm_15642 nohasharray
++pipeline_hs_tx_stat_fifo_int_read_15642 pipeline_hs_tx_stat_fifo_int_read 3 15642 &sk_memory_allocated_add_15642
++joydev_handle_JSIOCSBTNMAP_15643 joydev_handle_JSIOCSBTNMAP 3 15643 NULL
++fs_path_add_15648 fs_path_add 3-0 15648 NULL
 +xsd_read_15653 xsd_read 3 15653 NULL
-+compat_sys_fcntl_15654 compat_sys_fcntl 3 15654 NULL
 +unix_bind_15668 unix_bind 3 15668 NULL
 +SyS_connect_15674 SyS_connect 3 15674 NULL nohasharray
 +dm_read_15674 dm_read 3 15674 &SyS_connect_15674
 +pstore_mkfile_15675 pstore_mkfile 6 15675 NULL
-+uf_sme_queue_message_15697 uf_sme_queue_message 3 15697 NULL
-+ocfs2_split_tree_15716 ocfs2_split_tree 5 15716 NULL
++i915_gem_object_set_to_cpu_domain_15705 i915_gem_object_set_to_cpu_domain 0 15705 NULL nohasharray
++uncore_alloc_box_15705 uncore_alloc_box 2 15705 &i915_gem_object_set_to_cpu_domain_15705
++ocfs2_split_tree_15716 ocfs2_split_tree 5-0 15716 NULL
++tracing_snapshot_write_15719 tracing_snapshot_write 3 15719 NULL
 +HiSax_readstatus_15752 HiSax_readstatus 2 15752 NULL
-+bitmap_search_next_usable_block_15762 bitmap_search_next_usable_block 3-1 15762 NULL
-+do_test_15766 do_test 1 15766 NULL
-+set_std_nic_pfs_15792 set_std_nic_pfs 3 15792 NULL
++ftrace_profile_init_cpu_15761 ftrace_profile_init_cpu 0 15761 NULL
++bitmap_search_next_usable_block_15762 bitmap_search_next_usable_block 3-1-0 15762 NULL
++i915_gem_init_seqno_15793 i915_gem_init_seqno 0 15793 NULL
 +smk_read_direct_15803 smk_read_direct 3 15803 NULL
-+snd_pcm_ioctl_compat_15804 snd_pcm_ioctl_compat 3 15804 NULL
-+gx1_read_conf_reg_15817 gx1_read_conf_reg 0 15817 NULL nohasharray
-+nameseq_list_15817 nameseq_list 3 15817 &gx1_read_conf_reg_15817 nohasharray
++nameseq_list_15817 nameseq_list 3-0 15817 NULL nohasharray
 +gnttab_expand_15817 gnttab_expand 1 15817 &nameseq_list_15817
-+firmware_upload_15822 firmware_upload 3 15822 NULL nohasharray
-+afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 &firmware_upload_15822
++afs_proc_rootcell_write_15822 afs_proc_rootcell_write 3 15822 NULL
 +brcmf_sdbrcm_died_dump_15841 brcmf_sdbrcm_died_dump 3 15841 NULL
 +table_size_15851 table_size 0-1-2 15851 NULL
-+ubi_io_write_15870 ubi_io_write 5-4 15870 NULL nohasharray
++ubi_io_write_15870 ubi_io_write 0-5-4 15870 NULL nohasharray
 +media_entity_init_15870 media_entity_init 2-4 15870 &ubi_io_write_15870
 +__mptctl_ioctl_15875 __mptctl_ioctl 2 15875 NULL
++profile_pc_15887 profile_pc 0 15887 NULL
 +nfs_map_group_to_gid_15892 nfs_map_group_to_gid 3 15892 NULL
 +native_read_msr_15905 native_read_msr 0 15905 NULL
 +parse_audio_stream_data_15937 parse_audio_stream_data 3 15937 NULL
 +power_read_15939 power_read 3 15939 NULL
 +lpfc_idiag_drbacc_read_15948 lpfc_idiag_drbacc_read 3 15948 NULL
-+snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 4-2-5 15952 NULL
-+remap_pci_mem_15966 remap_pci_mem 1-2 15966 NULL
-+tfrc_calc_x_15975 tfrc_calc_x 1-2 15975 NULL
++snd_pcm_lib_read_transfer_15952 snd_pcm_lib_read_transfer 5-2-4 15952 NULL
++tfrc_calc_x_15975 tfrc_calc_x 2-1 15975 NULL
 +frame_alloc_15981 frame_alloc 4 15981 NULL
-+alloc_vm_area_15989 alloc_vm_area 1 15989 NULL
 +hdpvr_register_videodev_16010 hdpvr_register_videodev 3 16010 NULL
 +viafb_vt1636_proc_write_16018 viafb_vt1636_proc_write 3 16018 NULL
-+got_frame_16028 got_frame 2 16028 NULL
++i915_gem_object_pin_16032 i915_gem_object_pin 0 16032 NULL
++dccp_recvmsg_16056 dccp_recvmsg 4 16056 NULL
 +read_file_spectral_period_16057 read_file_spectral_period 3 16057 NULL
++si5351_msynth_params_address_16062 si5351_msynth_params_address 0-1 16062 NULL
++ocfs2_sync_local_to_main_16076 ocfs2_sync_local_to_main 0 16076 NULL
 +isr_tx_exch_complete_read_16103 isr_tx_exch_complete_read 3 16103 NULL
 +dma_tx_requested_read_16110 dma_tx_requested_read 3 16110 NULL nohasharray
 +isr_hw_pm_mode_changes_read_16110 isr_hw_pm_mode_changes_read 3 16110 &dma_tx_requested_read_16110
@@ -104165,102 +104227,136 @@ index 0000000..9a7096d
 +snd_dma_pointer_16126 snd_dma_pointer 0-2 16126 NULL
 +compat_sys_select_16131 compat_sys_select 1 16131 NULL
 +fsm_init_16134 fsm_init 2 16134 NULL
-+hysdn_rx_netpkt_16136 hysdn_rx_netpkt 3 16136 NULL
 +ext4_xattr_block_get_16148 ext4_xattr_block_get 0 16148 NULL
-+bnx2i_get_cid_num_16166 bnx2i_get_cid_num 0 16166 NULL
++update_block_group_16155 update_block_group 0 16155 NULL
++optimal_reclaimed_pages_16172 optimal_reclaimed_pages 0 16172 NULL
 +mapping_level_16188 mapping_level 2 16188 NULL
++i40e_allocate_virt_mem_d_16191 i40e_allocate_virt_mem_d 3 16191 NULL
++tcp_syn_options_16197 tcp_syn_options 0 16197 NULL
++ath10k_htt_rx_ring_size_16201 ath10k_htt_rx_ring_size 0 16201 NULL
 +cipso_v4_map_cat_rng_hton_16203 cipso_v4_map_cat_rng_hton 0 16203 NULL
 +SyS_pselect6_16210 SyS_pselect6 1 16210 NULL
 +create_table_16213 create_table 2 16213 NULL
 +atomic_read_file_16227 atomic_read_file 3 16227 NULL
 +BcmGetSectionValStartOffset_16235 BcmGetSectionValStartOffset 0 16235 NULL
-+swiotlb_sync_single_for_device_16247 swiotlb_sync_single_for_device 2 16247 NULL nohasharray
-+btrfs_dev_extent_chunk_offset_16247 btrfs_dev_extent_chunk_offset 0 16247 &swiotlb_sync_single_for_device_16247
++lov_prep_brw_set_16246 lov_prep_brw_set 3 16246 NULL
++i40e_dbg_dump_read_16247 i40e_dbg_dump_read 3 16247 NULL nohasharray
++btrfs_dev_extent_chunk_offset_16247 btrfs_dev_extent_chunk_offset 0 16247 &i40e_dbg_dump_read_16247
++il_dbgfs_disable_ht40_write_16249 il_dbgfs_disable_ht40_write 3 16249 NULL
 +SyS_fgetxattr_16254 SyS_fgetxattr 4 16254 NULL
-+mark_written_sectors_16262 mark_written_sectors 2 16262 NULL
 +reiserfs_acl_count_16265 reiserfs_acl_count 0-1 16265 NULL
-+set_disc_pfs_16270 set_disc_pfs 3 16270 NULL
 +mq_force_mapping_16277 mq_force_mapping 2 16277 NULL
 +ocfs2_xattr_bucket_value_truncate_16279 ocfs2_xattr_bucket_value_truncate 4 16279 NULL
 +drbd_setsockopt_16280 drbd_setsockopt 5 16280 NULL nohasharray
-+nand_bch_init_16280 nand_bch_init 3-2 16280 &drbd_setsockopt_16280
-+account_16283 account 0-2-4 16283 NULL nohasharray
++nand_bch_init_16280 nand_bch_init 2-3 16280 &drbd_setsockopt_16280
++account_16283 account 0-4-2 16283 NULL nohasharray
 +mirror_status_16283 mirror_status 5 16283 &account_16283
 +retry_instruction_16285 retry_instruction 2 16285 NULL
++jumpshot_read_data_16287 jumpshot_read_data 4 16287 NULL
++mo_xattr_get_16288 mo_xattr_get 0 16288 NULL
 +stk_allocate_buffers_16291 stk_allocate_buffers 2 16291 NULL
 +rbd_segment_offset_16293 rbd_segment_offset 0-2 16293 NULL
 +tfrc_invert_loss_event_rate_16295 tfrc_invert_loss_event_rate 1 16295 NULL
 +rsc_mgr_init_16299 rsc_mgr_init 3 16299 NULL
 +wb_map_16301 wb_map 2 16301 NULL
++kvm_handle_hva_range_16312 kvm_handle_hva_range 3-2 16312 NULL
 +ext4_blocks_count_16320 ext4_blocks_count 0 16320 NULL
 +vmw_cursor_update_image_16332 vmw_cursor_update_image 3-4 16332 NULL
++btrfs_insert_item_16357 btrfs_insert_item 0 16357 NULL
++sysfs_create_groups_16360 sysfs_create_groups 0 16360 NULL
 +total_ps_buffered_read_16365 total_ps_buffered_read 3 16365 NULL
 +iscsi_tcp_conn_setup_16376 iscsi_tcp_conn_setup 2 16376 NULL
-+nl80211_send_unprot_deauth_16378 nl80211_send_unprot_deauth 4 16378 NULL
 +diva_os_malloc_16406 diva_os_malloc 2 16406 NULL
 +ieee80211_if_read_tsf_16420 ieee80211_if_read_tsf 3 16420 NULL
 +rxrpc_server_keyring_16431 rxrpc_server_keyring 3 16431 NULL
++__bio_add_page_16435 __bio_add_page 0-4 16435 NULL
++btrfs_truncate_inode_items_16452 btrfs_truncate_inode_items 0 16452 NULL
++ocfs2_expand_refcount_tree_16455 ocfs2_expand_refcount_tree 0 16455 NULL
 +netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
++alloc_disk_node_16458 alloc_disk_node 2 16458 NULL
++req_capsule_get_size_16467 req_capsule_get_size 0 16467 NULL
++ocfs2_block_group_set_bits_16488 ocfs2_block_group_set_bits 0 16488 NULL
++add_qgroup_item_16492 add_qgroup_item 0 16492 NULL
 +tracing_readme_read_16493 tracing_readme_read 3 16493 NULL
++filemap_write_and_wait_16506 filemap_write_and_wait 0 16506 NULL
++start_this_handle_16519 start_this_handle 0 16519 NULL
 +snd_interval_max_16529 snd_interval_max 0 16529 NULL
 +raid10_resize_16537 raid10_resize 2 16537 NULL
-+tcp_manip_pkt_16563 tcp_manip_pkt 4 16563 NULL
 +lpfc_debugfs_read_16566 lpfc_debugfs_read 3 16566 NULL
++perf_event_set_period_16574 perf_event_set_period 2-3 16574 NULL
 +agp_allocate_memory_wrap_16576 agp_allocate_memory_wrap 1 16576 NULL
-+virt_to_scatterlist_16582 virt_to_scatterlist 2 16582 NULL
++lustre_msg_hdr_size_v2_16589 lustre_msg_hdr_size_v2 0 16589 NULL
++btrfs_insert_orphan_item_16602 btrfs_insert_orphan_item 0 16602 NULL
++gmux_index_read32_16604 gmux_index_read32 0 16604 NULL
++btrfs_end_transaction_16610 btrfs_end_transaction 0 16610 NULL
 +palmas_irq_get_virq_16613 palmas_irq_get_virq 2 16613 NULL
++btrfs_wait_marked_extents_16615 btrfs_wait_marked_extents 0 16615 NULL
++rtw_set_wpa_ie_16633 rtw_set_wpa_ie 3 16633 NULL
 +btrfs_get_token_32_16651 btrfs_get_token_32 0 16651 NULL
-+mfd_add_devices_16668 mfd_add_devices 4 16668 NULL
-+ax88179_write_cmd_async_16671 ax88179_write_cmd_async 5 16671 NULL
++packet_recv_error_16669 packet_recv_error 3 16669 NULL
++__proc_lnet_buffers_16717 __proc_lnet_buffers 5 16717 NULL
++__copy_to_user_swizzled_16748 __copy_to_user_swizzled 3-4 16748 NULL
 +arcmsr_adjust_disk_queue_depth_16756 arcmsr_adjust_disk_queue_depth 2 16756 NULL
-+compat_blkdev_driver_ioctl_16769 compat_blkdev_driver_ioctl 4 16769 NULL
 +blk_rq_map_user_iov_16772 blk_rq_map_user_iov 5 16772 NULL
 +i2o_parm_issue_16790 i2o_parm_issue 0 16790 NULL
 +get_server_iovec_16804 get_server_iovec 2 16804 NULL
 +tipc_send2name_16809 tipc_send2name 6 16809 NULL
 +dm_vcalloc_16814 dm_vcalloc 1-2 16814 NULL
++cache_grow_16818 cache_grow 3 16818 NULL
 +drm_malloc_ab_16831 drm_malloc_ab 1-2 16831 NULL
 +scsi_mode_sense_16835 scsi_mode_sense 5 16835 NULL
 +hfsplus_min_io_size_16859 hfsplus_min_io_size 0 16859 NULL
-+vfio_pci_rw_16861 vfio_pci_rw 3 16861 NULL
 +alloc_idx_lebs_16872 alloc_idx_lebs 2 16872 NULL
 +carl9170_debugfs_ampdu_state_read_16873 carl9170_debugfs_ampdu_state_read 3 16873 NULL
 +st_write_16874 st_write 3 16874 NULL
 +__kfifo_peek_n_16877 __kfifo_peek_n 0 16877 NULL
-+idx_to_pfn_16919 idx_to_pfn 0 16919 NULL
-+snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 NULL nohasharray
-+psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 &snd_gf1_mem_proc_dump_16926
-+_sp2d_alloc_16944 _sp2d_alloc 1-2-3 16944 NULL
++transport_init_session_tags_16878 transport_init_session_tags 1-2 16878 NULL
++ext4_ext_zeroout_16895 ext4_ext_zeroout 0 16895 NULL
++psb_unlocked_ioctl_16926 psb_unlocked_ioctl 2 16926 NULL nohasharray
++snd_gf1_mem_proc_dump_16926 snd_gf1_mem_proc_dump 5 16926 &psb_unlocked_ioctl_16926
++_sp2d_alloc_16944 _sp2d_alloc 3-2-1 16944 NULL
 +squashfs_read_table_16945 squashfs_read_table 3 16945 NULL
-+cfg80211_send_unprot_disassoc_16951 cfg80211_send_unprot_disassoc 3 16951 NULL
++wrm_16966 wrm 0 16966 NULL
 +keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
++ocfs2_read_quota_phys_block_16990 ocfs2_read_quota_phys_block 0 16990 NULL
 +ceph_read_dir_17005 ceph_read_dir 3 17005 NULL
++snd_mask_refine_first_17026 snd_mask_refine_first 0 17026 NULL
 +copy_counters_to_user_17027 copy_counters_to_user 5 17027 NULL
++btrfs_unlink_inode_17043 btrfs_unlink_inode 0 17043 NULL
 +jffs2_trusted_setxattr_17048 jffs2_trusted_setxattr 4 17048 NULL
 +__arch_hweight32_17060 __arch_hweight32 0 17060 NULL
++__copy_user_nocache_17065 __copy_user_nocache 0 17065 NULL
++sddr55_read_data_17072 sddr55_read_data 4 17072 NULL
 +dvb_dvr_read_17073 dvb_dvr_read 3 17073 NULL
 +simple_transaction_read_17076 simple_transaction_read 3 17076 NULL
-+__kmalloc_reserve_17080 __kmalloc_reserve 1 17080 NULL
++__kmalloc_reserve_17080 __kmalloc_reserve 3 17080 NULL
 +carl9170_debugfs_mem_usage_read_17084 carl9170_debugfs_mem_usage_read 3 17084 NULL
-+mac_address_string_17091 mac_address_string 0 17091 NULL
 +entry_length_17093 entry_length 0 17093 NULL
-+sys_preadv_17100 sys_preadv 3 17100 NULL
++ocfs2_get_refcount_cpos_end_17113 ocfs2_get_refcount_cpos_end 0 17113 NULL
++write_mem_17114 write_mem 3 17114 NULL
 +pvr2_hdw_state_report_17121 pvr2_hdw_state_report 3 17121 NULL
-+mwifiex_get_common_rates_17131 mwifiex_get_common_rates 3 17131 NULL
++wrmaltWithLock_17139 wrmaltWithLock 0 17139 NULL
 +nouveau_instobj_create__17144 nouveau_instobj_create_ 4 17144 NULL
++jumpshot_write_data_17151 jumpshot_write_data 4 17151 NULL
 +sep_read_17161 sep_read 3 17161 NULL
 +befs_nls2utf_17163 befs_nls2utf 3 17163 NULL
 +tx_tx_start_templates_read_17164 tx_tx_start_templates_read 3 17164 NULL
 +UniStrnlen_17169 UniStrnlen 0 17169 NULL
-+access_remote_vm_17189 access_remote_vm 0-2-4 17189 NULL
++ocfs2_flock_handle_signal_17189 ocfs2_flock_handle_signal 0 17189 NULL nohasharray
++access_remote_vm_17189 access_remote_vm 0-4-2 17189 &ocfs2_flock_handle_signal_17189 nohasharray
++iwl_dbgfs_txfifo_flush_write_17189 iwl_dbgfs_txfifo_flush_write 3 17189 &access_remote_vm_17189
 +driver_state_read_17194 driver_state_read 3 17194 NULL nohasharray
 +iscsit_find_cmd_from_itt_or_dump_17194 iscsit_find_cmd_from_itt_or_dump 3 17194 &driver_state_read_17194
++sync_request_17208 sync_request 2 17208 NULL
 +dn_recvmsg_17213 dn_recvmsg 4 17213 NULL
++send_write_or_clone_17241 send_write_or_clone 0 17241 NULL
 +to_oblock_17254 to_oblock 0-1 17254 NULL
 +unpack_value_17259 unpack_value 1 17259 NULL
-+__be16_to_cpup_17261 __be16_to_cpup 0 17261 NULL
++lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL
 +error_error_frame_cts_nul_flid_read_17262 error_error_frame_cts_nul_flid_read 3 17262 NULL
++alloc_reserved_file_extent_17267 alloc_reserved_file_extent 0 17267 NULL
 +alloc_ep_17269 alloc_ep 1 17269 NULL
++hw_test_and_write_17271 hw_test_and_write 3 17271 NULL
 +pg_read_17276 pg_read 3 17276 NULL
 +raw_recvmsg_17277 raw_recvmsg 4 17277 NULL
 +hmac_sha256_17278 hmac_sha256 2 17278 NULL
@@ -104268,247 +104364,300 @@ index 0000000..9a7096d
 +minstrel_stats_read_17290 minstrel_stats_read 3 17290 NULL
 +install_breakpoint_17292 install_breakpoint 4 17292 NULL
 +ieee80211_if_fmt_dot11MeshForwarding_17301 ieee80211_if_fmt_dot11MeshForwarding 3 17301 NULL
-+skb_pad_17302 skb_pad 2 17302 NULL
 +mb_cache_create_17307 mb_cache_create 2 17307 NULL
 +gnttab_map_frames_v2_17314 gnttab_map_frames_v2 2 17314 NULL
-+ata_host_alloc_pinfo_17325 ata_host_alloc_pinfo 3 17325 NULL
++SYSC_pread64_17337 SYSC_pread64 3 17337 NULL
 +ieee80211_if_read_dot11MeshHWMPperrMinInterval_17346 ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 NULL
 +ath6kl_wmi_send_mgmt_cmd_17347 ath6kl_wmi_send_mgmt_cmd 7 17347 NULL
-+_fd_dma_mem_free_17406 _fd_dma_mem_free 1 17406 NULL
++mdc_import_seq_write_17409 mdc_import_seq_write 3 17409 NULL
 +lpfc_debugfs_dif_err_write_17424 lpfc_debugfs_dif_err_write 3 17424 NULL
++compat_sys_ppoll_17430 compat_sys_ppoll 2 17430 NULL
 +sta_connected_time_read_17435 sta_connected_time_read 3 17435 NULL
 +SYSC_fcntl_17441 SYSC_fcntl 3 17441 NULL
++libcfs_ipif_enumerate_17445 libcfs_ipif_enumerate 0 17445 NULL
 +nla_get_u32_17455 nla_get_u32 0 17455 NULL
 +__ref_totlen_17461 __ref_totlen 0 17461 NULL
-+compat_cmd_17465 compat_cmd 2 17465 NULL
-+probe_bios_17467 probe_bios 1 17467 NULL
 +probe_kernel_write_17481 probe_kernel_write 3 17481 NULL
-+__alloc_session_17485 __alloc_session 2-1 17485 NULL
 +TSS_rawhmac_17486 TSS_rawhmac 3 17486 NULL
++lookup_tree_block_ref_17494 lookup_tree_block_ref 0 17494 NULL
 +bitmap_pos_to_ord_17503 bitmap_pos_to_ord 3 17503 NULL
-+__copy_to_user_17551 __copy_to_user 0-3 17551 NULL
-+copy_from_user_17559 copy_from_user 3 17559 NULL
++lbs_highrssi_write_17515 lbs_highrssi_write 3 17515 NULL
++qp_free_res_17541 qp_free_res 5 17541 NULL
++xlog_do_log_recovery_17550 xlog_do_log_recovery 3 17550 NULL
++__copy_to_user_17551 __copy_to_user 3-0 17551 NULL
++copy_from_user_17559 copy_from_user 3-0 17559 NULL
++snd_pcm_action_lock_irq_17569 snd_pcm_action_lock_irq 0 17569 NULL
 +acpi_ut_create_package_object_17594 acpi_ut_create_package_object 1 17594 NULL
 +neigh_hash_alloc_17595 neigh_hash_alloc 1 17595 NULL
-+rts51x_write_mem_17598 rts51x_write_mem 4 17598 NULL
-+iwl_dump_nic_event_log_17601 iwl_dump_nic_event_log 0 17601 NULL
++__inode_info_17603 __inode_info 0 17603 NULL
 +wm8994_gpio_to_irq_17604 wm8994_gpio_to_irq 2 17604 NULL
 +osst_execute_17607 osst_execute 7-6 17607 NULL
 +ocfs2_mark_extent_written_17615 ocfs2_mark_extent_written 6 17615 NULL
 +ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout_17618 ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 NULL
++dma_map_page_17628 dma_map_page 0 17628 NULL
++ocfs2_rotate_subtree_left_17634 ocfs2_rotate_subtree_left 0 17634 NULL
 +twl4030_set_gpio_direction_17645 twl4030_set_gpio_direction 1 17645 NULL
 +SYSC_migrate_pages_17657 SYSC_migrate_pages 2 17657 NULL
-+ubi_io_read_data_17662 ubi_io_read_data 0 17662 NULL nohasharray
-+packet_setsockopt_17662 packet_setsockopt 5 17662 &ubi_io_read_data_17662
++packet_setsockopt_17662 packet_setsockopt 5 17662 NULL nohasharray
++ubi_io_read_data_17662 ubi_io_read_data 0 17662 &packet_setsockopt_17662
++kernel_write_17665 kernel_write 3 17665 NULL
 +pwr_enable_ps_read_17686 pwr_enable_ps_read 3 17686 NULL
-+gfn_to_pfn_memslot_17693 gfn_to_pfn_memslot 2 17693 NULL
-+__einj_error_trigger_17707 __einj_error_trigger 1 17707 NULL nohasharray
-+venus_rename_17707 venus_rename 5-4 17707 &__einj_error_trigger_17707
-+isku_sysfs_write_keys_function_17726 isku_sysfs_write_keys_function 6 17726 NULL
++filemap_fdatawait_17688 filemap_fdatawait 0 17688 NULL
++gfn_to_pfn_memslot_17693 gfn_to_pfn_memslot 2-0 17693 NULL
++__einj_error_trigger_17707 __einj_error_trigger 0 17707 NULL nohasharray
++venus_rename_17707 venus_rename 4-5 17707 &__einj_error_trigger_17707
 +exofs_read_lookup_dev_table_17733 exofs_read_lookup_dev_table 3 17733 NULL
 +sctpprobe_read_17741 sctpprobe_read 3 17741 NULL
 +mark_unsafe_pages_17759 mark_unsafe_pages 0 17759 NULL
-+brcmf_usb_attach_17766 brcmf_usb_attach 2-3 17766 NULL
++dgap_do_fep_load_17765 dgap_do_fep_load 3 17765 NULL
 +dtf_read_run_17768 dtf_read_run 3 17768 NULL
 +brcmf_sdio_chip_verifynvram_17776 brcmf_sdio_chip_verifynvram 4 17776 NULL
 +hash_ipport6_expire_17784 hash_ipport6_expire 3 17784 NULL
 +perf_clock_17787 perf_clock 0 17787 NULL
-+ubifs_leb_change_17789 ubifs_leb_change 4 17789 NULL
++ubifs_leb_change_17789 ubifs_leb_change 0-4 17789 NULL
++get_unaligned_be64_17794 get_unaligned_be64 0 17794 NULL nohasharray
++shrink_slab_node_17794 shrink_slab_node 3-4 17794 &get_unaligned_be64_17794
++bkey_to_cacheline_17811 bkey_to_cacheline 0 17811 NULL
 +_snd_pcm_lib_alloc_vmalloc_buffer_17820 _snd_pcm_lib_alloc_vmalloc_buffer 2 17820 NULL
 +gnet_stats_copy_app_17821 gnet_stats_copy_app 3 17821 NULL
 +cipso_v4_gentag_rbm_17836 cipso_v4_gentag_rbm 0 17836 NULL
-+count_leafs_17842 count_leafs 0 17842 NULL
++dm_stats_message_17863 dm_stats_message 5 17863 NULL
 +sisusb_send_bulk_msg_17864 sisusb_send_bulk_msg 3 17864 NULL
 +alloc_sja1000dev_17868 alloc_sja1000dev 1 17868 NULL
 +ray_cs_essid_proc_write_17875 ray_cs_essid_proc_write 3 17875 NULL
-+orinoco_set_key_17878 orinoco_set_key 5-7 17878 NULL
++orinoco_set_key_17878 orinoco_set_key 7-5 17878 NULL nohasharray
++i40e_align_l2obj_base_17878 i40e_align_l2obj_base 0-1 17878 &orinoco_set_key_17878
 +init_per_cpu_17880 init_per_cpu 1 17880 NULL
 +ieee80211_if_fmt_dot11MeshMaxPeerLinks_17883 ieee80211_if_fmt_dot11MeshMaxPeerLinks 3 17883 NULL
-+compat_sys_pwritev_17886 compat_sys_pwritev 3 17886 NULL
 +ieee80211_if_fmt_dot11MeshHWMPRootMode_17890 ieee80211_if_fmt_dot11MeshHWMPRootMode 3 17890 NULL
 +ocfs2_clusters_to_blocks_17896 ocfs2_clusters_to_blocks 0-2 17896 NULL
 +recover_head_17904 recover_head 3 17904 NULL
-+dccp_feat_register_sp_17914 dccp_feat_register_sp 5 17914 NULL
 +xfs_buf_associate_memory_17915 xfs_buf_associate_memory 3 17915 NULL
-+srp_iu_pool_alloc_17920 srp_iu_pool_alloc 2 17920 NULL
 +scsi_bufflen_17933 scsi_bufflen 0 17933 NULL
-+ufs_free_blocks_17963 ufs_free_blocks 2-3 17963 NULL
++__mutex_lock_check_stamp_17947 __mutex_lock_check_stamp 0 17947 NULL
++beacon_interval_write_17952 beacon_interval_write 3 17952 NULL
++ufs_free_blocks_17963 ufs_free_blocks 3-2 17963 NULL nohasharray
++tlv_put_u64_17963 tlv_put_u64 0 17963 &ufs_free_blocks_17963
 +calc_nr_buckets_17976 calc_nr_buckets 0 17976 NULL
++ext4_ext_calc_credits_for_single_extent_17983 ext4_ext_calc_credits_for_single_extent 0-2 17983 NULL
 +smk_write_cipso_17989 smk_write_cipso 3 17989 NULL
 +gnttab_max_grant_frames_17993 gnttab_max_grant_frames 0 17993 NULL
 +ext4_num_overhead_clusters_18001 ext4_num_overhead_clusters 2 18001 NULL
 +pvr2_v4l2_read_18006 pvr2_v4l2_read 3 18006 NULL
 +alloc_rx_desc_ring_18016 alloc_rx_desc_ring 2 18016 NULL
 +fill_read_18019 fill_read 0 18019 NULL
-+o2hb_highest_node_18034 o2hb_highest_node 2 18034 NULL
-+cryptd_alloc_instance_18048 cryptd_alloc_instance 2-3 18048 NULL
-+find_next_inuse_18051 find_next_inuse 2-3 18051 NULL
++o2hb_highest_node_18034 o2hb_highest_node 2-0 18034 NULL
++__posix_lock_file_18035 __posix_lock_file 0 18035 NULL
++ocfs2_cache_cluster_dealloc_18043 ocfs2_cache_cluster_dealloc 0 18043 NULL
++cryptd_alloc_instance_18048 cryptd_alloc_instance 3-2 18048 NULL
++find_next_inuse_18051 find_next_inuse 2-3-0 18051 NULL
 +ddebug_proc_write_18055 ddebug_proc_write 3 18055 NULL
 +lua_sysfs_read_18062 lua_sysfs_read 6 18062 NULL
-+hex_byte_pack_18064 hex_byte_pack 0 18064 NULL
-+packet_came_18072 packet_came 3 18072 NULL
++fpregs_get_18066 fpregs_get 4 18066 NULL
 +kvm_read_guest_page_18074 kvm_read_guest_page 5-2 18074 NULL
 +SYSC_pselect6_18076 SYSC_pselect6 1 18076 NULL
-+get_vm_area_18080 get_vm_area 1 18080 NULL
 +SYSC_semtimedop_18091 SYSC_semtimedop 3 18091 NULL
 +mpi_alloc_18094 mpi_alloc 1 18094 NULL
++hfs_direct_IO_18104 hfs_direct_IO 4 18104 NULL
 +dfs_file_read_18116 dfs_file_read 3 18116 NULL
 +svc_getnl_18120 svc_getnl 0 18120 NULL
-+paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-1-2 18131 NULL
++paging32_gpte_to_gfn_lvl_18131 paging32_gpte_to_gfn_lvl 0-2-1 18131 NULL
 +vmw_surface_dma_size_18132 vmw_surface_dma_size 0 18132 NULL
 +selinux_inode_setsecurity_18148 selinux_inode_setsecurity 4 18148 NULL
-+_has_tag_18169 _has_tag 2 18169 NULL
++is_idx_node_in_use_18165 is_idx_node_in_use 0 18165 NULL
 +pccard_store_cis_18176 pccard_store_cis 6 18176 NULL
++snd_pcm_hw_refine_user_18204 snd_pcm_hw_refine_user 0 18204 NULL
 +orinoco_add_extscan_result_18207 orinoco_add_extscan_result 3 18207 NULL
 +gsm_control_message_18209 gsm_control_message 4 18209 NULL
++ocfs2_divide_leaf_refcount_block_18214 ocfs2_divide_leaf_refcount_block 0 18214 NULL
 +do_ipv6_setsockopt_18215 do_ipv6_setsockopt 5 18215 NULL
 +gnttab_alloc_grant_references_18240 gnttab_alloc_grant_references 1 18240 NULL
 +alloc_trace_uprobe_18247 alloc_trace_uprobe 3 18247 NULL
-+snd_ctl_ioctl_compat_18250 snd_ctl_ioctl_compat 3 18250 NULL
++rfcomm_sock_setsockopt_18254 rfcomm_sock_setsockopt 5 18254 NULL
++__sysfs_add_one_18258 __sysfs_add_one 0 18258 NULL
 +qdisc_class_hash_alloc_18262 qdisc_class_hash_alloc 1 18262 NULL
 +gfs2_alloc_sort_buffer_18275 gfs2_alloc_sort_buffer 1 18275 NULL
-+alloc_ring_18278 alloc_ring 2-4 18278 NULL
++alloc_ring_18278 alloc_ring 4-2 18278 NULL
 +find_dirty_idx_leb_18280 find_dirty_idx_leb 0 18280 NULL
-+bio_phys_segments_18281 bio_phys_segments 0 18281 NULL nohasharray
-+nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 &bio_phys_segments_18281
++nouveau_subdev_create__18281 nouveau_subdev_create_ 7 18281 NULL nohasharray
++bio_phys_segments_18281 bio_phys_segments 0 18281 &nouveau_subdev_create__18281
 +ext4_readpages_18283 ext4_readpages 4 18283 NULL
 +mmc_send_bus_test_18285 mmc_send_bus_test 4 18285 NULL
 +um_idi_write_18293 um_idi_write 3 18293 NULL
 +nouveau_disp_create__18305 nouveau_disp_create_ 4-7 18305 NULL
-+ip6ip6_err_18308 ip6ip6_err 5 18308 NULL
 +vga_r_18310 vga_r 0 18310 NULL
++class_add_profile_18315 class_add_profile 1-3-5 18315 NULL
++csio_mem_read_18319 csio_mem_read 3 18319 NULL
++alloc_and_copy_string_18321 alloc_and_copy_string 2 18321 NULL
 +ecryptfs_send_message_18322 ecryptfs_send_message 2 18322 NULL
 +bio_integrity_advance_18324 bio_integrity_advance 2 18324 NULL
++__inorder_to_tree_18329 __inorder_to_tree 0-3-1 18329 NULL
++lcd_proc_write_18351 lcd_proc_write 3 18351 NULL
 +pwr_power_save_off_read_18355 pwr_power_save_off_read 3 18355 NULL
 +xlbd_reserve_minors_18365 xlbd_reserve_minors 1-2 18365 NULL
-+SyS_process_vm_readv_18366 SyS_process_vm_readv 3-5 18366 NULL
++SyS_process_vm_readv_18366 SyS_process_vm_readv 5-3 18366 NULL
 +ep_io_18367 ep_io 0 18367 NULL
 +qib_user_sdma_num_pages_18371 qib_user_sdma_num_pages 0 18371 NULL
-+ci_role_write_18388 ci_role_write 3 18388 NULL
++ci_role_write_18388 ci_role_write 3 18388 NULL nohasharray
++irq_find_mapping_18388 irq_find_mapping 0-2 18388 &ci_role_write_18388
++btrfs_update_inode_18394 btrfs_update_inode 0 18394 NULL
++hdlc_empty_fifo_18397 hdlc_empty_fifo 2 18397 NULL
 +__video_register_device_18399 __video_register_device 3 18399 NULL
 +hash_ip4_expire_18402 hash_ip4_expire 3 18402 NULL nohasharray
 +adis16136_show_serial_18402 adis16136_show_serial 3 18402 &hash_ip4_expire_18402
++btrfs_rmap_block_18403 btrfs_rmap_block 0 18403 NULL
 +crystalhd_user_data_18407 crystalhd_user_data 3 18407 NULL
-+usbnet_write_cmd_nopm_18426 usbnet_write_cmd_nopm 7 18426 NULL
 +batadv_orig_node_add_if_18433 batadv_orig_node_add_if 2 18433 NULL nohasharray
 +iscsi_create_flashnode_sess_18433 iscsi_create_flashnode_sess 4 18433 &batadv_orig_node_add_if_18433
 +snd_hda_get_connections_18437 snd_hda_get_connections 0 18437 NULL
++btrfs_uuid_tree_lookup_18451 btrfs_uuid_tree_lookup 0 18451 NULL
++flash_dev_cache_miss_18454 flash_dev_cache_miss 4 18454 NULL
 +fuse_perform_write_18457 fuse_perform_write 4 18457 NULL
 +regset_tls_set_18459 regset_tls_set 4 18459 NULL
++pcibios_window_alignment_18460 pcibios_window_alignment 0 18460 NULL
 +dma_alloc_from_contiguous_18466 dma_alloc_from_contiguous 3-2 18466 NULL
-+pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL
-+udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 NULL
++pci_vpd_lrdt_size_18479 pci_vpd_lrdt_size 0 18479 NULL nohasharray
++mite_bytes_in_transit_18479 mite_bytes_in_transit 0 18479 &pci_vpd_lrdt_size_18479
++r600_texture_size_18487 r600_texture_size 4-5-6 18487 NULL nohasharray
++udpv6_setsockopt_18487 udpv6_setsockopt 5 18487 &r600_texture_size_18487
++btrfs_fiemap_18501 btrfs_fiemap 3 18501 NULL nohasharray
++remap_pmd_range_18501 remap_pmd_range 3-4-5 18501 &btrfs_fiemap_18501
++i915_gem_object_wait_fence_18508 i915_gem_object_wait_fence 0 18508 NULL
++__copy_user_zeroing_intel_18510 __copy_user_zeroing_intel 0-3 18510 NULL
++snd_vx_inb_18514 snd_vx_inb 0 18514 NULL
 +snd_gus_dram_poke_18525 snd_gus_dram_poke 4 18525 NULL
-+nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 5-6-9 18530 NULL
++nouveau_fifo_channel_create__18530 nouveau_fifo_channel_create_ 9 18530 NULL
 +seq_copy_in_user_18543 seq_copy_in_user 3 18543 NULL
 +acpi_register_gsi_ioapic_18550 acpi_register_gsi_ioapic 2 18550 NULL
 +sas_change_queue_depth_18555 sas_change_queue_depth 2 18555 NULL
++vb2_streamon_18562 vb2_streamon 0 18562 NULL
 +smk_write_rules_list_18565 smk_write_rules_list 3 18565 NULL
 +debug_output_18575 debug_output 3 18575 NULL
++is_extent_unchanged_18576 is_extent_unchanged 0 18576 NULL
 +check_lpt_type_18577 check_lpt_type 0 18577 NULL
-+__netdev_alloc_skb_18595 __netdev_alloc_skb 2 18595 NULL
-+slabinfo_write_18600 slabinfo_write 3 18600 NULL nohasharray
-+filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 &slabinfo_write_18600
++numa_node_id_18596 numa_node_id 0 18596 NULL
++filemap_fdatawait_range_18600 filemap_fdatawait_range 0 18600 NULL nohasharray
++slabinfo_write_18600 slabinfo_write 3 18600 &filemap_fdatawait_range_18600
 +iowarrior_write_18604 iowarrior_write 3 18604 NULL
-+batadv_arp_get_type_18609 batadv_arp_get_type 3 18609 NULL
++audio_get_endpoint_req_18624 audio_get_endpoint_req 0 18624 NULL
 +from_buffer_18625 from_buffer 3 18625 NULL
 +snd_pcm_oss_write3_18657 snd_pcm_oss_write3 0-3 18657 NULL
 +ieee80211_if_fmt_rssi_threshold_18664 ieee80211_if_fmt_rssi_threshold 3 18664 NULL
 +unmap_page_18665 unmap_page 2-3 18665 NULL
 +xfs_iext_insert_18667 xfs_iext_insert 3 18667 NULL
++__alloc_skb_head_18683 __alloc_skb_head 2 18683 NULL
++echo_client_prep_commit_18693 echo_client_prep_commit 8 18693 NULL
 +replay_log_leb_18704 replay_log_leb 3 18704 NULL
-+unlocked_compat_ipmi_ioctl_18708 unlocked_compat_ipmi_ioctl 3 18708 NULL nohasharray
-+iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 &unlocked_compat_ipmi_ioctl_18708
++iwl_dbgfs_rx_handlers_read_18708 iwl_dbgfs_rx_handlers_read 3 18708 NULL
 +ceph_alloc_page_vector_18710 ceph_alloc_page_vector 1 18710 NULL
-+ocfs2_trim_extent_18711 ocfs2_trim_extent 4-3 18711 NULL
-+compat_SyS_writev_18712 compat_SyS_writev 3 18712 NULL
++ocfs2_trim_extent_18711 ocfs2_trim_extent 3-4 18711 NULL
 +blk_rq_bytes_18715 blk_rq_bytes 0 18715 NULL
++byt_gpio_to_irq_18721 byt_gpio_to_irq 2 18721 NULL
++ext4_es_insert_extent_18729 ext4_es_insert_extent 0 18729 NULL
 +snd_als4k_gcr_read_addr_18741 snd_als4k_gcr_read_addr 0 18741 NULL
 +o2hb_debug_create_18744 o2hb_debug_create 4 18744 NULL
 +__erst_read_to_erange_from_nvram_18748 __erst_read_to_erange_from_nvram 0 18748 NULL
 +wep_packets_read_18751 wep_packets_read 3 18751 NULL
-+md_compat_ioctl_18764 md_compat_ioctl 4 18764 NULL
 +read_file_dump_nfcal_18766 read_file_dump_nfcal 3 18766 NULL
 +ffs_epfile_read_18775 ffs_epfile_read 3 18775 NULL
 +SyS_lsetxattr_18776 SyS_lsetxattr 4 18776 NULL
 +alloc_fcdev_18780 alloc_fcdev 1 18780 NULL
-+fat_compat_dir_ioctl_18800 fat_compat_dir_ioctl 3 18800 NULL
-+ieee80211_auth_challenge_18810 ieee80211_auth_challenge 3 18810 NULL
++prealloc_18800 prealloc 0 18800 NULL
 +madvise_hwpoison_18812 madvise_hwpoison 2 18812 NULL
 +setup_ioapic_irq_18813 setup_ioapic_irq 1 18813 NULL
++dm_stats_print_18815 dm_stats_print 7 18815 NULL
 +sys_modify_ldt_18824 sys_modify_ldt 3 18824 NULL
 +mtf_test_write_18844 mtf_test_write 3 18844 NULL
++iterate_inode_refs_18846 iterate_inode_refs 0 18846 NULL
 +drm_ht_create_18853 drm_ht_create 2 18853 NULL
 +sctp_setsockopt_events_18862 sctp_setsockopt_events 3 18862 NULL
-+ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL
++ieee80211_if_read_element_ttl_18869 ieee80211_if_read_element_ttl 3 18869 NULL nohasharray
++heads_to_leaves_18869 heads_to_leaves 2-0 18869 &ieee80211_if_read_element_ttl_18869
 +xlog_find_verify_log_record_18870 xlog_find_verify_log_record 2 18870 NULL
-+___alloc_bootmem_node_18882 ___alloc_bootmem_node 2-3 18882 NULL
 +width_to_agaw_18883 width_to_agaw 0-1 18883 NULL
++overwrite_item_18896 overwrite_item 0 18896 NULL
++kmem_cache_alloc_node_18899 kmem_cache_alloc_node 3 18899 NULL
 +ceph_setxattr_18913 ceph_setxattr 4 18913 NULL
-+mangle_packet_18920 mangle_packet 7-9 18920 NULL
++ext4_block_in_group_18922 ext4_block_in_group 2 18922 NULL
++ieee80211_rx_mgmt_disassoc_18927 ieee80211_rx_mgmt_disassoc 3 18927 NULL
++create_pending_snapshot_18936 create_pending_snapshot 0 18936 NULL
 +snapshot_write_next_18937 snapshot_write_next 0 18937 NULL
-+regcache_sync_block_18963 regcache_sync_block 3-4 18963 NULL
++regcache_sync_block_18963 regcache_sync_block 4-3 18963 NULL
 +__nla_reserve_18974 __nla_reserve 3 18974 NULL
++__blockdev_direct_IO_18977 __blockdev_direct_IO 0-6 18977 NULL
 +gfn_to_pfn_atomic_18981 gfn_to_pfn_atomic 2 18981 NULL
-+find_dirtiest_idx_leb_19001 find_dirtiest_idx_leb 0 19001 NULL
++get_inode_path_18988 get_inode_path 0 18988 NULL
++find_dirtiest_idx_leb_19001 find_dirtiest_idx_leb 0 19001 NULL nohasharray
++test_check_exists_19001 test_check_exists 2 19001 &find_dirtiest_idx_leb_19001
 +layout_in_gaps_19006 layout_in_gaps 2 19006 NULL
 +huge_page_size_19008 huge_page_size 0 19008 NULL
-+usbdev_compat_ioctl_19026 usbdev_compat_ioctl 3 19026 NULL
++push_leaf_right_19017 push_leaf_right 0 19017 NULL
 +prepare_highmem_image_19028 prepare_highmem_image 0 19028 NULL
++ocfs2_steal_resource_19036 ocfs2_steal_resource 0 19036 NULL
 +revalidate_19043 revalidate 2 19043 NULL
-+drm_fb_helper_init_19044 drm_fb_helper_init 3-4 19044 NULL
++afs_vnode_store_data_19048 afs_vnode_store_data 2-3-4-5 19048 NULL
++osc_pinger_recov_seq_write_19056 osc_pinger_recov_seq_write 3 19056 NULL
 +create_gpadl_header_19064 create_gpadl_header 2 19064 NULL
 +ieee80211_key_alloc_19065 ieee80211_key_alloc 3 19065 NULL
-+msix_map_region_19072 msix_map_region 2 19072 NULL
 +ceph_create_snap_context_19082 ceph_create_snap_context 1 19082 NULL
-+brcmf_usbdev_qinit_19090 brcmf_usbdev_qinit 2 19090 NULL nohasharray
-+sys_process_vm_readv_19090 sys_process_vm_readv 3-5 19090 &brcmf_usbdev_qinit_19090
 +sta_last_seq_ctrl_read_19106 sta_last_seq_ctrl_read 3 19106 NULL
 +cifs_readv_from_socket_19109 cifs_readv_from_socket 3 19109 NULL
-+skb_gro_offset_19123 skb_gro_offset 0 19123 NULL
++ATOMIC_SUB_RETURN_19115 ATOMIC_SUB_RETURN 2 19115 NULL
 +ext4_inode_table_19125 ext4_inode_table 0 19125 NULL
 +snd_als4k_iobase_readl_19136 snd_als4k_iobase_readl 0 19136 NULL
++btrfs_run_delayed_refs_19137 btrfs_run_delayed_refs 0 19137 NULL
 +alloc_irdadev_19140 alloc_irdadev 1 19140 NULL
 +sleep_auth_read_19159 sleep_auth_read 3 19159 NULL
++ext3_reserve_inode_write_19163 ext3_reserve_inode_write 0 19163 NULL
 +smk_write_access2_19170 smk_write_access2 3 19170 NULL
 +iwl_dbgfs_reply_tx_error_read_19205 iwl_dbgfs_reply_tx_error_read 3 19205 NULL
 +vmw_unlocked_ioctl_19212 vmw_unlocked_ioctl 2 19212 NULL
-+__copy_to_user_inatomic_19214 __copy_to_user_inatomic 3 19214 NULL
++__copy_to_user_inatomic_19214 __copy_to_user_inatomic 3-0 19214 NULL
 +dev_counters_read_19216 dev_counters_read 3 19216 NULL
 +wbcir_tx_19219 wbcir_tx 3 19219 NULL
 +gsi_to_irq_19220 gsi_to_irq 0-1 19220 NULL
 +snd_mask_max_19224 snd_mask_max 0 19224 NULL
++snd_pcm_capture_rewind_19229 snd_pcm_capture_rewind 0-2 19229 NULL
 +bio_alloc_mddev_19238 bio_alloc_mddev 2 19238 NULL
-+sys_fcntl_19267 sys_fcntl 3 19267 NULL
++ucma_query_19260 ucma_query 4 19260 NULL
++write_one_cache_group_19261 write_one_cache_group 0 19261 NULL
 +il_dbgfs_rxon_filter_flags_read_19281 il_dbgfs_rxon_filter_flags_read 3 19281 NULL
-+io_mapping_map_wc_19284 io_mapping_map_wc 2 19284 NULL
++cfg80211_rx_unprot_mlme_mgmt_19288 cfg80211_rx_unprot_mlme_mgmt 3 19288 NULL
++____cache_alloc_node_19297 ____cache_alloc_node 3 19297 NULL
 +qc_capture_19298 qc_capture 3 19298 NULL
-+ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 3-4 19303 NULL
++ocfs2_prepare_inode_for_refcount_19303 ocfs2_prepare_inode_for_refcount 4-3 19303 NULL
 +event_tx_stuck_read_19305 event_tx_stuck_read 3 19305 NULL
 +gfn_to_gpa_19320 gfn_to_gpa 0-1 19320 NULL
 +debug_read_19322 debug_read 3 19322 NULL
-+cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 NULL
++SYSC_sendfile64_19327 SYSC_sendfile64 4 19327 NULL
++cfg80211_inform_bss_19332 cfg80211_inform_bss 8 19332 NULL nohasharray
++lbs_host_sleep_write_19332 lbs_host_sleep_write 3 19332 &cfg80211_inform_bss_19332
 +closure_sub_19359 closure_sub 2 19359 NULL
++firmware_data_write_19360 firmware_data_write 6-5 19360 NULL
 +read_zero_19366 read_zero 3 19366 NULL
 +interpret_user_input_19393 interpret_user_input 2 19393 NULL
 +sync_fill_pt_info_19397 sync_fill_pt_info 0 19397 NULL
++get_unaligned_be16_19400 get_unaligned_be16 0 19400 NULL
 +get_n_events_by_type_19401 get_n_events_by_type 0 19401 NULL
++pep_recvmsg_19402 pep_recvmsg 4 19402 NULL
 +dvbdmx_write_19423 dvbdmx_write 3 19423 NULL
 +__phys_addr_19434 __phys_addr 0 19434 NULL
 +SyS_sched_getaffinity_19444 SyS_sched_getaffinity 2 19444 NULL
 +xfrm_alg_auth_len_19454 xfrm_alg_auth_len 0 19454 NULL
-+hpet_compat_ioctl_19455 hpet_compat_ioctl 3 19455 NULL
 +gnet_stats_copy_19458 gnet_stats_copy 4 19458 NULL
 +sky2_read16_19475 sky2_read16 0 19475 NULL
-+efivar_create_sysfs_entry_19485 efivar_create_sysfs_entry 2 19485 NULL
++__read_status_pciv2_19492 __read_status_pciv2 0 19492 NULL
++kstrtoll_from_user_19500 kstrtoll_from_user 2 19500 NULL
 +ext4_add_new_descs_19509 ext4_add_new_descs 3 19509 NULL
-+skb_realloc_headroom_19516 skb_realloc_headroom 2 19516 NULL
-+dev_alloc_skb_19517 dev_alloc_skb 1 19517 NULL
++cfc_write_array_to_buffer_19529 cfc_write_array_to_buffer 3 19529 NULL nohasharray
++apei_exec_pre_map_gars_19529 apei_exec_pre_map_gars 0 19529 &cfc_write_array_to_buffer_19529
 +nfc_llcp_build_tlv_19536 nfc_llcp_build_tlv 3 19536 NULL
++howmany_64_19548 howmany_64 2 19548 NULL
++btrfs_xattr_security_init_19553 btrfs_xattr_security_init 0 19553 NULL
 +gfn_to_index_19558 gfn_to_index 0-1-3-2 19558 NULL
++kernel_read_19559 kernel_read 4-0 19559 NULL
 +ocfs2_control_message_19564 ocfs2_control_message 3 19564 NULL
-+wlcore_hw_get_rx_packet_len_19565 wlcore_hw_get_rx_packet_len 0 19565 NULL nohasharray
-+ieee80211_if_read_tkip_mic_test_19565 ieee80211_if_read_tkip_mic_test 3 19565 &wlcore_hw_get_rx_packet_len_19565
++ieee80211_if_read_tkip_mic_test_19565 ieee80211_if_read_tkip_mic_test 3 19565 NULL
 +nfsd_read_19568 nfsd_read 5 19568 NULL
 +cgroup_read_s64_19570 cgroup_read_s64 5 19570 NULL
 +bm_status_read_19583 bm_status_read 3 19583 NULL
@@ -104517,17 +104666,21 @@ index 0000000..9a7096d
 +__mei_cl_recv_19636 __mei_cl_recv 3 19636 NULL
 +usbvision_rvmalloc_19655 usbvision_rvmalloc 1 19655 NULL
 +LoadBitmap_19658 LoadBitmap 2 19658 NULL
-+usbnet_write_cmd_19679 usbnet_write_cmd 7 19679 NULL
++i915_gem_object_bind_to_gtt_19682 i915_gem_object_bind_to_gtt 0 19682 NULL
 +bio_detain_19690 bio_detain 2 19690 NULL
++btrfs_del_inode_extref_19692 btrfs_del_inode_extref 0 19692 NULL
 +mem_cgroup_swappiness_19718 mem_cgroup_swappiness 0 19718 NULL
++btrfs_write_marked_extents_19720 btrfs_write_marked_extents 0 19720 NULL
 +read_reg_19723 read_reg 0 19723 NULL
-+wm8350_block_write_19727 wm8350_block_write 3-2 19727 NULL
-+memcpy_toiovecend_19736 memcpy_toiovecend 4-3 19736 NULL
++wm8350_block_write_19727 wm8350_block_write 2-3 19727 NULL
++memcpy_toiovecend_19736 memcpy_toiovecend 3-4-0 19736 NULL
 +snd_es1968_get_dma_ptr_19747 snd_es1968_get_dma_ptr 0 19747 NULL
-+p9_client_read_19750 p9_client_read 5 19750 NULL
++p9_client_read_19750 p9_client_read 0-5 19750 NULL
 +pnpbios_proc_write_19758 pnpbios_proc_write 3 19758 NULL
 +ocfs2_readpages_19759 ocfs2_readpages 4 19759 NULL
 +jffs2_acl_from_medium_19762 jffs2_acl_from_medium 2 19762 NULL
++readhscx_19769 readhscx 0 19769 NULL
++ocfs2_read_group_descriptor_19771 ocfs2_read_group_descriptor 0 19771 NULL
 +__set_print_fmt_19776 __set_print_fmt 0 19776 NULL
 +saa7146_vmalloc_build_pgtable_19780 saa7146_vmalloc_build_pgtable 2 19780 NULL
 +irda_setsockopt_19824 irda_setsockopt 5 19824 NULL
@@ -104537,23 +104690,39 @@ index 0000000..9a7096d
 +crypt_alloc_buffer_19846 crypt_alloc_buffer 2 19846 NULL
 +cfg80211_mlme_register_mgmt_19852 cfg80211_mlme_register_mgmt 5 19852 NULL
 +__nla_put_19857 __nla_put 3 19857 NULL
-+ip6gre_err_19869 ip6gre_err 5 19869 NULL
 +mrp_request_join_19882 mrp_request_join 4 19882 NULL
++blk_alloc_queue_node_19887 blk_alloc_queue_node 2 19887 NULL
 +aes_decrypt_interrupt_read_19910 aes_decrypt_interrupt_read 3 19910 NULL
 +ps_upsd_max_apturn_read_19918 ps_upsd_max_apturn_read 3 19918 NULL
++mangle_name_19923 mangle_name 0 19923 NULL
 +cgroup_task_count_19930 cgroup_task_count 0 19930 NULL
++guest_read_tsc_19931 guest_read_tsc 0 19931 NULL
 +iwl_dbgfs_rx_queue_read_19943 iwl_dbgfs_rx_queue_read 3 19943 NULL
++cfg80211_rx_assoc_resp_19944 cfg80211_rx_assoc_resp 4 19944 NULL
++alloc_elfnotes_buf_19974 alloc_elfnotes_buf 1 19974 NULL
++get_jack_mode_name_19976 get_jack_mode_name 4 19976 NULL
 +attach_hdlc_protocol_19986 attach_hdlc_protocol 3 19986 NULL
++rtw_set_wps_probe_resp_19989 rtw_set_wps_probe_resp 3 19989 NULL
 +diva_um_idi_read_20003 diva_um_idi_read 0 20003 NULL
++lov_stripe_md_size_20009 lov_stripe_md_size 0-1 20009 NULL
 +SYSC_fgetxattr_20027 SYSC_fgetxattr 4 20027 NULL
 +split_scan_timeout_read_20029 split_scan_timeout_read 3 20029 NULL
++mlx5_ib_db_map_user_20037 mlx5_ib_db_map_user 2 20037 NULL
++btrfs_block_rsv_migrate_20050 btrfs_block_rsv_migrate 0 20050 NULL
++__be32_to_cpup_20056 __be32_to_cpup 0 20056 NULL
 +alloc_ieee80211_20063 alloc_ieee80211 1 20063 NULL
++iwl_mvm_power_mac_dbgfs_read_20067 iwl_mvm_power_mac_dbgfs_read 4 20067 NULL
 +btrfs_pin_extent_for_log_replay_20069 btrfs_pin_extent_for_log_replay 2 20069 NULL
++target_message_20072 target_message 2 20072 NULL
 +rawv6_sendmsg_20080 rawv6_sendmsg 4 20080 NULL
 +fuse_conn_limit_read_20084 fuse_conn_limit_read 3 20084 NULL
++aat2870_reg_write_file_20086 aat2870_reg_write_file 3 20086 NULL
 +team_options_register_20091 team_options_register 3 20091 NULL
 +qla2x00_adjust_sdev_qdepth_up_20097 qla2x00_adjust_sdev_qdepth_up 2 20097 NULL
++read_int_20098 read_int 0 20098 NULL
++root_nfs_copy_20111 root_nfs_copy 3 20111 NULL
 +hptiop_adjust_disk_queue_depth_20122 hptiop_adjust_disk_queue_depth 2 20122 NULL
++self_check_vid_hdr_20131 self_check_vid_hdr 0 20131 NULL
 +tomoyo_commit_ok_20167 tomoyo_commit_ok 2 20167 NULL
 +read_flush_pipefs_20171 read_flush_pipefs 3 20171 NULL
 +wep_addr_key_count_read_20174 wep_addr_key_count_read 3 20174 NULL
@@ -104564,28 +104733,32 @@ index 0000000..9a7096d
 +rose_sendmsg_20249 rose_sendmsg 4 20249 NULL
 +tm6000_i2c_send_regs_20250 tm6000_i2c_send_regs 5 20250 NULL
 +pcpu_alloc_20255 pcpu_alloc 1-2 20255 NULL
-+_rtl92s_get_h2c_cmdlen_20312 _rtl92s_get_h2c_cmdlen 0 20312 NULL
++resource_size_20256 resource_size 0 20256 NULL
++r10_sync_page_io_20307 r10_sync_page_io 3 20307 NULL
++dm_get_reserved_bio_based_ios_20315 dm_get_reserved_bio_based_ios 0 20315 NULL
 +tx_tx_burst_programmed_read_20320 tx_tx_burst_programmed_read 3 20320 NULL
++vx_send_msg_nolock_20322 vx_send_msg_nolock 0 20322 NULL
 +snd_cs4281_BA1_read_20323 snd_cs4281_BA1_read 5 20323 NULL
++ocfs2_et_insert_check_20341 ocfs2_et_insert_check 0 20341 NULL
 +gfs2_glock_nq_m_20347 gfs2_glock_nq_m 1 20347 NULL
 +handle_arr_calc_size_20355 handle_arr_calc_size 0-1 20355 NULL
-+qla82xx_pci_mem_read_direct_20368 qla82xx_pci_mem_read_direct 2 20368 NULL
++snd_pcm_stop_20376 snd_pcm_stop 0 20376 NULL
 +smk_set_cipso_20379 smk_set_cipso 3 20379 NULL
-+u64_to_uptr_20384 u64_to_uptr 1 20384 NULL
-+snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL
-+SyS_get_mempolicy_20399 SyS_get_mempolicy 3-4 20399 NULL nohasharray
-+__kfifo_from_user_20399 __kfifo_from_user 3 20399 &SyS_get_mempolicy_20399
-+xen_create_contiguous_region_20457 xen_create_contiguous_region 1 20457 NULL
++block_read_full_page_20380 block_read_full_page 0 20380 NULL
++snd_nm256_readl_20394 snd_nm256_readl 0 20394 NULL nohasharray
++read_7220_creg32_20394 read_7220_creg32 0 20394 &snd_nm256_readl_20394
++__kfifo_from_user_20399 __kfifo_from_user 3 20399 NULL nohasharray
++SyS_get_mempolicy_20399 SyS_get_mempolicy 3-4 20399 &__kfifo_from_user_20399
++btrfs_set_acl_20440 btrfs_set_acl 0 20440 NULL
 +nfs3_setxattr_20458 nfs3_setxattr 4 20458 NULL
-+dec_zcache_pers_zpages_20465 dec_zcache_pers_zpages 1 20465 NULL
 +compat_ipv6_setsockopt_20468 compat_ipv6_setsockopt 5 20468 NULL
 +read_buf_20469 read_buf 2 20469 NULL
 +btrfs_get_32_20476 btrfs_get_32 0 20476 NULL
 +fast_user_write_20494 fast_user_write 5 20494 NULL
-+ocfs2_db_frozen_trigger_20503 ocfs2_db_frozen_trigger 4 20503 NULL nohasharray
-+hidraw_report_event_20503 hidraw_report_event 3 20503 &ocfs2_db_frozen_trigger_20503
++ocfs2_db_frozen_trigger_20503 ocfs2_db_frozen_trigger 4 20503 NULL
 +pcpu_alloc_area_20511 pcpu_alloc_area 0-3 20511 NULL
-+pcpu_depopulate_chunk_20517 pcpu_depopulate_chunk 2-3 20517 NULL
++link_free_space_20512 link_free_space 0 20512 NULL
++pcpu_depopulate_chunk_20517 pcpu_depopulate_chunk 3-2 20517 NULL
 +xfs_iext_realloc_direct_20521 xfs_iext_realloc_direct 2 20521 NULL
 +drbd_bm_resize_20522 drbd_bm_resize 2 20522 NULL
 +amd_create_gatt_pages_20537 amd_create_gatt_pages 1 20537 NULL
@@ -104593,30 +104766,34 @@ index 0000000..9a7096d
 +venus_create_20555 venus_create 4 20555 NULL
 +btrfs_super_log_root_20565 btrfs_super_log_root 0 20565 NULL
 +crypto_ahash_reqsize_20569 crypto_ahash_reqsize 0 20569 NULL
-+i915_max_freq_read_20581 i915_max_freq_read 3 20581 NULL
-+batadv_tt_append_diff_20588 batadv_tt_append_diff 4 20588 NULL
++batadv_tt_append_diff_20588 batadv_tt_append_diff 4 20588 NULL nohasharray
++ocfs2_cluster_lock_20588 ocfs2_cluster_lock 0 20588 &batadv_tt_append_diff_20588
++kvm_test_age_hva_20593 kvm_test_age_hva 2 20593 NULL
 +sync_timeline_create_20601 sync_timeline_create 2 20601 NULL
 +lirc_write_20604 lirc_write 3 20604 NULL
-+qib_qsfp_write_20614 qib_qsfp_write 0-4-2 20614 NULL
++qib_qsfp_write_20614 qib_qsfp_write 0-2-4 20614 NULL
 +snd_pcm_oss_prepare_20641 snd_pcm_oss_prepare 0 20641 NULL
-+kfifo_copy_to_user_20646 kfifo_copy_to_user 3 20646 NULL
-+cpulist_scnprintf_20648 cpulist_scnprintf 0-2 20648 NULL
++get_extent_skip_holes_20642 get_extent_skip_holes 2 20642 NULL
++kfifo_copy_to_user_20646 kfifo_copy_to_user 4-3 20646 NULL
++cpulist_scnprintf_20648 cpulist_scnprintf 2-0 20648 NULL
 +oz_add_farewell_20652 oz_add_farewell 5 20652 NULL
 +oz_cdev_read_20659 oz_cdev_read 3 20659 NULL
-+snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL
++snd_hdsp_playback_copy_20676 snd_hdsp_playback_copy 5 20676 NULL nohasharray
++btrfs_qgroup_reserve_20676 btrfs_qgroup_reserve 0 20676 &snd_hdsp_playback_copy_20676
 +get_user_page_nowait_20682 get_user_page_nowait 3 20682 NULL nohasharray
 +dvb_dmxdev_buffer_read_20682 dvb_dmxdev_buffer_read 0-4 20682 &get_user_page_nowait_20682
 +cpumask_size_20683 cpumask_size 0 20683 NULL
 +btrfs_node_blockptr_20685 btrfs_node_blockptr 0 20685 NULL
 +gru_vtop_20689 gru_vtop 2 20689 NULL
 +read_file_tgt_int_stats_20697 read_file_tgt_int_stats 3 20697 NULL
++i915_gem_obj_ggtt_pin_20698 i915_gem_obj_ggtt_pin 0 20698 NULL
 +__maestro_read_20700 __maestro_read 0 20700 NULL
 +cipso_v4_gentag_rng_20703 cipso_v4_gentag_rng 0 20703 NULL
 +pcpu_page_first_chunk_20712 pcpu_page_first_chunk 1 20712 NULL
 +ocfs2_read_xattr_bucket_20722 ocfs2_read_xattr_bucket 0 20722 NULL
 +security_context_to_sid_force_20724 security_context_to_sid_force 2 20724 NULL
-+vring_add_indirect_20737 vring_add_indirect 3-4 20737 NULL
 +io_apic_set_pci_routing_20740 io_apic_set_pci_routing 2 20740 NULL
++fb_prepare_logo_20743 fb_prepare_logo 0 20743 NULL
 +vol_cdev_direct_write_20751 vol_cdev_direct_write 3 20751 NULL
 +ocfs2_align_bytes_to_clusters_20754 ocfs2_align_bytes_to_clusters 2 20754 NULL
 +brcmf_p2p_escan_20763 brcmf_p2p_escan 2 20763 NULL
@@ -104625,55 +104802,65 @@ index 0000000..9a7096d
 +fb_alloc_cmap_gfp_20792 fb_alloc_cmap_gfp 2 20792 NULL
 +iommu_range_alloc_20794 iommu_range_alloc 3 20794 NULL
 +iwl_dbgfs_rxon_flags_read_20795 iwl_dbgfs_rxon_flags_read 3 20795 NULL
-+sys_sendto_20809 sys_sendto 6 20809 NULL
-+cfv_alloc_and_copy_skb_20812 cfv_alloc_and_copy_skb 4 20812 NULL
++ext4_convert_unwritten_extents_endio_20812 ext4_convert_unwritten_extents_endio 0 20812 NULL
 +strndup_user_20819 strndup_user 2 20819 NULL
-+calc_layout_20829 calc_layout 3 20829 NULL
 +dtf_read_channel_20831 dtf_read_channel 3 20831 NULL
 +wl1271_format_buffer_20834 wl1271_format_buffer 2 20834 NULL
 +uvc_alloc_entity_20836 uvc_alloc_entity 3-4 20836 NULL
++btrfs_orphan_add_20840 btrfs_orphan_add 0 20840 NULL
++p9_tag_alloc_20845 p9_tag_alloc 3 20845 NULL
++nvme_trans_supported_vpd_pages_20847 nvme_trans_supported_vpd_pages 4 20847 NULL
++get_name_20855 get_name 4 20855 NULL
++iwl_dbgfs_pm_params_read_20866 iwl_dbgfs_pm_params_read 3 20866 NULL
 +snd_pcm_capture_avail_20867 snd_pcm_capture_avail 0 20867 NULL
++srq_free_res_20868 srq_free_res 5 20868 NULL
 +ocfs2_bmap_20874 ocfs2_bmap 2 20874 NULL
-+skb_tail_pointer_20878 skb_tail_pointer 0 20878 NULL
++cfs_cpt_table_create_20884 cfs_cpt_table_create 1 20884 NULL
++rb_simple_write_20890 rb_simple_write 3 20890 NULL
 +sisusb_send_packet_20891 sisusb_send_packet 2 20891 NULL
 +key_icverrors_read_20895 key_icverrors_read 3 20895 NULL
 +vfio_msi_enable_20906 vfio_msi_enable 2 20906 NULL
-+compat_sys_readv_20911 compat_sys_readv 3 20911 NULL
++lbs_rdbbp_write_20918 lbs_rdbbp_write 3 20918 NULL
 +htable_bits_20933 htable_bits 0 20933 NULL
++check_eofblocks_fl_20942 check_eofblocks_fl 0 20942 NULL
 +altera_set_ir_post_20948 altera_set_ir_post 2 20948 NULL
 +rx_rx_phy_hdr_read_20950 rx_rx_phy_hdr_read 3 20950 NULL
++rsxx_cram_read_20957 rsxx_cram_read 3 20957 NULL
 +nfs_map_name_to_uid_20962 nfs_map_name_to_uid 3 20962 NULL
 +snd_rme9652_playback_copy_20970 snd_rme9652_playback_copy 5 20970 NULL
-+brcmf_tx_frame_20978 brcmf_tx_frame 3 20978 NULL
 +alg_setsockopt_20985 alg_setsockopt 5 20985 NULL
-+ocfs2_free_clusters_21001 ocfs2_free_clusters 4 21001 NULL
-+ceph_osdc_new_request_21017 ceph_osdc_new_request 14-4 21017 NULL
++qib_verbs_send_20999 qib_verbs_send 5-3 20999 NULL
++ocfs2_free_clusters_21001 ocfs2_free_clusters 4-0 21001 NULL
 +btrfs_inode_ref_name_len_21024 btrfs_inode_ref_name_len 0 21024 NULL
 +rx_defrag_tkip_called_read_21031 rx_defrag_tkip_called_read 3 21031 NULL
 +lbs_threshold_read_21046 lbs_threshold_read 5 21046 NULL
++reiserfs_direct_IO_21051 reiserfs_direct_IO 4 21051 NULL
 +proc_fault_inject_write_21058 proc_fault_inject_write 3 21058 NULL
++btrfs_insert_root_21061 btrfs_insert_root 0 21061 NULL
++qdisc_get_default_21072 qdisc_get_default 2 21072 NULL
 +event_calibration_read_21083 event_calibration_read 3 21083 NULL
-+compat_sock_ioctl_trans_21092 compat_sock_ioctl_trans 4 21092 NULL
-+multipath_status_21094 multipath_status 5 21094 NULL
-+__cfg80211_send_disassoc_21096 __cfg80211_send_disassoc 3 21096 NULL
++bl_add_page_to_bio_21094 bl_add_page_to_bio 2 21094 NULL nohasharray
++multipath_status_21094 multipath_status 5 21094 &bl_add_page_to_bio_21094
 +ext2_valid_block_bitmap_21101 ext2_valid_block_bitmap 3 21101 NULL
 +ath6kl_send_go_probe_resp_21113 ath6kl_send_go_probe_resp 3 21113 NULL
 +bitset_size_in_bytes_21124 bitset_size_in_bytes 0-1 21124 NULL
 +i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL
 +tps6586x_irq_init_21144 tps6586x_irq_init 3 21144 NULL
++chunk_size_21146 chunk_size 0 21146 NULL
 +ocfs2_block_check_validate_21149 ocfs2_block_check_validate 2 21149 NULL
 +alloc_pg_vec_21159 alloc_pg_vec 3 21159 NULL
++btrfs_add_root_ref_21186 btrfs_add_root_ref 0 21186 NULL
 +cx18_v4l2_read_21196 cx18_v4l2_read 3 21196 NULL
 +ipc_rcu_alloc_21208 ipc_rcu_alloc 1 21208 NULL
 +scsi_execute_req_flags_21215 scsi_execute_req_flags 5 21215 NULL
-+_ocfs2_free_clusters_21220 _ocfs2_free_clusters 4 21220 NULL
++_ocfs2_free_clusters_21220 _ocfs2_free_clusters 4-0 21220 NULL
 +get_numpages_21227 get_numpages 0-1-2 21227 NULL
-+SyS_mlock_21238 SyS_mlock 1 21238 NULL
++SyS_mlock_21238 SyS_mlock 1-2 21238 NULL
 +input_ff_create_21240 input_ff_create 2 21240 NULL
 +cfg80211_notify_new_peer_candidate_21242 cfg80211_notify_new_peer_candidate 4 21242 NULL
++fru_length_21257 fru_length 0 21257 NULL
++rtw_set_wps_beacon_21262 rtw_set_wps_beacon 3 21262 NULL
 +ocfs2_blocks_for_bytes_21268 ocfs2_blocks_for_bytes 0-2 21268 NULL
-+ip_vs_icmp_xmit_21269 ip_vs_icmp_xmit 4 21269 NULL
-+make_alloc_exact_21279 make_alloc_exact 1-3 21279 NULL
 +vmw_gmr2_bind_21305 vmw_gmr2_bind 3 21305 NULL
 +do_msg_fill_21307 do_msg_fill 3 21307 NULL
 +add_res_range_21310 add_res_range 4 21310 NULL
@@ -104682,6 +104869,7 @@ index 0000000..9a7096d
 +gfs2_ea_get_copy_21353 gfs2_ea_get_copy 0 21353 NULL
 +max77693_irq_domain_map_21357 max77693_irq_domain_map 2 21357 NULL
 +alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
++split_leaf_21378 split_leaf 0 21378 NULL
 +SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL
 +video_ioctl2_21380 video_ioctl2 2 21380 NULL
 +diva_get_driver_dbg_mask_21399 diva_get_driver_dbg_mask 0 21399 NULL
@@ -104691,243 +104879,295 @@ index 0000000..9a7096d
 +tracing_saved_cmdlines_read_21434 tracing_saved_cmdlines_read 3 21434 NULL
 +aggr_size_tx_agg_vs_rate_read_21438 aggr_size_tx_agg_vs_rate_read 3 21438 NULL
 +__ertm_hdr_size_21450 __ertm_hdr_size 0 21450 NULL
-+concat_writev_21451 concat_writev 3 21451 NULL
++ReadISAR_21453 ReadISAR 0 21453 NULL
 +mei_nfc_send_21477 mei_nfc_send 3 21477 NULL
 +read_file_xmit_21487 read_file_xmit 3 21487 NULL
 +mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
++dma_skb_copy_datagram_iovec_21516 dma_skb_copy_datagram_iovec 3-5 21516 NULL
 +btrfs_file_aio_write_21520 btrfs_file_aio_write 4 21520 NULL
 +il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3 21532 NULL
 +cipso_v4_map_cat_enum_hton_21540 cipso_v4_map_cat_enum_hton 0 21540 NULL
 +rxrpc_send_data_21553 rxrpc_send_data 5 21553 NULL
 +rx_rx_beacon_early_term_read_21559 rx_rx_beacon_early_term_read 3 21559 NULL
 +xfs_buf_read_uncached_21585 xfs_buf_read_uncached 3 21585 NULL
++snd_es18xx_mixer_read_21586 snd_es18xx_mixer_read 0 21586 NULL
 +ocfs2_acl_from_xattr_21604 ocfs2_acl_from_xattr 2 21604 NULL
-+compat_SyS_pwritev64_21606 compat_SyS_pwritev64 3 21606 NULL
++filemap_get_page_21606 filemap_get_page 2 21606 NULL
++xlog_do_recovery_pass_21618 xlog_do_recovery_pass 3 21618 NULL
++pci_cardbus_resource_alignment_21625 pci_cardbus_resource_alignment 0 21625 NULL
++add_pin_to_irq_node_21628 add_pin_to_irq_node 2 21628 NULL
++ocfs2_refcount_cow_hunk_21630 ocfs2_refcount_cow_hunk 3-4 21630 NULL
 +__jfs_getxattr_21631 __jfs_getxattr 0 21631 NULL
 +validate_nnode_21638 validate_nnode 0 21638 NULL
-+__irq_alloc_descs_21639 __irq_alloc_descs 2-1-3 21639 NULL
-+carl9170_rx_copy_data_21656 carl9170_rx_copy_data 2 21656 NULL
++__irq_alloc_descs_21639 __irq_alloc_descs 2-1-0-3-4 21639 NULL
++ocfs2_lock_refcount_allocators_21646 ocfs2_lock_refcount_allocators 0 21646 NULL
 +atalk_sendmsg_21677 atalk_sendmsg 4 21677 NULL
 +ocfs2_xattr_get_nolock_21678 ocfs2_xattr_get_nolock 0 21678 NULL
-+regmap_register_patch_21681 regmap_register_patch 3 21681 NULL
-+rtllib_alloc_txb_21687 rtllib_alloc_txb 1-2 21687 NULL
++rtllib_alloc_txb_21687 rtllib_alloc_txb 1 21687 NULL
 +evdev_ioctl_handler_21705 evdev_ioctl_handler 2 21705 NULL
-+reiserfs_allocate_list_bitmaps_21732 reiserfs_allocate_list_bitmaps 3 21732 NULL
-+vm_brk_21739 vm_brk 1 21739 NULL
-+__nf_nat_mangle_tcp_packet_21744 __nf_nat_mangle_tcp_packet 8-6 21744 NULL
++btrfs_find_all_leafs_21712 btrfs_find_all_leafs 0 21712 NULL
++unix_skb_len_21722 unix_skb_len 0 21722 NULL
++lprocfs_wr_import_21728 lprocfs_wr_import 3 21728 NULL
++ocfs2_remove_rightmost_path_21729 ocfs2_remove_rightmost_path 0 21729 NULL
++reiserfs_allocate_list_bitmaps_21732 reiserfs_allocate_list_bitmaps 3 21732 NULL nohasharray
++ext4_split_extent_at_21732 ext4_split_extent_at 0 21732 &reiserfs_allocate_list_bitmaps_21732
++vm_brk_21739 vm_brk 1-2 21739 NULL
 +mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
-+gen_pool_add_21776 gen_pool_add 3 21776 NULL
++usbat_flash_read_data_21762 usbat_flash_read_data 4 21762 NULL
++gen_pool_add_21776 gen_pool_add 3-4 21776 NULL
++SyS_sendfile_21777 SyS_sendfile 4 21777 NULL
++atomic64_cmpxchg_21782 atomic64_cmpxchg 0 21782 NULL
 +xfs_da_grow_inode_int_21785 xfs_da_grow_inode_int 3 21785 NULL
-+__ioremap_caller_21800 __ioremap_caller 1-2 21800 NULL
-+min_odd_21802 min_odd 0 21802 NULL
 +dvb_generic_ioctl_21810 dvb_generic_ioctl 2 21810 NULL
++__ocfs2_cluster_lock_21812 __ocfs2_cluster_lock 0 21812 NULL
 +wm8994_request_irq_21822 wm8994_request_irq 2 21822 NULL
 +oom_adj_read_21847 oom_adj_read 3 21847 NULL
-+acpi_tb_check_xsdt_21862 acpi_tb_check_xsdt 1 21862 NULL
++gen_unique_name_21852 gen_unique_name 0 21852 NULL
 +lpfc_idiag_extacc_avail_get_21865 lpfc_idiag_extacc_avail_get 0-3 21865 NULL
 +brcms_debugfs_hardware_read_21867 brcms_debugfs_hardware_read 3 21867 NULL
-+sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL nohasharray
-+tcp_cookie_size_check_21873 tcp_cookie_size_check 0-1 21873 &sisusbcon_bmove_21873
-+xen_swiotlb_map_page_21886 xen_swiotlb_map_page 3 21886 NULL
-+__alloc_reserved_percpu_21895 __alloc_reserved_percpu 1-2 21895 NULL
++sisusbcon_bmove_21873 sisusbcon_bmove 6-5-7 21873 NULL
++ldlm_lock_create_21888 ldlm_lock_create 7 21888 NULL
++__alloc_reserved_percpu_21895 __alloc_reserved_percpu 2-1 21895 NULL
 +rio_destid_first_21900 rio_destid_first 0 21900 NULL
 +dbAllocCtl_21911 dbAllocCtl 0 21911 NULL
 +qsfp_1_read_21915 qsfp_1_read 3 21915 NULL
-+security_mmap_addr_21970 security_mmap_addr 0 21970 NULL
++ast_ttm_tt_create_21917 ast_ttm_tt_create 2 21917 NULL
++__ocfs2_claim_clusters_21936 __ocfs2_claim_clusters 0 21936 NULL
 +alloc_ldt_21972 alloc_ldt 2 21972 NULL
 +SYSC_prctl_21980 SYSC_prctl 4 21980 NULL
 +rxpipe_descr_host_int_trig_rx_data_read_22001 rxpipe_descr_host_int_trig_rx_data_read 3 22001 NULL nohasharray
-+compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 0-3 22001 &rxpipe_descr_host_int_trig_rx_data_read_22001
++compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 3-0 22001 &rxpipe_descr_host_int_trig_rx_data_read_22001
++ocfs2_reserve_cluster_bitmap_bits_22016 ocfs2_reserve_cluster_bitmap_bits 0 22016 NULL
 +regcache_sync_block_raw_flush_22021 regcache_sync_block_raw_flush 3-4 22021 NULL
 +btrfs_get_16_22023 btrfs_get_16 0 22023 NULL
++i915_gem_evict_something_22028 i915_gem_evict_something 0 22028 NULL
 +_sp2d_min_pg_22032 _sp2d_min_pg 0 22032 NULL
 +zd_usb_read_fw_22049 zd_usb_read_fw 4 22049 NULL
++atalk_recvmsg_22053 atalk_recvmsg 4 22053 NULL
 +ieee80211_if_fmt_dropped_frames_ttl_22054 ieee80211_if_fmt_dropped_frames_ttl 3 22054 NULL
-+btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2 22077 NULL
++btrfs_reloc_clone_csums_22077 btrfs_reloc_clone_csums 2-3 22077 NULL
 +write_opcode_22082 write_opcode 2 22082 NULL
 +mem_rw_22085 mem_rw 3 22085 NULL
-+is_swbp_at_addr_22089 is_swbp_at_addr 2 22089 NULL
-+lowpan_fragment_xmit_22095 lowpan_fragment_xmit 3-4 22095 NULL
++snd_pcm_xrun_22088 snd_pcm_xrun 0 22088 NULL
 +sched_clock_cpu_22098 sched_clock_cpu 0 22098 NULL
-+qlcnic_sriov_pf_enable_22103 qlcnic_sriov_pf_enable 2 22103 NULL
-+sys_remap_file_pages_22124 sys_remap_file_pages 1 22124 NULL
-+__bitmap_size_22138 __bitmap_size 0 22138 NULL
-+compat_insn_22142 compat_insn 2 22142 NULL
++rt2x00debug_read_crypto_stats_22109 rt2x00debug_read_crypto_stats 3 22109 NULL
++shmem_add_to_page_cache_22121 shmem_add_to_page_cache 0 22121 NULL
++snd_hda_codec_read_22130 snd_hda_codec_read 0 22130 NULL
 +SyS_sched_setaffinity_22148 SyS_sched_setaffinity 2 22148 NULL
 +do_tcp_sendpages_22155 do_tcp_sendpages 4 22155 NULL
-+__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL
++remap_pud_range_22164 remap_pud_range 3-4-5 22164 NULL
++__kfifo_alloc_22173 __kfifo_alloc 3 22173 NULL nohasharray
++vmci_qp_broker_map_22173 vmci_qp_broker_map 3 22173 &__kfifo_alloc_22173
 +fls_22210 fls 0 22210 NULL
++rfcomm_sock_recvmsg_22227 rfcomm_sock_recvmsg 4 22227 NULL nohasharray
++bitmap_clear_bits_22227 bitmap_clear_bits 3 22227 &rfcomm_sock_recvmsg_22227
 +mem_write_22232 mem_write 3 22232 NULL
 +p9_virtio_zc_request_22240 p9_virtio_zc_request 6-5 22240 NULL
++fsnotify_parent_22243 fsnotify_parent 0 22243 NULL
 +atomic64_xchg_22246 atomic64_xchg 0 22246 NULL
 +compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
++ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL
++add_res_tree_22263 add_res_tree 7 22263 NULL
 +__btrfs_direct_write_22273 __btrfs_direct_write 4 22273 NULL
 +queue_max_sectors_22280 queue_max_sectors 0 22280 NULL
++i915_gem_execbuffer_relocate_22294 i915_gem_execbuffer_relocate 0 22294 NULL
 +pci_vpd_srdt_size_22300 pci_vpd_srdt_size 0 22300 NULL nohasharray
 +__tun_chr_ioctl_22300 __tun_chr_ioctl 4 22300 &pci_vpd_srdt_size_22300
-+extend_brk_22301 extend_brk 0 22301 NULL
 +mesh_table_alloc_22305 mesh_table_alloc 1 22305 NULL
-+C_SYSC_msgrcv_22320 C_SYSC_msgrcv 2-3 22320 NULL
-+get_segment_base_22324 get_segment_base 0 22324 NULL
-+radix_tree_find_next_bit_22334 radix_tree_find_next_bit 2-3 22334 NULL
++lov_setstripe_22307 lov_setstripe 2 22307 NULL
++udpv6_sendmsg_22316 udpv6_sendmsg 4 22316 NULL
++C_SYSC_msgrcv_22320 C_SYSC_msgrcv 3 22320 NULL
++radix_tree_find_next_bit_22334 radix_tree_find_next_bit 3-2-0 22334 NULL
 +atomic_read_22342 atomic_read 0 22342 NULL
++ll_lazystatfs_seq_write_22353 ll_lazystatfs_seq_write 3 22353 NULL
 +mlx4_db_alloc_22358 mlx4_db_alloc 3 22358 NULL
 +irq_reserve_irq_22360 irq_reserve_irq 1 22360 NULL nohasharray
 +memcg_size_22360 memcg_size 0 22360 &irq_reserve_irq_22360
 +snd_pcm_alsa_frames_22363 snd_pcm_alsa_frames 2 22363 NULL
 +tps6586x_gpio_to_irq_22365 tps6586x_gpio_to_irq 2 22365 NULL
 +evdev_ioctl_22371 evdev_ioctl 2 22371 NULL
-+alloc_large_system_hash_22391 alloc_large_system_hash 2 22391 NULL
-+btmrvl_psmode_read_22395 btmrvl_psmode_read 3 22395 NULL
-+crash_shrink_memory_22401 crash_shrink_memory 1 22401 NULL
++alloc_large_system_hash_22391 alloc_large_system_hash 2-8-9 22391 NULL
++ocfs2_assign_bh_22392 ocfs2_assign_bh 0 22392 NULL
 +zoran_write_22404 zoran_write 3 22404 NULL
++ATOMIC_ADD_RETURN_22413 ATOMIC_ADD_RETURN 2 22413 NULL
 +queue_reply_22416 queue_reply 3 22416 NULL
 +__set_enter_print_fmt_22431 __set_enter_print_fmt 0 22431 NULL
 +queue_max_segments_22441 queue_max_segments 0 22441 NULL
++_rtw_vmalloc_22444 _rtw_vmalloc 1 22444 NULL
 +handle_received_packet_22457 handle_received_packet 3 22457 NULL
 +mem_cgroup_read_22461 mem_cgroup_read 5 22461 NULL
-+batadv_check_unicast_packet_22468 batadv_check_unicast_packet 3 22468 NULL
-+dtf_write_device_22471 dtf_write_device 3 22471 NULL
++btrfs_write_out_cache_22471 btrfs_write_out_cache 0 22471 NULL nohasharray
++dtf_write_device_22471 dtf_write_device 3 22471 &btrfs_write_out_cache_22471
++source_sink_start_ep_22472 source_sink_start_ep 0 22472 NULL
++alloc_desc_22487 alloc_desc 2 22487 NULL
++ecryptfs_write_22488 ecryptfs_write 4-3 22488 NULL
++qib_user_sdma_alloc_header_22490 qib_user_sdma_alloc_header 2 22490 NULL
 +cache_write_procfs_22491 cache_write_procfs 3 22491 NULL
 +mp_find_ioapic_pin_22499 mp_find_ioapic_pin 0-2 22499 NULL
 +mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL
-+ip4_addr_string_22511 ip4_addr_string 0 22511 NULL
-+usb_dump_config_descriptor_22522 usb_dump_config_descriptor 0 22522 NULL nohasharray
-+swiotlb_tbl_unmap_single_22522 swiotlb_tbl_unmap_single 2 22522 &usb_dump_config_descriptor_22522
-+pskb_may_pull_22546 pskb_may_pull 2 22546 NULL
++__btrfs_add_delayed_item_22511 __btrfs_add_delayed_item 0 22511 NULL
++trim_no_bitmap_22524 trim_no_bitmap 4-3 22524 NULL
 +ocfs2_read_extent_block_22550 ocfs2_read_extent_block 0 22550 NULL
-+atomic_long_read_unchecked_22551 atomic_long_read_unchecked 0 22551 NULL
 +agp_alloc_page_array_22554 agp_alloc_page_array 1 22554 NULL
++snd_pcm_hw_params_choose_22560 snd_pcm_hw_params_choose 0 22560 NULL
 +dbFindCtl_22587 dbFindCtl 0 22587 NULL
 +snapshot_read_22601 snapshot_read 3 22601 NULL
++ocfs2_get_refcount_block_22610 ocfs2_get_refcount_block 0 22610 NULL
 +remove_breakpoint_22628 remove_breakpoint 3 22628 NULL
 +sctp_setsockopt_connectx_old_22631 sctp_setsockopt_connectx_old 3 22631 NULL
 +ide_core_cp_entry_22636 ide_core_cp_entry 3 22636 NULL
 +wl1271_rx_filter_get_fields_size_22638 wl1271_rx_filter_get_fields_size 0 22638 NULL
 +pwr_wake_on_timer_exp_read_22640 pwr_wake_on_timer_exp_read 3 22640 NULL
++sysfs_attr_ns_22645 sysfs_attr_ns 0 22645 NULL
 +iwl_dbgfs_calib_disabled_read_22649 iwl_dbgfs_calib_disabled_read 3 22649 NULL
-+compat_SyS_msgrcv_22661 compat_SyS_msgrcv 2-3 22661 NULL
-+ubifs_leb_write_22679 ubifs_leb_write 4-5 22679 NULL
-+qlcnic_83xx_sysfs_flash_write_handler_22680 qlcnic_83xx_sysfs_flash_write_handler 6 22680 NULL
++compat_SyS_msgrcv_22661 compat_SyS_msgrcv 3 22661 NULL
++ubifs_leb_write_22679 ubifs_leb_write 4-5 22679 NULL nohasharray
++ext4_ext_direct_IO_22679 ext4_ext_direct_IO 4 22679 &ubifs_leb_write_22679
++fill_gap_22681 fill_gap 0 22681 NULL nohasharray
++l2tp_ip_recvmsg_22681 l2tp_ip_recvmsg 4 22681 &fill_gap_22681
++bch_dump_read_22685 bch_dump_read 3 22685 NULL
++reg_umr_22686 reg_umr 5 22686 NULL
 +ocfs2_get_block_22687 ocfs2_get_block 2 22687 NULL
-+compat_fd_ioctl_22694 compat_fd_ioctl 4 22694 NULL
-+map_22700 map 2 22700 NULL
++map_22700 map 2 22700 NULL nohasharray
++btrfs_del_inode_ref_in_log_22700 btrfs_del_inode_ref_in_log 0 22700 &map_22700
 +alloc_libipw_22708 alloc_libipw 1 22708 NULL
-+brcmf_sdbrcm_read_control_22721 brcmf_sdbrcm_read_control 3 22721 NULL
-+cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4 22735 NULL
++ecryptfs_write_metadata_to_contents_22721 ecryptfs_write_metadata_to_contents 3 22721 NULL
++cx18_copy_buf_to_user_22735 cx18_copy_buf_to_user 4-0 22735 NULL
 +ceph_decode_32_22738 ceph_decode_32 0 22738 NULL nohasharray
 +__mei_cl_send_22738 __mei_cl_send 3 22738 &ceph_decode_32_22738
 +iio_debugfs_write_reg_22742 iio_debugfs_write_reg 3 22742 NULL
 +qlcnic_sriov_init_22762 qlcnic_sriov_init 2 22762 NULL
 +print_frame_22769 print_frame 0 22769 NULL
 +ftrace_arch_read_dyn_info_22773 ftrace_arch_read_dyn_info 0 22773 NULL
-+compat_blkdev_ioctl_22841 compat_blkdev_ioctl 3 22841 NULL
++ocfs2_block_group_alloc_22774 ocfs2_block_group_alloc 0 22774 NULL
++pla_ocp_write_22802 pla_ocp_write 4 22802 NULL
++__generic_copy_to_user_intel_22806 __generic_copy_to_user_intel 0-3 22806 NULL
 +clone_bio_integrity_22842 clone_bio_integrity 4 22842 NULL
 +read_file_rcstat_22854 read_file_rcstat 3 22854 NULL
-+do_atm_iobuf_22857 do_atm_iobuf 3 22857 NULL
 +create_attr_set_22861 create_attr_set 1 22861 NULL
 +vmw_execbuf_process_22885 vmw_execbuf_process 5 22885 NULL
 +usblp_new_writeurb_22894 usblp_new_writeurb 2 22894 NULL
 +mdc800_device_read_22896 mdc800_device_read 3 22896 NULL
 +policy_emit_config_values_22900 policy_emit_config_values 3 22900 NULL
++__btrfs_add_free_space_22917 __btrfs_add_free_space 0 22917 NULL
++xstateregs_set_22932 xstateregs_set 4 22932 NULL
 +pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
-+alloc_sglist_22960 alloc_sglist 1-2-3 22960 NULL
++alloc_sglist_22960 alloc_sglist 3-2 22960 NULL
 +caif_seqpkt_sendmsg_22961 caif_seqpkt_sendmsg 4 22961 NULL
 +vme_get_size_22964 vme_get_size 0 22964 NULL
 +tx_frag_key_not_found_read_22971 tx_frag_key_not_found_read 3 22971 NULL
-+page_table_range_init_count_22977 page_table_range_init_count 0 22977 NULL
++cached_dev_cache_miss_22979 cached_dev_cache_miss 4 22979 NULL
 +usb_get_langid_22983 usb_get_langid 0 22983 NULL
 +set_msr_hyperv_22985 set_msr_hyperv 3 22985 NULL
 +remote_settings_file_write_22987 remote_settings_file_write 3 22987 NULL
 +brcmf_sdio_chip_exit_download_23001 brcmf_sdio_chip_exit_download 4 23001 NULL
 +viafb_dvp0_proc_write_23023 viafb_dvp0_proc_write 3 23023 NULL
 +cifs_local_to_utf16_bytes_23025 cifs_local_to_utf16_bytes 0 23025 NULL
++ocfs2_refcount_cow_xattr_23029 ocfs2_refcount_cow_xattr 0-6-7 23029 NULL
 +st_status_23032 st_status 5 23032 NULL
 +nv50_disp_chan_create__23056 nv50_disp_chan_create_ 5 23056 NULL
-+reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL
++comedi_buf_write_n_available_23057 comedi_buf_write_n_available 0 23057 NULL
++reiserfs_add_entry_23062 reiserfs_add_entry 4 23062 NULL nohasharray
++unix_seqpacket_recvmsg_23062 unix_seqpacket_recvmsg 4 23062 &reiserfs_add_entry_23062
 +mei_cl_send_23068 mei_cl_send 3 23068 NULL
++filp_close_23071 filp_close 0 23071 NULL
 +kvm_mmu_gva_to_gpa_write_23075 kvm_mmu_gva_to_gpa_write 0 23075 NULL
-+vm_map_ram_23078 vm_map_ram 2 23078 NULL nohasharray
++vm_map_ram_23078 vm_map_ram 3 23078 NULL nohasharray
 +raw_sendmsg_23078 raw_sendmsg 4 23078 &vm_map_ram_23078
 +get_user_hdr_len_23079 get_user_hdr_len 0 23079 NULL
-+qla4_82xx_pci_mem_read_2M_23081 qla4_82xx_pci_mem_read_2M 2 23081 NULL
 +isr_tx_procs_read_23084 isr_tx_procs_read 3 23084 NULL
 +lnw_gpio_irq_map_23087 lnw_gpio_irq_map 2 23087 NULL
 +rt2x00debug_write_eeprom_23091 rt2x00debug_write_eeprom 3 23091 NULL
++__add_prelim_ref_23095 __add_prelim_ref 0 23095 NULL
 +fls_long_23096 fls_long 0 23096 NULL
-+ntfs_ucstonls_23097 ntfs_ucstonls 3-5 23097 NULL
++ntfs_ucstonls_23097 ntfs_ucstonls 5-3 23097 NULL
 +pipe_iov_copy_from_user_23102 pipe_iov_copy_from_user 3 23102 NULL
++dgram_recvmsg_23104 dgram_recvmsg 4 23104 NULL
++ip_recv_error_23109 ip_recv_error 3 23109 NULL
 +mwl8k_cmd_set_beacon_23110 mwl8k_cmd_set_beacon 4 23110 NULL
 +nl80211_send_rx_auth_23111 nl80211_send_rx_auth 4 23111 NULL
-+__clear_user_23118 __clear_user 0 23118 NULL
-+dm_write_async_23120 dm_write_async 3 23120 NULL
++__clear_user_23118 __clear_user 0-2 23118 NULL
 +drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
-+ca91cx42_master_set_23146 ca91cx42_master_set 4 23146 NULL
++ata_scsi_change_queue_depth_23126 ata_scsi_change_queue_depth 2 23126 NULL
++ext3_listxattr_23137 ext3_listxattr 3 23137 NULL
 +read_file_ani_23161 read_file_ani 3 23161 NULL
-+ioremap_23172 ioremap 1-2 23172 NULL
 +tg_get_cfs_quota_23176 tg_get_cfs_quota 0 23176 NULL
 +usblp_write_23178 usblp_write 3 23178 NULL
 +msnd_fifo_alloc_23179 msnd_fifo_alloc 2 23179 NULL
 +gss_pipe_downcall_23182 gss_pipe_downcall 3 23182 NULL
-+ieee80211_get_mesh_hdrlen_23183 ieee80211_get_mesh_hdrlen 0 23183 NULL
 +fix_unclean_leb_23188 fix_unclean_leb 3 23188 NULL
 +mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
 +convert_ip_to_linear_23198 convert_ip_to_linear 0 23198 NULL
-+pm80x_free_irq_23210 pm80x_free_irq 2 23210 NULL nohasharray
-+compat_rawv6_ioctl_23210 compat_rawv6_ioctl 3 23210 &pm80x_free_irq_23210
-+tty_buffer_request_room_23228 tty_buffer_request_room 2 23228 NULL
-+xlog_get_bp_23229 xlog_get_bp 2 23229 NULL
++pm80x_free_irq_23210 pm80x_free_irq 2 23210 NULL
++tty_buffer_request_room_23228 tty_buffer_request_room 2-0 23228 NULL
++__read_status_pci_23229 __read_status_pci 0 23229 NULL nohasharray
++xlog_get_bp_23229 xlog_get_bp 2 23229 &__read_status_pci_23229
++ft1000_read_dpram_mag_32_23232 ft1000_read_dpram_mag_32 0 23232 NULL
 +rxrpc_client_sendmsg_23236 rxrpc_client_sendmsg 5 23236 NULL
-+__gfn_to_rmap_23240 __gfn_to_rmap 1-2 23240 NULL
++__gfn_to_rmap_23240 __gfn_to_rmap 2-1 23240 NULL
++sctp_recvmsg_23265 sctp_recvmsg 4 23265 NULL
 +uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL
-+ipv6_skip_exthdr_23283 ipv6_skip_exthdr 0-2 23283 NULL
-+doc_probe_23285 doc_probe 1 23285 NULL
 +diva_get_trace_filter_23286 diva_get_trace_filter 0 23286 NULL
-+perf_mmap_free_page_23302 perf_mmap_free_page 1 23302 NULL
++gru_preload_tlb_23305 gru_preload_tlb 7-4 23305 NULL
 +i2cdev_write_23310 i2cdev_write 3 23310 NULL
-+mc13xxx_get_num_regulators_dt_23344 mc13xxx_get_num_regulators_dt 0 23344 NULL
++__aa_kvmalloc_23320 __aa_kvmalloc 1 23320 NULL
++__es_remove_extent_23323 __es_remove_extent 0 23323 NULL
 +page_readlink_23346 page_readlink 3 23346 NULL
++kmem_zalloc_large_23351 kmem_zalloc_large 1 23351 NULL
 +get_dst_timing_23358 get_dst_timing 0 23358 NULL
 +fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL
 +iscsi_change_queue_depth_23416 iscsi_change_queue_depth 2 23416 NULL
 +vga_mm_r_23419 vga_mm_r 0 23419 NULL
-+vzalloc_node_23424 vzalloc_node 1 23424 NULL
++vzalloc_node_23424 vzalloc_node 1-2 23424 NULL
++__ctzsi2_23444 __ctzsi2 1 23444 NULL
 +ocfs2_zero_tail_23447 ocfs2_zero_tail 3 23447 NULL
 +hidraw_send_report_23449 hidraw_send_report 3 23449 NULL
-+linear_conf_23485 linear_conf 2 23485 NULL nohasharray
-+divasa_remap_pci_bar_23485 divasa_remap_pci_bar 3-4 23485 &linear_conf_23485
++__ata_change_queue_depth_23484 __ata_change_queue_depth 3-0 23484 NULL
++linear_conf_23485 linear_conf 2 23485 NULL
++copy_module_from_user_23492 copy_module_from_user 2 23492 NULL
 +event_filter_read_23494 event_filter_read 3 23494 NULL
++ext4_remove_blocks_23497 ext4_remove_blocks 0 23497 NULL
++lustre_acl_xattr_merge2ext_23502 lustre_acl_xattr_merge2ext 2 23502 NULL
 +__gfn_to_hva_many_23508 __gfn_to_hva_many 0-2 23508 NULL
++devm_iio_device_alloc_23511 devm_iio_device_alloc 2 23511 NULL
++__proc_cpt_table_23516 __proc_cpt_table 5 23516 NULL
 +ima_show_measurements_count_23536 ima_show_measurements_count 3 23536 NULL
++__es_insert_extent_23543 __es_insert_extent 0 23543 NULL
 +xen_allocate_irq_gsi_23546 xen_allocate_irq_gsi 1-0 23546 NULL
 +tcp_current_mss_23552 tcp_current_mss 0 23552 NULL
-+dbg_leb_change_23555 dbg_leb_change 4 23555 NULL
-+venus_symlink_23570 venus_symlink 4-6 23570 NULL
++dbg_leb_change_23555 dbg_leb_change 0-4 23555 NULL
++btrfs_super_bytenr_23561 btrfs_super_bytenr 0 23561 NULL
++venus_symlink_23570 venus_symlink 6-4 23570 NULL
 +iwl_dbgfs_interrupt_read_23574 iwl_dbgfs_interrupt_read 3 23574 NULL
++xfpregs_get_23586 xfpregs_get 4 23586 NULL
 +snd_interval_min_23590 snd_interval_min 0 23590 NULL
 +do_mmap_pgoff_23600 do_mmap_pgoff 0 23600 NULL
-+_alloc_cdb_cont_23609 _alloc_cdb_cont 2 23609 NULL
 +islpci_mgt_transaction_23610 islpci_mgt_transaction 5 23610 NULL
++ocfs2_journal_access_23616 ocfs2_journal_access 0 23616 NULL
++alloc_pte_23642 alloc_pte 3 23642 NULL
 +__i2400mu_send_barker_23652 __i2400mu_send_barker 3 23652 NULL
-+ext3_compat_ioctl_23659 ext3_compat_ioctl 3 23659 NULL
 +sInW_23663 sInW 0 23663 NULL
 +SyS_connect_23669 SyS_connect 3 23669 NULL
-+proc_ioctl_compat_23682 proc_ioctl_compat 2 23682 NULL
-+nftl_partscan_23688 nftl_partscan 0 23688 NULL
 +cx18_read_23699 cx18_read 3 23699 NULL
-+isku_sysfs_write_control_23718 isku_sysfs_write_control 6 23718 NULL
++btrfs_insert_delayed_item_23705 btrfs_insert_delayed_item 0 23705 NULL
++at_get_23708 at_get 0 23708 NULL
++snd_pcm_hw_refine_23721 snd_pcm_hw_refine 0 23721 NULL
 +mp_config_acpi_gsi_23728 mp_config_acpi_gsi 2 23728 NULL
-+pack_sg_list_p_23739 pack_sg_list_p 0-2 23739 NULL
 +rx_rx_dropped_frame_read_23748 rx_rx_dropped_frame_read 3 23748 NULL
 +__kfifo_max_r_23768 __kfifo_max_r 0-2-1 23768 NULL
-+__build_packet_message_23778 __build_packet_message 10-4 23778 NULL
++svc_prepare_thread_23772 svc_prepare_thread 3 23772 NULL
++__build_packet_message_23778 __build_packet_message 4-10 23778 NULL
 +security_inode_getxattr_23781 security_inode_getxattr 0 23781 NULL
++cfg80211_inform_bss_width_frame_23782 cfg80211_inform_bss_width_frame 5 23782 NULL
++mpt_free_res_23793 mpt_free_res 5 23793 NULL
++map_write_23795 map_write 3 23795 NULL
 +diva_alloc_dma_map_23798 diva_alloc_dma_map 2 23798 NULL
 +rx_path_reset_read_23801 rx_path_reset_read 3 23801 NULL
-+__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2-3 23824 NULL
-+ceph_copy_page_vector_to_user_23829 ceph_copy_page_vector_to_user 3-4 23829 NULL
++ocfs2_replace_cow_23803 ocfs2_replace_cow 0 23803 NULL
++__earlyonly_bootmem_alloc_23824 __earlyonly_bootmem_alloc 2 23824 NULL
++lustre_msg_buflen_23827 lustre_msg_buflen 0 23827 NULL
++ceph_copy_page_vector_to_user_23829 ceph_copy_page_vector_to_user 0-4-3 23829 NULL
 +tfrc_binsearch_23833 tfrc_binsearch 0 23833 NULL
-+xfs_dir2_leaf_getdents_23841 xfs_dir2_leaf_getdents 3 23841 NULL
 +pgdat_end_pfn_23842 pgdat_end_pfn 0 23842 NULL
 +iwl_dbgfs_nvm_read_23845 iwl_dbgfs_nvm_read 3 23845 NULL
 +p54_init_common_23850 p54_init_common 1 23850 NULL
@@ -104936,181 +105176,229 @@ index 0000000..9a7096d
 +ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL
 +ieee80211_if_read_dot11MeshMaxPeerLinks_23878 ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 NULL
 +nes_alloc_resource_23891 nes_alloc_resource 3 23891 NULL
-+tipc_snprintf_23893 tipc_snprintf 2 23893 NULL
++_rtw_zvmalloc_23892 _rtw_zvmalloc 1 23892 NULL
++tipc_snprintf_23893 tipc_snprintf 2-0 23893 NULL
++usbg_prepare_w_request_23895 usbg_prepare_w_request 0 23895 NULL
 +add_new_gdb_meta_bg_23911 add_new_gdb_meta_bg 3 23911 NULL nohasharray
 +ieee80211_if_read_hw_queues_23911 ieee80211_if_read_hw_queues 3 23911 &add_new_gdb_meta_bg_23911
++device_create_bin_file_23914 device_create_bin_file 0 23914 NULL
 +f2fs_getxattr_23917 f2fs_getxattr 0 23917 NULL
 +ipath_reg_phys_mr_23918 ipath_reg_phys_mr 3 23918 NULL nohasharray
 +mpihelp_mul_karatsuba_case_23918 mpihelp_mul_karatsuba_case 5-3 23918 &ipath_reg_phys_mr_23918
-+kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL
-+__alloc_skb_23940 __alloc_skb 1 23940 NULL
++kvm_read_guest_23928 kvm_read_guest 4-2 23928 NULL nohasharray
++intel_ring_alloc_seqno_23928 intel_ring_alloc_seqno 0 23928 &kvm_read_guest_23928
++__alloc_skb_23940 __alloc_skb 4 23940 NULL
 +uvc_endpoint_max_bpi_23944 uvc_endpoint_max_bpi 0 23944 NULL
 +cifs_setxattr_23957 cifs_setxattr 4 23957 NULL
++size_roundup_power2_23958 size_roundup_power2 0-1 23958 NULL
++vfs_write_23971 vfs_write 0-3 23971 NULL
++sddr55_write_data_23983 sddr55_write_data 4 23983 NULL
 +zd_usb_iowrite16v_async_23984 zd_usb_iowrite16v_async 3 23984 NULL
 +cxgb_alloc_mem_24007 cxgb_alloc_mem 1 24007 NULL
-+dgrp_send_24028 dgrp_send 0-2 24028 NULL
++intel_ring_idle_24014 intel_ring_idle 0 24014 NULL
++give_pages_24021 give_pages 3 24021 NULL
 +ocfs2_mark_extent_refcounted_24035 ocfs2_mark_extent_refcounted 6 24035 NULL
 +adis16400_show_serial_number_24037 adis16400_show_serial_number 3 24037 NULL
++hmac_setkey_24043 hmac_setkey 3 24043 NULL
 +afs_cell_alloc_24052 afs_cell_alloc 2 24052 NULL
-+brcmf_sdio_ramrw_24074 brcmf_sdio_ramrw 5 24074 NULL
 +blkcipher_copy_iv_24075 blkcipher_copy_iv 3 24075 NULL
 +vb2_fop_read_24080 vb2_fop_read 3 24080 NULL
++ocfs2_cannibalize_resv_24090 ocfs2_cannibalize_resv 3 24090 NULL
 +pipeline_post_proc_swi_read_24108 pipeline_post_proc_swi_read 3 24108 NULL
 +request_key_auth_read_24109 request_key_auth_read 3 24109 NULL
-+mpu401_read_24126 mpu401_read 3 24126 NULL
++lov_brw_24122 lov_brw 4 24122 NULL
++mpu401_read_24126 mpu401_read 3-0 24126 NULL
++_picolcd_flash_write_24134 _picolcd_flash_write 4 24134 NULL
 +irnet_ctrl_write_24139 irnet_ctrl_write 3 24139 NULL
 +SyS_sethostname_24150 SyS_sethostname 2 24150 NULL
 +trim_bitmaps_24158 trim_bitmaps 3 24158 NULL
 +set_discard_24162 set_discard 2 24162 NULL
++__copy_user_zeroing_intel_nocache_24163 __copy_user_zeroing_intel_nocache 0-3 24163 NULL
 +adu_read_24177 adu_read 3 24177 NULL
 +safe_prepare_write_buffer_24187 safe_prepare_write_buffer 3 24187 NULL
++shrink_tnc_24190 shrink_tnc 0 24190 NULL
++irq_remapping_setup_msi_irqs_24194 irq_remapping_setup_msi_irqs 2 24194 NULL
 +ieee80211_if_read_dot11MeshHWMPpreqMinInterval_24208 ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 NULL
 +efx_vf_size_24213 efx_vf_size 0 24213 NULL
++SyS_sendfile64_24220 SyS_sendfile64 4 24220 NULL
 +tcpprobe_sprint_24222 tcpprobe_sprint 0-2 24222 NULL
-+pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 1-2-3 24224 NULL nohasharray
++pcpu_embed_first_chunk_24224 pcpu_embed_first_chunk 3-2-1 24224 NULL nohasharray
 +mei_amthif_read_24224 mei_amthif_read 4 24224 &pcpu_embed_first_chunk_24224
 +pci_num_vf_24235 pci_num_vf 0 24235 NULL
 +sel_read_bool_24236 sel_read_bool 3 24236 NULL
 +dm_cache_save_hint_24257 dm_cache_save_hint 2 24257 NULL
 +em28xx_alloc_urbs_24260 em28xx_alloc_urbs 4-6 24260 NULL
++calculate_sizes_24273 calculate_sizes 2 24273 NULL
 +thin_status_24278 thin_status 5 24278 NULL
-+compat_sys_preadv64_24283 compat_sys_preadv64 3 24283 NULL
 +msg_size_24288 msg_size 0 24288 NULL
-+ext2_free_blocks_24292 ext2_free_blocks 2-3 24292 NULL
++ext2_free_blocks_24292 ext2_free_blocks 3-2 24292 NULL
++i2c_smbus_check_pec_24297 i2c_smbus_check_pec 0 24297 NULL
 +map_page_24298 map_page 3-4 24298 NULL
++gserial_connect_24302 gserial_connect 0 24302 NULL
 +btmrvl_pscmd_read_24308 btmrvl_pscmd_read 3 24308 NULL
-+reserve_metadata_bytes_24313 reserve_metadata_bytes 3 24313 NULL
++reserve_metadata_bytes_24313 reserve_metadata_bytes 3-0 24313 NULL
 +ath6kl_add_bss_if_needed_24317 ath6kl_add_bss_if_needed 6 24317 NULL
 +ocfs2_direct_IO_get_blocks_24333 ocfs2_direct_IO_get_blocks 2 24333 NULL
 +si476x_radio_read_acf_blob_24336 si476x_radio_read_acf_blob 3 24336 NULL
-+C_SYSC_pwritev_24345 C_SYSC_pwritev 3 24345 NULL
-+kzalloc_node_24352 kzalloc_node 1 24352 NULL
++kzalloc_node_24352 kzalloc_node 1-3 24352 NULL
 +qla2x00_handle_queue_full_24365 qla2x00_handle_queue_full 2 24365 NULL
 +cfi_read_pri_24366 cfi_read_pri 3 24366 NULL
 +btrfs_item_size_nr_24367 btrfs_item_size_nr 0 24367 NULL
 +igetword_24373 igetword 0 24373 NULL
++max_io_len_24384 max_io_len 0-1 24384 NULL
++mpt_alloc_res_24387 mpt_alloc_res 5 24387 NULL
++osc_cur_grant_bytes_seq_write_24396 osc_cur_grant_bytes_seq_write 3 24396 NULL
 +pvr2_v4l2_ioctl_24398 pvr2_v4l2_ioctl 2 24398 NULL nohasharray
-+getxattr_24398 getxattr 4 24398 &pvr2_v4l2_ioctl_24398
++getxattr_24398 getxattr 4 24398 &pvr2_v4l2_ioctl_24398 nohasharray
++__btrfs_write_out_cache_24398 __btrfs_write_out_cache 0 24398 &getxattr_24398
 +blk_update_bidi_request_24415 blk_update_bidi_request 3-4 24415 NULL
++nvme_trans_log_supp_pages_24418 nvme_trans_log_supp_pages 3 24418 NULL
 +b43_debugfs_read_24425 b43_debugfs_read 3 24425 NULL
-+iwl_nvm_read_section_24438 iwl_nvm_read_section 0 24438 NULL
-+ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 4-6 24439 NULL
-+smk_user_access_24440 smk_user_access 3 24440 NULL
-+page_address_24444 page_address 0 24444 NULL
++xenbus_file_read_24427 xenbus_file_read 3 24427 NULL
++ieee80211_rx_mgmt_beacon_24430 ieee80211_rx_mgmt_beacon 3 24430 NULL
++copy_and_ioctl_24434 copy_and_ioctl 4 24434 NULL
++ixgbe_alloc_q_vector_24439 ixgbe_alloc_q_vector 6-4 24439 NULL
++smk_user_access_24440 smk_user_access 3 24440 NULL nohasharray
++rtw_set_wps_assoc_resp_24440 rtw_set_wps_assoc_resp 3 24440 &smk_user_access_24440
++__push_leaf_left_24456 __push_leaf_left 0 24456 NULL
 +evdev_do_ioctl_24459 evdev_do_ioctl 2 24459 NULL
-+ocfs2_write_cluster_by_desc_24466 ocfs2_write_cluster_by_desc 5-6 24466 NULL
++lbs_highsnr_write_24460 lbs_highsnr_write 3 24460 NULL
++skb_copy_and_csum_datagram_iovec_24466 skb_copy_and_csum_datagram_iovec 2 24466 NULL nohasharray
++ocfs2_write_cluster_by_desc_24466 ocfs2_write_cluster_by_desc 6-5 24466 &skb_copy_and_csum_datagram_iovec_24466
++snd_pcm_hw_param_first_24487 snd_pcm_hw_param_first 0 24487 NULL
 +read_file_spec_scan_ctl_24491 read_file_spec_scan_ctl 3 24491 NULL
++i915_gem_obj_offset_24494 i915_gem_obj_offset 0 24494 NULL
++push_nodes_for_insert_24496 push_nodes_for_insert 0 24496 NULL
 +pd_video_read_24510 pd_video_read 3 24510 NULL
 +request_key_with_auxdata_24515 request_key_with_auxdata 4 24515 NULL
 +xfs_buf_get_map_24522 xfs_buf_get_map 3 24522 NULL
-+named_prepare_buf_24532 named_prepare_buf 2 24532 NULL
 +do_mpage_readpage_24536 do_mpage_readpage 3 24536 NULL
 +write_cache_pages_24562 write_cache_pages 0 24562 NULL
-+tsi148_alloc_resource_24563 tsi148_alloc_resource 2 24563 NULL
 +SyS_pselect6_24582 SyS_pselect6 1 24582 NULL
 +udf_compute_nr_groups_24594 udf_compute_nr_groups 0 24594 NULL
-+count_preds_24600 count_preds 0 24600 NULL
-+sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL
++sensor_hub_get_physical_device_count_24605 sensor_hub_get_physical_device_count 0 24605 NULL nohasharray
++lov_alloc_memmd_24605 lov_alloc_memmd 2 24605 &sensor_hub_get_physical_device_count_24605
++SyS_poll_24620 SyS_poll 2 24620 NULL
 +kvm_pv_enable_async_pf_24637 kvm_pv_enable_async_pf 2 24637 NULL
 +context_alloc_24645 context_alloc 3 24645 NULL
 +blk_rq_err_bytes_24650 blk_rq_err_bytes 0 24650 NULL
-+unifi_net_data_malloc_24716 unifi_net_data_malloc 3 24716 NULL
-+read_fs_24717 read_fs 0 24717 NULL
++btrfs_check_data_free_space_24692 btrfs_check_data_free_space 0 24692 NULL
++datafab_write_data_24696 datafab_write_data 4 24696 NULL
++intelfbhw_get_p1p2_24703 intelfbhw_get_p1p2 2 24703 NULL
 +simple_attr_read_24738 simple_attr_read 3 24738 NULL
 +qla2x00_change_queue_depth_24742 qla2x00_change_queue_depth 2 24742 NULL
-+ath_rxbuf_alloc_24745 ath_rxbuf_alloc 2 24745 NULL
 +get_dma_residue_24749 get_dma_residue 0 24749 NULL
++ocfs2_cow_file_pos_24751 ocfs2_cow_file_pos 3 24751 NULL
 +kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL
-+nfsd4_sanitize_slot_size_24756 nfsd4_sanitize_slot_size 0-1 24756 NULL
-+i915_cache_sharing_read_24775 i915_cache_sharing_read 3 24775 NULL
++kempld_read8_24756 kempld_read8 0 24756 NULL
 +ocfs2_read_blocks_24777 ocfs2_read_blocks 0 24777 NULL
-+skb_make_writable_24783 skb_make_writable 2 24783 NULL
 +datablob_hmac_verify_24786 datablob_hmac_verify 4 24786 NULL
 +cache_read_24790 cache_read 3 24790 NULL
-+unpack_str_24798 unpack_str 0 24798 NULL
++__xfs_get_blocks_24791 __xfs_get_blocks 2 24791 NULL
++i915_gem_check_wedge_24793 i915_gem_check_wedge 0 24793 NULL
++user_regset_copyout_24796 user_regset_copyout 7 24796 NULL
++kvm_read_guest_virt_helper_24804 kvm_read_guest_virt_helper 3-1 24804 NULL
 +__next_cpu_nr_24805 __next_cpu_nr 1 24805 NULL
++sb_set_blocksize_24807 sb_set_blocksize 0-2 24807 NULL
++ath6kl_fwlog_mask_write_24810 ath6kl_fwlog_mask_write 3 24810 NULL
 +comedi_buf_alloc_24822 comedi_buf_alloc 3 24822 NULL
++net2272_read_24825 net2272_read 0 24825 NULL
 +snd_als4k_gcr_read_24840 snd_als4k_gcr_read 0 24840 NULL
++btrfs_next_old_item_24843 btrfs_next_old_item 0 24843 NULL
++xfs_free_file_space_24853 xfs_free_file_space 2-3 24853 NULL
 +snd_pcm_lib_buffer_bytes_24865 snd_pcm_lib_buffer_bytes 0 24865 NULL
 +pnp_alloc_24869 pnp_alloc 1 24869 NULL nohasharray
 +l2cap_create_basic_pdu_24869 l2cap_create_basic_pdu 3 24869 &pnp_alloc_24869
 +setup_buffering_24872 setup_buffering 3 24872 NULL
-+bnx2fc_cmd_mgr_alloc_24873 bnx2fc_cmd_mgr_alloc 3-2 24873 NULL
-+queues_read_24877 queues_read 3 24877 NULL nohasharray
-+symbol_string_24877 symbol_string 0 24877 &queues_read_24877
++queues_read_24877 queues_read 3 24877 NULL
++__vxge_hw_vp_initialize_24885 __vxge_hw_vp_initialize 2 24885 NULL
 +codec_list_read_file_24910 codec_list_read_file 3 24910 NULL
-+v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 NULL
-+next_token_24929 next_token 0 24929 NULL
-+uf_create_device_nodes_24948 uf_create_device_nodes 2 24948 NULL
-+ocfs2_fiemap_24949 ocfs2_fiemap 3-4 24949 NULL
++__btrfs_free_extent_24927 __btrfs_free_extent 7-0 24927 NULL nohasharray
++v4l2_ctrl_new_24927 v4l2_ctrl_new 7 24927 &__btrfs_free_extent_24927
++ocfs2_fiemap_24949 ocfs2_fiemap 4-3 24949 NULL
 +packet_sendmsg_24954 packet_sendmsg 4 24954 NULL
-+sys_rt_sigpending_24961 sys_rt_sigpending 2 24961 NULL
 +ensure_wear_leveling_24971 ensure_wear_leveling 0 24971 NULL
 +twl_i2c_write_u8_24976 twl_i2c_write_u8 3 24976 NULL
-+nf_nat_sdp_port_24977 nf_nat_sdp_port 7 24977 NULL
 +llc_ui_sendmsg_24987 llc_ui_sendmsg 4 24987 NULL
++btrfs_update_delayed_inode_24988 btrfs_update_delayed_inode 0 24988 NULL
 +key_conf_hw_key_idx_read_25003 key_conf_hw_key_idx_read 3 25003 NULL
 +il_dbgfs_channels_read_25005 il_dbgfs_channels_read 3 25005 NULL
++twl6030_irq_unmap_25014 twl6030_irq_unmap 2 25014 NULL
 +ni_660x_num_counters_25031 ni_660x_num_counters 0 25031 NULL
 +nfs_dns_resolve_name_25036 nfs_dns_resolve_name 3 25036 NULL
++load_unaligned_zeropad_25050 load_unaligned_zeropad 0 25050 NULL
++btrfs_stack_key_blockptr_25058 btrfs_stack_key_blockptr 0 25058 NULL
 +gs_buf_alloc_25067 gs_buf_alloc 2 25067 NULL
++ll_track_pid_seq_write_25068 ll_track_pid_seq_write 3 25068 NULL
 +SYSC_listxattr_25072 SYSC_listxattr 3 25072 NULL
-+ceph_osdc_writepages_25085 ceph_osdc_writepages 5 25085 NULL
++iwl_dbgfs_tx_flush_write_25091 iwl_dbgfs_tx_flush_write 3 25091 NULL
++gfs2_iter_unstuffed_25099 gfs2_iter_unstuffed 0 25099 NULL nohasharray
++blkg_path_25099 blkg_path 3 25099 &gfs2_iter_unstuffed_25099
 +snd_rawmidi_kernel_write_25106 snd_rawmidi_kernel_write 3 25106 NULL
-+sys_fgetxattr_25166 sys_fgetxattr 4 25166 NULL
-+ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL
++fs32_to_cpu_25143 fs32_to_cpu 0 25143 NULL
++record_new_ref_25154 record_new_ref 0 25154 NULL
++ipath_init_qp_table_25167 ipath_init_qp_table 2 25167 NULL nohasharray
++btrfs_delete_delayed_items_25167 btrfs_delete_delayed_items 0 25167 &ipath_init_qp_table_25167
++kvm_mmu_notifier_change_pte_25169 kvm_mmu_notifier_change_pte 3 25169 NULL
 +sctp_getsockopt_local_addrs_25178 sctp_getsockopt_local_addrs 2 25178 NULL
-+ks8851_rdreg32_25187 ks8851_rdreg32 0 25187 NULL
++res_counter_read_u64_25180 res_counter_read_u64 0 25180 NULL
++send_create_inode_if_needed_25211 send_create_inode_if_needed 0 25211 NULL
++security_socket_post_create_25221 security_socket_post_create 0 25221 NULL
 +ocfs2_block_check_compute_25223 ocfs2_block_check_compute 2 25223 NULL
-+free_memcg_kmem_pages_25228 free_memcg_kmem_pages 1 25228 NULL
 +dtf_write_string_25232 dtf_write_string 5 25232 NULL
 +mon_stat_read_25238 mon_stat_read 3 25238 NULL
-+tcf_csum_ipv6_udp_25241 tcf_csum_ipv6_udp 4 25241 NULL
-+nilfs_palloc_find_available_slot_25245 nilfs_palloc_find_available_slot 3-5 25245 NULL
++nilfs_palloc_find_available_slot_25245 nilfs_palloc_find_available_slot 5-3 25245 NULL
 +stripe_status_25259 stripe_status 5 25259 NULL
 +snd_pcm_start_25273 snd_pcm_start 0 25273 NULL
 +crypto_alloc_instance2_25277 crypto_alloc_instance2 3 25277 NULL
 +vfs_writev_25278 vfs_writev 3 25278 NULL
 +l2tp_session_create_25286 l2tp_session_create 1 25286 NULL
-+snd_seq_ioctl_compat_25307 snd_seq_ioctl_compat 3 25307 NULL
-+ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL nohasharray
-+help_25316 help 5 25316 &ath9k_debugfs_read_buf_25316
++ath9k_debugfs_read_buf_25316 ath9k_debugfs_read_buf 3 25316 NULL
 +rng_buffer_size_25348 rng_buffer_size 0 25348 NULL
 +SYSC_kexec_load_25361 SYSC_kexec_load 2 25361 NULL
-+unix_mkname_25368 unix_mkname 0-2 25368 NULL nohasharray
-+rio_destid_next_25368 rio_destid_next 2 25368 &unix_mkname_25368
++rio_destid_next_25368 rio_destid_next 2-0 25368 NULL nohasharray
++unix_mkname_25368 unix_mkname 0-2 25368 &rio_destid_next_25368
 +sel_read_mls_25369 sel_read_mls 3 25369 NULL
 +tc3589x_gpio_to_irq_25371 tc3589x_gpio_to_irq 2 25371 NULL
++orphanize_inode_25382 orphanize_inode 0 25382 NULL
++SyS_splice_25390 SyS_splice 5 25390 NULL
++btrfs_update_reserved_bytes_25393 btrfs_update_reserved_bytes 0 25393 NULL
++vsp1_entity_init_25407 vsp1_entity_init 3 25407 NULL
 +ebt_buf_add_pad_25413 ebt_buf_add_pad 0 25413 NULL
 +dai_list_read_file_25421 dai_list_read_file 3 25421 NULL
-+ath6kl_wmi_beginscan_cmd_25462 ath6kl_wmi_beginscan_cmd 8 25462 NULL
 +generic_file_buffered_write_25464 generic_file_buffered_write 4 25464 NULL
++ipath_decode_err_25468 ipath_decode_err 3 25468 NULL
 +crypto_hash_digestsize_25469 crypto_hash_digestsize 0 25469 NULL
 +ocfs2_hamming_encode_25501 ocfs2_hamming_encode 3 25501 NULL
-+ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4 25502 NULL
++ivtv_buf_copy_from_user_25502 ivtv_buf_copy_from_user 4-0 25502 NULL
++evm_init_hmac_25504 evm_init_hmac 0 25504 NULL
 +snd_pcm_plugin_build_25505 snd_pcm_plugin_build 5 25505 NULL
 +sb_permission_25523 sb_permission 0 25523 NULL
++down_read_failed_25532 down_read_failed 2 25532 NULL
 +ext3_get_inode_loc_25542 ext3_get_inode_loc 0 25542 NULL
 +ieee80211_if_read_path_refresh_time_25545 ieee80211_if_read_path_refresh_time 3 25545 NULL
 +wimax_addr_scnprint_25548 wimax_addr_scnprint 2 25548 NULL
++mgag200_ttm_tt_create_25550 mgag200_ttm_tt_create 2 25550 NULL
 +ht_print_chan_25556 ht_print_chan 0 25556 NULL
 +skb_tailroom_25567 skb_tailroom 0 25567 NULL
-+find_extend_vma_25597 find_extend_vma 2 25597 NULL
-+__devres_alloc_25598 __devres_alloc 2 25598 NULL
++ping_recvmsg_25597 ping_recvmsg 4 25597 NULL nohasharray
++find_extend_vma_25597 find_extend_vma 2 25597 &ping_recvmsg_25597
 +copy_user_generic_25611 copy_user_generic 0 25611 NULL
 +proc_coredump_filter_write_25625 proc_coredump_filter_write 3 25625 NULL
-+befs_utf2nls_25628 befs_utf2nls 3 25628 NULL nohasharray
-+__get_user_pages_25628 __get_user_pages 0-3-4 25628 &befs_utf2nls_25628
-+__direct_map_25647 __direct_map 5-6 25647 NULL
-+ext2_try_to_allocate_25667 ext2_try_to_allocate 4-2 25667 NULL
++__get_user_pages_25628 __get_user_pages 0-3-4 25628 NULL nohasharray
++befs_utf2nls_25628 befs_utf2nls 3 25628 &__get_user_pages_25628
++__direct_map_25647 __direct_map 6-5 25647 NULL
++ext2_try_to_allocate_25667 ext2_try_to_allocate 4-2-0 25667 NULL
 +aircable_prepare_write_buffer_25669 aircable_prepare_write_buffer 3 25669 NULL
++lpfc_idiag_cmd_get_25672 lpfc_idiag_cmd_get 2 25672 NULL
 +sta_inactive_ms_read_25690 sta_inactive_ms_read 3 25690 NULL
 +ebitmap_start_positive_25703 ebitmap_start_positive 0 25703 NULL
-+rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 NULL
++wl1271_tx_enabled_rates_get_25712 wl1271_tx_enabled_rates_get 0 25712 NULL nohasharray
++rx_filter_mc_filter_read_25712 rx_filter_mc_filter_read 3 25712 &wl1271_tx_enabled_rates_get_25712
 +ibmasm_new_command_25714 ibmasm_new_command 2 25714 NULL
++ttm_tt_init_25717 ttm_tt_init 3 25717 NULL
 +sel_write_context_25726 sel_write_context 3 25726 NULL nohasharray
-+__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2-3 25726 &sel_write_context_25726
-+mcs_unwrap_fir_25733 mcs_unwrap_fir 3 25733 NULL
++__alloc_bootmem_low_node_25726 __alloc_bootmem_low_node 2 25726 &sel_write_context_25726
 +ext2_find_near_25734 ext2_find_near 0 25734 NULL
 +__set_clear_dirty_25744 __set_clear_dirty 2 25744 NULL
 +cxgbi_device_portmap_create_25747 cxgbi_device_portmap_create 3 25747 NULL
@@ -105119,17 +105407,17 @@ index 0000000..9a7096d
 +sg_read_25799 sg_read 3 25799 NULL
 +system_enable_read_25815 system_enable_read 3 25815 NULL
 +realloc_buffer_25816 realloc_buffer 2 25816 NULL
++ftrace_profile_init_25821 ftrace_profile_init 0 25821 NULL
 +mthca_map_user_db_25823 mthca_map_user_db 5 25823 NULL
 +pwr_missing_bcns_read_25824 pwr_missing_bcns_read 3 25824 NULL
 +parport_read_25855 parport_read 0 25855 NULL
 +xfs_dir2_sf_hdr_size_25858 xfs_dir2_sf_hdr_size 0 25858 NULL
-+uf_ap_process_data_pdu_25860 uf_ap_process_data_pdu 7 25860 NULL
 +key_attr_size_25865 key_attr_size 0 25865 NULL
 +ath6kl_regread_read_25884 ath6kl_regread_read 3 25884 NULL
-+run_delalloc_nocow_25896 run_delalloc_nocow 3 25896 NULL
++run_delalloc_nocow_25896 run_delalloc_nocow 3-4 25896 NULL
 +sisusbcon_scroll_area_25899 sisusbcon_scroll_area 4-3 25899 NULL
 +lpfc_change_queue_depth_25905 lpfc_change_queue_depth 2 25905 NULL
-+nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7 25908 NULL
++nvme_trans_mode_page_create_25908 nvme_trans_mode_page_create 7-4 25908 NULL
 +do_jffs2_setxattr_25910 do_jffs2_setxattr 5 25910 NULL
 +rcname_read_25919 rcname_read 3 25919 NULL
 +snd_es1938_capture_copy_25930 snd_es1938_capture_copy 5 25930 NULL
@@ -105138,335 +105426,402 @@ index 0000000..9a7096d
 +flush_25957 flush 2 25957 NULL
 +video_register_device_25971 video_register_device 3 25971 NULL
 +udp_setsockopt_25985 udp_setsockopt 5 25985 NULL
++lustre_msg_buflen_v2_25997 lustre_msg_buflen_v2 0 25997 NULL
 +ebt_compat_entry_padsize_26001 ebt_compat_entry_padsize 0 26001 NULL
-+lpfc_sli_probe_sriov_nr_virtfn_26004 lpfc_sli_probe_sriov_nr_virtfn 2 26004 NULL
++blk_init_queue_node_26015 blk_init_queue_node 3 26015 NULL
 +SyS_process_vm_readv_26019 SyS_process_vm_readv 3-5 26019 NULL
 +irq_create_strict_mappings_26025 irq_create_strict_mappings 2-4 26025 NULL
 +xfs_xattr_acl_set_26028 xfs_xattr_acl_set 4 26028 NULL
-+skb_mac_header_26034 skb_mac_header 0 26034 NULL
 +mptscsih_change_queue_depth_26036 mptscsih_change_queue_depth 2 26036 NULL
 +selinux_inode_post_setxattr_26037 selinux_inode_post_setxattr 4 26037 NULL
 +tun_do_read_26047 tun_do_read 5 26047 NULL
-+__alloc_memory_core_early_26053 __alloc_memory_core_early 2-3 26053 NULL
++make_bfloat_26056 make_bfloat 2 26056 NULL
 +keyctl_update_key_26061 keyctl_update_key 3 26061 NULL
 +rx_rx_wa_density_dropped_frame_read_26095 rx_rx_wa_density_dropped_frame_read 3 26095 NULL
-+skb_cow_26138 skb_cow 2 26138 NULL
-+usb_dump_device_strings_26146 usb_dump_device_strings 0 26146 NULL
-+copy_oldmem_page_26164 copy_oldmem_page 3-1 26164 NULL
-+ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 NULL nohasharray
-+gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 &ath6kl_roam_table_read_26166
-+perf_adjust_period_26168 perf_adjust_period 2-3 26168 NULL
-+mid_get_vbt_data_r1_26170 mid_get_vbt_data_r1 2 26170 NULL
++__add_inline_refs_26096 __add_inline_refs 0 26096 NULL
++dup_ref_26100 dup_ref 0 26100 NULL
++intel_wrap_ring_buffer_26117 intel_wrap_ring_buffer 0 26117 NULL
++read_sb_page_26119 read_sb_page 5 26119 NULL
++__fswab64_26155 __fswab64 0 26155 NULL
++copy_oldmem_page_26164 copy_oldmem_page 3 26164 NULL
++gfs2_xattr_acl_get_26166 gfs2_xattr_acl_get 0 26166 NULL nohasharray
++ath6kl_roam_table_read_26166 ath6kl_roam_table_read 3 26166 &gfs2_xattr_acl_get_26166
 +disk_devt_26180 disk_devt 0 26180 NULL
-+get_registers_26187 get_registers 3 26187 NULL
 +cgroup_setxattr_26188 cgroup_setxattr 4 26188 NULL
 +ieee80211_if_fmt_dot11MeshTTL_26198 ieee80211_if_fmt_dot11MeshTTL 3 26198 NULL
 +xfs_idata_realloc_26199 xfs_idata_realloc 2 26199 NULL
 +mce_write_26201 mce_write 3 26201 NULL
++SyS_splice_26206 SyS_splice 5 26206 NULL
++mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3 26225 NULL
 +_scsih_change_queue_depth_26230 _scsih_change_queue_depth 2 26230 NULL
++rxrpc_recvmsg_26233 rxrpc_recvmsg 4 26233 NULL
 +bio_split_26235 bio_split 2 26235 NULL
++btrfs_delayed_inode_reserve_metadata_26236 btrfs_delayed_inode_reserve_metadata 0 26236 NULL
++ecryptfs_read_lower_page_segment_26244 ecryptfs_read_lower_page_segment 4 26244 NULL
++do_setxattr_26264 do_setxattr 0 26264 NULL
 +crypto_ctxsize_26278 crypto_ctxsize 0 26278 NULL
++apei_resources_request_26279 apei_resources_request 0 26279 NULL
 +wacom_set_device_mode_26280 wacom_set_device_mode 3 26280 NULL
 +ext2_find_goal_26306 ext2_find_goal 0 26306 NULL
 +snd_pcm_plug_client_channels_buf_26309 snd_pcm_plug_client_channels_buf 0-3 26309 NULL nohasharray
 +pax_get_random_long_26309 pax_get_random_long 0 26309 &snd_pcm_plug_client_channels_buf_26309
 +pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3 26321 NULL
-+efx_rx_mk_skb_26342 efx_rx_mk_skb 5 26342 NULL
-+ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 5 26357 NULL
++check_can_nocow_26336 check_can_nocow 2 26336 NULL
++snd_vx_check_reg_bit_26344 snd_vx_check_reg_bit 0 26344 NULL
++ocfs2_duplicate_clusters_by_page_26357 ocfs2_duplicate_clusters_by_page 5-0-6-3 26357 NULL
 +cifs_readdata_alloc_26360 cifs_readdata_alloc 1 26360 NULL
-+dup_to_netobj_26363 dup_to_netobj 3 26363 NULL
 +invalidate_inode_pages2_range_26403 invalidate_inode_pages2_range 0 26403 NULL
-+dma_declare_contiguous_26455 dma_declare_contiguous 2 26455 NULL
++ntty_write_26404 ntty_write 3 26404 NULL
++pagemap_read_26441 pagemap_read 3 26441 NULL
++tower_read_26461 tower_read 3 26461 NULL nohasharray
++enc_pools_add_pages_26461 enc_pools_add_pages 1 26461 &tower_read_26461 nohasharray
++numa_cpu_node_26461 numa_cpu_node 0 26461 &enc_pools_add_pages_26461
++memory_present_26470 memory_present 1 26470 NULL
 +ib_alloc_device_26483 ib_alloc_device 1 26483 NULL
 +ulong_write_file_26485 ulong_write_file 3 26485 NULL
 +dvb_ca_en50221_io_ioctl_26490 dvb_ca_en50221_io_ioctl 2 26490 NULL
++vfio_pin_pages_26494 vfio_pin_pages 1 26494 NULL
 +read_vmcore_26501 read_vmcore 3 26501 NULL
-+vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 3-4 26507 NULL
++uhid_char_write_26502 uhid_char_write 3 26502 NULL
++vfio_pci_set_msi_trigger_26507 vfio_pci_set_msi_trigger 4-3 26507 NULL
 +iwl_dbgfs_rf_reset_read_26512 iwl_dbgfs_rf_reset_read 3 26512 NULL
 +SyS_rt_sigpending_26538 SyS_rt_sigpending 2 26538 NULL
++rds_message_inc_copy_to_user_26540 rds_message_inc_copy_to_user 3 26540 NULL
 +__vhost_add_used_n_26554 __vhost_add_used_n 3 26554 NULL
-+ip6_addr_string_26568 ip6_addr_string 0 26568 NULL
++qgroup_account_ref_step3_26558 qgroup_account_ref_step3 0 26558 NULL
++dio_new_bio_26562 dio_new_bio 0 26562 NULL
 +kvm_iommu_put_pages_26571 kvm_iommu_put_pages 2 26571 NULL
-+rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL nohasharray
-+batadv_receive_server_sync_packet_26577 batadv_receive_server_sync_packet 3 26577 &rts51x_read_mem_26577
-+cirrusfb_get_memsize_26597 cirrusfb_get_memsize 0 26597 NULL
++rts51x_read_mem_26577 rts51x_read_mem 4 26577 NULL
 +regcache_set_reg_present_26598 regcache_set_reg_present 2 26598 NULL
 +__unmap_single_26604 __unmap_single 2-3 26604 NULL
++dev_to_node_26617 dev_to_node 0 26617 NULL
 +iommu_alloc_26621 iommu_alloc 4 26621 NULL
 +pack_value_26625 pack_value 1 26625 NULL
 +pwr_fix_tsf_ps_read_26627 pwr_fix_tsf_ps_read 3 26627 NULL
++drm_ht_find_item_26637 drm_ht_find_item 0 26637 NULL
++process_extent_26646 process_extent 0 26646 NULL nohasharray
++btrfs_lookup_inode_26646 btrfs_lookup_inode 0 26646 &process_extent_26646
 +irq_alloc_generic_chip_26650 irq_alloc_generic_chip 2 26650 NULL nohasharray
 +inb_p_26650 inb_p 0 26650 &irq_alloc_generic_chip_26650
++usb_reset_device_26661 usb_reset_device 0 26661 NULL
 +cipso_v4_map_cat_rbm_hton_26680 cipso_v4_map_cat_rbm_hton 0 26680 NULL
-+__alloc_pred_stack_26687 __alloc_pred_stack 2 26687 NULL
-+rtllib_authentication_req_26713 rtllib_authentication_req 3 26713 NULL
-+aty_ld_le32_26720 aty_ld_le32 0 26720 NULL
 +nouveau_namedb_create__26732 nouveau_namedb_create_ 7 26732 NULL
 +SyS_fcntl_26737 SyS_fcntl 3 26737 NULL
 +pipeline_tcp_rx_stat_fifo_int_read_26745 pipeline_tcp_rx_stat_fifo_int_read 3 26745 NULL
-+srp_ring_alloc_26760 srp_ring_alloc 2 26760 NULL
++bos_desc_26752 bos_desc 0 26752 NULL
 +snd_hda_get_raw_connections_26762 snd_hda_get_raw_connections 0 26762 NULL
++dma_map_single_attrs_26779 dma_map_single_attrs 0 26779 NULL
++cache_save_setup_26783 cache_save_setup 0 26783 NULL
 +qlcnic_alloc_sds_rings_26795 qlcnic_alloc_sds_rings 2 26795 NULL
 +cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL
 +iwl_trans_read_mem32_26825 iwl_trans_read_mem32 0 26825 NULL
 +smk_write_load_26829 smk_write_load 3 26829 NULL
-+sizeof_pwm_leds_priv_26830 sizeof_pwm_leds_priv 0-1 26830 NULL
-+slgt_compat_ioctl_26834 slgt_compat_ioctl 3 26834 NULL
++ept_get_level1_sp_gpa_26831 ept_get_level1_sp_gpa 0 26831 NULL
 +__nodes_onto_26838 __nodes_onto 4 26838 NULL
-+scnprint_id_26842 scnprint_id 3 26842 NULL
++scnprint_id_26842 scnprint_id 3-0 26842 NULL
 +ecryptfs_miscdev_write_26847 ecryptfs_miscdev_write 3 26847 NULL
-+netxen_nic_hw_read_wx_128M_26858 netxen_nic_hw_read_wx_128M 2 26858 NULL
++tipc_conn_sendmsg_26867 tipc_conn_sendmsg 5 26867 NULL
++ath6kl_create_qos_write_26879 ath6kl_create_qos_write 3 26879 NULL
 +svc_print_xprts_26881 svc_print_xprts 0 26881 NULL
-+ext2_compat_ioctl_26883 ext2_compat_ioctl 3 26883 NULL
-+slhc_uncompress_26905 slhc_uncompress 0-3 26905 NULL
++cfg80211_process_auth_26916 cfg80211_process_auth 3 26916 NULL
 +x25_asy_change_mtu_26928 x25_asy_change_mtu 2 26928 NULL
 +compat_mtw_from_user_26932 compat_mtw_from_user 0 26932 NULL
 +scsi_tgt_copy_sense_26933 scsi_tgt_copy_sense 3 26933 NULL
 +pwr_ps_enter_read_26935 pwr_ps_enter_read 3 26935 NULL nohasharray
 +sctp_setsockopt_adaptation_layer_26935 sctp_setsockopt_adaptation_layer 3 26935 &pwr_ps_enter_read_26935
-+carl9170_handle_mpdu_26940 carl9170_handle_mpdu 3 26940 NULL nohasharray
-+create_bm_block_list_26940 create_bm_block_list 0 26940 &carl9170_handle_mpdu_26940
++remove_from_bitmap_26939 remove_from_bitmap 0 26939 NULL
++create_bm_block_list_26940 create_bm_block_list 0 26940 NULL
 +hecubafb_write_26942 hecubafb_write 3 26942 NULL
-+do_trimming_26952 do_trimming 3 26952 NULL nohasharray
-+extract_entropy_user_26952 extract_entropy_user 3 26952 &do_trimming_26952
++extract_entropy_user_26952 extract_entropy_user 3 26952 NULL nohasharray
++do_trimming_26952 do_trimming 3 26952 &extract_entropy_user_26952
++xlog_grant_push_ail_26972 xlog_grant_push_ail 2 26972 NULL
++do_direct_IO_26979 do_direct_IO 0 26979 NULL
 +pcf857x_irq_domain_map_26998 pcf857x_irq_domain_map 2 26998 NULL
-+swiotlb_bounce_27046 swiotlb_bounce 2-1 27046 NULL
++i2c_smbus_xfer_27006 i2c_smbus_xfer 0 27006 NULL
++omfs_allocate_range_27034 omfs_allocate_range 3 27034 NULL
 +ufs_alloc_fragments_27059 ufs_alloc_fragments 3-0-2 27059 NULL
 +__videobuf_alloc_vb_27062 __videobuf_alloc_vb 1 27062 NULL
++ext4_convert_unwritten_extents_27064 ext4_convert_unwritten_extents 4-3-0 27064 NULL
 +snd_pcm_lib_period_bytes_27071 snd_pcm_lib_period_bytes 0 27071 NULL
 +paravirt_read_msr_27077 paravirt_read_msr 0 27077 NULL
++snd_mixer_oss_set_recsrc_27080 snd_mixer_oss_set_recsrc 2 27080 NULL
 +alloc_fdmem_27083 alloc_fdmem 1 27083 NULL
-+compat_SyS_rt_sigpending_27084 compat_SyS_rt_sigpending 2 27084 NULL
 +find_first_bit_27088 find_first_bit 0-2 27088 NULL
 +btmrvl_hscmd_write_27089 btmrvl_hscmd_write 3 27089 NULL
 +nes_reg_user_mr_27106 nes_reg_user_mr 2-3 27106 NULL
 +__devcgroup_inode_permission_27108 __devcgroup_inode_permission 0 27108 NULL
-+SYSC_ipc_27123 SYSC_ipc 3 27123 NULL
++i915_gem_execbuffer_relocate_slow_27116 i915_gem_execbuffer_relocate_slow 0 27116 NULL
 +get_kernel_page_27133 get_kernel_page 0 27133 NULL
++__ext4_handle_dirty_metadata_27137 __ext4_handle_dirty_metadata 0 27137 NULL
 +drbd_get_capacity_27141 drbd_get_capacity 0 27141 NULL
 +pms_capture_27142 pms_capture 4 27142 NULL
 +btmrvl_hscfgcmd_write_27143 btmrvl_hscfgcmd_write 3 27143 NULL
 +snd_compr_calc_avail_27165 snd_compr_calc_avail 0 27165 NULL
-+i2400m_net_rx_27170 i2400m_net_rx 5 27170 NULL
 +ieee80211_if_read_rc_rateidx_mask_5ghz_27183 ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 NULL
-+mmc_blk_compat_ioctl_27194 mmc_blk_compat_ioctl 4 27194 NULL
++get_unaligned_be32_27184 get_unaligned_be32 0 27184 NULL
++__intel_ring_begin_27197 __intel_ring_begin 0 27197 NULL
++__sg_alloc_table_27198 __sg_alloc_table 0 27198 NULL
++ocfs2_read_blocks_sync_27210 ocfs2_read_blocks_sync 0 27210 NULL
++write_kmem_27225 write_kmem 3 27225 NULL
 +dbAllocAG_27228 dbAllocAG 0 27228 NULL
 +rxrpc_request_key_27235 rxrpc_request_key 3 27235 NULL
-+cfpkt_add_trail_27260 cfpkt_add_trail 3 27260 NULL
++ocfs2_journal_access_path_27243 ocfs2_journal_access_path 0 27243 NULL
++ll_track_gid_seq_write_27267 ll_track_gid_seq_write 3 27267 NULL
++qfq_unblock_groups_27269 qfq_unblock_groups 2 27269 NULL
++comedi_alloc_devpriv_27272 comedi_alloc_devpriv 2 27272 NULL
 +__dma_map_cont_27289 __dma_map_cont 5 27289 NULL
-+hpi_read_reg_27302 hpi_read_reg 0 27302 NULL
-+copy_from_buf_27308 copy_from_buf 4-2 27308 NULL
-+virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL nohasharray
-+ath6kl_wmi_test_cmd_27312 ath6kl_wmi_test_cmd 3 27312 &virtqueue_add_inbuf_27312
++copy_from_buf_27308 copy_from_buf 2-4 27308 NULL
++virtqueue_add_inbuf_27312 virtqueue_add_inbuf 3 27312 NULL
++write_buf_27316 write_buf 0-3 27316 NULL
 +ocfs2_blocks_to_clusters_27327 ocfs2_blocks_to_clusters 0-2 27327 NULL
 +snd_pcm_oss_write2_27332 snd_pcm_oss_write2 3-0 27332 NULL
 +afs_cell_create_27346 afs_cell_create 2 27346 NULL
-+compat_SyS_semctl_27349 compat_SyS_semctl 4 27349 NULL
++iwl_dbgfs_csr_write_27363 iwl_dbgfs_csr_write 3 27363 NULL
 +pcbit_stat_27364 pcbit_stat 2 27364 NULL
-+init_memory_mapping_27395 init_memory_mapping 0 27395 NULL
-+phys_pte_init_27411 phys_pte_init 0-3-2 27411 NULL
++lz4_compress_crypto_27387 lz4_compress_crypto 3 27387 NULL
++seq_read_27411 seq_read 3 27411 NULL
 +ib_dma_map_sg_27413 ib_dma_map_sg 0 27413 NULL
-+acpi_os_get_root_pointer_27416 acpi_os_get_root_pointer 0 27416 NULL nohasharray
-+ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 &acpi_os_get_root_pointer_27416
-+pack_sg_list_27425 pack_sg_list 0-2 27425 NULL
++ieee80211_if_read_smps_27416 ieee80211_if_read_smps 3 27416 NULL
++ocfs2_refcount_cal_cow_clusters_27422 ocfs2_refcount_cal_cow_clusters 0-3-4 27422 NULL nohasharray
++evm_inode_init_security_27422 evm_inode_init_security 0 27422 &ocfs2_refcount_cal_cow_clusters_27422
++cypress_write_27423 cypress_write 4 27423 NULL
++sddr09_read_data_27447 sddr09_read_data 3 27447 NULL
 +ktime_to_us_27455 ktime_to_us 0 27455 NULL
++sk_extract_addr_27474 sk_extract_addr 0 27474 NULL
 +v4l2_ctrl_new_std_menu_items_27487 v4l2_ctrl_new_std_menu_items 4 27487 NULL
-+set_tpl_pfs_27490 set_tpl_pfs 3 27490 NULL
 +hcd_buffer_alloc_27495 hcd_buffer_alloc 2 27495 NULL
 +qib_create_cq_27497 qib_create_cq 2 27497 NULL
 +ip_set_get_h32_27498 ip_set_get_h32 0 27498 NULL
 +btrfs_get_64_27499 btrfs_get_64 0 27499 NULL
-+__usbnet_write_cmd_27500 __usbnet_write_cmd 7 27500 NULL
++ept_walk_addr_generic_27501 ept_walk_addr_generic 4 27501 NULL
 +garmin_read_process_27509 garmin_read_process 3 27509 NULL
++oti_alloc_cookies_27510 oti_alloc_cookies 2 27510 NULL
 +ib_copy_to_udata_27525 ib_copy_to_udata 3 27525 NULL
 +snd_sonicvibes_getdmaa_27552 snd_sonicvibes_getdmaa 0 27552 NULL
 +SyS_fgetxattr_27571 SyS_fgetxattr 4 27571 NULL
-+libipw_alloc_txb_27579 libipw_alloc_txb 1-2-3 27579 NULL
++sco_sock_recvmsg_27572 sco_sock_recvmsg 4 27572 NULL
++libipw_alloc_txb_27579 libipw_alloc_txb 1 27579 NULL
 +read_flush_procfs_27642 read_flush_procfs 3 27642 NULL nohasharray
 +nl80211_send_connect_result_27642 nl80211_send_connect_result 5-7 27642 &read_flush_procfs_27642 nohasharray
-+ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 &nl80211_send_connect_result_27642
++ocfs2_direct_IO_27642 ocfs2_direct_IO 4 27642 &nl80211_send_connect_result_27642 nohasharray
++ocfs2_xattr_ibody_get_27642 ocfs2_xattr_ibody_get 0 27642 &ocfs2_direct_IO_27642
 +add_new_gdb_27643 add_new_gdb 3 27643 NULL
++btrfs_fallocate_27647 btrfs_fallocate 3-4 27647 NULL
 +qnx6_readpages_27657 qnx6_readpages 4 27657 NULL
 +cdrom_read_cdda_old_27664 cdrom_read_cdda_old 4 27664 NULL
-+set_bypass_pwoff_pfs_27669 set_bypass_pwoff_pfs 3 27669 NULL
-+qword_get_27670 qword_get 0 27670 NULL
++record_changed_ref_27665 record_changed_ref 0 27665 NULL
++iommu_pgsize_27677 iommu_pgsize 2-0 27677 NULL
 +ocfs2_extend_dir_27695 ocfs2_extend_dir 4 27695 NULL
-+fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4 27702 NULL
-+inc_zcache_eph_zbytes_27704 inc_zcache_eph_zbytes 1 27704 NULL
++fs_path_add_from_extent_buffer_27702 fs_path_add_from_extent_buffer 4-0 27702 NULL
 +evm_write_key_27715 evm_write_key 3 27715 NULL
 +ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol_27722 ieee80211_if_fmt_dot11MeshGateAnnouncementProtocol 3 27722 NULL
-+reg_w_buf_27724 reg_w_buf 3 27724 NULL
 +xfs_dir2_block_sfsize_27727 xfs_dir2_block_sfsize 0 27727 NULL
-+a4t_cs_init_27734 a4t_cs_init 3 27734 NULL
++macvtap_skb_to_vnet_hdr_27747 macvtap_skb_to_vnet_hdr 0 27747 NULL
 +SyS_setsockopt_27759 SyS_setsockopt 5 27759 NULL
-+kcalloc_27770 kcalloc 1-2 27770 NULL
++gpiochip_export_27776 gpiochip_export 0 27776 NULL
++__lov_setstripe_27782 __lov_setstripe 2 27782 NULL
 +twl4030_set_gpio_dataout_27792 twl4030_set_gpio_dataout 1 27792 NULL
 +DivaSTraceGetMemotyRequirement_27797 DivaSTraceGetMemotyRequirement 0-1 27797 NULL
 +ttm_object_file_init_27804 ttm_object_file_init 2 27804 NULL nohasharray
 +SyS_readv_27804 SyS_readv 3 27804 &ttm_object_file_init_27804
 +mpihelp_mul_27805 mpihelp_mul 5-3 27805 NULL
 +fwtty_buffer_rx_27821 fwtty_buffer_rx 3 27821 NULL
-+sys_listxattr_27833 sys_listxattr 3 27833 NULL nohasharray
-+init_header_complete_27833 init_header_complete 0 27833 &sys_listxattr_27833
++hpt374_read_freq_27828 hpt374_read_freq 0 27828 NULL
++init_header_complete_27833 init_header_complete 0 27833 NULL
 +read_profile_27859 read_profile 3 27859 NULL
 +sky2_pci_read16_27863 sky2_pci_read16 0 27863 NULL
 +ieee80211_if_read_dot11MeshHWMProotInterval_27873 ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 NULL
++process_all_extents_27879 process_all_extents 0 27879 NULL
 +unix_seqpacket_sendmsg_27893 unix_seqpacket_sendmsg 4 27893 NULL
-+gluebi_write_27905 gluebi_write 3 27905 NULL
-+SyS_ptrace_27924 SyS_ptrace 3-4 27924 NULL
++gluebi_write_27905 gluebi_write 3-2 27905 NULL
++SyS_ptrace_27924 SyS_ptrace 3 27924 NULL
 +bm_find_next_27929 bm_find_next 2 27929 NULL
++check_mapped_name_27943 check_mapped_name 3 27943 NULL
++i915_gem_execbuffer_reserve_object_27956 i915_gem_execbuffer_reserve_object 0 27956 NULL
 +tracing_clock_write_27961 tracing_clock_write 3 27961 NULL
 +tipc_media_addr_printf_27971 tipc_media_addr_printf 2 27971 NULL
-+mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 NULL
++device_register_27972 device_register 0 27972 NULL nohasharray
++mic_rx_pkts_read_27972 mic_rx_pkts_read 3 27972 &device_register_27972
++pci_enable_device_flags_27977 pci_enable_device_flags 0 27977 NULL
 +f2fs_bio_alloc_27983 f2fs_bio_alloc 2 27983 NULL
 +edt_ft5x06_debugfs_raw_data_read_28002 edt_ft5x06_debugfs_raw_data_read 3 28002 NULL
 +snd_rawmidi_write_28008 snd_rawmidi_write 3 28008 NULL
-+serial8250_port_size_28019 serial8250_port_size 0 28019 NULL
++remove_extent_data_ref_28023 remove_extent_data_ref 0 28023 NULL
 +alloc_one_pg_vec_page_28031 alloc_one_pg_vec_page 1 28031 NULL
++record_deleted_ref_28039 record_deleted_ref 0 28039 NULL
 +sctp_setsockopt_maxburst_28041 sctp_setsockopt_maxburst 3 28041 NULL
 +rts51x_xd_rw_28046 rts51x_xd_rw 3-4 28046 NULL
-+cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2 28053 NULL
++p9_fd_write_28050 p9_fd_write 3 28050 NULL
++cx231xx_init_vbi_isoc_28053 cx231xx_init_vbi_isoc 3-2-4 28053 NULL
 +pool_status_28055 pool_status 5 28055 NULL
++init_rs_non_canonical_28059 init_rs_non_canonical 1 28059 NULL
 +lpfc_idiag_mbxacc_read_28061 lpfc_idiag_mbxacc_read 3 28061 NULL
 +tx_frag_bad_mblk_num_read_28064 tx_frag_bad_mblk_num_read 3 28064 NULL
 +ext4_read_block_bitmap_nowait_28078 ext4_read_block_bitmap_nowait 2 28078 NULL
-+GetRecvByte_28082 GetRecvByte 0 28082 NULL
 +platform_get_irq_28088 platform_get_irq 0 28088 NULL
-+gdth_init_isa_28091 gdth_init_isa 1 28091 NULL
-+mmc_test_alloc_mem_28102 mmc_test_alloc_mem 3-2 28102 NULL
++SyS_brk_28096 SyS_brk 1 28096 NULL
++mmc_test_alloc_mem_28102 mmc_test_alloc_mem 2-3 28102 NULL
 +rx_defrag_need_defrag_read_28117 rx_defrag_need_defrag_read 3 28117 NULL
 +vgacon_adjust_height_28124 vgacon_adjust_height 2 28124 NULL
++tipc_msg_init_28128 tipc_msg_init 4-2 28128 NULL
 +video_read_28148 video_read 3 28148 NULL
 +snd_midi_channel_alloc_set_28153 snd_midi_channel_alloc_set 1 28153 NULL
 +stats_dot11FCSErrorCount_read_28154 stats_dot11FCSErrorCount_read 3 28154 NULL
-+vread_28173 vread 0 28173 NULL
++__add_reloc_root_28155 __add_reloc_root 0 28155 NULL
++vread_28173 vread 0-3 28173 NULL
 +macvtap_get_user_28185 macvtap_get_user 4 28185 NULL
-+d_path_28198 d_path 0 28198 NULL
++counter_free_res_28187 counter_free_res 5 28187 NULL
++read_disk_sb_28188 read_disk_sb 2 28188 NULL
 +nouveau_mxm_create__28200 nouveau_mxm_create_ 4 28200 NULL
++__exclude_logged_extent_28212 __exclude_logged_extent 2-0 28212 NULL
 +__qp_memcpy_from_queue_28220 __qp_memcpy_from_queue 3-4 28220 NULL
-+set_dis_disc_pfs_28225 set_dis_disc_pfs 3 28225 NULL nohasharray
-+line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 &set_dis_disc_pfs_28225
++ocfs2_cow_sync_writeback_28221 ocfs2_cow_sync_writeback 0 28221 NULL
++line6_alloc_sysex_buffer_28225 line6_alloc_sysex_buffer 4 28225 NULL
 +amd_nb_num_28228 amd_nb_num 0 28228 NULL
 +ext4_validate_block_bitmap_28243 ext4_validate_block_bitmap 3 28243 NULL
++fuse_direct_IO_28275 fuse_direct_IO 4 28275 NULL
 +usemap_size_28281 usemap_size 0 28281 NULL
++inline_xattr_size_28285 inline_xattr_size 0 28285 NULL
 +dma_map_sg_attrs_28289 dma_map_sg_attrs 0 28289 NULL
++SyS_ppoll_28290 SyS_ppoll 2 28290 NULL
++kstrtos16_from_user_28300 kstrtos16_from_user 2 28300 NULL
 +acpi_register_gsi_xen_28305 acpi_register_gsi_xen 2 28305 NULL nohasharray
 +nouveau_compat_ioctl_28305 nouveau_compat_ioctl 2 28305 &acpi_register_gsi_xen_28305
-+__mlock_vma_pages_range_28315 __mlock_vma_pages_range 2-3 28315 NULL
++create_io_context_28306 create_io_context 2 28306 NULL
++__mlock_vma_pages_range_28315 __mlock_vma_pages_range 2-3-0 28315 NULL
 +snd_pcm_oss_read_28317 snd_pcm_oss_read 3 28317 NULL
 +bm_entry_write_28338 bm_entry_write 3 28338 NULL
-+snapshot_write_28351 snapshot_write 3 28351 NULL
-+sys_writev_28384 sys_writev 3 28384 NULL
++tcp_copy_to_iovec_28344 tcp_copy_to_iovec 3 28344 NULL
++cpuset_spread_node_28351 cpuset_spread_node 0 28351 NULL nohasharray
++snapshot_write_28351 snapshot_write 3 28351 &cpuset_spread_node_28351
++xfs_iomap_write_unwritten_28365 xfs_iomap_write_unwritten 3-2 28365 NULL
 +dlmfs_file_read_28385 dlmfs_file_read 3 28385 NULL
 +tx_frag_cache_miss_read_28394 tx_frag_cache_miss_read 3 28394 NULL
-+set_bypass_pfs_28395 set_bypass_pfs 3 28395 NULL
 +bypass_pwup_write_28416 bypass_pwup_write 3 28416 NULL
 +subdev_ioctl_28417 subdev_ioctl 2 28417 NULL
-+__split_large_page_28429 __split_large_page 2 28429 NULL
++get_extent_allocation_hint_28423 get_extent_allocation_hint 0 28423 NULL
++ksocknal_alloc_tx_28426 ksocknal_alloc_tx 2 28426 NULL
 +mpage_readpages_28436 mpage_readpages 3 28436 NULL
-+set_memory_uc_28439 set_memory_uc 1 28439 NULL
 +snd_emu10k1_efx_read_28452 snd_emu10k1_efx_read 2 28452 NULL
 +key_mic_failures_read_28457 key_mic_failures_read 3 28457 NULL
 +alloc_irq_cpu_rmap_28459 alloc_irq_cpu_rmap 1 28459 NULL
 +vmw_du_crtc_cursor_set_28479 vmw_du_crtc_cursor_set 4-5 28479 NULL
 +ocfs2_backup_super_blkno_28484 ocfs2_backup_super_blkno 0-2 28484 NULL
-+max_response_pages_28492 max_response_pages 0 28492 NULL
++__filemap_fdatawrite_28485 __filemap_fdatawrite 0 28485 NULL
 +clear_discard_28494 clear_discard 2 28494 NULL
 +ps_poll_upsd_utilization_read_28519 ps_poll_upsd_utilization_read 3 28519 NULL
-+__next_node_28521 __next_node 1 28521 NULL
++__next_node_28521 __next_node 1-0 28521 NULL
 +i2400m_tx_stats_read_28527 i2400m_tx_stats_read 3 28527 NULL
 +sel_read_policycap_28544 sel_read_policycap 3 28544 NULL
-+run_delalloc_range_28545 run_delalloc_range 3 28545 NULL nohasharray
-+mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &run_delalloc_range_28545
++run_delalloc_range_28545 run_delalloc_range 3-4 28545 NULL nohasharray
++mptctl_getiocinfo_28545 mptctl_getiocinfo 2 28545 &run_delalloc_range_28545 nohasharray
++aio_read_events_28545 aio_read_events 3 28545 &mptctl_getiocinfo_28545
++sysfs_create_bin_file_28551 sysfs_create_bin_file 0 28551 NULL
 +b43legacy_debugfs_write_28556 b43legacy_debugfs_write 3 28556 NULL
++i2o_msg_post_wait_mem_28558 i2o_msg_post_wait_mem 0 28558 NULL
 +asymmetric_verify_28567 asymmetric_verify 3 28567 NULL
-+phys_pud_init_28574 phys_pud_init 0-3-2 28574 NULL
-+cfg80211_send_rx_auth_28580 cfg80211_send_rx_auth 3 28580 NULL
 +oxygen_read32_28582 oxygen_read32 0 28582 NULL
 +ocfs2_read_dir_block_28587 ocfs2_read_dir_block 2 28587 NULL
-+extract_entropy_28604 extract_entropy 3-5 28604 NULL
++extract_entropy_28604 extract_entropy 5-3 28604 NULL
 +kfifo_unused_28612 kfifo_unused 0 28612 NULL
 +mp_override_legacy_irq_28618 mp_override_legacy_irq 4 28618 NULL
 +snd_nm256_capture_copy_28622 snd_nm256_capture_copy 5-3 28622 NULL
-+_set_range_28627 _set_range 3 28627 NULL
-+v4l2_compat_ioctl32_28630 v4l2_compat_ioctl32 3 28630 NULL
 +setup_usemap_28636 setup_usemap 3-4 28636 NULL
++qib_handle_6120_hwerrors_28642 qib_handle_6120_hwerrors 3 28642 NULL
++p9_fcall_alloc_28652 p9_fcall_alloc 1 28652 NULL
++read_nic_io_byte_28654 read_nic_io_byte 0 28654 NULL
++btrfs_previous_item_28667 btrfs_previous_item 0 28667 NULL
 +blk_queue_resize_tags_28670 blk_queue_resize_tags 2 28670 NULL
-+__dev_alloc_skb_28681 __dev_alloc_skb 1 28681 NULL
++__perf_sw_event_28684 __perf_sw_event 2 28684 NULL
 +SyS_setgroups16_28686 SyS_setgroups16 1 28686 NULL
-+nl80211_send_new_peer_candidate_28692 nl80211_send_new_peer_candidate 5 28692 NULL nohasharray
-+kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 &nl80211_send_new_peer_candidate_28692
++kvm_mmu_get_page_28692 kvm_mmu_get_page 2 28692 NULL
++balance_level_28707 balance_level 0 28707 NULL
 +drm_plane_init_28731 drm_plane_init 6 28731 NULL
++alloc_irq_cfg_28734 alloc_irq_cfg 2 28734 NULL
 +spi_execute_28736 spi_execute 5 28736 NULL
-+phantom_compat_ioctl_28738 phantom_compat_ioctl 3 28738 NULL nohasharray
-+snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 &phantom_compat_ioctl_28738
++snd_pcm_aio_write_28738 snd_pcm_aio_write 3 28738 NULL
 +read_file_btcoex_28743 read_file_btcoex 3 28743 NULL
 +max_hw_blocks_28748 max_hw_blocks 0 28748 NULL
++rpc_pipe_generic_upcall_28766 rpc_pipe_generic_upcall 4 28766 NULL
++atomic_inc_return_unchecked_28778 atomic_inc_return_unchecked 0 28778 NULL
 +ath6kl_get_num_reg_28780 ath6kl_get_num_reg 0 28780 NULL
-+dvb_net_sec_callback_28786 dvb_net_sec_callback 2 28786 NULL
 +btrfs_block_rsv_refill_28800 btrfs_block_rsv_refill 3 28800 NULL nohasharray
 +sel_write_member_28800 sel_write_member 3 28800 &btrfs_block_rsv_refill_28800
 +cgroup_file_read_28804 cgroup_file_read 3 28804 NULL
-+btrfs_ref_to_path_28809 btrfs_ref_to_path 0 28809 NULL
 +memory_bm_create_28814 memory_bm_create 0 28814 NULL
 +iwl_dbgfs_rxon_filter_flags_read_28832 iwl_dbgfs_rxon_filter_flags_read 3 28832 NULL
-+C_SYSC_shmat_28843 C_SYSC_shmat 2 28843 NULL
 +vp_request_msix_vectors_28849 vp_request_msix_vectors 2 28849 NULL
 +ipv6_renew_options_28867 ipv6_renew_options 5 28867 NULL
++max_io_len_target_boundary_28879 max_io_len_target_boundary 0-1 28879 NULL
 +packet_sendmsg_spkt_28885 packet_sendmsg_spkt 4 28885 NULL
 +to_cblock_28899 to_cblock 0-1 28899 NULL
 +da9055_group_write_28904 da9055_group_write 2-3 28904 NULL
 +ps_upsd_timeouts_read_28924 ps_upsd_timeouts_read 3 28924 NULL
++iwl_dbgfs_sleep_level_override_write_28925 iwl_dbgfs_sleep_level_override_write 3 28925 NULL
 +ocfs2_frozen_trigger_28929 ocfs2_frozen_trigger 4 28929 NULL
 +push_rx_28939 push_rx 3 28939 NULL
-+btrfs_trim_block_group_28963 btrfs_trim_block_group 3 28963 NULL
++btrfs_trim_block_group_28963 btrfs_trim_block_group 4-3 28963 NULL
 +alloc_sched_domains_28972 alloc_sched_domains 1 28972 NULL
++remap_pfn_range_28976 remap_pfn_range 3-4-2 28976 NULL
 +ext4_mb_add_groupinfo_28988 ext4_mb_add_groupinfo 2 28988 NULL
++hci_sock_setsockopt_28993 hci_sock_setsockopt 5 28993 NULL
 +bin_uuid_28999 bin_uuid 3 28999 NULL
-+offset_to_bitmap_29004 offset_to_bitmap 2 29004 NULL
++fd_execute_rw_29004 fd_execute_rw 3 29004 NULL nohasharray
++offset_to_bitmap_29004 offset_to_bitmap 2 29004 &fd_execute_rw_29004
 +xz_dec_init_29029 xz_dec_init 2 29029 NULL
-+sys_fcntl64_29031 sys_fcntl64 3 29031 NULL
++i915_gem_object_bind_to_vm_29035 i915_gem_object_bind_to_vm 0 29035 NULL
 +ieee80211_if_read_ht_opmode_29044 ieee80211_if_read_ht_opmode 3 29044 NULL
-+rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 NULL
++ProcessGetHostMibs_29049 ProcessGetHostMibs 0 29049 NULL nohasharray
++rxrpc_sendmsg_29049 rxrpc_sendmsg 4 29049 &ProcessGetHostMibs_29049
++btrfs_root_bytenr_29058 btrfs_root_bytenr 0 29058 NULL
 +iso_packets_buffer_init_29061 iso_packets_buffer_init 3-4 29061 NULL
++roundup_64_29066 roundup_64 2-0-1 29066 NULL
 +lpfc_idiag_extacc_drivr_get_29067 lpfc_idiag_extacc_drivr_get 0-3 29067 NULL
-+memblock_alloc_base_nid_29072 memblock_alloc_base_nid 1-2 29072 NULL
 +sctp_getsockopt_assoc_stats_29074 sctp_getsockopt_assoc_stats 2 29074 NULL
-+mark_extents_written_29082 mark_extents_written 2 29082 NULL
++iwl_dbgfs_log_event_write_29088 iwl_dbgfs_log_event_write 3 29088 NULL
 +i915_error_object_create_sized_29091 i915_error_object_create_sized 3 29091 NULL
++init_cache_node_node_29092 init_cache_node_node 1 29092 NULL
 +isdn_ppp_write_29109 isdn_ppp_write 4 29109 NULL
 +snprintf_29125 snprintf 0 29125 NULL
 +iov_shorten_29130 iov_shorten 0 29130 NULL
 +proc_scsi_write_29142 proc_scsi_write 3 29142 NULL
-+reshape_ring_29147 reshape_ring 2 29147 NULL
-+alloc_irqs_from_29152 alloc_irqs_from 1-2 29152 NULL
++alloc_irqs_from_29152 alloc_irqs_from 1-2-0-3 29152 NULL
++kvm_mmu_notifier_clear_flush_young_29154 kvm_mmu_notifier_clear_flush_young 3 29154 NULL
 +drm_property_create_enum_29201 drm_property_create_enum 5 29201 NULL
-+alloc_group_attrs_29203 alloc_group_attrs 3 29203 NULL nohasharray
-+wusb_prf_256_29203 wusb_prf_256 7 29203 &alloc_group_attrs_29203
-+__mm_populate_29204 __mm_populate 1 29204 NULL
-+comedi_alloc_subdevices_29207 comedi_alloc_subdevices 2 29207 NULL
++wusb_prf_256_29203 wusb_prf_256 7 29203 NULL
++__mm_populate_29204 __mm_populate 1-2 29204 NULL
 +do_shrinker_shrink_29208 do_shrinker_shrink 0 29208 NULL
++rds_iw_inc_copy_to_user_29214 rds_iw_inc_copy_to_user 3 29214 NULL
 +iwl_dbgfs_temperature_read_29224 iwl_dbgfs_temperature_read 3 29224 NULL
 +nvme_trans_copy_from_user_29227 nvme_trans_copy_from_user 3 29227 NULL
-+devm_ioremap_29235 devm_ioremap 2-3 29235 NULL
 +irq_domain_add_linear_29236 irq_domain_add_linear 2 29236 NULL
-+recover_peb_29238 recover_peb 6-7 29238 NULL
++recover_peb_29238 recover_peb 0-7-6 29238 NULL
++evdev_handle_get_val_29242 evdev_handle_get_val 5-6 29242 NULL
++rw_verify_area_29243 rw_verify_area 0-4 29243 NULL
 +security_context_to_sid_core_29248 security_context_to_sid_core 2 29248 NULL
 +block_div_29268 block_div 0-1-2 29268 NULL
 +prism2_set_genericelement_29277 prism2_set_genericelement 3 29277 NULL
 +bitmap_ord_to_pos_29279 bitmap_ord_to_pos 3 29279 NULL
++ext4_fiemap_29296 ext4_fiemap 4 29296 NULL
 +sn9c102_read_29305 sn9c102_read 3 29305 NULL
++replace_file_extents_29312 replace_file_extents 0 29312 NULL
 +__fuse_get_req_29315 __fuse_get_req 2 29315 NULL
-+lo_compat_ioctl_29336 lo_compat_ioctl 4 29336 NULL
++lprocfs_write_helper_29323 lprocfs_write_helper 2 29323 NULL
++kvm_handle_hva_29326 kvm_handle_hva 2 29326 NULL
 +tun_put_user_29337 tun_put_user 5 29337 NULL
 +__alloc_ei_netdev_29338 __alloc_ei_netdev 1 29338 NULL
-+alloc_and_copy_ftrace_hash_29368 alloc_and_copy_ftrace_hash 1 29368 NULL
++ide_read_altstatus_29343 ide_read_altstatus 0 29343 NULL
++l2cap_sock_setsockopt_old_29346 l2cap_sock_setsockopt_old 4 29346 NULL
++gpiochip_find_base_29366 gpiochip_find_base 0-1 29366 NULL
 +ktime_us_delta_29375 ktime_us_delta 0 29375 NULL
 +mwifiex_cfg80211_mgmt_tx_29387 mwifiex_cfg80211_mgmt_tx 7 29387 NULL
 +pca953x_irq_setup_29407 pca953x_irq_setup 3 29407 NULL
++btrfs_run_delayed_items_29428 btrfs_run_delayed_items 0 29428 NULL
 +mempool_create_29437 mempool_create 1 29437 NULL
 +crypto_ahash_alignmask_29445 crypto_ahash_alignmask 0 29445 NULL
-+apei_exec_ctx_get_output_29457 apei_exec_ctx_get_output 0 29457 NULL
++p9_client_prepare_req_29448 p9_client_prepare_req 3 29448 NULL
++ept_page_fault_29450 ept_page_fault 2 29450 NULL
++__kmalloc_node_29455 __kmalloc_node 3 29455 NULL
 +validate_scan_freqs_29462 validate_scan_freqs 0 29462 NULL
 +SyS_flistxattr_29474 SyS_flistxattr 3 29474 NULL
 +do_register_entry_29478 do_register_entry 4 29478 NULL
@@ -105474,102 +105829,127 @@ index 0000000..9a7096d
 +sched_clock_local_29498 sched_clock_local 0 29498 NULL
 +btmrvl_pscmd_write_29504 btmrvl_pscmd_write 3 29504 NULL
 +btrfs_file_extent_disk_bytenr_29505 btrfs_file_extent_disk_bytenr 0 29505 NULL
++write_file_regidx_29517 write_file_regidx 3 29517 NULL
 +atk_debugfs_ggrp_read_29522 atk_debugfs_ggrp_read 3 29522 NULL
-+_regmap_raw_write_29541 _regmap_raw_write 4-2 29541 NULL
-+set_brk_29551 set_brk 1 29551 NULL nohasharray
++_regmap_raw_write_29541 _regmap_raw_write 2-4 29541 NULL
++vfs_read_29543 vfs_read 0-3 29543 NULL
++set_brk_29551 set_brk 1-2 29551 NULL nohasharray
 +ftrace_write_29551 ftrace_write 3 29551 &set_brk_29551
 +idetape_queue_rw_tail_29562 idetape_queue_rw_tail 3 29562 NULL
-+alloc_empty_pages_29566 alloc_empty_pages 2 29566 NULL nohasharray
-+leaf_dealloc_29566 leaf_dealloc 3 29566 &alloc_empty_pages_29566
++leaf_dealloc_29566 leaf_dealloc 3 29566 NULL
++kvm_read_guest_virt_system_29569 kvm_read_guest_virt_system 4-2 29569 NULL
++p9_fd_read_29570 p9_fd_read 3 29570 NULL
 +lbs_lowsnr_read_29571 lbs_lowsnr_read 3 29571 NULL
-+pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4 29589 NULL
++iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3 29586 NULL
++pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 4-0 29589 NULL
++dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 NULL
 +slots_per_page_29601 slots_per_page 0 29601 NULL
-+qla4_82xx_pci_set_window_29605 qla4_82xx_pci_set_window 0-2 29605 NULL
-+alloc_low_pages_29623 alloc_low_pages 1 29623 NULL
++osc_cached_mb_seq_write_29610 osc_cached_mb_seq_write 3 29610 NULL
 +nla_get_u16_29624 nla_get_u16 0 29624 NULL
 +tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3 29639 NULL
-+lowmem_page_address_29649 lowmem_page_address 0 29649 NULL
 +sctp_make_abort_user_29654 sctp_make_abort_user 3 29654 NULL
-+br_send_bpdu_29669 br_send_bpdu 3 29669 NULL
 +sisusb_write_mem_bulk_29678 sisusb_write_mem_bulk 4 29678 NULL
-+sd_alloc_ctl_entry_29708 sd_alloc_ctl_entry 1 29708 NULL nohasharray
-+posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 &sd_alloc_ctl_entry_29708
++tracepoint_probe_register_29688 tracepoint_probe_register 0 29688 NULL
++__btrfs_setxattr_29689 __btrfs_setxattr 0 29689 NULL
++jbd2_journal_restart_29692 jbd2_journal_restart 0 29692 NULL
++lustre_posix_acl_xattr_2ext_29693 lustre_posix_acl_xattr_2ext 2 29693 NULL
++posix_acl_from_xattr_29708 posix_acl_from_xattr 3 29708 NULL
 +probes_write_29711 probes_write 3 29711 NULL
-+emi62_writememory_29731 emi62_writememory 4 29731 NULL
 +read_cis_cache_29735 read_cis_cache 4 29735 NULL
++xfs_new_eof_29737 xfs_new_eof 2 29737 NULL
 +std_nic_write_29752 std_nic_write 3 29752 NULL
-+ip_vs_conn_fill_param_sync_29771 ip_vs_conn_fill_param_sync 6 29771 NULL
-+tcf_csum_ipv6_icmp_29777 tcf_csum_ipv6_icmp 3 29777 NULL
 +dbAlloc_29794 dbAlloc 0 29794 NULL
 +ext4_trim_all_free_29806 ext4_trim_all_free 4-3-2 29806 NULL
 +tcp_sendpage_29829 tcp_sendpage 4 29829 NULL
 +scan_bitmap_block_29840 scan_bitmap_block 4 29840 NULL
 +__probe_kernel_write_29842 __probe_kernel_write 3 29842 NULL
 +kvm_read_hva_atomic_29848 kvm_read_hva_atomic 3 29848 NULL
++count_partial_29850 count_partial 0 29850 NULL
++radeon_ttm_tt_create_29859 radeon_ttm_tt_create 2 29859 NULL
 +solo_enc_alloc_29860 solo_enc_alloc 3 29860 NULL
 +ipv6_setsockopt_29871 ipv6_setsockopt 5 29871 NULL
++tlv_put_29872 tlv_put 0 29872 NULL
 +scsi_end_request_29876 scsi_end_request 3 29876 NULL
++changed_extent_29881 changed_extent 0 29881 NULL
 +crypto_aead_alignmask_29885 crypto_aead_alignmask 0 29885 NULL
-+nfc_targets_found_29886 nfc_targets_found 3 29886 NULL
++lov_ost_pool_extend_29914 lov_ost_pool_extend 2 29914 NULL
++write_file_queue_29922 write_file_queue 3 29922 NULL
 +ext4_xattr_set_acl_29930 ext4_xattr_set_acl 4 29930 NULL
 +__btrfs_getxattr_29947 __btrfs_getxattr 0 29947 NULL
-+irias_add_octseq_attrib_29983 irias_add_octseq_attrib 4 29983 NULL nohasharray
-+diva_os_get_context_size_29983 diva_os_get_context_size 0 29983 &irias_add_octseq_attrib_29983
++diva_os_get_context_size_29983 diva_os_get_context_size 0 29983 NULL
 +arch_setup_dmar_msi_29992 arch_setup_dmar_msi 1 29992 NULL
 +vmci_host_setup_notify_30002 vmci_host_setup_notify 2 30002 NULL
-+utf32_to_utf8_30028 utf32_to_utf8 0 30028 NULL
++dev_mem_write_30028 dev_mem_write 3 30028 NULL
 +alloc_netdev_mqs_30030 alloc_netdev_mqs 1 30030 NULL
 +scsi_vpd_inquiry_30040 scsi_vpd_inquiry 4 30040 NULL
-+drp_wmove_30043 drp_wmove 4 30043 NULL
++drp_wmove_30043 drp_wmove 4 30043 NULL nohasharray
++wrmalt_30043 wrmalt 0 30043 &drp_wmove_30043
++mem_cgroup_charge_common_30047 mem_cgroup_charge_common 0 30047 NULL
++SyS_write_30059 SyS_write 3 30059 NULL
 +cxgbi_ddp_reserve_30091 cxgbi_ddp_reserve 4 30091 NULL
 +snd_midi_channel_init_set_30092 snd_midi_channel_init_set 1 30092 NULL
-+tg3_run_loopback_30093 tg3_run_loopback 2 30093 NULL
-+dma_to_phys_30098 dma_to_phys 0-2 30098 NULL nohasharray
-+rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 &dma_to_phys_30098
-+skb_pagelen_30113 skb_pagelen 0 30113 NULL
++rx_filter_data_filter_read_30098 rx_filter_data_filter_read 3 30098 NULL
++defragment_dma_buffer_30113 defragment_dma_buffer 0 30113 NULL
 +spi_async_locked_30117 spi_async_locked 0 30117 NULL
-+calgary_unmap_page_30130 calgary_unmap_page 2-3 30130 NULL
-+_osd_req_sizeof_alist_header_30134 _osd_req_sizeof_alist_header 0 30134 NULL
-+u_memcpya_30139 u_memcpya 2-3 30139 NULL
++calgary_unmap_page_30130 calgary_unmap_page 3-2 30130 NULL
++recv_stream_30138 recv_stream 4 30138 NULL
++u_memcpya_30139 u_memcpya 3-2 30139 NULL
++elfcorehdr_read_30159 elfcorehdr_read 2 30159 NULL
++alloc_switch_ctx_30165 alloc_switch_ctx 2 30165 NULL
++expand_inode_data_30169 expand_inode_data 2-3 30169 NULL
 +btrfs_start_transaction_lflush_30178 btrfs_start_transaction_lflush 2 30178 NULL
-+cx25821_video_ioctl_30188 cx25821_video_ioctl 2 30188 NULL
 +mempool_create_page_pool_30189 mempool_create_page_pool 1 30189 NULL
 +drm_property_create_bitmask_30195 drm_property_create_bitmask 5 30195 NULL
++snd_pcm_playback_forward_30201 snd_pcm_playback_forward 0-2 30201 NULL
 +usblp_ioctl_30203 usblp_ioctl 2 30203 NULL
-+nfs_idmap_request_key_30208 nfs_idmap_request_key 3 30208 NULL
 +read_4k_modal_eeprom_30212 read_4k_modal_eeprom 3 30212 NULL
-+snd_ac97_pcm_assign_30218 snd_ac97_pcm_assign 2 30218 NULL
-+SyS_semop_30227 SyS_semop 3 30227 NULL
-+f2fs_compat_ioctl_30261 f2fs_compat_ioctl 3 30261 NULL
++bitmap_file_set_bit_30228 bitmap_file_set_bit 2 30228 NULL
++shmem_unuse_inode_30263 shmem_unuse_inode 0 30263 NULL
++rawv6_recvmsg_30265 rawv6_recvmsg 4 30265 NULL
++hfsplus_trusted_setxattr_30270 hfsplus_trusted_setxattr 4 30270 NULL
 +isr_pci_pm_read_30271 isr_pci_pm_read 3 30271 NULL
 +compat_readv_30273 compat_readv 3 30273 NULL
 +lapic_register_intr_30279 lapic_register_intr 1 30279 NULL
 +skcipher_sendmsg_30290 skcipher_sendmsg 4 30290 NULL
 +pipeline_sec_frag_swi_read_30294 pipeline_sec_frag_swi_read 3 30294 NULL
 +tcp_sendmsg_30296 tcp_sendmsg 4 30296 NULL
++osc_contention_seconds_seq_write_30305 osc_contention_seconds_seq_write 3 30305 NULL
++drm_core_get_reg_ofs_30309 drm_core_get_reg_ofs 0 30309 NULL
 +ext4_acl_from_disk_30320 ext4_acl_from_disk 2 30320 NULL
++i8254_read_30330 i8254_read 0 30330 NULL
 +generic_ptrace_pokedata_30338 generic_ptrace_pokedata 2 30338 NULL
 +resource_from_user_30341 resource_from_user 3 30341 NULL
-+__vmalloc_node_flags_30352 __vmalloc_node_flags 1 30352 NULL
++o2nm_this_node_30342 o2nm_this_node 0 30342 NULL
++__vmalloc_node_flags_30352 __vmalloc_node_flags 1-2 30352 NULL
++kstrtou32_from_user_30361 kstrtou32_from_user 2 30361 NULL
++inet_getid_30365 inet_getid 2 30365 NULL
 +C_SYSC_readv_30369 C_SYSC_readv 3 30369 NULL
-+sys_get_mempolicy_30379 sys_get_mempolicy 3-4 30379 NULL
-+mangle_sdp_packet_30381 mangle_sdp_packet 10 30381 NULL
++blkdev_issue_zeroout_30392 blkdev_issue_zeroout 3-0 30392 NULL
 +c4iw_init_resource_30393 c4iw_init_resource 2-3 30393 NULL
 +get_kernel_pages_30397 get_kernel_pages 0 30397 NULL
 +_drbd_bm_find_next_zero_30415 _drbd_bm_find_next_zero 2 30415 NULL
++ext3_xattr_list_30419 ext3_xattr_list 3 30419 NULL
 +vb2_fop_write_30420 vb2_fop_write 3 30420 NULL
 +tx_tx_template_prepared_read_30424 tx_tx_template_prepared_read 3 30424 NULL
-+mq_create_30425 mq_create 1 30425 NULL
++mq_create_30425 mq_create 1 30425 NULL nohasharray
++lstcon_session_info_30425 lstcon_session_info 6 30425 &mq_create_30425
++ext4_ext_create_new_leaf_30428 ext4_ext_create_new_leaf 0 30428 NULL
 +enable_write_30456 enable_write 3 30456 NULL
++pci_resource_alignment_30457 pci_resource_alignment 0 30457 NULL
 +tx_tx_template_programmed_read_30461 tx_tx_template_programmed_read 3 30461 NULL
 +urandom_read_30462 urandom_read 3 30462 NULL
 +zoran_ioctl_30465 zoran_ioctl 2 30465 NULL
-+ocrdma_reg_user_mr_30474 ocrdma_reg_user_mr 2-3 30474 NULL
++i2c_ctrl_read_30467 i2c_ctrl_read 0 30467 NULL
++send_rmdir_30470 send_rmdir 0 30470 NULL
++i915_mutex_lock_interruptible_30474 i915_mutex_lock_interruptible 0 30474 NULL nohasharray
++ocrdma_reg_user_mr_30474 ocrdma_reg_user_mr 2-3 30474 &i915_mutex_lock_interruptible_30474
 +write_head_30481 write_head 4 30481 NULL
 +adu_write_30487 adu_write 3 30487 NULL
++dtim_interval_write_30489 dtim_interval_write 3 30489 NULL
++btrfs_free_extent_30515 btrfs_free_extent 0 30515 NULL
 +dwc3_testmode_write_30516 dwc3_testmode_write 3 30516 NULL
-+debug_debug2_read_30526 debug_debug2_read 3 30526 NULL
-+batadv_dat_snoop_incoming_arp_request_30548 batadv_dat_snoop_incoming_arp_request 3 30548 NULL
++debug_debug2_read_30526 debug_debug2_read 3 30526 NULL nohasharray
++set_config_30526 set_config 0 30526 &debug_debug2_read_30526
 +disk_expand_part_tbl_30561 disk_expand_part_tbl 2 30561 NULL
 +set_le_30581 set_le 4 30581 NULL
 +from_cblock_30582 from_cblock 0-1 30582 NULL
@@ -105580,43 +105960,49 @@ index 0000000..9a7096d
 +macvtap_sendmsg_30629 macvtap_sendmsg 4 30629 NULL
 +ieee80211_if_read_dot11MeshAwakeWindowDuration_30631 ieee80211_if_read_dot11MeshAwakeWindowDuration 3 30631 NULL
 +compat_raw_setsockopt_30634 compat_raw_setsockopt 5 30634 NULL
++mlx5_ib_alloc_fast_reg_page_list_30638 mlx5_ib_alloc_fast_reg_page_list 2 30638 NULL
 +SyS_listxattr_30647 SyS_listxattr 3 30647 NULL
 +agp_remap_30665 agp_remap 2 30665 NULL
 +jffs2_flash_read_30667 jffs2_flash_read 0 30667 NULL
-+il_free_pages_30692 il_free_pages 2 30692 NULL
++ni_ai_fifo_read_30681 ni_ai_fifo_read 3 30681 NULL
 +dccp_setsockopt_ccid_30701 dccp_setsockopt_ccid 4 30701 NULL
++lbs_wrbbp_write_30712 lbs_wrbbp_write 3 30712 NULL
++ocfs2_find_cpos_for_left_leaf_30713 ocfs2_find_cpos_for_left_leaf 0 30713 NULL
++__mutex_lock_common_30717 __mutex_lock_common 0 30717 NULL
 +lbs_debugfs_read_30721 lbs_debugfs_read 3 30721 NULL
 +snd_nm256_playback_silence_30727 snd_nm256_playback_silence 4-3 30727 NULL
 +snapshot_status_30744 snapshot_status 5 30744 NULL
-+tcf_csum_ipv4_udp_30777 tcf_csum_ipv4_udp 4 30777 NULL
++fuse_conn_limit_write_30777 fuse_conn_limit_write 3 30777 NULL
++SyS_pread64_30778 SyS_pread64 3 30778 NULL
++btrfs_run_ordered_operations_30793 btrfs_run_ordered_operations 0 30793 NULL
 +smk_read_doi_30813 smk_read_doi 3 30813 NULL
++SYSC_splice_30820 SYSC_splice 5 30820 NULL
++xlog_grant_head_wait_30829 xlog_grant_head_wait 4 30829 NULL
 +get_kobj_path_length_30831 get_kobj_path_length 0 30831 NULL
 +sctp_setsockopt_auth_chunk_30843 sctp_setsockopt_auth_chunk 3 30843 NULL
 +cfg80211_rx_mgmt_30844 cfg80211_rx_mgmt 5 30844 NULL
-+hda_hwdep_ioctl_compat_30847 hda_hwdep_ioctl_compat 4 30847 NULL
-+trace_probe_nr_files_30882 trace_probe_nr_files 0 30882 NULL
++wd_autoreset_write_30862 wd_autoreset_write 3 30862 NULL
 +ieee80211_if_fmt_dropped_frames_no_route_30884 ieee80211_if_fmt_dropped_frames_no_route 3 30884 NULL
-+iommu_map_mmio_space_30919 iommu_map_mmio_space 1 30919 NULL
++pn_recvmsg_30887 pn_recvmsg 4 30887 NULL
 +sctp_setsockopt_rtoinfo_30941 sctp_setsockopt_rtoinfo 3 30941 NULL
++find_free_dev_extent_30963 find_free_dev_extent 0 30963 NULL
 +tty_insert_flip_string_flags_30969 tty_insert_flip_string_flags 4 30969 NULL
 +huge_page_mask_30981 huge_page_mask 0 30981 NULL
-+i2400mu_rx_size_grow_30989 i2400mu_rx_size_grow 0 30989 NULL
++read_file_bt_ant_diversity_30983 read_file_bt_ant_diversity 3 30983 NULL
 +lbs_host_sleep_read_31013 lbs_host_sleep_read 3 31013 NULL
-+phys_pmd_init_31024 phys_pmd_init 0-3-2 31024 NULL
-+compat_sys_mq_timedsend_31060 compat_sys_mq_timedsend 3 31060 NULL
++do_setup_msi_irqs_31043 do_setup_msi_irqs 2 31043 NULL
++stride_pg_count_31053 stride_pg_count 0-2-1-4-3-5 31053 NULL
 +lbs_failcount_read_31063 lbs_failcount_read 3 31063 NULL
 +find_next_bit_le_31064 find_next_bit_le 0-2-3 31064 NULL
-+sys_mincore_31079 sys_mincore 1 31079 NULL
-+ttm_bo_ioremap_31082 ttm_bo_ioremap 2-3 31082 NULL
 +sctp_setsockopt_context_31091 sctp_setsockopt_context 3 31091 NULL
-+compat_sys_get_mempolicy_31109 compat_sys_get_mempolicy 3-4 31109 NULL
++proc_gid_map_write_31093 proc_gid_map_write 3 31093 NULL
++compat_sys_get_mempolicy_31109 compat_sys_get_mempolicy 3 31109 NULL
++si_calculate_power_efficiency_ratio_31111 si_calculate_power_efficiency_ratio 3-2 31111 NULL
 +depth_read_31112 depth_read 3 31112 NULL
-+ssb_read16_31139 ssb_read16 0 31139 NULL
 +kimage_normal_alloc_31140 kimage_normal_alloc 3 31140 NULL
-+size_inside_page_31141 size_inside_page 0 31141 NULL
++size_inside_page_31141 size_inside_page 0-1-2 31141 NULL
 +w9966_v4l_read_31148 w9966_v4l_read 3 31148 NULL
 +ch_do_scsi_31171 ch_do_scsi 4 31171 NULL
-+acpi_ex_system_memory_space_handler_31192 acpi_ex_system_memory_space_handler 2 31192 NULL
 +r592_read_fifo_pio_31198 r592_read_fifo_pio 3 31198 NULL
 +mtdchar_readoob_31200 mtdchar_readoob 4 31200 NULL
 +__btrfs_free_reserved_extent_31207 __btrfs_free_reserved_extent 2 31207 NULL
@@ -105624,37 +106010,48 @@ index 0000000..9a7096d
 +cpumask_weight_31215 cpumask_weight 0 31215 NULL
 +__read_reg_31216 __read_reg 0 31216 NULL
 +atm_get_addr_31221 atm_get_addr 3 31221 NULL
++ulist_rbtree_insert_31235 ulist_rbtree_insert 0 31235 NULL
++tcp_recvmsg_31238 tcp_recvmsg 4 31238 NULL
 +cyy_readb_31240 cyy_readb 0 31240 NULL
 +_create_sg_bios_31244 _create_sg_bios 4 31244 NULL
 +ieee80211_if_read_last_beacon_31257 ieee80211_if_read_last_beacon 3 31257 NULL
 +sctp_tsnmap_find_gap_ack_31272 sctp_tsnmap_find_gap_ack 3-2 31272 NULL
 +uvc_simplify_fraction_31303 uvc_simplify_fraction 3 31303 NULL
++push_leaf_left_31306 push_leaf_left 0 31306 NULL
 +sisusbcon_scroll_31315 sisusbcon_scroll 5-2-3 31315 NULL
 +command_file_write_31318 command_file_write 3 31318 NULL
++ext4_xattr_block_list_31325 ext4_xattr_block_list 3 31325 NULL
++hwerr_crcbits_31334 hwerr_crcbits 4 31334 NULL
++radix_tree_insert_31336 radix_tree_insert 0 31336 NULL
 +em28xx_init_usb_xfer_31337 em28xx_init_usb_xfer 4-6 31337 NULL
 +__cpu_to_node_31345 __cpu_to_node 0 31345 NULL
++outlen_write_31358 outlen_write 3 31358 NULL
++ieee80211_rx_mgmt_auth_31366 ieee80211_rx_mgmt_auth 3 31366 NULL
 +xprt_rdma_allocate_31372 xprt_rdma_allocate 2 31372 NULL
-+vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 3-2 31374 NULL
++vb2_vmalloc_get_userptr_31374 vb2_vmalloc_get_userptr 2-3 31374 NULL
 +trace_parser_get_init_31379 trace_parser_get_init 2 31379 NULL
 +inb_31388 inb 0 31388 NULL
 +key_ifindex_read_31411 key_ifindex_read 3 31411 NULL
-+mcs7830_set_reg_31413 mcs7830_set_reg 3 31413 NULL
++i915_gem_object_put_fence_31413 i915_gem_object_put_fence 0 31413 NULL
++_sp2d_max_pg_31422 _sp2d_max_pg 0 31422 NULL
 +TSS_checkhmac1_31429 TSS_checkhmac1 5 31429 NULL
 +snd_aw2_saa7146_get_hw_ptr_capture_31431 snd_aw2_saa7146_get_hw_ptr_capture 0 31431 NULL
 +acpi_sci_ioapic_setup_31445 acpi_sci_ioapic_setup 4 31445 NULL
++transport_alloc_session_tags_31449 transport_alloc_session_tags 2-3 31449 NULL
 +opera1_xilinx_rw_31453 opera1_xilinx_rw 5 31453 NULL
++register_ftrace_graph_31456 register_ftrace_graph 0 31456 NULL
 +input_get_new_minor_31464 input_get_new_minor 1 31464 NULL
 +do_fcntl_31468 do_fcntl 3 31468 NULL
 +xfs_btree_get_numrecs_31477 xfs_btree_get_numrecs 0 31477 NULL
++__ext4_journal_get_write_access_31482 __ext4_journal_get_write_access 0 31482 NULL
 +alg_setkey_31485 alg_setkey 3 31485 NULL
 +rds_message_map_pages_31487 rds_message_map_pages 2 31487 NULL
 +qsfp_2_read_31491 qsfp_2_read 3 31491 NULL
-+__alloc_bootmem_31498 __alloc_bootmem 1-2 31498 NULL
-+rmode_tss_base_31510 rmode_tss_base 0 31510 NULL
++__alloc_bootmem_31498 __alloc_bootmem 1 31498 NULL
++nouveau_mc_create__31513 nouveau_mc_create_ 5 31513 NULL
 +hidraw_write_31536 hidraw_write 3 31536 NULL
 +mtd_div_by_eb_31543 mtd_div_by_eb 0-1 31543 NULL
 +usbvision_read_31555 usbvision_read 3 31555 NULL
-+normalize_31566 normalize 0-1-2 31566 NULL
 +tx_frag_tkip_called_read_31575 tx_frag_tkip_called_read 3 31575 NULL
 +get_max_inline_xattr_value_size_31578 get_max_inline_xattr_value_size 0 31578 NULL
 +osst_write_31581 osst_write 3 31581 NULL
@@ -105667,169 +106064,199 @@ index 0000000..9a7096d
 +xfer_secondary_pool_31661 xfer_secondary_pool 2 31661 NULL
 +emulator_set_cr_31665 emulator_set_cr 3 31665 NULL
 +__lgread_31668 __lgread 4 31668 NULL
-+symbol_string_31670 symbol_string 0 31670 NULL
-+_usb_writeN_sync_31682 _usb_writeN_sync 4 31682 NULL
 +forced_ps_read_31685 forced_ps_read 3 31685 NULL
++fst_recover_rx_error_31687 fst_recover_rx_error 3 31687 NULL
 +reiserfs_in_journal_31689 reiserfs_in_journal 3 31689 NULL
-+audit_log_n_string_31705 audit_log_n_string 3 31705 NULL
-+ath6kl_wmi_send_probe_response_cmd_31728 ath6kl_wmi_send_probe_response_cmd 6 31728 NULL nohasharray
-+gfn_to_hva_read_31728 gfn_to_hva_read 2 31728 &ath6kl_wmi_send_probe_response_cmd_31728
-+utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 NULL
-+shmem_pwrite_slow_31741 shmem_pwrite_slow 3 31741 NULL
++gfn_to_hva_read_31728 gfn_to_hva_read 2 31728 NULL
++utf16s_to_utf8s_31735 utf16s_to_utf8s 0 31735 NULL nohasharray
++lu_buf_check_and_grow_31735 lu_buf_check_and_grow 2 31735 &utf16s_to_utf8s_31735
++shmem_pwrite_slow_31741 shmem_pwrite_slow 3-2 31741 NULL
 +NCR_700_change_queue_depth_31742 NCR_700_change_queue_depth 2 31742 NULL nohasharray
 +input_abs_get_max_31742 input_abs_get_max 0 31742 &NCR_700_change_queue_depth_31742
-+muldiv64_31743 muldiv64 2-3 31743 NULL
-+bcm_char_read_31750 bcm_char_read 3 31750 NULL
++muldiv64_31743 muldiv64 3-2-0 31743 NULL
++stmpe_set_altfunc_31750 stmpe_set_altfunc 2 31750 NULL nohasharray
++bcm_char_read_31750 bcm_char_read 3 31750 &stmpe_set_altfunc_31750
 +snd_seq_device_new_31753 snd_seq_device_new 4 31753 NULL
-+set_memory_wb_31761 set_memory_wb 1 31761 NULL
 +SyS_lsetxattr_31766 SyS_lsetxattr 4 31766 NULL
 +usblp_cache_device_id_string_31790 usblp_cache_device_id_string 0 31790 NULL
-+get_count_order_31800 get_count_order 0 31800 NULL
 +ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
 +isr_rx_procs_read_31804 isr_rx_procs_read 3 31804 NULL
++data_write_31805 data_write 3 31805 NULL
 +SyS_msgsnd_31814 SyS_msgsnd 3 31814 NULL
 +strnlen_user_31815 strnlen_user 0-2 31815 NULL
 +sta_last_signal_read_31818 sta_last_signal_read 3 31818 NULL
++fsnotify_perm_31843 fsnotify_perm 0 31843 NULL
++SyS_ppoll_31855 SyS_ppoll 2 31855 NULL
++iwl_dbgfs_disable_ht40_write_31876 iwl_dbgfs_disable_ht40_write 3 31876 NULL
 +drm_mode_crtc_set_gamma_size_31881 drm_mode_crtc_set_gamma_size 2 31881 NULL
-+ddb_output_write_31902 ddb_output_write 3 31902 NULL
++ddb_output_write_31902 ddb_output_write 3-0 31902 NULL
 +xattr_permission_31907 xattr_permission 0 31907 NULL
++lu_buf_realloc_31915 lu_buf_realloc 2 31915 NULL
 +new_dir_31919 new_dir 3 31919 NULL
 +kmem_alloc_31920 kmem_alloc 1 31920 NULL
 +guestwidth_to_adjustwidth_31937 guestwidth_to_adjustwidth 0-1 31937 NULL
++process_recorded_refs_if_needed_31938 process_recorded_refs_if_needed 0 31938 NULL
 +SYSC_sethostname_31940 SYSC_sethostname 2 31940 NULL
-+iov_iter_copy_from_user_31942 iov_iter_copy_from_user 4 31942 NULL
++iov_iter_copy_from_user_31942 iov_iter_copy_from_user 4-0 31942 NULL nohasharray
++read_mem_31942 read_mem 3 31942 &iov_iter_copy_from_user_31942
 +vb2_write_31948 vb2_write 3 31948 NULL
 +pvr2_ctrl_get_valname_31951 pvr2_ctrl_get_valname 4 31951 NULL
 +regcache_rbtree_sync_31964 regcache_rbtree_sync 2 31964 NULL
 +copy_from_user_toio_31966 copy_from_user_toio 3 31966 NULL
 +mtd_add_partition_31971 mtd_add_partition 3 31971 NULL
-+find_next_zero_bit_31990 find_next_zero_bit 0-2-3 31990 NULL
++btrfs_insert_empty_inode_31975 btrfs_insert_empty_inode 0 31975 NULL
++vx_read_status_31982 vx_read_status 0 31982 NULL nohasharray
++iblock_execute_rw_31982 iblock_execute_rw 3 31982 &vx_read_status_31982
++find_next_zero_bit_31990 find_next_zero_bit 3-2-0 31990 NULL
 +default_setup_hpet_msi_31991 default_setup_hpet_msi 1 31991 NULL
++lustre_acl_xattr_merge2posix_31992 lustre_acl_xattr_merge2posix 2 31992 NULL
++sysfs_create_file_31996 sysfs_create_file 0 31996 NULL
 +tps6586x_irq_map_32002 tps6586x_irq_map 2 32002 NULL
 +calc_hmac_32010 calc_hmac 3 32010 NULL
 +vmcs_read64_32012 vmcs_read64 0 32012 NULL
++resource_alignment_32020 resource_alignment 0 32020 NULL
 +aead_len_32021 aead_len 0 32021 NULL
-+ocfs2_remove_extent_32032 ocfs2_remove_extent 4-3 32032 NULL
++ocfs2_remove_extent_32032 ocfs2_remove_extent 4-3-0 32032 NULL
 +posix_acl_set_32037 posix_acl_set 4 32037 NULL
 +stk_read_32038 stk_read 3 32038 NULL
 +vmw_cursor_update_dmabuf_32045 vmw_cursor_update_dmabuf 3-4 32045 NULL
-+sys_sched_setaffinity_32046 sys_sched_setaffinity 2 32046 NULL
++ocfs2_update_edge_lengths_32046 ocfs2_update_edge_lengths 0 32046 NULL
 +SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL
 +proc_scsi_devinfo_write_32064 proc_scsi_devinfo_write 3 32064 NULL
-+cfg80211_send_unprot_deauth_32080 cfg80211_send_unprot_deauth 3 32080 NULL
++cow_file_range_inline_32091 cow_file_range_inline 3 32091 NULL
 +bio_alloc_32095 bio_alloc 2 32095 NULL
 +alloc_pwms_32100 alloc_pwms 1-2 32100 NULL
 +ath6kl_fwlog_read_32101 ath6kl_fwlog_read 3 32101 NULL
 +disk_status_32120 disk_status 4 32120 NULL
++kobject_add_internal_32133 kobject_add_internal 0 32133 NULL
++btrfs_split_item_32164 btrfs_split_item 0 32164 NULL
 +venus_link_32165 venus_link 5 32165 NULL
 +do_writepages_32173 do_writepages 0 32173 NULL nohasharray
 +ntfs_rl_realloc_nofail_32173 ntfs_rl_realloc_nofail 3 32173 &do_writepages_32173
 +load_header_32183 load_header 0 32183 NULL
 +ubi_wl_scrub_peb_32196 ubi_wl_scrub_peb 0 32196 NULL
 +wusb_ccm_mac_32199 wusb_ccm_mac 7 32199 NULL
++__mem_cgroup_try_charge_swapin_32204 __mem_cgroup_try_charge_swapin 0 32204 NULL
 +riva_get_cmap_len_32218 riva_get_cmap_len 0 32218 NULL
++caif_seqpkt_recvmsg_32241 caif_seqpkt_recvmsg 4 32241 NULL
 +lbs_lowrssi_read_32242 lbs_lowrssi_read 3 32242 NULL
 +ocfs2_xattr_find_entry_32260 ocfs2_xattr_find_entry 0 32260 NULL
-+fb_compat_ioctl_32265 fb_compat_ioctl 3 32265 NULL
 +vmalloc_user_32308 vmalloc_user 1 32308 NULL
-+hex_string_32310 hex_string 0 32310 NULL
++kvm_set_spte_hva_32312 kvm_set_spte_hva 2 32312 NULL
++cas_calc_tabort_32316 cas_calc_tabort 0 32316 NULL
 +SyS_select_32319 SyS_select 1 32319 NULL
 +nouveau_bar_create__32332 nouveau_bar_create_ 4 32332 NULL
 +nl80211_send_mlme_event_32337 nl80211_send_mlme_event 4 32337 NULL
++apic_get_tmcct_32338 apic_get_tmcct 0 32338 NULL
 +t4_alloc_mem_32342 t4_alloc_mem 1 32342 NULL
-+dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL
-+sel_read_initcon_32362 sel_read_initcon 3 32362 NULL
++dispatch_ioctl_32357 dispatch_ioctl 2 32357 NULL nohasharray
++rx_streaming_always_write_32357 rx_streaming_always_write 3 32357 &dispatch_ioctl_32357
++sel_read_initcon_32362 sel_read_initcon 3 32362 NULL nohasharray
++ReadHDLCPCI_32362 ReadHDLCPCI 0 32362 &sel_read_initcon_32362
++__wait_seqno_32370 __wait_seqno 0 32370 NULL
 +_drbd_bm_find_next_32372 _drbd_bm_find_next 2 32372 NULL
-+usbtmc_read_32377 usbtmc_read 3 32377 NULL
++cpuset_slab_spread_node_32376 cpuset_slab_spread_node 0 32376 NULL
++intel_iommu_map_32384 intel_iommu_map 4-3 32384 NULL
 +local_clock_32385 local_clock 0 32385 NULL
-+qla4_82xx_pci_mem_write_2M_32398 qla4_82xx_pci_mem_write_2M 2 32398 NULL
++ocfs2_cancel_convert_32392 ocfs2_cancel_convert 0 32392 NULL
++ll_setxattr_common_32398 ll_setxattr_common 4 32398 NULL
 +xfs_iext_add_indirect_multi_32400 xfs_iext_add_indirect_multi 3 32400 NULL
-+vmci_qp_alloc_32405 vmci_qp_alloc 3-5 32405 NULL
-+log_text_32428 log_text 0 32428 NULL
++__add_missing_keys_32402 __add_missing_keys 0 32402 NULL
++vmci_qp_alloc_32405 vmci_qp_alloc 5-3 32405 NULL
 +regmap_irq_map_32429 regmap_irq_map 2 32429 NULL
-+hid_input_report_32458 hid_input_report 4 32458 NULL
++__ext4_handle_dirty_super_32458 __ext4_handle_dirty_super 0 32458 NULL
++snd_pcm_sync_ptr_32461 snd_pcm_sync_ptr 0 32461 NULL
 +cache_status_32462 cache_status 5 32462 NULL
-+ieee80211_fill_mesh_addresses_32465 ieee80211_fill_mesh_addresses 0 32465 NULL
++fill_readbuf_32464 fill_readbuf 3 32464 NULL
++dgap_usertoboard_32490 dgap_usertoboard 4 32490 NULL
 +ide_driver_proc_write_32493 ide_driver_proc_write 3 32493 NULL
 +bypass_pwoff_write_32499 bypass_pwoff_write 3 32499 NULL
++mdc_pinger_recov_seq_write_32510 mdc_pinger_recov_seq_write 3 32510 NULL
 +ctrl_std_val_to_sym_32516 ctrl_std_val_to_sym 5 32516 NULL
++ocfs2_local_alloc_reserve_for_window_32518 ocfs2_local_alloc_reserve_for_window 0 32518 NULL
 +disconnect_32521 disconnect 4 32521 NULL
-+qsfp_read_32522 qsfp_read 0-4-2 32522 NULL
++qsfp_read_32522 qsfp_read 0-2-4 32522 NULL
++audio_get_intf_req_32524 audio_get_intf_req 0 32524 NULL nohasharray
++ocfs2_refresh_qinfo_32524 ocfs2_refresh_qinfo 0 32524 &audio_get_intf_req_32524
 +ilo_read_32531 ilo_read 3 32531 NULL
 +ieee80211_if_read_estab_plinks_32533 ieee80211_if_read_estab_plinks 3 32533 NULL
-+gnttab_set_unmap_op_32534 gnttab_set_unmap_op 2 32534 NULL
-+ieee80211_send_auth_32543 ieee80211_send_auth 6 32543 NULL
 +format_devstat_counter_32550 format_devstat_counter 3 32550 NULL
 +__first_node_32558 __first_node 0 32558 NULL
 +aes_encrypt_fail_read_32562 aes_encrypt_fail_read 3 32562 NULL
-+pnp_mem_len_32584 pnp_mem_len 0 32584 NULL
++osc_iocontrol_32565 osc_iocontrol 3 32565 NULL
 +mem_swapout_entry_32586 mem_swapout_entry 3 32586 NULL
 +pipeline_tcp_tx_stat_fifo_int_read_32589 pipeline_tcp_tx_stat_fifo_int_read 3 32589 NULL
 +read_file_beacon_32595 read_file_beacon 3 32595 NULL
 +ieee80211_if_read_dropped_frames_congestion_32603 ieee80211_if_read_dropped_frames_congestion 3 32603 NULL
-+sys_set_mempolicy_32608 sys_set_mempolicy 3 32608 NULL
++irda_recvmsg_dgram_32631 irda_recvmsg_dgram 4 32631 NULL
 +cfg80211_roamed_32632 cfg80211_roamed 5-7 32632 NULL
-+ieee80211_hdrlen_32637 ieee80211_hdrlen 0 32637 NULL
 +ite_decode_bytes_32642 ite_decode_bytes 3 32642 NULL
 +kvmalloc_32646 kvmalloc 1 32646 NULL
 +ib_sg_dma_len_32649 ib_sg_dma_len 0 32649 NULL
-+generic_readlink_32654 generic_readlink 3 32654 NULL
++generic_readlink_32654 generic_readlink 3 32654 NULL nohasharray
++ftrace_startup_32654 ftrace_startup 0 32654 &generic_readlink_32654
 +move_addr_to_kernel_32673 move_addr_to_kernel 2 32673 NULL
-+compat_SyS_preadv_32679 compat_SyS_preadv 3 32679 NULL
-+compat_SyS_pwritev_32680 compat_SyS_pwritev 3 32680 NULL
++apei_res_add_32674 apei_res_add 0 32674 NULL
 +jfs_readpages_32702 jfs_readpages 4 32702 NULL
-+snd_hwdep_ioctl_compat_32736 snd_hwdep_ioctl_compat 3 32736 NULL
++rt2x00debug_read_queue_dump_32712 rt2x00debug_read_queue_dump 3 32712 NULL
++i40e_pci_sriov_enable_32742 i40e_pci_sriov_enable 2 32742 NULL
 +get_arg_page_32746 get_arg_page 2 32746 NULL
 +megasas_change_queue_depth_32747 megasas_change_queue_depth 2 32747 NULL
 +stats_read_ul_32751 stats_read_ul 3 32751 NULL
-+tty_compat_ioctl_32761 tty_compat_ioctl 3 32761 NULL
++begin_cmd_32766 begin_cmd 0 32766 NULL
++vmci_transport_dgram_dequeue_32775 vmci_transport_dgram_dequeue 4 32775 NULL
 +sctp_tsnmap_grow_32784 sctp_tsnmap_grow 2 32784 NULL
-+firmwareUpload_32794 firmwareUpload 3 32794 NULL
++ocfs2_read_inode_block_full_32790 ocfs2_read_inode_block_full 0 32790 NULL
 +rproc_name_read_32805 rproc_name_read 3 32805 NULL
-+vga_rseq_32848 vga_rseq 0 32848 NULL
 +new_tape_buffer_32866 new_tape_buffer 2 32866 NULL
-+io_apic_setup_irq_pin_32868 io_apic_setup_irq_pin 1 32868 NULL
-+cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 NULL nohasharray
-+ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 &cifs_writedata_alloc_32880
-+ath6kl_usb_post_recv_transfers_32892 ath6kl_usb_post_recv_transfers 2 32892 NULL
-+ext4_get_group_number_32899 ext4_get_group_number 0 32899 NULL
++io_apic_setup_irq_pin_32868 io_apic_setup_irq_pin 1-2 32868 NULL
++ath6kl_usb_submit_ctrl_in_32880 ath6kl_usb_submit_ctrl_in 6 32880 NULL nohasharray
++cifs_writedata_alloc_32880 cifs_writedata_alloc 1 32880 &ath6kl_usb_submit_ctrl_in_32880
++vp702x_usb_inout_cmd_32884 vp702x_usb_inout_cmd 6-4 32884 NULL
++ext4_get_group_number_32899 ext4_get_group_number 0-2 32899 NULL
 +il_dbgfs_tx_stats_read_32913 il_dbgfs_tx_stats_read 3 32913 NULL
 +zlib_inflate_workspacesize_32927 zlib_inflate_workspacesize 0 32927 NULL
 +rmap_recycle_32938 rmap_recycle 3 32938 NULL
 +irq_reserve_irqs_32946 irq_reserve_irqs 1-2 32946 NULL
 +ext4_valid_block_bitmap_32958 ext4_valid_block_bitmap 3 32958 NULL
-+arch_ptrace_32981 arch_ptrace 3-4 32981 NULL
++xfs_log_reserve_32959 xfs_log_reserve 2 32959 NULL
++ext4_group_overhead_blocks_32971 ext4_group_overhead_blocks 0 32971 NULL
++arch_ptrace_32981 arch_ptrace 3 32981 NULL
 +compat_filldir_32999 compat_filldir 3 32999 NULL
-+ext3_alloc_blocks_33007 ext3_alloc_blocks 3 33007 NULL nohasharray
++btrfs_lookup_extent_info_33000 btrfs_lookup_extent_info 0 33000 NULL
++ext3_alloc_blocks_33007 ext3_alloc_blocks 3-0 33007 NULL nohasharray
 +SyS_syslog_33007 SyS_syslog 3 33007 &ext3_alloc_blocks_33007
++br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL
++write_file_bt_ant_diversity_33019 write_file_bt_ant_diversity 3 33019 NULL
++snd_pcm_prepare_33036 snd_pcm_prepare 0 33036 NULL
 +SYSC_lgetxattr_33049 SYSC_lgetxattr 4 33049 NULL
 +pipeline_dec_packet_in_fifo_full_read_33052 pipeline_dec_packet_in_fifo_full_read 3 33052 NULL
 +ebt_compat_match_offset_33053 ebt_compat_match_offset 0-2 33053 NULL
-+bitmap_resize_33054 bitmap_resize 2 33054 NULL
++bitmap_resize_33054 bitmap_resize 2-3 33054 NULL
++intel_ring_flush_all_caches_33059 intel_ring_flush_all_caches 0 33059 NULL
 +stats_dot11RTSSuccessCount_read_33065 stats_dot11RTSSuccessCount_read 3 33065 NULL
 +sel_read_checkreqprot_33068 sel_read_checkreqprot 3 33068 NULL
 +alloc_tio_33077 alloc_tio 3 33077 NULL
 +acl_permission_check_33083 acl_permission_check 0 33083 NULL
-+ieee80211_fragment_33112 ieee80211_fragment 4 33112 NULL
 +write_node_33121 write_node 4 33121 NULL
-+calc_patch_size_33124 calc_patch_size 0 33124 NULL
 +fb_sys_write_33130 fb_sys_write 3 33130 NULL
 +__len_within_target_33132 __len_within_target 0 33132 NULL
++SyS_poll_33152 SyS_poll 2 33152 NULL
 +debug_debug6_read_33168 debug_debug6_read 3 33168 NULL
-+dataflash_read_fact_otp_33204 dataflash_read_fact_otp 2-3 33204 NULL
++dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL
 +pp_read_33210 pp_read 3 33210 NULL
-+xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL
-+build_completion_wait_33242 build_completion_wait 2 33242 NULL
++xfs_file_aio_write_33234 xfs_file_aio_write 4 33234 NULL nohasharray
++i915_gem_object_wait_rendering__tail_33234 i915_gem_object_wait_rendering__tail 0 33234 &xfs_file_aio_write_33234
++__vb2_wait_for_done_vb_33246 __vb2_wait_for_done_vb 0 33246 NULL
 +snd_pcm_plug_client_size_33267 snd_pcm_plug_client_size 0-2 33267 NULL
-+sched_find_first_bit_33270 sched_find_first_bit 0 33270 NULL
 +cachefiles_cook_key_33274 cachefiles_cook_key 2 33274 NULL
-+mei_compat_ioctl_33275 mei_compat_ioctl 3 33275 NULL
 +sync_pt_create_33282 sync_pt_create 2 33282 NULL
++btrfs_delete_one_dir_name_33303 btrfs_delete_one_dir_name 0 33303 NULL
 +mcs7830_get_reg_33308 mcs7830_get_reg 3 33308 NULL
 +isku_sysfs_read_keys_easyzone_33318 isku_sysfs_read_keys_easyzone 6 33318 NULL
-+ath6kl_usb_ctrl_msg_exchange_33327 ath6kl_usb_ctrl_msg_exchange 4 33327 NULL
-+gsm_mux_rx_netchar_33336 gsm_mux_rx_netchar 3 33336 NULL
++vx_send_irq_dsp_33329 vx_send_irq_dsp 0 33329 NULL
 +joydev_ioctl_33343 joydev_ioctl 2 33343 NULL
++lov_stripesize_seq_write_33353 lov_stripesize_seq_write 3 33353 NULL
 +create_xattr_datum_33356 create_xattr_datum 5 33356 NULL nohasharray
 +irq_pkt_threshold_read_33356 irq_pkt_threshold_read 3 33356 &create_xattr_datum_33356
 +read_file_regidx_33370 read_file_regidx 3 33370 NULL
@@ -105837,17 +106264,19 @@ index 0000000..9a7096d
 +ieee80211_if_read_dropped_frames_no_route_33383 ieee80211_if_read_dropped_frames_no_route 3 33383 NULL
 +scsi_varlen_cdb_length_33385 scsi_varlen_cdb_length 0 33385 NULL
 +tg_get_cfs_period_33390 tg_get_cfs_period 0 33390 NULL
-+ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 2-3 33394 NULL
++ocfs2_allocate_unwritten_extents_33394 ocfs2_allocate_unwritten_extents 3-2 33394 NULL
++cfs_trace_copyin_string_33396 cfs_trace_copyin_string 4 33396 NULL
 +ext4_meta_bg_first_block_no_33408 ext4_meta_bg_first_block_no 2 33408 NULL nohasharray
 +snd_pcm_capture_ioctl1_33408 snd_pcm_capture_ioctl1 0 33408 &ext4_meta_bg_first_block_no_33408
 +ufs_getfrag_block_33409 ufs_getfrag_block 2 33409 NULL
++filemap_fdatawrite_33415 filemap_fdatawrite 0 33415 NULL
 +dis_tap_write_33426 dis_tap_write 3 33426 NULL
-+ubh_scanc_33436 ubh_scanc 0-4-3 33436 NULL
++ubh_scanc_33436 ubh_scanc 0-3-4 33436 NULL
++message_stats_list_33440 message_stats_list 5 33440 NULL
 +ovs_vport_alloc_33475 ovs_vport_alloc 1 33475 NULL
 +create_entry_33479 create_entry 2 33479 NULL
-+elf_map_33487 elf_map 0-2 33487 NULL nohasharray
-+ip_setsockopt_33487 ip_setsockopt 5 33487 &elf_map_33487
-+netxen_nic_hw_write_wx_128M_33488 netxen_nic_hw_write_wx_128M 2 33488 NULL
++ip_setsockopt_33487 ip_setsockopt 5 33487 NULL nohasharray
++elf_map_33487 elf_map 0-2 33487 &ip_setsockopt_33487
 +ol_dqblk_chunk_off_33489 ol_dqblk_chunk_off 2 33489 NULL
 +res_counter_read_33499 res_counter_read 4 33499 NULL
 +fb_read_33506 fb_read 3 33506 NULL
@@ -105856,118 +106285,156 @@ index 0000000..9a7096d
 +nes_alloc_fast_reg_page_list_33523 nes_alloc_fast_reg_page_list 2 33523 NULL
 +aggr_size_rx_size_read_33526 aggr_size_rx_size_read 3 33526 NULL
 +acpi_gsi_to_irq_33533 acpi_gsi_to_irq 1 33533 NULL
-+tomoyo_read_self_33539 tomoyo_read_self 3 33539 NULL
-+dup_array_33551 dup_array 3 33551 NULL
-+solo_enc_read_33553 solo_enc_read 3 33553 NULL
++osc_max_rpcs_in_flight_seq_write_33539 osc_max_rpcs_in_flight_seq_write 3 33539 NULL nohasharray
++tomoyo_read_self_33539 tomoyo_read_self 3 33539 &osc_max_rpcs_in_flight_seq_write_33539
++read_symlink_33572 read_symlink 0 33572 NULL
 +count_subheaders_33591 count_subheaders 0 33591 NULL
 +scsi_execute_33596 scsi_execute 5 33596 NULL
 +comedi_buf_write_n_allocated_33604 comedi_buf_write_n_allocated 0 33604 NULL
-+ip6_find_1stfragopt_33608 ip6_find_1stfragopt 0 33608 NULL nohasharray
-+xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 &ip6_find_1stfragopt_33608
-+il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 NULL nohasharray
-+usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 &il_dbgfs_qos_read_33615
++xt_compat_target_offset_33608 xt_compat_target_offset 0 33608 NULL
++usb_gstrings_attach_33615 usb_gstrings_attach 3 33615 NULL nohasharray
++il_dbgfs_qos_read_33615 il_dbgfs_qos_read 3 33615 &usb_gstrings_attach_33615
++do_sync_write_33624 do_sync_write 0 33624 NULL
++stride_page_count_33641 stride_page_count 2 33641 NULL
++slab_alloc_node_33663 slab_alloc_node 3 33663 NULL
 +irq_blk_threshold_read_33666 irq_blk_threshold_read 3 33666 NULL
 +inw_p_33668 inw_p 0 33668 NULL
 +arp_hdr_len_33671 arp_hdr_len 0 33671 NULL
 +i2c_hid_alloc_buffers_33673 i2c_hid_alloc_buffers 2 33673 NULL
-+ath6kl_wmi_startscan_cmd_33674 ath6kl_wmi_startscan_cmd 8 33674 NULL
 +nv50_disp_dmac_create__33696 nv50_disp_dmac_create_ 6 33696 NULL
-+compat_insnlist_33706 compat_insnlist 2 33706 NULL
-+sys_keyctl_33708 sys_keyctl 4 33708 NULL nohasharray
-+netlink_sendmsg_33708 netlink_sendmsg 4 33708 &sys_keyctl_33708
++netlink_sendmsg_33708 netlink_sendmsg 4 33708 NULL
 +tipc_link_stats_33716 tipc_link_stats 3 33716 NULL
++ext4_wb_update_i_disksize_33717 ext4_wb_update_i_disksize 2 33717 NULL
 +pvr2_stream_buffer_count_33719 pvr2_stream_buffer_count 2 33719 NULL
 +ocfs2_extent_map_get_blocks_33720 ocfs2_extent_map_get_blocks 2 33720 NULL
++write_file_spectral_count_33723 write_file_spectral_count 3 33723 NULL nohasharray
++ocfs2_lock_allocators_move_extents_33723 ocfs2_lock_allocators_move_extents 0 33723 &write_file_spectral_count_33723
 +__mutex_lock_interruptible_slowpath_33735 __mutex_lock_interruptible_slowpath 0 33735 NULL
-+Read_hfc_33755 Read_hfc 0 33755 NULL
++do_munmap_33752 do_munmap 0 33752 NULL
 +vifs_state_read_33762 vifs_state_read 3 33762 NULL
 +hashtab_create_33769 hashtab_create 3 33769 NULL
-+midibuf_message_length_33770 midibuf_message_length 0 33770 NULL
++btrfs_delayed_refs_qgroup_accounting_33775 btrfs_delayed_refs_qgroup_accounting 0 33775 NULL
++irq_map_generic_chip_33793 irq_map_generic_chip 2 33793 NULL
 +if_sdio_read_rx_len_33800 if_sdio_read_rx_len 0 33800 NULL
-+find_next_offset_33804 find_next_offset 3 33804 NULL
-+sky2_rx_pad_33819 sky2_rx_pad 0 33819 NULL
++find_next_offset_33804 find_next_offset 3-0 33804 NULL
++filter_write_33819 filter_write 3 33819 NULL
 +sep_create_msgarea_context_33829 sep_create_msgarea_context 4 33829 NULL
 +scrub_setup_recheck_block_33831 scrub_setup_recheck_block 5-4 33831 NULL
-+udplite_manip_pkt_33832 udplite_manip_pkt 4 33832 NULL
-+usb_dump_endpoint_descriptor_33849 usb_dump_endpoint_descriptor 0 33849 NULL
++ext4_journal_extend_33835 ext4_journal_extend 2-0 33835 NULL
++snd_pcm_action_nonatomic_33844 snd_pcm_action_nonatomic 0 33844 NULL
 +calgary_alloc_coherent_33851 calgary_alloc_coherent 2 33851 NULL
 +oz_cdev_write_33852 oz_cdev_write 3 33852 NULL
-+cap_mmap_addr_33853 cap_mmap_addr 0 33853 NULL
++bin_string_33884 bin_string 3-5 33884 NULL
 +get_user_pages_33908 get_user_pages 0-3-4 33908 NULL
++ath6kl_roam_mode_write_33912 ath6kl_roam_mode_write 3 33912 NULL
 +queue_logical_block_size_33918 queue_logical_block_size 0 33918 NULL
++atomic64_add_return_33927 atomic64_add_return 0-1 33927 NULL
 +sel_read_avc_cache_threshold_33942 sel_read_avc_cache_threshold 3 33942 NULL
 +lpfc_idiag_ctlacc_read_33943 lpfc_idiag_ctlacc_read 3 33943 NULL
-+read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL
++read_file_tgt_rx_stats_33944 read_file_tgt_rx_stats 3 33944 NULL nohasharray
++btrfs_uuid_tree_rem_33944 btrfs_uuid_tree_rem 0 33944 &read_file_tgt_rx_stats_33944
++hfsplus_osx_setxattr_33952 hfsplus_osx_setxattr 4 33952 NULL
++__proc_dump_kernel_33954 __proc_dump_kernel 5 33954 NULL
++ocfs2_create_new_meta_bhs_33955 ocfs2_create_new_meta_bhs 0 33955 NULL
 +vga_switcheroo_debugfs_write_33984 vga_switcheroo_debugfs_write 3 33984 NULL
++snd_interval_refine_33987 snd_interval_refine 0 33987 NULL
 +__ntfs_malloc_34022 __ntfs_malloc 1 34022 NULL
++lbs_lowrssi_write_34025 lbs_lowrssi_write 3 34025 NULL
 +ppp_write_34034 ppp_write 3 34034 NULL
-+tty_insert_flip_string_34042 tty_insert_flip_string 3 34042 NULL
++tty_insert_flip_string_34042 tty_insert_flip_string 3-0 34042 NULL
 +__domain_flush_pages_34045 __domain_flush_pages 2-3 34045 NULL
 +is_trap_at_addr_34047 is_trap_at_addr 2 34047 NULL
-+acpi_dev_get_irqresource_34064 acpi_dev_get_irqresource 2 34064 NULL
 +memcg_update_all_caches_34068 memcg_update_all_caches 1 34068 NULL
-+read_file_ant_diversity_34071 read_file_ant_diversity 3 34071 NULL
-+compat_hdio_ioctl_34088 compat_hdio_ioctl 4 34088 NULL
 +pipeline_pipeline_fifo_full_read_34095 pipeline_pipeline_fifo_full_read 3 34095 NULL
-+proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 NULL
++__irq_domain_add_34101 __irq_domain_add 2 34101 NULL
++i915_gem_object_set_cache_level_34107 i915_gem_object_set_cache_level 0 34107 NULL nohasharray
++proc_scsi_host_write_34107 proc_scsi_host_write 3 34107 &i915_gem_object_set_cache_level_34107
 +is_discarded_oblock_34120 is_discarded_oblock 2 34120 NULL
 +islpci_mgt_transmit_34133 islpci_mgt_transmit 5 34133 NULL
-+ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2 34135 NULL
-+cdc_mbim_process_dgram_34136 cdc_mbim_process_dgram 3 34136 NULL
++ttm_dma_page_pool_free_34135 ttm_dma_page_pool_free 2-0 34135 NULL
 +ixgbe_dbg_netdev_ops_write_34141 ixgbe_dbg_netdev_ops_write 3 34141 NULL
 +shmem_pread_fast_34147 shmem_pread_fast 3 34147 NULL
++ext4_xattr_list_34162 ext4_xattr_list 3 34162 NULL
++ocfs2_xattr_list_entry_34165 ocfs2_xattr_list_entry 0 34165 NULL
 +skb_to_sgvec_34171 skb_to_sgvec 0 34171 NULL
++dtf_write_run_34196 dtf_write_run 3 34196 NULL
 +ext4_da_write_begin_34215 ext4_da_write_begin 3-4 34215 NULL
++i915_gem_execbuffer_reserve_object_34224 i915_gem_execbuffer_reserve_object 0 34224 NULL
++setup_nodes_for_search_34248 setup_nodes_for_search 0 34248 NULL
++numa_migrate_prep_34256 numa_migrate_prep 0 34256 NULL
++btrfs_bitmap_cluster_34257 btrfs_bitmap_cluster 4 34257 NULL
 +bl_pipe_downcall_34264 bl_pipe_downcall 3 34264 NULL
++ocfs2_dlm_lock_34265 ocfs2_dlm_lock 0 34265 NULL
 +pcf857x_to_irq_34273 pcf857x_to_irq 2 34273 NULL
-+zone_spanned_pages_in_node_34299 zone_spanned_pages_in_node 0 34299 NULL
++device_private_init_34279 device_private_init 0 34279 NULL
++get_task_io_context_34316 get_task_io_context 3 34316 NULL
++ext4_get_groups_count_34324 ext4_get_groups_count 0 34324 NULL
 +iov_iter_single_seg_count_34326 iov_iter_single_seg_count 0 34326 NULL nohasharray
 +pcpu_need_to_extend_34326 pcpu_need_to_extend 0 34326 &iov_iter_single_seg_count_34326
++SYSC_brk_34331 SYSC_brk 1 34331 NULL
 +__insert_34349 __insert 2-3 34349 NULL
-+crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 NULL
-+rngapi_reset_34366 rngapi_reset 3 34366 NULL nohasharray
-+p54_alloc_skb_34366 p54_alloc_skb 3 34366 &rngapi_reset_34366
-+i2c_hid_get_raw_report_34376 i2c_hid_get_raw_report 0 34376 NULL
++sync_page_io_34363 sync_page_io 3 34363 NULL nohasharray
++crypto_ablkcipher_ivsize_34363 crypto_ablkcipher_ivsize 0 34363 &sync_page_io_34363
++rngapi_reset_34366 rngapi_reset 3 34366 NULL
 +reiserfs_resize_34377 reiserfs_resize 2 34377 NULL
 +ea_read_34378 ea_read 0 34378 NULL
 +fuse_send_read_34379 fuse_send_read 4 34379 NULL
 +av7110_vbi_write_34384 av7110_vbi_write 3 34384 NULL
 +usbvision_v4l2_read_34386 usbvision_v4l2_read 3 34386 NULL
 +read_rbu_image_type_34387 read_rbu_image_type 6 34387 NULL
-+ivtv_read_pos_34400 ivtv_read_pos 3 34400 NULL nohasharray
-+iwl_calib_set_34400 iwl_calib_set 3 34400 &ivtv_read_pos_34400
++iwl_calib_set_34400 iwl_calib_set 3 34400 NULL nohasharray
++ivtv_read_pos_34400 ivtv_read_pos 3 34400 &iwl_calib_set_34400
 +wd_exp_mode_write_34407 wd_exp_mode_write 3 34407 NULL
 +nl80211_send_disassoc_34424 nl80211_send_disassoc 4 34424 NULL
-+usbtest_alloc_urb_34446 usbtest_alloc_urb 3-5 34446 NULL
++security_socket_create_34439 security_socket_create 0 34439 NULL
++usbtest_alloc_urb_34446 usbtest_alloc_urb 5-3 34446 NULL
 +mwifiex_regrdwr_read_34472 mwifiex_regrdwr_read 3 34472 NULL
 +skcipher_sndbuf_34476 skcipher_sndbuf 0 34476 NULL
 +i2o_parm_field_get_34477 i2o_parm_field_get 5 34477 NULL
++ocfs2_block_group_clear_bits_34484 ocfs2_block_group_clear_bits 0 34484 NULL
 +security_inode_permission_34488 security_inode_permission 0 34488 NULL
-+SyS_pwritev_34494 SyS_pwritev 3 34494 NULL
-+tracing_stats_read_34537 tracing_stats_read 3 34537 NULL
-+hugetlbfs_read_actor_34547 hugetlbfs_read_actor 0-2-5-4 34547 NULL
++SyS_pwritev_34494 SyS_pwritev 3 34494 NULL nohasharray
++__ffs64_34494 __ffs64 1-0 34494 &SyS_pwritev_34494
++qp_alloc_res_34496 qp_alloc_res 5 34496 NULL
++lu_buf_check_and_alloc_34505 lu_buf_check_and_alloc 2 34505 NULL
++snd_pcm_hw_param_value_34525 snd_pcm_hw_param_value 0 34525 NULL
++ext4_fallocate_34537 ext4_fallocate 4-3 34537 NULL nohasharray
++tracing_stats_read_34537 tracing_stats_read 3 34537 &ext4_fallocate_34537
++hugetlbfs_read_actor_34547 hugetlbfs_read_actor 4-5-2-0 34547 NULL
 +dbBackSplit_34561 dbBackSplit 0 34561 NULL
-+alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL
-+velocity_rx_copy_34583 velocity_rx_copy 2 34583 NULL
++alloc_ieee80211_rsl_34564 alloc_ieee80211_rsl 1 34564 NULL nohasharray
++self_check_peb_ec_hdr_34564 self_check_peb_ec_hdr 0 34564 &alloc_ieee80211_rsl_34564
++i915_gem_execbuffer_relocate_object_34575 i915_gem_execbuffer_relocate_object 0 34575 NULL
++lov_stripecount_seq_write_34582 lov_stripecount_seq_write 3 34582 NULL
 +init_send_hfcd_34586 init_send_hfcd 1 34586 NULL
 +inet6_ifla6_size_34591 inet6_ifla6_size 0 34591 NULL
-+ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL
++ceph_msgpool_init_34599 ceph_msgpool_init 4 34599 NULL nohasharray
++cw1200_queue_init_34599 cw1200_queue_init 4 34599 &ceph_msgpool_init_34599
++__add_prelim_ref_34600 __add_prelim_ref 0 34600 NULL
 +brcmf_cfg80211_mgmt_tx_34608 brcmf_cfg80211_mgmt_tx 7 34608 NULL
-+__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL
++__jffs2_ref_totlen_34609 __jffs2_ref_totlen 0 34609 NULL nohasharray
++mtd_write_34609 mtd_write 0 34609 &__jffs2_ref_totlen_34609
++apei_get_nvs_resources_34616 apei_get_nvs_resources 0 34616 NULL
 +__cfg80211_disconnected_34622 __cfg80211_disconnected 3 34622 NULL
 +cnic_alloc_dma_34641 cnic_alloc_dma 3 34641 NULL
 +tomoyo_dump_page_34649 tomoyo_dump_page 2 34649 NULL
-+nf_nat_mangle_udp_packet_34661 nf_nat_mangle_udp_packet 8-6 34661 NULL
++kvm_set_spte_hva_34671 kvm_set_spte_hva 2 34671 NULL
++sleep_auth_write_34676 sleep_auth_write 3 34676 NULL
 +isr_fiqs_read_34687 isr_fiqs_read 3 34687 NULL
 +port_print_34704 port_print 3 34704 NULL
-+alloc_irq_and_cfg_at_34706 alloc_irq_and_cfg_at 1 34706 NULL
++alloc_irq_and_cfg_at_34706 alloc_irq_and_cfg_at 1-2 34706 NULL
++ext4_listxattr_34712 ext4_listxattr 3 34712 NULL
 +ieee80211_if_read_num_sta_ps_34722 ieee80211_if_read_num_sta_ps 3 34722 NULL
 +platform_list_read_file_34734 platform_list_read_file 3 34734 NULL
 +reg_w_ixbuf_34736 reg_w_ixbuf 4 34736 NULL
++lsm_alloc_plain_34755 lsm_alloc_plain 1 34755 NULL
++device_add_34766 device_add 0 34766 NULL
 +qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
-+__copy_in_user_34790 __copy_in_user 3 34790 NULL
 +SYSC_keyctl_34800 SYSC_keyctl 4 34800 NULL
++can_nocow_extent_34801 can_nocow_extent 2 34801 NULL
 +drbd_get_max_capacity_34804 drbd_get_max_capacity 0 34804 NULL
++ll_setxattr_34806 ll_setxattr 4 34806 NULL
++file_page_index_34820 file_page_index 0-2 34820 NULL
 +b43_debugfs_write_34838 b43_debugfs_write 3 34838 NULL
 +nl_portid_hash_zalloc_34843 nl_portid_hash_zalloc 1 34843 NULL
 +acpi_system_write_wakeup_device_34853 acpi_system_write_wakeup_device 3 34853 NULL
@@ -105975,47 +106442,54 @@ index 0000000..9a7096d
 +ieee80211_if_read_txpower_34871 ieee80211_if_read_txpower 3 34871 NULL
 +msg_print_text_34889 msg_print_text 0 34889 NULL
 +ieee80211_if_write_34894 ieee80211_if_write 3 34894 NULL
-+compat_put_uint_34905 compat_put_uint 1 34905 NULL
 +si476x_radio_read_rsq_primary_blob_34916 si476x_radio_read_rsq_primary_blob 3 34916 NULL
 +__inode_permission_34925 __inode_permission 0 34925 NULL nohasharray
 +btrfs_super_chunk_root_34925 btrfs_super_chunk_root 0 34925 &__inode_permission_34925
++ODM_AllocateMemory_34929 ODM_AllocateMemory 3 34929 NULL
 +ceph_aio_write_34930 ceph_aio_write 4 34930 NULL
-+i2c_transfer_34958 i2c_transfer 0 34958 NULL nohasharray
-+skb_gro_header_slow_34958 skb_gro_header_slow 2 34958 &i2c_transfer_34958
-+Realloc_34961 Realloc 2 34961 NULL
++sec_flags2str_34933 sec_flags2str 3 34933 NULL
++snd_info_entry_read_34938 snd_info_entry_read 3 34938 NULL
++i2c_transfer_34958 i2c_transfer 0 34958 NULL
++do_add_page_to_bio_34974 do_add_page_to_bio 2-10 34974 NULL
 +mq_lookup_34990 mq_lookup 2 34990 NULL
++i915_gem_gtt_prepare_object_34991 i915_gem_gtt_prepare_object 0 34991 NULL
++schedule_erase_34996 schedule_erase 0 34996 NULL
 +rx_rx_hdr_overflow_read_35002 rx_rx_hdr_overflow_read 3 35002 NULL
 +l2cap_skbuff_fromiovec_35003 l2cap_skbuff_fromiovec 4-3 35003 NULL
 +dm_cache_insert_mapping_35005 dm_cache_insert_mapping 2-3 35005 NULL
 +sisusb_copy_memory_35016 sisusb_copy_memory 4 35016 NULL
-+alloc_p2m_page_35025 alloc_p2m_page 0 35025 NULL
++snd_pcm_hw_params_35020 snd_pcm_hw_params 0 35020 NULL
++process_changed_xattr_35025 process_changed_xattr 0 35025 NULL
 +coda_psdev_read_35029 coda_psdev_read 3 35029 NULL
 +brcmf_sdio_chip_writenvram_35042 brcmf_sdio_chip_writenvram 4 35042 NULL
-+btmrvl_gpiogap_write_35053 btmrvl_gpiogap_write 3 35053 NULL
 +pwr_connection_out_of_sync_read_35061 pwr_connection_out_of_sync_read 3 35061 NULL
++ext4_split_unwritten_extents_35063 ext4_split_unwritten_extents 0 35063 NULL
 +store_ifalias_35088 store_ifalias 4 35088 NULL
 +__kfifo_uint_must_check_helper_35097 __kfifo_uint_must_check_helper 0-1 35097 NULL
 +capi_write_35104 capi_write 3 35104 NULL nohasharray
 +tx_tx_done_template_read_35104 tx_tx_done_template_read 3 35104 &capi_write_35104
 +ide_settings_proc_write_35110 ide_settings_proc_write 3 35110 NULL
-+pointer_35138 pointer 0 35138 NULL
-+gntdev_alloc_map_35145 gntdev_alloc_map 2 35145 NULL
++ceph_osdc_start_request_35122 ceph_osdc_start_request 0 35122 NULL
++message_stats_print_35158 message_stats_print 6 35158 NULL
 +iscsi_conn_setup_35159 iscsi_conn_setup 2 35159 NULL
 +ieee80211_if_read_bssid_35161 ieee80211_if_read_bssid 3 35161 NULL
++relocate_entry_cpu_35176 relocate_entry_cpu 0 35176 NULL
 +solo_v4l2_init_35179 solo_v4l2_init 2 35179 NULL
++SyS_init_module_35180 SyS_init_module 2 35180 NULL
 +mlx4_ib_get_cq_umem_35184 mlx4_ib_get_cq_umem 5-6 35184 NULL
-+iwl_nvm_read_chunk_35198 iwl_nvm_read_chunk 0 35198 NULL
 +uprobe_get_swbp_addr_35201 uprobe_get_swbp_addr 0 35201 NULL
 +unix_stream_recvmsg_35210 unix_stream_recvmsg 4 35210 NULL
-+_osd_req_alist_elem_size_35216 _osd_req_alist_elem_size 0-2 35216 NULL
-+striped_read_35218 striped_read 0-2-8-3 35218 NULL nohasharray
++striped_read_35218 striped_read 0-3-2 35218 NULL nohasharray
 +security_key_getsecurity_35218 security_key_getsecurity 0 35218 &striped_read_35218
-+rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 NULL nohasharray
-+video_register_device_no_warn_35226 video_register_device_no_warn 3 35226 &rx_rx_cmplt_task_read_35226
-+gfn_to_page_many_atomic_35234 gfn_to_page_many_atomic 2 35234 NULL
-+SYSC_madvise_35241 SYSC_madvise 1 35241 NULL
++video_register_device_no_warn_35226 video_register_device_no_warn 3 35226 NULL nohasharray
++rx_rx_cmplt_task_read_35226 rx_rx_cmplt_task_read 3 35226 &video_register_device_no_warn_35226
++gfn_to_page_many_atomic_35234 gfn_to_page_many_atomic 2 35234 NULL nohasharray
++may_commit_transaction_35234 may_commit_transaction 0 35234 &gfn_to_page_many_atomic_35234
++SYSC_madvise_35241 SYSC_madvise 1-2 35241 NULL
 +set_fd_set_35249 set_fd_set 1 35249 NULL
 +ioapic_setup_resources_35255 ioapic_setup_resources 1 35255 NULL
++alloc_thread_groups_35256 alloc_thread_groups 2 35256 NULL
++jbd2_journal_get_write_access_35263 jbd2_journal_get_write_access 0 35263 NULL
 +dis_disc_write_35265 dis_disc_write 3 35265 NULL
 +dma_show_regs_35266 dma_show_regs 3 35266 NULL
 +irda_recvmsg_stream_35280 irda_recvmsg_stream 4 35280 NULL
@@ -106024,45 +106498,58 @@ index 0000000..9a7096d
 +brcmf_sdio_forensic_read_35311 brcmf_sdio_forensic_read 3 35311 NULL nohasharray
 +__btrfs_buffered_write_35311 __btrfs_buffered_write 3 35311 &brcmf_sdio_forensic_read_35311
 +tracing_read_pipe_35312 tracing_read_pipe 3 35312 NULL
-+sys_setsockopt_35320 sys_setsockopt 5 35320 NULL
-+irq_domain_disassociate_many_35325 irq_domain_disassociate_many 2-3 35325 NULL
 +fallback_on_nodma_alloc_35332 fallback_on_nodma_alloc 2 35332 NULL
-+pskb_network_may_pull_35336 pskb_network_may_pull 2 35336 NULL
 +ieee80211_if_fmt_ap_power_level_35347 ieee80211_if_fmt_ap_power_level 3 35347 NULL
 +nouveau_devinit_create__35348 nouveau_devinit_create_ 4 35348 NULL
-+hpi_alloc_control_cache_35351 hpi_alloc_control_cache 1 35351 NULL
++ieee80211_rx_mgmt_deauth_35351 ieee80211_rx_mgmt_deauth 3 35351 NULL
 +compat_filldir64_35354 compat_filldir64 3 35354 NULL
++amd_iommu_map_35355 amd_iommu_map 4 35355 NULL
++read_kmem_35372 read_kmem 3 35372 NULL
++ocfs2_journal_access_di_35393 ocfs2_journal_access_di 0 35393 NULL
++create_pending_snapshots_35402 create_pending_snapshots 0 35402 NULL
++btrfs_search_old_slot_35406 btrfs_search_old_slot 0 35406 NULL
 +SyS_getxattr_35408 SyS_getxattr 4 35408 NULL
 +rawv6_send_hdrinc_35425 rawv6_send_hdrinc 3 35425 NULL
++C_SYSC_sendfile_35432 C_SYSC_sendfile 4 35432 NULL
 +__set_test_and_free_35436 __set_test_and_free 2 35436 NULL
 +buffer_to_user_35439 buffer_to_user 3 35439 NULL
-+i915_wedged_read_35474 i915_wedged_read 3 35474 NULL
-+ecryptfs_get_zeroed_pages_35483 ecryptfs_get_zeroed_pages 0 35483 NULL
-+do_atm_ioctl_35519 do_atm_ioctl 3 35519 NULL
++memcg_memory_allocated_read_35469 memcg_memory_allocated_read 0 35469 NULL
++fiemap_prepare_and_copy_exts_35494 fiemap_prepare_and_copy_exts 5 35494 NULL
++btrfs_prealloc_file_range_trans_35500 btrfs_prealloc_file_range_trans 4-0 35500 NULL
 +async_setkey_35521 async_setkey 3 35521 NULL
++inet_mask_len_35527 inet_mask_len 1 35527 NULL
 +__filemap_fdatawrite_range_35528 __filemap_fdatawrite_range 0 35528 NULL
 +iwl_dbgfs_bt_traffic_read_35534 iwl_dbgfs_bt_traffic_read 3 35534 NULL
++pstore_mkfile_35536 pstore_mkfile 7 35536 NULL
 +rxpipe_tx_xfr_host_int_trig_rx_data_read_35538 rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 NULL
 +ibnl_put_attr_35541 ibnl_put_attr 3 35541 NULL
 +ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3 35550 NULL
++send_update_extent_35556 send_update_extent 0 35556 NULL
++vb2_dqbuf_35559 vb2_dqbuf 0 35559 NULL
++sysfs_create_subdir_35567 sysfs_create_subdir 0 35567 NULL
++ext4_blocks_for_truncate_35579 ext4_blocks_for_truncate 0 35579 NULL
 +ext2_acl_from_disk_35580 ext2_acl_from_disk 2 35580 NULL
 +spk_msg_set_35586 spk_msg_set 3 35586 NULL
-+ReadZReg_35604 ReadZReg 0 35604 NULL
 +kernel_readv_35617 kernel_readv 3 35617 NULL
-+ixgbe_pci_sriov_configure_35624 ixgbe_pci_sriov_configure 2 35624 NULL
 +reiserfs_readpages_35629 reiserfs_readpages 4 35629 NULL
++ptlrpcd_steal_rqset_35637 ptlrpcd_steal_rqset 0 35637 NULL
++nv50_vm_create_35643 nv50_vm_create 2-3 35643 NULL
 +spi_register_board_info_35651 spi_register_board_info 2 35651 NULL
-+store_debug_level_35652 store_debug_level 3 35652 NULL
 +rdmaltWithLock_35669 rdmaltWithLock 0 35669 NULL
-+compat_sys_kexec_load_35674 compat_sys_kexec_load 2 35674 NULL
++ext3_mark_iloc_dirty_35686 ext3_mark_iloc_dirty 0 35686 NULL
 +dm_table_create_35687 dm_table_create 3 35687 NULL
 +SYSC_pwritev_35690 SYSC_pwritev 3 35690 NULL
 +rds_page_copy_user_35691 rds_page_copy_user 4 35691 NULL
-+pci_enable_sriov_35745 pci_enable_sriov 2 35745 NULL
++md_super_write_35703 md_super_write 4 35703 NULL
++btrfs_commit_transaction_35725 btrfs_commit_transaction 0 35725 NULL
++rtw_IOL_cmd_tx_pkt_buf_dump_35732 rtw_IOL_cmd_tx_pkt_buf_dump 2 35732 NULL
++ext4_truncate_restart_trans_35750 ext4_truncate_restart_trans 0 35750 NULL
 +iwl_dbgfs_disable_ht40_read_35761 iwl_dbgfs_disable_ht40_read 3 35761 NULL
 +udf_alloc_i_data_35786 udf_alloc_i_data 2 35786 NULL
 +pvr2_hdw_cpufw_get_35824 pvr2_hdw_cpufw_get 0-4-2 35824 NULL
 +tx_tx_cmplt_read_35854 tx_tx_cmplt_read 3 35854 NULL
++vx_query_hbuffer_size_35859 vx_query_hbuffer_size 0 35859 NULL
++changed_xattr_35860 changed_xattr 0 35860 NULL
 +mthca_buf_alloc_35861 mthca_buf_alloc 2 35861 NULL
 +fls64_35862 fls64 0 35862 NULL
 +kvm_dirty_bitmap_bytes_35886 kvm_dirty_bitmap_bytes 0 35886 NULL
@@ -106071,73 +106558,93 @@ index 0000000..9a7096d
 +SyS_set_mempolicy_35909 SyS_set_mempolicy 3 35909 NULL
 +kernel_setsockopt_35913 kernel_setsockopt 5 35913 NULL
 +rbio_nr_pages_35916 rbio_nr_pages 0-1-2 35916 NULL
-+vol_cdev_compat_ioctl_35923 vol_cdev_compat_ioctl 3 35923 NULL
++balance_node_right_35920 balance_node_right 0 35920 NULL
 +sctp_tsnmap_mark_35929 sctp_tsnmap_mark 2 35929 NULL
 +rx_defrag_init_called_read_35935 rx_defrag_init_called_read 3 35935 NULL
 +put_cmsg_compat_35937 put_cmsg_compat 4 35937 NULL
 +ext_rts51x_sd_execute_write_data_35971 ext_rts51x_sd_execute_write_data 9 35971 NULL
-+ceph_buffer_new_35974 ceph_buffer_new 1 35974 NULL
++ceph_buffer_new_35974 ceph_buffer_new 1 35974 NULL nohasharray
++generic_ocp_read_35974 generic_ocp_read 3 35974 &ceph_buffer_new_35974
 +acl_alloc_35979 acl_alloc 1 35979 NULL
++device_add_class_symlinks_35985 device_add_class_symlinks 0 35985 NULL
 +generic_file_aio_read_35987 generic_file_aio_read 0 35987 NULL
-+koneplus_sysfs_write_35993 koneplus_sysfs_write 6 35993 NULL
++write_file_antenna_35998 write_file_antenna 3 35998 NULL nohasharray
++kuc_alloc_35998 kuc_alloc 1 35998 &write_file_antenna_35998
++locks_mandatory_area_35999 locks_mandatory_area 0 35999 NULL
 +il3945_ucode_tx_stats_read_36016 il3945_ucode_tx_stats_read 3 36016 NULL
-+ubi_eba_write_leb_36029 ubi_eba_write_leb 5-6 36029 NULL
++ubi_eba_write_leb_36029 ubi_eba_write_leb 0-6-5 36029 NULL
 +__videobuf_alloc_36031 __videobuf_alloc 1 36031 NULL
 +account_shadowed_36048 account_shadowed 2 36048 NULL
 +gpio_power_read_36059 gpio_power_read 3 36059 NULL
++snd_pcm_playback_hw_avail_36061 snd_pcm_playback_hw_avail 0 36061 NULL
++did_create_dir_36062 did_create_dir 0 36062 NULL
 +write_emulate_36065 write_emulate 2-4 36065 NULL
++stack_max_size_write_36068 stack_max_size_write 3 36068 NULL
 +radeon_vm_num_pdes_36070 radeon_vm_num_pdes 0 36070 NULL
 +ieee80211_if_fmt_peer_36071 ieee80211_if_fmt_peer 3 36071 NULL
-+ext3_new_blocks_36073 ext3_new_blocks 3 36073 NULL
++ext3_new_blocks_36073 ext3_new_blocks 3-0 36073 NULL
 +ieee80211_if_write_tsf_36077 ieee80211_if_write_tsf 3 36077 NULL
 +snd_pcm_plug_read_transfer_36080 snd_pcm_plug_read_transfer 0-3 36080 NULL
++mtip_hw_read_device_status_36082 mtip_hw_read_device_status 3 36082 NULL
 +vga_arb_write_36112 vga_arb_write 3 36112 NULL
 +simple_xattr_alloc_36118 simple_xattr_alloc 2 36118 NULL
-+compat_ptrace_request_36131 compat_ptrace_request 3-4 36131 NULL
++compat_ptrace_request_36131 compat_ptrace_request 3 36131 NULL
 +vmalloc_exec_36132 vmalloc_exec 1 36132 NULL
 +max8925_irq_domain_map_36133 max8925_irq_domain_map 2 36133 NULL
++set_flexbg_block_bitmap_36136 set_flexbg_block_bitmap 0-4-5 36136 NULL
 +ext3_readpages_36144 ext3_readpages 4 36144 NULL
-+alloc_vm_area_36149 alloc_vm_area 1 36149 NULL
 +twl_set_36154 twl_set 2 36154 NULL
 +b1_alloc_card_36155 b1_alloc_card 1 36155 NULL
 +btrfs_file_extent_inline_len_36158 btrfs_file_extent_inline_len 0 36158 NULL
 +snd_korg1212_copy_from_36169 snd_korg1212_copy_from 6 36169 NULL
++wm8994_edge_irq_map_36170 wm8994_edge_irq_map 2 36170 NULL
 +SyS_kexec_load_36176 SyS_kexec_load 2 36176 NULL
++ramoops_init_przs_36199 ramoops_init_przs 4 36199 NULL
 +SYSC_sched_getaffinity_36208 SYSC_sched_getaffinity 2 36208 NULL
-+SYSC_process_vm_readv_36216 SYSC_process_vm_readv 3-5 36216 NULL
++SYSC_process_vm_readv_36216 SYSC_process_vm_readv 5-3 36216 NULL
 +ubifs_read_nnode_36221 ubifs_read_nnode 0 36221 NULL
 +is_dirty_36223 is_dirty 2 36223 NULL
-+dma_alloc_attrs_36225 dma_alloc_attrs 0 36225 NULL
-+nfqnl_mangle_36226 nfqnl_mangle 4-2 36226 NULL
++ept_walk_addr_36226 ept_walk_addr 3 36226 NULL
 +atomic_stats_read_36228 atomic_stats_read 3 36228 NULL
 +viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3 36241 NULL
 +SYSC_getxattr_36242 SYSC_getxattr 4 36242 NULL
 +rproc_recovery_read_36245 rproc_recovery_read 3 36245 NULL
 +scrub_stripe_36248 scrub_stripe 5-4 36248 NULL
 +compat_sys_mbind_36256 compat_sys_mbind 5 36256 NULL
-+usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 NULL
++usb_buffer_alloc_36276 usb_buffer_alloc 2 36276 NULL nohasharray
++cfs_hash_buckets_realloc_36276 cfs_hash_buckets_realloc 4 36276 &usb_buffer_alloc_36276
 +codec_reg_read_file_36280 codec_reg_read_file 3 36280 NULL
 +crypto_shash_digestsize_36284 crypto_shash_digestsize 0 36284 NULL
 +nouveau_cli_create_36293 nouveau_cli_create 3 36293 NULL
 +lpfc_debugfs_dif_err_read_36303 lpfc_debugfs_dif_err_read 3 36303 NULL
++cfg80211_rx_mlme_mgmt_36306 cfg80211_rx_mlme_mgmt 3 36306 NULL
 +ad7879_spi_xfer_36311 ad7879_spi_xfer 3 36311 NULL
 +fuse_get_user_addr_36312 fuse_get_user_addr 0 36312 NULL
 +fat_compat_ioctl_filldir_36328 fat_compat_ioctl_filldir 3 36328 NULL
 +lc_create_36332 lc_create 4 36332 NULL
 +jbd2_journal_init_revoke_table_36336 jbd2_journal_init_revoke_table 1 36336 NULL
 +isku_sysfs_read_key_mask_36343 isku_sysfs_read_key_mask 6 36343 NULL
++ath6kl_regwrite_write_36351 ath6kl_regwrite_write 3 36351 NULL
 +v9fs_file_readn_36353 v9fs_file_readn 4 36353 NULL nohasharray
 +xz_dec_lzma2_create_36353 xz_dec_lzma2_create 2 36353 &v9fs_file_readn_36353
 +to_sector_36361 to_sector 0-1 36361 NULL
++irq_domain_disassociate_36367 irq_domain_disassociate 2 36367 NULL
++posix_acl_create_36383 posix_acl_create 0 36383 NULL
 +tunables_read_36385 tunables_read 3 36385 NULL
-+afs_alloc_flat_call_36399 afs_alloc_flat_call 2-3 36399 NULL
++afs_alloc_flat_call_36399 afs_alloc_flat_call 3-2 36399 NULL
++sierra_write_36402 sierra_write 4 36402 NULL
++msb_update_block_36412 msb_update_block 2 36412 NULL
 +SyS_sethostname_36417 SyS_sethostname 2 36417 NULL
++ReadW6692B_36445 ReadW6692B 0 36445 NULL
 +sctp_tsnmap_init_36446 sctp_tsnmap_init 2 36446 NULL
 +alloc_etherdev_mqs_36450 alloc_etherdev_mqs 1 36450 NULL
-+tcf_csum_ipv6_udp_36457 tcf_csum_ipv6_udp 3 36457 NULL
-+SyS_process_vm_writev_36476 SyS_process_vm_writev 3-5 36476 NULL
++check_extent_in_eb_36467 check_extent_in_eb 0 36467 NULL
++SyS_process_vm_writev_36476 SyS_process_vm_writev 5-3 36476 NULL
 +b43_nphy_load_samples_36481 b43_nphy_load_samples 3 36481 NULL
-+tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 NULL
++set_var_mtrr_range_36483 set_var_mtrr_range 2 36483 NULL
++ip6_append_data_36490 ip6_append_data 4 36490 NULL nohasharray
++tx_tx_checksum_result_read_36490 tx_tx_checksum_result_read 3 36490 &ip6_append_data_36490
++cmd_loop_36491 cmd_loop 0 36491 NULL
 +__hwahc_op_set_ptk_36510 __hwahc_op_set_ptk 5 36510 NULL
 +mcam_v4l_read_36513 mcam_v4l_read 3 36513 NULL
 +get_param_l_36518 get_param_l 0 36518 NULL
@@ -106145,38 +106652,41 @@ index 0000000..9a7096d
 +lguest_setup_irq_36531 lguest_setup_irq 1 36531 NULL
 +crypto_aead_authsize_36537 crypto_aead_authsize 0 36537 NULL
 +cpu_type_read_36540 cpu_type_read 3 36540 NULL
-+get_entry_len_36549 get_entry_len 0 36549 NULL
-+__kfifo_to_user_36555 __kfifo_to_user 3 36555 NULL nohasharray
++__kfifo_to_user_36555 __kfifo_to_user 3-0 36555 NULL nohasharray
 +macvtap_do_read_36555 macvtap_do_read 4 36555 &__kfifo_to_user_36555
 +btrfs_get_token_64_36572 btrfs_get_token_64 0 36572 NULL
-+ssb_bus_scan_36578 ssb_bus_scan 2 36578 NULL
 +__erst_read_36579 __erst_read 0 36579 NULL
 +put_cmsg_36589 put_cmsg 4 36589 NULL
-+pcnet32_realloc_rx_ring_36598 pcnet32_realloc_rx_ring 3 36598 NULL
++do_sendfile_36610 do_sendfile 4-5 36610 NULL
 +fat_ioctl_filldir_36621 fat_ioctl_filldir 3 36621 NULL
++i915_gem_execbuffer_relocate_slow_36634 i915_gem_execbuffer_relocate_slow 0 36634 NULL
 +vxge_config_vpaths_36636 vxge_config_vpaths 0 36636 NULL
-+format_decode_36638 format_decode 0 36638 NULL
++convert_extent_item_v0_36645 convert_extent_item_v0 4-0 36645 NULL
 +ced_ioctl_36647 ced_ioctl 2 36647 NULL
 +lpfc_idiag_extacc_alloc_get_36648 lpfc_idiag_extacc_alloc_get 0-3 36648 NULL
-+perf_calculate_period_36662 perf_calculate_period 3-2 36662 NULL
 +osd_req_list_collection_objects_36664 osd_req_list_collection_objects 5 36664 NULL
 +iscsi_host_alloc_36671 iscsi_host_alloc 2 36671 NULL
-+ptr_to_compat_36680 ptr_to_compat 0 36680 NULL
-+ext4_mb_discard_group_preallocations_36685 ext4_mb_discard_group_preallocations 2 36685 NULL
++xillybus_read_36678 xillybus_read 3 36678 NULL
++tlv_put_btrfs_timespec_36685 tlv_put_btrfs_timespec 0 36685 NULL nohasharray
++ext4_mb_discard_group_preallocations_36685 ext4_mb_discard_group_preallocations 2 36685 &tlv_put_btrfs_timespec_36685
++gsmtty_write_36702 gsmtty_write 3 36702 NULL
 +sched_clock_36717 sched_clock 0 36717 NULL
-+extract_icmp6_fields_36732 extract_icmp6_fields 2 36732 NULL
-+snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4 36740 NULL
-+cxgbi_device_register_36746 cxgbi_device_register 1-2 36746 NULL
++ocfs2_rotate_tree_right_36723 ocfs2_rotate_tree_right 0 36723 NULL
++snd_rawmidi_kernel_read1_36740 snd_rawmidi_kernel_read1 4-0 36740 NULL
++cxgbi_device_register_36746 cxgbi_device_register 2-1 36746 NULL
++fc_exch_mgr_alloc_36751 fc_exch_mgr_alloc 3-4 36751 NULL
 +ps_poll_upsd_timeouts_read_36755 ps_poll_upsd_timeouts_read 3 36755 NULL
-+ip4ip6_err_36772 ip4ip6_err 5 36772 NULL
++ext4_ext_convert_to_initialized_36765 ext4_ext_convert_to_initialized 0 36765 NULL
 +ptp_filter_init_36780 ptp_filter_init 2 36780 NULL
++i40e_init_lan_hmc_36796 i40e_init_lan_hmc 2-3-4-5 36796 NULL
 +proc_fault_inject_read_36802 proc_fault_inject_read 3 36802 NULL
 +hiddev_ioctl_36816 hiddev_ioctl 2 36816 NULL
-+tcf_csum_ipv6_tcp_36822 tcf_csum_ipv6_tcp 3 36822 NULL
++ocfs2_journal_access_rb_36823 ocfs2_journal_access_rb 0 36823 NULL
 +int_hardware_entry_36833 int_hardware_entry 3 36833 NULL
 +fc_change_queue_depth_36841 fc_change_queue_depth 2 36841 NULL
 +keyctl_describe_key_36853 keyctl_describe_key 3 36853 NULL
 +cm_write_36858 cm_write 3 36858 NULL
++range_to_mtrr_with_hole_36861 range_to_mtrr_with_hole 2 36861 NULL
 +tx_tx_data_programmed_read_36871 tx_tx_data_programmed_read 3 36871 NULL
 +svc_setsockopt_36876 svc_setsockopt 5 36876 NULL
 +raid56_parity_write_36877 raid56_parity_write 5 36877 NULL
@@ -106184,71 +106694,105 @@ index 0000000..9a7096d
 +ib_ucm_alloc_data_36885 ib_ucm_alloc_data 3 36885 NULL
 +selinux_inode_notifysecctx_36896 selinux_inode_notifysecctx 3 36896 NULL
 +OS_kmalloc_36909 OS_kmalloc 1 36909 NULL
++audio_set_endpoint_req_36918 audio_set_endpoint_req 0 36918 NULL
 +build_key_36931 build_key 1 36931 NULL
 +crypto_blkcipher_ivsize_36944 crypto_blkcipher_ivsize 0 36944 NULL
-+write_leb_36957 write_leb 5 36957 NULL
++div_u64_36951 div_u64 0 36951 NULL
++write_leb_36957 write_leb 0-5 36957 NULL
 +ntfs_external_attr_find_36963 ntfs_external_attr_find 0 36963 NULL
 +sparse_early_mem_maps_alloc_node_36971 sparse_early_mem_maps_alloc_node 4 36971 NULL
++il4965_rs_sta_dbgfs_scale_table_write_36979 il4965_rs_sta_dbgfs_scale_table_write 3 36979 NULL
 +drbd_new_dev_size_36998 drbd_new_dev_size 0-3 36998 NULL
 +auok190xfb_write_37001 auok190xfb_write 3 37001 NULL
 +setxattr_37006 setxattr 4 37006 NULL
-+ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 NULL nohasharray
-+qp_broker_create_37053 qp_broker_create 6-5 37053 &ieee80211_if_read_drop_unencrypted_37053
++btrfs_update_root_37035 btrfs_update_root 0 37035 NULL
++ocfs2_dlm_unlock_37037 ocfs2_dlm_unlock 0 37037 NULL
++command_file_read_37038 command_file_read 3 37038 NULL
++__hfsplus_brec_find_37048 __hfsplus_brec_find 0 37048 NULL
++figure_loop_size_37051 figure_loop_size 2-3 37051 NULL
++qp_broker_create_37053 qp_broker_create 6-5 37053 NULL nohasharray
++ieee80211_if_read_drop_unencrypted_37053 ieee80211_if_read_drop_unencrypted 3 37053 &qp_broker_create_37053
 +SYSC_setxattr_37078 SYSC_setxattr 4 37078 NULL
 +parse_command_37079 parse_command 2 37079 NULL
 +pipeline_cs_rx_packet_in_read_37089 pipeline_cs_rx_packet_in_read 3 37089 NULL
 +tun_get_user_37094 tun_get_user 5 37094 NULL
-+has_wrprotected_page_37123 has_wrprotected_page 2-3 37123 NULL
++has_wrprotected_page_37123 has_wrprotected_page 3-2 37123 NULL
 +snd_hda_get_conn_list_37132 snd_hda_get_conn_list 0 37132 NULL
++mtt_free_res_37144 mtt_free_res 5 37144 NULL
 +msg_word_37164 msg_word 0 37164 NULL
++BeceemNVMRead_37166 BeceemNVMRead 0 37166 NULL
++f2fs_direct_IO_37167 f2fs_direct_IO 4 37167 NULL
 +can_set_xattr_37182 can_set_xattr 4 37182 NULL
-+crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL
++btrfs_insert_delayed_items_37191 btrfs_insert_delayed_items 0 37191 NULL
++vcc_recvmsg_37198 vcc_recvmsg 4 37198 NULL
++sysfs_add_file_37200 sysfs_add_file 0 37200 NULL
++mpol_misplaced_37205 mpol_misplaced 0 37205 NULL
++forced_ps_write_37209 forced_ps_write 3 37209 NULL
++crypto_shash_descsize_37212 crypto_shash_descsize 0 37212 NULL nohasharray
++ext4_ind_direct_IO_37212 ext4_ind_direct_IO 0-4 37212 &crypto_shash_descsize_37212
++bchannel_get_rxbuf_37213 bchannel_get_rxbuf 2-0 37213 NULL
 +regmap_access_read_file_37223 regmap_access_read_file 3 37223 NULL
 +__do_replace_37227 __do_replace 5 37227 NULL
++produce_free_peb_37232 produce_free_peb 0 37232 NULL
++iwl_dbgfs_d3_sram_read_37237 iwl_dbgfs_d3_sram_read 3 37237 NULL
 +rx_filter_dup_filter_read_37238 rx_filter_dup_filter_read 3 37238 NULL
++BeceemFlashBulkWrite_37255 BeceemFlashBulkWrite 0 37255 NULL
 +prot_queue_del_37258 prot_queue_del 0 37258 NULL
-+ath6kl_wmi_set_ie_cmd_37260 ath6kl_wmi_set_ie_cmd 6 37260 NULL
 +exofs_max_io_pages_37263 exofs_max_io_pages 0-2 37263 NULL
++__add_keyed_refs_37264 __add_keyed_refs 0 37264 NULL
 +nested_svm_map_37268 nested_svm_map 2 37268 NULL
-+c101_run_37279 c101_run 2 37279 NULL
-+srp_target_alloc_37288 srp_target_alloc 3 37288 NULL
-+isku_sysfs_write_talkfx_37298 isku_sysfs_write_talkfx 6 37298 NULL
++create_cq_user_37278 create_cq_user 5 37278 NULL
++request_threaded_irq_37303 request_threaded_irq 0 37303 NULL
 +ieee80211_if_read_power_mode_37305 ieee80211_if_read_power_mode 3 37305 NULL
++ext3_direct_IO_37308 ext3_direct_IO 4 37308 NULL
 +jffs2_write_dirent_37311 jffs2_write_dirent 5 37311 NULL
 +send_msg_37323 send_msg 4 37323 NULL
-+brcmf_sdbrcm_membytes_37324 brcmf_sdbrcm_membytes 3-5 37324 NULL
-+l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL
++l2cap_create_connless_pdu_37327 l2cap_create_connless_pdu 3 37327 NULL nohasharray
++bnx2x_vf_fill_fw_str_37327 bnx2x_vf_fill_fw_str 3 37327 &l2cap_create_connless_pdu_37327
 +scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
 +rxrpc_server_sendmsg_37331 rxrpc_server_sendmsg 4 37331 NULL
++lz4_compressbound_37337 lz4_compressbound 0-1 37337 NULL
++move_vma_37341 move_vma 0-5 37341 NULL
 +security_inode_getsecurity_37354 security_inode_getsecurity 0 37354 NULL
++cl_io_submit_rw_37374 cl_io_submit_rw 0 37374 NULL
++iterate_leaf_refs_37385 iterate_leaf_refs 0 37385 NULL
 +iommu_num_pages_37391 iommu_num_pages 0-1-3-2 37391 NULL
-+sys_getxattr_37418 sys_getxattr 4 37418 NULL
++btrfs_find_free_objectid_37412 btrfs_find_free_objectid 0 37412 NULL
 +hci_sock_sendmsg_37420 hci_sock_sendmsg 4 37420 NULL
 +acpi_os_allocate_zeroed_37422 acpi_os_allocate_zeroed 1 37422 NULL nohasharray
-+find_next_bit_37422 find_next_bit 0-2-3 37422 &acpi_os_allocate_zeroed_37422
-+tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4 37428 NULL
++find_next_bit_37422 find_next_bit 0-3-2 37422 &acpi_os_allocate_zeroed_37422
++ocfs2_insert_path_37425 ocfs2_insert_path 0 37425 NULL
++tty_insert_flip_string_fixed_flag_37428 tty_insert_flip_string_fixed_flag 4-0 37428 NULL
 +iwl_print_last_event_logs_37433 iwl_print_last_event_logs 0-7-9 37433 NULL
-+tty_audit_log_37440 tty_audit_log 5 37440 NULL
++fru_alloc_37442 fru_alloc 1 37442 NULL
 +tcp_established_options_37450 tcp_established_options 0 37450 NULL
 +brcmf_sdio_dump_console_37455 brcmf_sdio_dump_console 4 37455 NULL
 +__remove_37457 __remove 2 37457 NULL
 +ufs_data_ptr_to_cpu_37475 ufs_data_ptr_to_cpu 0 37475 NULL
 +get_est_timing_37484 get_est_timing 0 37484 NULL
 +kmem_realloc_37489 kmem_realloc 2 37489 NULL
-+kvm_vcpu_compat_ioctl_37500 kvm_vcpu_compat_ioctl 3 37500 NULL
-+vmalloc_32_user_37519 vmalloc_32_user 1 37519 NULL
++__hfsplus_setxattr_37499 __hfsplus_setxattr 4 37499 NULL
++bitmap_dirty_bits_37503 bitmap_dirty_bits 2 37503 NULL
++osc_active_seq_write_37514 osc_active_seq_write 3 37514 NULL
++bdev_writeseg_37519 bdev_writeseg 2-3 37519 NULL nohasharray
++vmalloc_32_user_37519 vmalloc_32_user 1 37519 &bdev_writeseg_37519
++xz_dec_test_write_37527 xz_dec_test_write 3 37527 NULL
 +fault_inject_read_37534 fault_inject_read 3 37534 NULL
 +hdr_size_37536 hdr_size 0 37536 NULL
-+a2p_37544 a2p 0-1 37544 NULL
-+sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL nohasharray
-+nf_nat_mangle_tcp_packet_37551 nf_nat_mangle_tcp_packet 6-8 37551 &sep_create_dcb_dmatables_context_37551
++extent_map_end_37550 extent_map_end 0 37550 NULL
++sep_create_dcb_dmatables_context_37551 sep_create_dcb_dmatables_context 6 37551 NULL
++ioat_chansts_37558 ioat_chansts 0 37558 NULL
 +xhci_alloc_streams_37586 xhci_alloc_streams 5 37586 NULL
-+mlx4_get_mgm_entry_size_37607 mlx4_get_mgm_entry_size 0 37607 NULL
++ocfs2_add_branch_37588 ocfs2_add_branch 0 37588 NULL
++alloc_descs_37593 alloc_descs 0-1-3 37593 NULL
++qla2x00_debounce_register_37597 qla2x00_debounce_register 0 37597 NULL
++find_extent_clone_37603 find_extent_clone 0 37603 NULL
++btrfs_write_and_wait_marked_extents_37604 btrfs_write_and_wait_marked_extents 0 37604 NULL
 +kvm_read_guest_page_mmu_37611 kvm_read_guest_page_mmu 6-3 37611 NULL
-+SYSC_mbind_37622 SYSC_mbind 5 37622 NULL
++SYSC_mbind_37622 SYSC_mbind 5 37622 NULL nohasharray
++ocfs2_split_refcount_rec_37622 ocfs2_split_refcount_rec 0 37622 &SYSC_mbind_37622
 +btrfs_calc_trans_metadata_size_37629 btrfs_calc_trans_metadata_size 0-2 37629 NULL nohasharray
 +policy_residency_37629 policy_residency 0 37629 &btrfs_calc_trans_metadata_size_37629
-+check_pt_base_37635 check_pt_base 3 37635 NULL
 +alloc_fd_37637 alloc_fd 1 37637 NULL
 +SyS_mbind_37638 SyS_mbind 5 37638 NULL
 +bio_copy_user_iov_37660 bio_copy_user_iov 4 37660 NULL
@@ -106258,427 +106802,485 @@ index 0000000..9a7096d
 +lnw_gpio_to_irq_37665 lnw_gpio_to_irq 2 37665 NULL
 +ieee80211_if_read_rc_rateidx_mcs_mask_2ghz_37675 ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 NULL
 +regmap_map_read_file_37685 regmap_map_read_file 3 37685 NULL
-+nametbl_header_37698 nametbl_header 2 37698 NULL
++page_chain_free_37697 page_chain_free 0 37697 NULL
++nametbl_header_37698 nametbl_header 2-0 37698 NULL
 +__le32_to_cpup_37702 __le32_to_cpup 0 37702 NULL
++dynamic_ps_timeout_write_37713 dynamic_ps_timeout_write 3 37713 NULL
 +dm_thin_remove_block_37724 dm_thin_remove_block 2 37724 NULL
 +find_active_uprobe_37733 find_active_uprobe 1 37733 NULL
 +read_enabled_file_bool_37744 read_enabled_file_bool 3 37744 NULL
-+ocfs2_duplicate_clusters_by_jbd_37749 ocfs2_duplicate_clusters_by_jbd 6-4-5 37749 NULL
++ocfs2_duplicate_clusters_by_jbd_37749 ocfs2_duplicate_clusters_by_jbd 5-4-6 37749 NULL
 +ocfs2_control_cfu_37750 ocfs2_control_cfu 2 37750 NULL
 +ipath_cdev_init_37752 ipath_cdev_init 1 37752 NULL
 +dccp_setsockopt_cscov_37766 dccp_setsockopt_cscov 2 37766 NULL
-+dma_pte_addr_37784 dma_pte_addr 0 37784 NULL
 +il4965_rs_sta_dbgfs_rate_scale_data_read_37792 il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 NULL
 +smk_read_logging_37804 smk_read_logging 3 37804 NULL
 +deny_write_access_37813 deny_write_access 0 37813 NULL
++ocrdma_alloc_frmr_page_list_37815 ocrdma_alloc_frmr_page_list 2 37815 NULL
 +rx_decrypt_key_not_found_read_37820 rx_decrypt_key_not_found_read 3 37820 NULL
-+bitmap_find_next_zero_area_37827 bitmap_find_next_zero_area 2-3-5-4 37827 NULL
++bitmap_find_next_zero_area_37827 bitmap_find_next_zero_area 2-3-0-5-4 37827 NULL
++android_get_p2p_addr_37832 android_get_p2p_addr 0 37832 NULL
++jbd2_journal_get_undo_access_37837 jbd2_journal_get_undo_access 0 37837 NULL
 +o2hb_debug_read_37851 o2hb_debug_read 3 37851 NULL
-+isku_sysfs_write_last_set_37868 isku_sysfs_write_last_set 6 37868 NULL nohasharray
-+xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 &isku_sysfs_write_last_set_37868
-+sys_setxattr_37880 sys_setxattr 4 37880 NULL
-+dvb_net_sec_37884 dvb_net_sec 3 37884 NULL
++SYSC_pwrite64_37862 SYSC_pwrite64 3 37862 NULL
++xfs_dir2_block_to_sf_37868 xfs_dir2_block_to_sf 3 37868 NULL
++set_registers_37883 set_registers 4 37883 NULL
++btrfs_stack_file_extent_disk_bytenr_37888 btrfs_stack_file_extent_disk_bytenr 0 37888 NULL
 +max77686_irq_domain_map_37897 max77686_irq_domain_map 2 37897 NULL
-+compat_sys_rt_sigpending_37899 compat_sys_rt_sigpending 2 37899 NULL
 +tipc_link_send_sections_fast_37920 tipc_link_send_sections_fast 4 37920 NULL
-+pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 NULL
++_rtw_malloc_37928 _rtw_malloc 1 37928 NULL nohasharray
++pkt_alloc_packet_data_37928 pkt_alloc_packet_data 1 37928 &_rtw_malloc_37928
 +read_rbu_packet_size_37939 read_rbu_packet_size 6 37939 NULL
++write_file_bool_37957 write_file_bool 3 37957 NULL
 +fifo_alloc_37961 fifo_alloc 1 37961 NULL
-+ext3_free_blocks_sb_37967 ext3_free_blocks_sb 3-4 37967 NULL
++ext3_free_blocks_sb_37967 ext3_free_blocks_sb 4-3 37967 NULL
 +rds_rdma_extra_size_37990 rds_rdma_extra_size 0 37990 NULL
 +persistent_ram_old_size_37997 persistent_ram_old_size 0 37997 NULL
 +vfs_readv_38011 vfs_readv 3 38011 NULL
 +aggr_recv_addba_req_evt_38037 aggr_recv_addba_req_evt 4 38037 NULL
-+il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 NULL nohasharray
-+klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 &il_dbgfs_chain_noise_read_38044
++SyS_pwrite64_38041 SyS_pwrite64 3 38041 NULL
++klsi_105_prepare_write_buffer_38044 klsi_105_prepare_write_buffer 3 38044 NULL nohasharray
++il_dbgfs_chain_noise_read_38044 il_dbgfs_chain_noise_read 3 38044 &klsi_105_prepare_write_buffer_38044
 +SyS_llistxattr_38048 SyS_llistxattr 3 38048 NULL
++sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL
 +_xfs_buf_alloc_38058 _xfs_buf_alloc 3 38058 NULL nohasharray
 +is_discarded_38058 is_discarded 2 38058 &_xfs_buf_alloc_38058
 +nsm_create_handle_38060 nsm_create_handle 4 38060 NULL
 +alloc_ltalkdev_38071 alloc_ltalkdev 1 38071 NULL
 +xfs_buf_readahead_map_38081 xfs_buf_readahead_map 3 38081 NULL
 +uwb_mac_addr_print_38085 uwb_mac_addr_print 2 38085 NULL
-+tcf_csum_ipv4_udp_38089 tcf_csum_ipv4_udp 3 38089 NULL
 +request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
 +proc_self_readlink_38094 proc_self_readlink 3 38094 NULL
 +ep0_read_38095 ep0_read 3 38095 NULL
-+sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 NULL
-+rbd_obj_read_sync_38098 rbd_obj_read_sync 3-4 38098 NULL
++sk_wmem_schedule_38096 sk_wmem_schedule 2 38096 NULL nohasharray
++osc_checksum_seq_write_38096 osc_checksum_seq_write 3 38096 &sk_wmem_schedule_38096
++o2hb_read_slots_38105 o2hb_read_slots 2 38105 NULL
 +snd_pcm_oss_write_38108 snd_pcm_oss_write 3 38108 NULL
++_get_val_38115 _get_val 2 38115 NULL
 +vmw_kms_present_38130 vmw_kms_present 9 38130 NULL
-+__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 3-4 38153 NULL
++__ntfs_copy_from_user_iovec_inatomic_38153 __ntfs_copy_from_user_iovec_inatomic 0-4-3 38153 NULL
 +kvm_clear_guest_38164 kvm_clear_guest 3-2 38164 NULL
++cirrus_ttm_tt_create_38167 cirrus_ttm_tt_create 2 38167 NULL
++send_rename_38170 send_rename 0 38170 NULL
 +cdev_add_38176 cdev_add 2-3 38176 NULL
-+brcmf_sdcard_recv_buf_38179 brcmf_sdcard_recv_buf 6 38179 NULL
++create_srq_user_38191 create_srq_user 5 38191 NULL
 +rt2x00debug_write_rf_38195 rt2x00debug_write_rf 3 38195 NULL
++do_chunk_alloc_38200 do_chunk_alloc 0 38200 NULL
 +get_ucode_user_38202 get_ucode_user 3 38202 NULL
-+ext3_new_block_38208 ext3_new_block 3 38208 NULL
++ext3_new_block_38208 ext3_new_block 3-0 38208 NULL
 +stmpe_gpio_irq_map_38222 stmpe_gpio_irq_map 3 38222 NULL
 +osd_req_list_partition_collections_38223 osd_req_list_partition_collections 5 38223 NULL
 +palmas_gpio_to_irq_38235 palmas_gpio_to_irq 2 38235 NULL
-+vhost_net_compat_ioctl_38237 vhost_net_compat_ioctl 3 38237 NULL
++ceph_decode_16_38239 ceph_decode_16 0 38239 NULL
 +_ipw_read_reg32_38245 _ipw_read_reg32 0 38245 NULL
++snd_pcm_playback_rewind_38249 snd_pcm_playback_rewind 0-2 38249 NULL
 +from_dblock_38256 from_dblock 0-1 38256 NULL
-+vmci_qp_broker_set_page_store_38260 vmci_qp_broker_set_page_store 2-3 38260 NULL
++vmci_qp_broker_set_page_store_38260 vmci_qp_broker_set_page_store 3-2 38260 NULL
 +SYSC_msgrcv_38268 SYSC_msgrcv 3 38268 NULL nohasharray
 +ieee80211_if_read_auto_open_plinks_38268 ieee80211_if_read_auto_open_plinks 3 38268 &SYSC_msgrcv_38268 nohasharray
 +mthca_alloc_icm_table_38268 mthca_alloc_icm_table 4-3 38268 &ieee80211_if_read_auto_open_plinks_38268
-+xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 NULL nohasharray
-+xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 &xfs_bmbt_to_bmdr_38275
-+ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL nohasharray
-+swiotlb_sync_single_for_cpu_38281 swiotlb_sync_single_for_cpu 2 38281 &ftdi_process_packet_38281
++xfs_bmdr_to_bmbt_38275 xfs_bmdr_to_bmbt 5 38275 NULL nohasharray
++xfs_bmbt_to_bmdr_38275 xfs_bmbt_to_bmdr 3 38275 &xfs_bmdr_to_bmbt_38275
++ftdi_process_packet_38281 ftdi_process_packet 4 38281 NULL
 +gpa_to_gfn_38291 gpa_to_gfn 0-1 38291 NULL
-+zd_mac_rx_38296 zd_mac_rx 3 38296 NULL
++ucma_query_path_38305 ucma_query_path 3 38305 NULL
 +isr_rx_headers_read_38325 isr_rx_headers_read 3 38325 NULL
-+ida_simple_get_38326 ida_simple_get 2 38326 NULL
++ida_simple_get_38326 ida_simple_get 2-0 38326 NULL
++ocfs2_rotate_rightmost_leaf_left_38330 ocfs2_rotate_rightmost_leaf_left 0 38330 NULL
 +__snd_gf1_look8_38333 __snd_gf1_look8 0 38333 NULL
-+pyra_sysfs_write_38370 pyra_sysfs_write 6 38370 NULL
++ocfs2_replace_extent_rec_38357 ocfs2_replace_extent_rec 0 38357 NULL
++btrfs_file_extent_disk_num_bytes_38363 btrfs_file_extent_disk_num_bytes 0 38363 NULL
 +dn_sendmsg_38390 dn_sendmsg 4 38390 NULL
 +get_valid_node_allowed_38412 get_valid_node_allowed 1-0 38412 NULL
-+ocfs2_which_cluster_group_38413 ocfs2_which_cluster_group 2 38413 NULL
++ocfs2_which_cluster_group_38413 ocfs2_which_cluster_group 0-2 38413 NULL
 +ht_destroy_irq_38418 ht_destroy_irq 1 38418 NULL
 +ieee80211_if_read_dtim_count_38419 ieee80211_if_read_dtim_count 3 38419 NULL
-+asix_write_cmd_async_38420 asix_write_cmd_async 5 38420 NULL
-+pcnet32_realloc_tx_ring_38428 pcnet32_realloc_tx_ring 3 38428 NULL
 +pmcraid_copy_sglist_38431 pmcraid_copy_sglist 3 38431 NULL
 +kvm_write_guest_38454 kvm_write_guest 4-2 38454 NULL
-+i915_min_freq_read_38470 i915_min_freq_read 3 38470 NULL
++btrfs_next_old_leaf_38465 btrfs_next_old_leaf 0 38465 NULL
 +kvm_arch_setup_async_pf_38481 kvm_arch_setup_async_pf 3 38481 NULL
-+blk_end_bidi_request_38482 blk_end_bidi_request 3-4 38482 NULL
++blk_end_bidi_request_38482 blk_end_bidi_request 4-3 38482 NULL
 +cpu_to_mem_38501 cpu_to_mem 0 38501 NULL
 +dev_names_read_38509 dev_names_read 3 38509 NULL
 +iscsi_create_iface_38510 iscsi_create_iface 5 38510 NULL
 +event_rx_mismatch_read_38518 event_rx_mismatch_read 3 38518 NULL
-+set_queue_count_38519 set_queue_count 0 38519 NULL
 +mlx4_ib_db_map_user_38529 mlx4_ib_db_map_user 2 38529 NULL
 +ubifs_idx_node_sz_38546 ubifs_idx_node_sz 0-2 38546 NULL
 +btrfs_discard_extent_38547 btrfs_discard_extent 2 38547 NULL
++kuc_len_38557 kuc_len 0-1 38557 NULL
 +cpu_to_node_38561 cpu_to_node 0 38561 NULL
 +irda_sendmsg_dgram_38563 irda_sendmsg_dgram 4 38563 NULL
 +il4965_rs_sta_dbgfs_scale_table_read_38564 il4965_rs_sta_dbgfs_scale_table_read 3 38564 NULL
 +_ipw_read32_38565 _ipw_read32 0 38565 NULL
 +snd_nm256_playback_copy_38567 snd_nm256_playback_copy 5-3 38567 NULL
 +copy_ctl_value_to_user_38587 copy_ctl_value_to_user 4 38587 NULL
-+cosa_net_setup_rx_38594 cosa_net_setup_rx 2 38594 NULL
-+compat_sys_ptrace_38595 compat_sys_ptrace 3-4 38595 NULL
++compat_sys_ptrace_38595 compat_sys_ptrace 3 38595 NULL
++blkg_stat_read_38612 blkg_stat_read 0 38612 NULL
 +icn_writecmd_38629 icn_writecmd 2 38629 NULL
++write_enabled_file_bool_38630 write_enabled_file_bool 3 38630 NULL
 +ext2_readpages_38640 ext2_readpages 4 38640 NULL
 +cma_create_area_38642 cma_create_area 2 38642 NULL
 +audit_init_entry_38644 audit_init_entry 1 38644 NULL
-+qp_broker_alloc_38646 qp_broker_alloc 5-6 38646 NULL
++qp_broker_alloc_38646 qp_broker_alloc 6-5 38646 NULL
 +mmc_send_cxd_data_38655 mmc_send_cxd_data 5 38655 NULL
 +nouveau_instmem_create__38664 nouveau_instmem_create_ 4 38664 NULL
-+skb_tnl_header_len_38669 skb_tnl_header_len 0 38669 NULL
-+cfg80211_send_disassoc_38678 cfg80211_send_disassoc 3 38678 NULL
++snd_es1371_wait_src_ready_38673 snd_es1371_wait_src_ready 0 38673 NULL
 +iscsit_dump_data_payload_38683 iscsit_dump_data_payload 2 38683 NULL
 +ext4_wait_block_bitmap_38695 ext4_wait_block_bitmap 2 38695 NULL
++validate_vid_hdr_38699 validate_vid_hdr 0 38699 NULL
 +rbio_add_io_page_38700 rbio_add_io_page 6 38700 NULL
-+find_next_usable_block_38716 find_next_usable_block 1-3 38716 NULL
++find_next_usable_block_38716 find_next_usable_block 3-1-0 38716 NULL
 +alloc_trace_probe_38720 alloc_trace_probe 6 38720 NULL
-+phys_to_virt_38757 phys_to_virt 0-1 38757 NULL
++w83977af_sir_interrupt_38738 w83977af_sir_interrupt 0 38738 NULL
 +udf_readpages_38761 udf_readpages 4 38761 NULL
 +iwl_dbgfs_thermal_throttling_read_38779 iwl_dbgfs_thermal_throttling_read 3 38779 NULL
++bcache_device_init_38781 bcache_device_init 3 38781 NULL
 +snd_gus_dram_write_38784 snd_gus_dram_write 4 38784 NULL
++slab_order_38794 slab_order 0 38794 NULL
++do_pci_enable_device_38802 do_pci_enable_device 0 38802 NULL
 +err_decode_38804 err_decode 2 38804 NULL
++btrfs_find_space_cluster_38812 btrfs_find_space_cluster 4-0 38812 NULL
 +ipv6_renew_option_38813 ipv6_renew_option 3 38813 NULL
-+sys_select_38827 sys_select 1 38827 NULL
-+b43_txhdr_size_38832 b43_txhdr_size 0 38832 NULL
 +direct_entry_38836 direct_entry 3 38836 NULL
 +compat_udp_setsockopt_38840 compat_udp_setsockopt 5 38840 NULL
++read_nic_io_word_38853 read_nic_io_word 0 38853 NULL
 +interfaces_38859 interfaces 2 38859 NULL
 +pci_msix_table_size_38867 pci_msix_table_size 0 38867 NULL
-+sizeof_gpio_leds_priv_38882 sizeof_gpio_leds_priv 0-1 38882 NULL
 +dbgfs_state_38894 dbgfs_state 3 38894 NULL
 +f2fs_xattr_set_acl_38895 f2fs_xattr_set_acl 4 38895 NULL
-+process_bulk_data_command_38906 process_bulk_data_command 4 38906 NULL
-+ext3_trim_all_free_38929 ext3_trim_all_free 3-4-2 38929 NULL
-+sbp_count_se_tpg_luns_38943 sbp_count_se_tpg_luns 0 38943 NULL
++traverse_38897 traverse 0 38897 NULL
++__fswab16_38898 __fswab16 0 38898 NULL
++ext3_trim_all_free_38929 ext3_trim_all_free 4-3-2 38929 NULL
++il_dbgfs_sram_write_38942 il_dbgfs_sram_write 3 38942 NULL
 +__ath6kl_wmi_send_mgmt_cmd_38971 __ath6kl_wmi_send_mgmt_cmd 7 38971 NULL
-+usb_maxpacket_38977 usb_maxpacket 0 38977 NULL nohasharray
-+C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 &usb_maxpacket_38977
-+OSDSetBlock_38986 OSDSetBlock 4-2 38986 NULL
++C_SYSC_preadv64_38977 C_SYSC_preadv64 3 38977 NULL nohasharray
++usb_maxpacket_38977 usb_maxpacket 0 38977 &C_SYSC_preadv64_38977
++OSDSetBlock_38986 OSDSetBlock 2-4 38986 NULL
++lpfc_idiag_extacc_write_38998 lpfc_idiag_extacc_write 3 38998 NULL
 +udf_new_block_38999 udf_new_block 4 38999 NULL
 +get_nodes_39012 get_nodes 3 39012 NULL
 +twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL
++__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3-0 39020 NULL
++qgroup_account_ref_step1_39024 qgroup_account_ref_step1 0 39024 NULL
 +acpi_install_gpe_block_39031 acpi_install_gpe_block 4 39031 NULL
 +_zd_iowrite32v_async_locked_39034 _zd_iowrite32v_async_locked 3 39034 NULL
-+line6_midibuf_read_39067 line6_midibuf_read 0-3 39067 NULL
++do_write_kmem_39051 do_write_kmem 1-3-0 39051 NULL
++gen_pool_create_39064 gen_pool_create 2 39064 NULL
 +ext4_init_block_bitmap_39071 ext4_init_block_bitmap 3 39071 NULL
++atomic64_add_negative_39098 atomic64_add_negative 1 39098 NULL
++ReadHFC_39104 ReadHFC 0 39104 NULL
 +tomoyo_truncate_39105 tomoyo_truncate 0 39105 NULL
-+__kfifo_to_user_r_39123 __kfifo_to_user_r 3 39123 NULL
++leb_write_lock_39111 leb_write_lock 0 39111 NULL
++__kfifo_to_user_r_39123 __kfifo_to_user_r 5-3 39123 NULL
++ttm_mem_global_alloc_zone_39125 ttm_mem_global_alloc_zone 0 39125 NULL
 +ea_foreach_39133 ea_foreach 0 39133 NULL
 +generic_permission_39150 generic_permission 0 39150 NULL
-+alloc_ring_39151 alloc_ring 2-4 39151 NULL
 +proc_coredump_filter_read_39153 proc_coredump_filter_read 3 39153 NULL
-+create_bounce_buffer_39155 create_bounce_buffer 3 39155 NULL
++echo_client_kbrw_39170 echo_client_kbrw 6 39170 NULL
++btrfs_start_delalloc_flush_39173 btrfs_start_delalloc_flush 0 39173 NULL
 +ext3_xattr_check_names_39174 ext3_xattr_check_names 0 39174 NULL
-+init_list_set_39188 init_list_set 2-3 39188 NULL
-+ubi_more_update_data_39189 ubi_more_update_data 4 39189 NULL
++ubi_more_update_data_39189 ubi_more_update_data 4-0 39189 NULL
 +qcam_read_bytes_39205 qcam_read_bytes 0 39205 NULL
-+qla4_82xx_pci_mem_read_direct_39208 qla4_82xx_pci_mem_read_direct 2 39208 NULL
-+vfio_group_fops_compat_ioctl_39219 vfio_group_fops_compat_ioctl 3 39219 NULL
 +ivtv_v4l2_write_39226 ivtv_v4l2_write 3 39226 NULL
-+batadv_tt_response_fill_table_39236 batadv_tt_response_fill_table 1 39236 NULL
 +posix_acl_to_xattr_39237 posix_acl_to_xattr 0 39237 NULL
 +drm_order_39244 drm_order 0 39244 NULL
-+pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 NULL nohasharray
-+r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 &pwr_cont_miss_bcns_spread_read_39250
-+__skb_cow_39254 __skb_cow 2 39254 NULL
-+ath6kl_wmi_set_appie_cmd_39266 ath6kl_wmi_set_appie_cmd 5 39266 NULL
++snd_pcm_capture_forward_39248 snd_pcm_capture_forward 0-2 39248 NULL
++r128_compat_ioctl_39250 r128_compat_ioctl 2 39250 NULL nohasharray
++pwr_cont_miss_bcns_spread_read_39250 pwr_cont_miss_bcns_spread_read 3 39250 &r128_compat_ioctl_39250
++i915_error_state_read_39254 i915_error_state_read 3 39254 NULL
++bitmap_set_bits_39272 bitmap_set_bits 3 39272 NULL
 +rx_filter_protection_filter_read_39282 rx_filter_protection_filter_read 3 39282 NULL
-+__vmalloc_node_39308 __vmalloc_node 1 39308 NULL
++__vmalloc_node_39308 __vmalloc_node 1-5 39308 NULL
 +__cfg80211_connect_result_39326 __cfg80211_connect_result 4-6 39326 NULL
++insert_reserved_file_extent_39327 insert_reserved_file_extent 3-0 39327 NULL
 +wimax_msg_alloc_39343 wimax_msg_alloc 4 39343 NULL
-+__cfg80211_send_deauth_39344 __cfg80211_send_deauth 3 39344 NULL
-+__copy_from_user_nocache_39351 __copy_from_user_nocache 3 39351 NULL
++__copy_from_user_nocache_39351 __copy_from_user_nocache 3-0 39351 NULL
 +ide_complete_rq_39354 ide_complete_rq 3 39354 NULL
-+do_write_log_from_user_39362 do_write_log_from_user 3 39362 NULL
++do_write_log_from_user_39362 do_write_log_from_user 3-0 39362 NULL
 +vortex_wtdma_getlinearpos_39371 vortex_wtdma_getlinearpos 0 39371 NULL
 +regmap_name_read_file_39379 regmap_name_read_file 3 39379 NULL
 +fnic_trace_debugfs_read_39380 fnic_trace_debugfs_read 3 39380 NULL
 +ps_poll_ps_poll_utilization_read_39383 ps_poll_ps_poll_utilization_read 3 39383 NULL
 +__send_to_port_39386 __send_to_port 3 39386 NULL
++perf_trace_buf_submit_39413 perf_trace_buf_submit 5 39413 NULL
 +user_power_read_39414 user_power_read 3 39414 NULL
 +alloc_agpphysmem_i8xx_39427 alloc_agpphysmem_i8xx 1 39427 NULL
-+sys_semop_39457 sys_semop 3 39457 NULL
-+ptrace_peek_siginfo_39458 ptrace_peek_siginfo 3 39458 NULL
++__vb2_get_done_vb_39448 __vb2_get_done_vb 0 39448 NULL
++apei_resources_add_39470 apei_resources_add 0 39470 NULL
 +setkey_unaligned_39474 setkey_unaligned 3 39474 NULL
 +do_get_mempolicy_39485 do_get_mempolicy 3 39485 NULL
 +ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries_39499 ieee80211_if_fmt_dot11MeshHWMPmaxPREQretries 3 39499 NULL
-+atomic64_read_unchecked_39505 atomic64_read_unchecked 0 39505 NULL
++cl_req_alloc_39523 cl_req_alloc 4 39523 NULL
 +int_proc_write_39542 int_proc_write 3 39542 NULL
 +pp_write_39554 pp_write 3 39554 NULL
-+ol_dqblk_block_39558 ol_dqblk_block 0-3-2 39558 NULL
++ol_dqblk_block_39558 ol_dqblk_block 2-0-3 39558 NULL
 +datablob_format_39571 datablob_format 2 39571 NULL nohasharray
 +ieee80211_if_read_fwded_mcast_39571 ieee80211_if_read_fwded_mcast 3 39571 &datablob_format_39571
-+handle_response_icmp_39574 handle_response_icmp 7 39574 NULL
-+mtdchar_compat_ioctl_39602 mtdchar_compat_ioctl 3 39602 NULL
-+n_tty_compat_ioctl_helper_39605 n_tty_compat_ioctl_helper 4 39605 NULL
 +ext_depth_39607 ext_depth 0 39607 NULL
 +nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
 +sdio_readb_39618 sdio_readb 0 39618 NULL
-+dm_exception_table_init_39645 dm_exception_table_init 2 39645 NULL nohasharray
-+set_dev_class_39645 set_dev_class 4 39645 &dm_exception_table_init_39645
++set_dev_class_39645 set_dev_class 4 39645 NULL nohasharray
++dm_exception_table_init_39645 dm_exception_table_init 2 39645 &set_dev_class_39645
 +snd_rme32_capture_copy_39653 snd_rme32_capture_copy 5 39653 NULL
-+tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL nohasharray
-+prism2_info_hostscanresults_39657 prism2_info_hostscanresults 3 39657 &tcp_try_rmem_schedule_39657
++tcp_try_rmem_schedule_39657 tcp_try_rmem_schedule 3 39657 NULL
 +kvm_read_guest_cached_39666 kvm_read_guest_cached 4 39666 NULL
 +v4l_stk_read_39672 v4l_stk_read 3 39672 NULL
 +hsc_msg_len_get_39673 hsc_msg_len_get 0 39673 NULL
 +do_surface_dirty_sou_39678 do_surface_dirty_sou 7 39678 NULL
++vmx_set_cr3_39688 vmx_set_cr3 2 39688 NULL
++sd_completed_bytes_39705 sd_completed_bytes 0 39705 NULL
 +ftrace_pid_write_39710 ftrace_pid_write 3 39710 NULL
-+tcf_csum_ipv4_tcp_39713 tcf_csum_ipv4_tcp 4 39713 NULL
++test_add_free_space_entry_39754 test_add_free_space_entry 2-3 39754 NULL
++adt7316_spi_multi_read_39765 adt7316_spi_multi_read 3 39765 NULL
 +remap_to_origin_clear_discard_39767 remap_to_origin_clear_discard 3 39767 NULL
-+ocfs2_pages_per_cluster_39790 ocfs2_pages_per_cluster 0 39790 NULL
 +crypto_ablkcipher_blocksize_39811 crypto_ablkcipher_blocksize 0 39811 NULL
 +security_inode_listsecurity_39812 security_inode_listsecurity 0 39812 NULL
 +snd_pcm_oss_writev3_39818 snd_pcm_oss_writev3 3 39818 NULL
-+sys_migrate_pages_39825 sys_migrate_pages 2 39825 NULL
 +get_priv_size_39828 get_priv_size 0-1 39828 NULL
++can_rmdir_39890 can_rmdir 0 39890 NULL
 +pkt_add_39897 pkt_add 3 39897 NULL
 +read_file_modal_eeprom_39909 read_file_modal_eeprom 3 39909 NULL
-+gen_pool_add_virt_39913 gen_pool_add_virt 4 39913 NULL
++gen_pool_add_virt_39913 gen_pool_add_virt 4-5 39913 NULL
 +dw210x_op_rw_39915 dw210x_op_rw 6 39915 NULL
++dma_to_mm_pfn_39916 dma_to_mm_pfn 0-1 39916 NULL
 +aes_encrypt_interrupt_read_39919 aes_encrypt_interrupt_read 3 39919 NULL
 +exofs_read_kern_39921 exofs_read_kern 6 39921 NULL nohasharray
 +oom_score_adj_read_39921 oom_score_adj_read 3 39921 &exofs_read_kern_39921
 +__spi_async_39932 __spi_async 0 39932 NULL
 +__get_order_39935 __get_order 0 39935 NULL
-+fwnet_pd_new_39947 fwnet_pd_new 4 39947 NULL nohasharray
-+error_error_frame_read_39947 error_error_frame_read 3 39947 &fwnet_pd_new_39947
-+tty_prepare_flip_string_39955 tty_prepare_flip_string 3 39955 NULL
++error_error_frame_read_39947 error_error_frame_read 3 39947 NULL
++tty_prepare_flip_string_39955 tty_prepare_flip_string 3-0 39955 NULL
++lstcon_group_list_39958 lstcon_group_list 2 39958 NULL
 +dma_push_rx_39973 dma_push_rx 2 39973 NULL
-+vfio_pci_read_39975 vfio_pci_read 3 39975 NULL
 +broadsheetfb_write_39976 broadsheetfb_write 3 39976 NULL
 +mthca_array_init_39987 mthca_array_init 2 39987 NULL
++fw_device_op_read_39990 fw_device_op_read 3 39990 NULL
++server_name2svname_39998 server_name2svname 4 39998 NULL
 +xen_hvm_config_40018 xen_hvm_config 2 40018 NULL
-+nf_nat_icmpv6_reply_translation_40023 nf_nat_icmpv6_reply_translation 5 40023 NULL nohasharray
-+ivtvfb_write_40023 ivtvfb_write 3 40023 &nf_nat_icmpv6_reply_translation_40023
++ivtvfb_write_40023 ivtvfb_write 3 40023 NULL
 +disc_pwup_write_40027 disc_pwup_write 3 40027 NULL
 +ea_foreach_i_40028 ea_foreach_i 0 40028 NULL
 +datablob_hmac_append_40038 datablob_hmac_append 3 40038 NULL
 +regmap_add_irq_chip_40042 regmap_add_irq_chip 4 40042 NULL
++ocfs2_claim_clusters_40050 ocfs2_claim_clusters 0 40050 NULL
 +add_tty_40055 add_tty 1 40055 NULL nohasharray
 +l2cap_create_iframe_pdu_40055 l2cap_create_iframe_pdu 3 40055 &add_tty_40055
 +atomic_xchg_40070 atomic_xchg 0 40070 NULL
++snd_pcm_sw_params_user_40095 snd_pcm_sw_params_user 0 40095 NULL
 +gen_pool_first_fit_40110 gen_pool_first_fit 2-3-4 40110 NULL
 +sctp_setsockopt_delayed_ack_40129 sctp_setsockopt_delayed_ack 3 40129 NULL
 +dwc2_max_desc_num_40132 dwc2_max_desc_num 0 40132 NULL
 +rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3 40140 NULL
++ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3 40143 NULL
 +iwch_alloc_fastreg_pbl_40153 iwch_alloc_fastreg_pbl 2 40153 NULL
++clone_backref_node_40154 clone_backref_node 0 40154 NULL
 +pt_write_40159 pt_write 3 40159 NULL
 +scsi_sg_count_40182 scsi_sg_count 0 40182 NULL
 +ipr_alloc_ucode_buffer_40199 ipr_alloc_ucode_buffer 1 40199 NULL nohasharray
 +devnode_find_40199 devnode_find 3-2 40199 &ipr_alloc_ucode_buffer_40199
 +allocate_probes_40204 allocate_probes 1 40204 NULL
-+compat_put_long_40214 compat_put_long 1 40214 NULL
++acpi_system_write_alarm_40205 acpi_system_write_alarm 3 40205 NULL
 +au0828_v4l2_read_40220 au0828_v4l2_read 3 40220 NULL
++compress_file_range_40225 compress_file_range 3-4 40225 NULL
 +osst_read_40237 osst_read 3 40237 NULL
-+lpage_info_slot_40243 lpage_info_slot 1-3 40243 NULL
-+ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4 40248 NULL
-+of_get_child_count_40254 of_get_child_count 0 40254 NULL
++lpage_info_slot_40243 lpage_info_slot 3-1 40243 NULL
++ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 4-3 40248 NULL
 +rs_sta_dbgfs_scale_table_read_40262 rs_sta_dbgfs_scale_table_read 3 40262 NULL
++ext2_fiemap_40271 ext2_fiemap 4 40271 NULL
 +usbnet_read_cmd_40275 usbnet_read_cmd 7 40275 NULL
 +rx_xfr_hint_trig_read_40283 rx_xfr_hint_trig_read 3 40283 NULL
++vfio_unmap_unpin_40284 vfio_unmap_unpin 3 40284 NULL
 +_calc_trunk_info_40291 _calc_trunk_info 2 40291 NULL
-+crash_free_reserved_phys_range_40292 crash_free_reserved_phys_range 1 40292 NULL
 +SyS_bind_40303 SyS_bind 3 40303 NULL
-+ubi_io_write_data_40305 ubi_io_write_data 4-5 40305 NULL
++ubi_io_write_data_40305 ubi_io_write_data 0-5-4 40305 NULL
 +batadv_tt_changes_fill_buff_40323 batadv_tt_changes_fill_buff 4 40323 NULL
 +ib_get_mad_data_offset_40336 ib_get_mad_data_offset 0 40336 NULL
 +mmio_read_40348 mmio_read 4 40348 NULL
-+usb_dump_interface_40353 usb_dump_interface 0 40353 NULL
-+ocfs2_release_clusters_40355 ocfs2_release_clusters 4 40355 NULL
++ocfs2_release_clusters_40355 ocfs2_release_clusters 4-0 40355 NULL
 +event_rx_mem_empty_read_40363 event_rx_mem_empty_read 3 40363 NULL
-+ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 2-3 40365 NULL
-+fwnet_incoming_packet_40380 fwnet_incoming_packet 3 40380 NULL
-+brcmf_sdbrcm_get_image_40397 brcmf_sdbrcm_get_image 0-2 40397 NULL
-+atmel_rmem16_40450 atmel_rmem16 0 40450 NULL
++ocfs2_check_range_for_refcount_40365 ocfs2_check_range_for_refcount 3-2 40365 NULL
++get_chars_40373 get_chars 3 40373 NULL
++submit_page_section_40408 submit_page_section 0 40408 NULL
++ecryptfs_read_lower_40419 ecryptfs_read_lower 3 40419 NULL
++slab_node_40421 slab_node 0 40421 NULL
++fb_prepare_extra_logos_40429 fb_prepare_extra_logos 0-2 40429 NULL
 +tomoyo_update_policy_40458 tomoyo_update_policy 2 40458 NULL
 +zd_usb_scnprint_id_40459 zd_usb_scnprint_id 0-3 40459 NULL
 +SyS_writev_40467 SyS_writev 3 40467 NULL
++__i915_add_request_40469 __i915_add_request 0 40469 NULL
 +SyS_select_40473 SyS_select 1 40473 NULL
++afs_fs_store_data_40484 afs_fs_store_data 3-4-5-6 40484 NULL
 +batadv_hash_new_40491 batadv_hash_new 1 40491 NULL
 +devcgroup_inode_permission_40492 devcgroup_inode_permission 0 40492 NULL
-+tty_write_room_40495 tty_write_room 0 40495 NULL
-+persistent_ram_new_40501 persistent_ram_new 1-2 40501 NULL
++drm_vma_node_start_40500 drm_vma_node_start 0 40500 NULL
 +sg_phys_40507 sg_phys 0 40507 NULL
-+TSS_checkhmac2_40520 TSS_checkhmac2 5-7 40520 NULL
++__ethtool_get_sset_count_40511 __ethtool_get_sset_count 0 40511 NULL
++TSS_checkhmac2_40520 TSS_checkhmac2 7-5 40520 NULL
 +ixgbe_dbg_reg_ops_read_40540 ixgbe_dbg_reg_ops_read 3 40540 NULL
++i915_gem_execbuffer_relocate_object_slow_40546 i915_gem_execbuffer_relocate_object_slow 0 40546 NULL
 +ima_write_policy_40548 ima_write_policy 3 40548 NULL
-+esp_alloc_tmp_40558 esp_alloc_tmp 3-2 40558 NULL
++btrfs_flush_all_pending_stuffs_40553 btrfs_flush_all_pending_stuffs 0 40553 NULL
++esp_alloc_tmp_40558 esp_alloc_tmp 2-3 40558 NULL
 +ufs_inode_getfrag_40560 ufs_inode_getfrag 2-4 40560 NULL
 +bdev_sectors_40564 bdev_sectors 0 40564 NULL
 +lba_to_map_index_40580 lba_to_map_index 0-1 40580 NULL
-+skge_rx_get_40598 skge_rx_get 3 40598 NULL
++b1_get_byte_40597 b1_get_byte 0 40597 NULL
 +get_priv_descr_and_size_40612 get_priv_descr_and_size 0 40612 NULL
-+bl_mark_sectors_init_40613 bl_mark_sectors_init 2-3 40613 NULL
-+cpuset_sprintf_cpulist_40627 cpuset_sprintf_cpulist 0 40627 NULL
++qla8044_rd_reg_40652 qla8044_rd_reg 0 40652 NULL
++pid_nr_ns_40654 pid_nr_ns 0 40654 NULL
 +twl4030_kpwrite_u8_40665 twl4030_kpwrite_u8 3 40665 NULL
 +__cfg80211_roamed_40668 __cfg80211_roamed 4-6 40668 NULL
 +pipeline_rx_complete_stat_fifo_int_read_40671 pipeline_rx_complete_stat_fifo_int_read 3 40671 NULL
 +fops_read_40672 fops_read 3 40672 NULL
++ext4_mark_inode_dirty_40673 ext4_mark_inode_dirty 0 40673 NULL
++idr_get_empty_slot_40674 idr_get_empty_slot 0 40674 NULL
 +alloc_rbio_40676 alloc_rbio 4 40676 NULL
-+videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 3 40678 NULL
++videobuf_dma_init_user_locked_40678 videobuf_dma_init_user_locked 3-4 40678 NULL
++pci_enable_resources_40680 pci_enable_resources 0 40680 NULL
 +nfc_hci_set_param_40697 nfc_hci_set_param 5 40697 NULL
-+vfio_pci_config_rw_40698 vfio_pci_config_rw 3 40698 NULL
 +__seq_open_private_40715 __seq_open_private 3 40715 NULL
++btrfs_find_one_extref_40724 btrfs_find_one_extref 0 40724 NULL
 +fuse_readpages_40737 fuse_readpages 4 40737 NULL
 +xfs_iext_remove_direct_40744 xfs_iext_remove_direct 3 40744 NULL nohasharray
-+find_next_zero_bit_le_40744 find_next_zero_bit_le 0-2-3 40744 &xfs_iext_remove_direct_40744
++find_next_zero_bit_le_40744 find_next_zero_bit_le 2-3-0 40744 &xfs_iext_remove_direct_40744
++i915_gem_execbuffer_relocate_entry_40750 i915_gem_execbuffer_relocate_entry 0 40750 NULL
 +security_inode_listxattr_40752 security_inode_listxattr 0 40752 NULL
-+fat_generic_compat_ioctl_40755 fat_generic_compat_ioctl 3 40755 NULL
 +card_send_command_40757 card_send_command 3 40757 NULL
 +ad1889_readl_40765 ad1889_readl 0 40765 NULL
 +pg_write_40766 pg_write 3 40766 NULL
-+show_list_40775 show_list 3 40775 NULL
++show_list_40775 show_list 3-0 40775 NULL
 +calcu_metadata_size_40782 calcu_metadata_size 0 40782 NULL
-+kfifo_out_copy_r_40784 kfifo_out_copy_r 0-3 40784 NULL
++kfifo_out_copy_r_40784 kfifo_out_copy_r 3-0 40784 NULL
 +bitmap_weight_40791 bitmap_weight 0-2 40791 NULL
 +pyra_sysfs_read_40795 pyra_sysfs_read 6 40795 NULL
-+netdev_alloc_skb_ip_align_40811 netdev_alloc_skb_ip_align 2 40811 NULL
++add_action_40811 add_action 4 40811 NULL
 +nl80211_send_roamed_40825 nl80211_send_roamed 5-7 40825 NULL
 +SyS_mbind_40828 SyS_mbind 5 40828 NULL
 +__mlx4_qp_reserve_range_40847 __mlx4_qp_reserve_range 2-3 40847 NULL
-+isku_sysfs_write_keys_thumbster_40851 isku_sysfs_write_keys_thumbster 6 40851 NULL
++nilfs_mdt_init_40849 nilfs_mdt_init 3 40849 NULL
 +ocfs2_zero_partial_clusters_40856 ocfs2_zero_partial_clusters 2-3 40856 NULL
 +v9fs_file_read_40858 v9fs_file_read 3 40858 NULL
 +read_file_queue_40895 read_file_queue 3 40895 NULL
++btrfs_set_inode_index_count_40901 btrfs_set_inode_index_count 0 40901 NULL
 +waiters_read_40902 waiters_read 3 40902 NULL
 +isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
 +gfs2_ea_find_40913 gfs2_ea_find 0 40913 NULL
 +vol_cdev_write_40915 vol_cdev_write 3 40915 NULL
-+snd_vx_create_40948 snd_vx_create 4 40948 NULL
-+skb_end_offset_40949 skb_end_offset 0 40949 NULL
++snd_vx_create_40948 snd_vx_create 4 40948 NULL nohasharray
++sg_alloc_table_40948 sg_alloc_table 0 40948 &snd_vx_create_40948
 +wm8994_free_irq_40951 wm8994_free_irq 2 40951 NULL
 +rds_sendmsg_40976 rds_sendmsg 4 40976 NULL
++btrfs_find_orphan_item_40977 btrfs_find_orphan_item 0 40977 NULL
++insert_old_idx_40987 insert_old_idx 0 40987 NULL
 +il_dbgfs_fh_reg_read_40993 il_dbgfs_fh_reg_read 3 40993 NULL
 +mac80211_format_buffer_41010 mac80211_format_buffer 2 41010 NULL
 +mtd_block_isbad_41015 mtd_block_isbad 0 41015 NULL
++__proc_dobitmasks_41029 __proc_dobitmasks 5 41029 NULL
 +_req_append_segment_41031 _req_append_segment 2 41031 NULL
 +mISDN_sock_sendmsg_41035 mISDN_sock_sendmsg 4 41035 NULL
 +ocfs2_xattr_index_block_find_41040 ocfs2_xattr_index_block_find 0 41040 NULL
-+vfs_listxattr_41062 vfs_listxattr 0 41062 NULL
++lprocfs_write_frac_helper_41050 lprocfs_write_frac_helper 2 41050 NULL
++BcmFlash2xBulkWrite_41054 BcmFlash2xBulkWrite 0 41054 NULL
++calculate_order_41061 calculate_order 0 41061 NULL
++vfs_listxattr_41062 vfs_listxattr 0 41062 NULL nohasharray
++beacon_filtering_write_41062 beacon_filtering_write 3 41062 &vfs_listxattr_41062
 +cfg80211_inform_bss_frame_41078 cfg80211_inform_bss_frame 4 41078 NULL
 +roccat_read_41093 roccat_read 3 41093 NULL nohasharray
-+nvme_map_user_pages_41093 nvme_map_user_pages 3-4 41093 &roccat_read_41093
-+dma_attach_41094 dma_attach 5-6 41094 NULL
++nvme_map_user_pages_41093 nvme_map_user_pages 4-3 41093 &roccat_read_41093
++dma_attach_41094 dma_attach 6-5 41094 NULL
 +provide_user_output_41105 provide_user_output 3 41105 NULL
 +f_audio_buffer_alloc_41110 f_audio_buffer_alloc 1 41110 NULL
++ath10k_read_wmi_services_41112 ath10k_read_wmi_services 3 41112 NULL
++ocfs2_extend_trans_41116 ocfs2_extend_trans 0 41116 NULL
++btrfs_subvolume_reserve_metadata_41130 btrfs_subvolume_reserve_metadata 3 41130 NULL
 +v4l2_ctrl_new_int_menu_41151 v4l2_ctrl_new_int_menu 4 41151 NULL
 +tx_frag_mpdu_alloc_failed_read_41167 tx_frag_mpdu_alloc_failed_read 3 41167 NULL
 +dvb_ca_write_41171 dvb_ca_write 3 41171 NULL
 +ol_quota_chunk_block_41177 ol_quota_chunk_block 0-2 41177 NULL
-+netif_get_num_default_rss_queues_41187 netif_get_num_default_rss_queues 0 41187 NULL
++dgap_driver_kzmalloc_41189 dgap_driver_kzmalloc 1 41189 NULL
 +compat_sys_process_vm_writev_41194 compat_sys_process_vm_writev 3-5 41194 NULL
 +dfs_file_write_41196 dfs_file_write 3 41196 NULL
-+xfs_readdir_41200 xfs_readdir 3 41200 NULL
 +ocfs2_read_quota_block_41207 ocfs2_read_quota_block 2 41207 NULL
 +nfs_page_array_len_41219 nfs_page_array_len 0-2-1 41219 NULL
-+hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2-3 41255 NULL
++cfg80211_process_disassoc_41231 cfg80211_process_disassoc 3 41231 NULL
++hiddev_compat_ioctl_41255 hiddev_compat_ioctl 2 41255 NULL
++create_dir_41256 create_dir 0 41256 NULL
 +erst_read_41260 erst_read 0 41260 NULL
-+__fprog_create_41263 __fprog_create 2 41263 NULL
-+setup_cluster_bitmap_41270 setup_cluster_bitmap 4 41270 NULL
++setup_cluster_bitmap_41270 setup_cluster_bitmap 4-0 41270 NULL
 +alloc_context_41283 alloc_context 1 41283 NULL
-+arch_gnttab_map_shared_41306 arch_gnttab_map_shared 3 41306 NULL
-+objio_alloc_io_state_41316 objio_alloc_io_state 6 41316 NULL
++objio_alloc_io_state_41316 objio_alloc_io_state 7-6 41316 NULL
++o2hb_setup_one_bio_41341 o2hb_setup_one_bio 4 41341 NULL
 +twl_change_queue_depth_41342 twl_change_queue_depth 2 41342 NULL
++rtw_android_set_block_41347 rtw_android_set_block 0 41347 NULL
++irq_expand_nr_irqs_41351 irq_expand_nr_irqs 0 41351 NULL
 +cnic_init_id_tbl_41354 cnic_init_id_tbl 2 41354 NULL
 +jbd2_alloc_41359 jbd2_alloc 1 41359 NULL
 +kmp_init_41373 kmp_init 2 41373 NULL
++netlink_alloc_large_skb_41375 netlink_alloc_large_skb 1 41375 NULL
 +isr_commands_read_41398 isr_commands_read 3 41398 NULL
 +is_writethrough_io_41406 is_writethrough_io 3 41406 NULL
-+sys_flistxattr_41407 sys_flistxattr 3 41407 NULL
 +rx_defrag_decrypt_failed_read_41411 rx_defrag_decrypt_failed_read 3 41411 NULL
 +xfs_iext_add_41422 xfs_iext_add 3 41422 NULL
-+vsock_dev_compat_ioctl_41427 vsock_dev_compat_ioctl 3 41427 NULL
 +isdn_ppp_fill_rq_41428 isdn_ppp_fill_rq 2 41428 NULL
 +lbs_rdrf_read_41431 lbs_rdrf_read 3 41431 NULL
 +iio_device_alloc_41440 iio_device_alloc 1 41440 NULL
-+ntfs_file_buffered_write_41442 ntfs_file_buffered_write 4-6 41442 NULL
++ntfs_file_buffered_write_41442 ntfs_file_buffered_write 6-4 41442 NULL
 +pcpu_build_alloc_info_41443 pcpu_build_alloc_info 1-2-3 41443 NULL
 +layout_leb_in_gaps_41470 layout_leb_in_gaps 0 41470 NULL
++snd_pcm_status_41472 snd_pcm_status 0 41472 NULL
 +rt2x00debug_write_rfcsr_41473 rt2x00debug_write_rfcsr 3 41473 NULL
++bl_alloc_init_bio_41478 bl_alloc_init_bio 1 41478 NULL
++split_item_41483 split_item 0 41483 NULL
++kvm_unmap_hva_range_41484 kvm_unmap_hva_range 3-2 41484 NULL
++ipath_user_sdma_page_length_41490 ipath_user_sdma_page_length 0-2-1 41490 NULL
 +wep_interrupt_read_41492 wep_interrupt_read 3 41492 NULL
 +SyS_get_mempolicy_41495 SyS_get_mempolicy 3-4 41495 NULL
 +hpfs_translate_name_41497 hpfs_translate_name 3 41497 NULL
 +xfrm_hash_new_size_41505 xfrm_hash_new_size 0-1 41505 NULL
-+ldisc_receive_41516 ldisc_receive 4 41516 NULL
++perf_sw_event_41517 perf_sw_event 2 41517 NULL
 +SyS_preadv_41523 SyS_preadv 3 41523 NULL
++dm_get_reserved_rq_based_ios_41529 dm_get_reserved_rq_based_ios 0 41529 NULL
++add_excluded_extent_41547 add_excluded_extent 0 41547 NULL
 +tx_tx_frame_checksum_read_41553 tx_tx_frame_checksum_read 3 41553 NULL
 +ath6kl_endpoint_stats_read_41554 ath6kl_endpoint_stats_read 3 41554 NULL
-+nr_status_frames_41559 nr_status_frames 0-1 41559 NULL
-+batadv_receive_client_update_packet_41578 batadv_receive_client_update_packet 3 41578 NULL
++si476x_radio_fops_read_41559 si476x_radio_fops_read 3 41559 NULL nohasharray
++nr_status_frames_41559 nr_status_frames 0-1 41559 &si476x_radio_fops_read_41559
 +rng_dev_read_41581 rng_dev_read 3 41581 NULL
-+read_file_rx_chainmask_41605 read_file_rx_chainmask 3 41605 NULL
 +vga_io_r_41609 vga_io_r 0 41609 NULL
 +tcp_hdrlen_41610 tcp_hdrlen 0 41610 NULL
-+usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 NULL
++lbs_bcnmiss_write_41613 lbs_bcnmiss_write 3 41613 NULL nohasharray
++usb_endpoint_maxp_41613 usb_endpoint_maxp 0 41613 &lbs_bcnmiss_write_41613
 +a2mp_send_41615 a2mp_send 4 41615 NULL
 +btrfs_calc_trunc_metadata_size_41626 btrfs_calc_trunc_metadata_size 0-2 41626 NULL
++lstcon_batch_list_41627 lstcon_batch_list 2 41627 NULL
 +mempool_create_kmalloc_pool_41650 mempool_create_kmalloc_pool 1 41650 NULL
 +rx_rx_pre_complt_read_41653 rx_rx_pre_complt_read 3 41653 NULL
 +get_std_timing_41654 get_std_timing 0 41654 NULL
-+squashfs_cache_init_41656 squashfs_cache_init 2 41656 NULL
++start_graph_tracing_41656 start_graph_tracing 0 41656 NULL
 +ieee80211_if_fmt_bssid_41677 ieee80211_if_fmt_bssid 3 41677 NULL
 +params_period_bytes_41683 params_period_bytes 0 41683 NULL
-+aac_src_ioremap_41688 aac_src_ioremap 2 41688 NULL
++fill_pcm_stream_name_41685 fill_pcm_stream_name 2 41685 NULL
++lov_unpackmd_41701 lov_unpackmd 4 41701 NULL
++__ext3_journal_get_write_access_41705 __ext3_journal_get_write_access 0 41705 NULL
++apei_exec_for_each_entry_41717 apei_exec_for_each_entry 0 41717 NULL
 +bdx_tx_db_init_41719 bdx_tx_db_init 2 41719 NULL
-+sys_pwritev_41722 sys_pwritev 3 41722 NULL
-+get_bios_ebda_41730 get_bios_ebda 0 41730 NULL
++ocfs2_block_group_fill_41744 ocfs2_block_group_fill 0 41744 NULL
 +fillonedir_41746 fillonedir 3 41746 NULL
 +ocfs2_dx_dir_rebalance_41793 ocfs2_dx_dir_rebalance 7 41793 NULL
 +iwl_dbgfs_bt_notif_read_41794 iwl_dbgfs_bt_notif_read 3 41794 NULL
++remap_pte_range_41800 remap_pte_range 5 41800 NULL
 +hsi_alloc_controller_41802 hsi_alloc_controller 1 41802 NULL
-+regcache_sync_block_raw_41803 regcache_sync_block_raw 3-4 41803 NULL
++regcache_sync_block_raw_41803 regcache_sync_block_raw 4-3 41803 NULL
++rtw_android_get_macaddr_41812 rtw_android_get_macaddr 0 41812 NULL
 +da9052_enable_irq_41814 da9052_enable_irq 2 41814 NULL
 +sco_send_frame_41815 sco_send_frame 3 41815 NULL
 +lp_gpio_to_irq_41822 lp_gpio_to_irq 2 41822 NULL
 +ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3 41839 NULL
 +do_ip_setsockopt_41852 do_ip_setsockopt 5 41852 NULL
 +keyctl_instantiate_key_41855 keyctl_instantiate_key 3 41855 NULL
-+ieee80211_rx_radiotap_space_41870 ieee80211_rx_radiotap_space 0 41870 NULL
-+get_packet_41914 get_packet 3 41914 NULL
++pci_map_single_41869 pci_map_single 0 41869 NULL
++usb_gadget_get_string_41871 usb_gadget_get_string 0 41871 NULL
++v_APCI3120_InterruptDmaMoveBlock16bit_41914 v_APCI3120_InterruptDmaMoveBlock16bit 4 41914 NULL
 +get_fdb_entries_41916 get_fdb_entries 3 41916 NULL
 +find_ge_pid_41918 find_ge_pid 1 41918 NULL
 +build_inv_iotlb_pages_41922 build_inv_iotlb_pages 4-5 41922 NULL
@@ -106687,217 +107289,260 @@ index 0000000..9a7096d
 +read_gssp_41947 read_gssp 3 41947 NULL
 +ocfs2_xattr_bucket_get_name_value_41949 ocfs2_xattr_bucket_get_name_value 0 41949 NULL
 +portnames_read_41958 portnames_read 3 41958 NULL
-+ubi_self_check_all_ff_41959 ubi_self_check_all_ff 4 41959 NULL
++ubi_self_check_all_ff_41959 ubi_self_check_all_ff 0-4 41959 NULL
 +dst_mtu_41969 dst_mtu 0 41969 NULL
++btrfs_check_trunc_cache_free_space_41973 btrfs_check_trunc_cache_free_space 0 41973 NULL
 +cx24116_writeregN_41975 cx24116_writeregN 4 41975 NULL
 +ubi_io_is_bad_41983 ubi_io_is_bad 0 41983 NULL
-+lguest_map_42008 lguest_map 1-2 42008 NULL
 +pool_allocate_42012 pool_allocate 3 42012 NULL
 +spidev_sync_read_42014 spidev_sync_read 0 42014 NULL
++rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3 42017 NULL
++nouveau_ttm_tt_create_42026 nouveau_ttm_tt_create 2 42026 NULL
 +acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL
++__btrfs_drop_extents_42032 __btrfs_drop_extents 5-0 42032 NULL
 +__hwahc_op_set_gtk_42038 __hwahc_op_set_gtk 4 42038 NULL
 +irda_sendmsg_ultra_42047 irda_sendmsg_ultra 4 42047 NULL
-+jffs2_do_link_42048 jffs2_do_link 6 42048 NULL nohasharray
-+dma_generic_alloc_coherent_42048 dma_generic_alloc_coherent 2 42048 &jffs2_do_link_42048
++dma_generic_alloc_coherent_42048 dma_generic_alloc_coherent 2 42048 NULL nohasharray
++jffs2_do_link_42048 jffs2_do_link 6 42048 &dma_generic_alloc_coherent_42048
 +ps_poll_upsd_max_ap_turn_read_42050 ps_poll_upsd_max_ap_turn_read 3 42050 NULL
 +InterfaceTransmitPacket_42058 InterfaceTransmitPacket 3 42058 NULL
 +alloc_bitset_42085 alloc_bitset 1 42085 NULL
 +scsi_execute_req_42088 scsi_execute_req 5 42088 NULL
 +sk_chk_filter_42095 sk_chk_filter 2 42095 NULL
++send_truncate_42107 send_truncate 0 42107 NULL
 +submit_inquiry_42108 submit_inquiry 3 42108 NULL
 +sysfs_read_file_42113 sysfs_read_file 3 42113 NULL nohasharray
 +dw_dma_cyclic_prep_42113 dw_dma_cyclic_prep 3-4 42113 &sysfs_read_file_42113
-+Read_hfc16_stable_42131 Read_hfc16_stable 0 42131 NULL
++__btrfs_unlink_inode_42114 __btrfs_unlink_inode 0 42114 NULL
++ext4_do_update_inode_42127 ext4_do_update_inode 0 42127 NULL
++blk_ioctl_zeroout_42160 blk_ioctl_zeroout 3 42160 NULL
 +mmc_align_data_size_42161 mmc_align_data_size 0-2 42161 NULL
++kvm_lapic_get_cr8_42166 kvm_lapic_get_cr8 0 42166 NULL
 +read_file_base_eeprom_42168 read_file_base_eeprom 3 42168 NULL
-+iwl_mvm_send_cmd_42173 iwl_mvm_send_cmd 0 42173 NULL
 +oprofilefs_str_to_user_42182 oprofilefs_str_to_user 3 42182 NULL
++write_file_beacon_42185 write_file_beacon 3 42185 NULL
 +get_znodes_to_commit_42201 get_znodes_to_commit 0 42201 NULL
-+btmrvl_hsmode_write_42252 btmrvl_hsmode_write 3 42252 NULL
++ocfs2_resv_window_bits_42207 ocfs2_resv_window_bits 0 42207 NULL
++pla_ocp_read_42235 pla_ocp_read 3 42235 NULL
 +rx_defrag_need_decrypt_read_42253 rx_defrag_need_decrypt_read 3 42253 NULL
-+netxen_nic_map_indirect_address_128M_42257 netxen_nic_map_indirect_address_128M 2 42257 NULL
-+savu_sysfs_write_42273 savu_sysfs_write 6 42273 NULL
++vfio_remove_dma_overlap_42255 vfio_remove_dma_overlap 2 42255 NULL
++__pcpu_size_to_slot_42271 __pcpu_size_to_slot 0 42271 NULL
 +snd_pcm_hw_param_value_max_42280 snd_pcm_hw_param_value_max 0 42280 NULL
++__cpus_weight_42299 __cpus_weight 2-0 42299 NULL
 +sel_read_perm_42302 sel_read_perm 3 42302 NULL
 +sctp_setsockopt_del_key_42304 sctp_setsockopt_del_key 3 42304 NULL nohasharray
 +ulong_read_file_42304 ulong_read_file 3 42304 &sctp_setsockopt_del_key_42304
-+gfn_to_hva_42305 gfn_to_hva 0-2 42305 NULL
-+xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 NULL
++gfn_to_hva_42305 gfn_to_hva 2-0 42305 NULL
++close_cur_inode_file_42308 close_cur_inode_file 0 42308 NULL nohasharray
++xfs_vm_readpages_42308 xfs_vm_readpages 4 42308 &close_cur_inode_file_42308
 +free_cblock_42318 free_cblock 2 42318 NULL
 +hysdn_conf_read_42324 hysdn_conf_read 3 42324 NULL
-+tcp_sync_mss_42330 tcp_sync_mss 0-2 42330 NULL
++tcp_sync_mss_42330 tcp_sync_mss 2-0 42330 NULL
 +snd_pcm_plug_alloc_42339 snd_pcm_plug_alloc 2 42339 NULL
 +ide_raw_taskfile_42355 ide_raw_taskfile 4 42355 NULL
++drbd_md_last_sector_42378 drbd_md_last_sector 0 42378 NULL
 +il_dbgfs_disable_ht40_read_42386 il_dbgfs_disable_ht40_read 3 42386 NULL
 +hash_ipportnet4_expire_42391 hash_ipportnet4_expire 3 42391 NULL
 +msnd_fifo_read_42406 msnd_fifo_read 0-3 42406 NULL
 +krng_get_random_42420 krng_get_random 3 42420 NULL
 +gsm_data_alloc_42437 gsm_data_alloc 3 42437 NULL
 +key_conf_keyidx_read_42443 key_conf_keyidx_read 3 42443 NULL
++alloc_request_42448 alloc_request 0 42448 NULL
 +snd_pcm_action_group_42452 snd_pcm_action_group 0 42452 NULL
 +tcm_loop_change_queue_depth_42454 tcm_loop_change_queue_depth 2 42454 NULL
++kuc_free_42455 kuc_free 2 42455 NULL
 +tc3589x_gpio_irq_get_virq_42457 tc3589x_gpio_irq_get_virq 2 42457 NULL
 +ext3_valid_block_bitmap_42459 ext3_valid_block_bitmap 3 42459 NULL
 +__simple_xattr_set_42474 __simple_xattr_set 4 42474 NULL
 +follow_hugetlb_page_42486 follow_hugetlb_page 0-7 42486 NULL
 +omfs_readpages_42490 omfs_readpages 4 42490 NULL
-+brcmf_sdbrcm_bus_txctl_42492 brcmf_sdbrcm_bus_txctl 3 42492 NULL
 +bypass_write_42498 bypass_write 3 42498 NULL
-+SyS_mincore_42511 SyS_mincore 1 42511 NULL
++SyS_mincore_42511 SyS_mincore 1-2 42511 NULL
++jbd2_log_wait_commit_42519 jbd2_log_wait_commit 0 42519 NULL
 +kvm_write_wall_clock_42520 kvm_write_wall_clock 2 42520 NULL
++dio_bio_complete_42524 dio_bio_complete 0 42524 NULL
 +smk_write_netlbladdr_42525 smk_write_netlbladdr 3 42525 NULL
-+snd_emux_create_port_42533 snd_emux_create_port 3 42533 NULL
++self_check_ec_hdr_42528 self_check_ec_hdr 0 42528 NULL
++__register_ftrace_function_42543 __register_ftrace_function 0 42543 NULL
 +dbAllocNear_42546 dbAllocNear 0 42546 NULL
-+i915_ring_stop_read_42549 i915_ring_stop_read 3 42549 NULL nohasharray
-+ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 &i915_ring_stop_read_42549
++inorder_next_42548 inorder_next 1-0 42548 NULL
++ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL
++udp_recvmsg_42558 udp_recvmsg 4 42558 NULL
 +iwl_print_event_log_42566 iwl_print_event_log 0-5-7 42566 NULL
++ocfs2_reserve_suballoc_bits_42569 ocfs2_reserve_suballoc_bits 0 42569 NULL
 +xfrm_new_hash_mask_42579 xfrm_new_hash_mask 0-1 42579 NULL
 +oom_score_adj_write_42594 oom_score_adj_write 3 42594 NULL
-+__pskb_pull_42602 __pskb_pull 2 42602 NULL nohasharray
-+map_state_42602 map_state 1 42602 &__pskb_pull_42602
-+nd_get_link_42603 nd_get_link 0 42603 NULL
-+sys_move_pages_42626 sys_move_pages 2 42626 NULL
++map_state_42602 map_state 1 42602 NULL
 +resp_write_42628 resp_write 2 42628 NULL
 +ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout_42635 ieee80211_if_fmt_dot11MeshHWMPactivePathTimeout 3 42635 NULL
 +scsi_activate_tcq_42640 scsi_activate_tcq 2 42640 NULL
 +br_mdb_rehash_42643 br_mdb_rehash 2 42643 NULL
-+l2tp_xmit_skb_42672 l2tp_xmit_skb 3 42672 NULL
++parport_pc_compat_write_block_pio_42644 parport_pc_compat_write_block_pio 3 42644 NULL
++ocfs2_search_chain_42655 ocfs2_search_chain 0 42655 NULL
 +request_key_and_link_42693 request_key_and_link 4 42693 NULL
 +acpi_dev_get_irqresource_42694 acpi_dev_get_irqresource 2 42694 NULL
 +vb2_read_42703 vb2_read 3 42703 NULL
-+sierra_net_send_cmd_42708 sierra_net_send_cmd 3 42708 NULL
-+__ocfs2_decrease_refcount_42717 __ocfs2_decrease_refcount 4 42717 NULL
++__ocfs2_decrease_refcount_42717 __ocfs2_decrease_refcount 5-4-0 42717 NULL
++read_status_42722 read_status 0 42722 NULL
 +dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL
 +set_aoe_iflist_42737 set_aoe_iflist 2 42737 NULL
 +ax25_setsockopt_42740 ax25_setsockopt 5 42740 NULL
 +xen_bind_pirq_gsi_to_irq_42750 xen_bind_pirq_gsi_to_irq 1 42750 NULL
++dpm_sysfs_add_42756 dpm_sysfs_add 0 42756 NULL
++x25_recvmsg_42777 x25_recvmsg 4 42777 NULL
 +snd_midi_event_decode_42780 snd_midi_event_decode 0 42780 NULL
-+isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 NULL nohasharray
-+cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 &isku_sysfs_read_info_42781
++cryptd_hash_setkey_42781 cryptd_hash_setkey 3 42781 NULL nohasharray
++isku_sysfs_read_info_42781 isku_sysfs_read_info 6 42781 &cryptd_hash_setkey_42781
++elfcorehdr_read_notes_42786 elfcorehdr_read_notes 2 42786 NULL
 +koneplus_sysfs_read_42792 koneplus_sysfs_read 6 42792 NULL
 +ntfs_attr_extend_allocation_42796 ntfs_attr_extend_allocation 0-2 42796 NULL
-+fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2-3 42804 NULL
++fw_device_op_compat_ioctl_42804 fw_device_op_compat_ioctl 2 42804 NULL
 +drm_ioctl_42813 drm_ioctl 2 42813 NULL
 +iwl_dbgfs_ucode_bt_stats_read_42820 iwl_dbgfs_ucode_bt_stats_read 3 42820 NULL
++xfs_iomap_eof_prealloc_initial_size_42822 xfs_iomap_eof_prealloc_initial_size 0-3 42822 NULL
 +set_arg_42824 set_arg 3 42824 NULL
 +si476x_radio_read_rsq_blob_42827 si476x_radio_read_rsq_blob 3 42827 NULL
 +ocfs2_desc_bitmap_to_cluster_off_42831 ocfs2_desc_bitmap_to_cluster_off 2 42831 NULL
 +prandom_u32_42853 prandom_u32 0 42853 NULL
-+of_property_count_strings_42863 of_property_count_strings 0 42863 NULL
++ntfs_mapping_pairs_build_42859 ntfs_mapping_pairs_build 0 42859 NULL
++nouveau_vm_create_42869 nouveau_vm_create 3-2 42869 NULL
 +ocfs2_clusters_for_bytes_42872 ocfs2_clusters_for_bytes 0-2 42872 NULL
-+pskb_expand_head_42881 pskb_expand_head 2-3 42881 NULL
-+vt_compat_ioctl_42887 vt_compat_ioctl 3 42887 NULL
-+tipc_port_recv_sections_42890 tipc_port_recv_sections 4 42890 NULL
++nvme_trans_unit_serial_page_42879 nvme_trans_unit_serial_page 4 42879 NULL
 +xpc_kmalloc_cacheline_aligned_42895 xpc_kmalloc_cacheline_aligned 1 42895 NULL
-+SendTxCommandPacket_42901 SendTxCommandPacket 3 42901 NULL
 +hd_end_request_42904 hd_end_request 2 42904 NULL
 +sta_last_rx_rate_read_42909 sta_last_rx_rate_read 3 42909 NULL
 +sctp_getsockopt_maxburst_42941 sctp_getsockopt_maxburst 2 42941 NULL
 +get_unmapped_area_42944 get_unmapped_area 0 42944 NULL
-+sys_sethostname_42962 sys_sethostname 2 42962 NULL
++vx_reset_chk_42946 vx_reset_chk 0 42946 NULL
++send_link_42948 send_link 0 42948 NULL
++blkdev_direct_IO_42962 blkdev_direct_IO 4 42962 NULL
 +read_file_node_stat_42964 read_file_node_stat 3 42964 NULL
 +compat_udpv6_setsockopt_42981 compat_udpv6_setsockopt 5 42981 NULL
-+snd_timer_user_ioctl_compat_42985 snd_timer_user_ioctl_compat 3 42985 NULL
-+nfs_idmap_get_desc_42990 nfs_idmap_get_desc 4-2 42990 NULL
++nfs_idmap_get_desc_42990 nfs_idmap_get_desc 2-4 42990 NULL nohasharray
++rtw_os_xmit_resource_alloc_42990 rtw_os_xmit_resource_alloc 3 42990 &nfs_idmap_get_desc_42990
 +mlx4_qp_reserve_range_43000 mlx4_qp_reserve_range 2-3 43000 NULL
 +isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3 43025 NULL
-+add_bytes_to_bitmap_43026 add_bytes_to_bitmap 0 43026 NULL
++add_bytes_to_bitmap_43026 add_bytes_to_bitmap 0-3-4 43026 NULL
++init_phys_status_page_43028 init_phys_status_page 0 43028 NULL
 +wep_default_key_count_read_43035 wep_default_key_count_read 3 43035 NULL
++send_to_group_43051 send_to_group 0 43051 NULL
 +nouveau_gpuobj_create__43072 nouveau_gpuobj_create_ 9 43072 NULL
 +nfs_map_group_to_gid_43082 nfs_map_group_to_gid 3 43082 NULL
-+cpuset_sprintf_memlist_43088 cpuset_sprintf_memlist 0 43088 NULL
 +ieee80211_if_fmt_drop_unencrypted_43107 ieee80211_if_fmt_drop_unencrypted 3 43107 NULL
-+i2c_hid_get_report_43145 i2c_hid_get_report 0 43145 NULL nohasharray
-+read_file_dfs_43145 read_file_dfs 3 43145 &i2c_hid_get_report_43145
-+uuid_string_43154 uuid_string 0 43154 NULL
++calculate_node_totalpages_43118 calculate_node_totalpages 2-3 43118 NULL
++cow_file_range_inline_43132 cow_file_range_inline 4 43132 NULL
++read_file_dfs_43145 read_file_dfs 3 43145 NULL
++cfs_cpt_table_alloc_43159 cfs_cpt_table_alloc 1 43159 NULL
 +usb_string_sub_43164 usb_string_sub 0 43164 NULL
 +il_dbgfs_power_save_status_read_43165 il_dbgfs_power_save_status_read 3 43165 NULL
++send_cmd_43168 send_cmd 0 43168 NULL
 +ath6kl_set_assoc_req_ies_43185 ath6kl_set_assoc_req_ies 3 43185 NULL
-+process_measurement_43190 process_measurement 0 43190 NULL
 +ext4_xattr_ibody_get_43200 ext4_xattr_ibody_get 0 43200 NULL
 +uio_write_43202 uio_write 3 43202 NULL
 +iso_callback_43208 iso_callback 3 43208 NULL
++ath10k_p2p_calc_noa_ie_len_43209 ath10k_p2p_calc_noa_ie_len 0 43209 NULL
 +f2fs_acl_from_disk_43210 f2fs_acl_from_disk 2 43210 NULL
-+atomic_long_add_return_43217 atomic_long_add_return 1 43217 NULL
-+comedi_compat_ioctl_43218 comedi_compat_ioctl 3 43218 NULL
++atomic_long_add_return_43217 atomic_long_add_return 1-0 43217 NULL
 +vmemmap_alloc_block_43245 vmemmap_alloc_block 1 43245 NULL
 +fixup_leb_43256 fixup_leb 3 43256 NULL
 +ide_end_rq_43269 ide_end_rq 4 43269 NULL
-+evtchn_write_43278 evtchn_write 3 43278 NULL
++nilfs_direct_IO_43271 nilfs_direct_IO 4 43271 NULL
++mlx5_ib_reg_user_mr_43275 mlx5_ib_reg_user_mr 2-3 43275 NULL
++parport_pc_ecp_write_block_pio_43278 parport_pc_ecp_write_block_pio 3 43278 NULL nohasharray
++evtchn_write_43278 evtchn_write 3 43278 &parport_pc_ecp_write_block_pio_43278
 +filemap_write_and_wait_range_43279 filemap_write_and_wait_range 0 43279 NULL
 +mpage_alloc_43299 mpage_alloc 3 43299 NULL
 +get_nr_irqs_gsi_43315 get_nr_irqs_gsi 0 43315 NULL
-+mmu_set_spte_43327 mmu_set_spte 6-7 43327 NULL
++mmu_set_spte_43327 mmu_set_spte 7-6 43327 NULL
 +__ext4_get_inode_loc_43332 __ext4_get_inode_loc 0 43332 NULL
-+kvm_host_page_size_43348 kvm_host_page_size 2 43348 NULL
++kvm_host_page_size_43348 kvm_host_page_size 2-0 43348 NULL
 +gart_free_coherent_43362 gart_free_coherent 4-2 43362 NULL
 +hash_net4_expire_43378 hash_net4_expire 3 43378 NULL
-+__alloc_bootmem_low_43423 __alloc_bootmem_low 1-2 43423 NULL nohasharray
-+gdm_wimax_netif_rx_43423 gdm_wimax_netif_rx 3 43423 &__alloc_bootmem_low_43423
-+isku_sysfs_write_keys_capslock_43432 isku_sysfs_write_keys_capslock 6 43432 NULL
++xenfb_write_43412 xenfb_write 3 43412 NULL
++__alloc_bootmem_low_43423 __alloc_bootmem_low 1 43423 NULL
 +usb_alloc_urb_43436 usb_alloc_urb 1 43436 NULL
-+ucs2_strsize_43438 ucs2_strsize 0 43438 NULL
 +ath6kl_wmi_roam_tbl_event_rx_43440 ath6kl_wmi_roam_tbl_event_rx 3 43440 NULL
-+usb_string_43443 usb_string 0 43443 NULL nohasharray
-+usemap_size_43443 usemap_size 0-2-1 43443 &usb_string_43443
-+alloc_new_reservation_43480 alloc_new_reservation 4 43480 NULL
++ocfs2_rotate_tree_left_43442 ocfs2_rotate_tree_left 0 43442 NULL
++usemap_size_43443 usemap_size 0-2-1 43443 NULL nohasharray
++usb_string_43443 usb_string 0 43443 &usemap_size_43443
++get_vm_area_size_43444 get_vm_area_size 0 43444 NULL
++nvme_trans_device_id_page_43466 nvme_trans_device_id_page 4 43466 NULL
++calculate_discard_block_size_43480 calculate_discard_block_size 0 43480 NULL nohasharray
++alloc_new_reservation_43480 alloc_new_reservation 4-0-2 43480 &calculate_discard_block_size_43480
 +tx_tx_data_prepared_read_43497 tx_tx_data_prepared_read 3 43497 NULL
 +ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime_43505 ieee80211_if_fmt_dot11MeshHWMPnetDiameterTraversalTime 3 43505 NULL
 +do_readlink_43518 do_readlink 2 43518 NULL
 +dvb_ca_en50221_io_write_43533 dvb_ca_en50221_io_write 3 43533 NULL
++read_events_43534 read_events 3 43534 NULL
 +cachefiles_daemon_write_43535 cachefiles_daemon_write 3 43535 NULL
 +tx_frag_failed_read_43540 tx_frag_failed_read 3 43540 NULL nohasharray
 +ufs_alloccg_block_43540 ufs_alloccg_block 3-0 43540 &tx_frag_failed_read_43540
-+ath_rx_init_43564 ath_rx_init 2 43564 NULL
-+_fc_frame_alloc_43568 _fc_frame_alloc 1 43568 NULL
++request_resource_43548 request_resource 0 43548 NULL
 +rpc_malloc_43573 rpc_malloc 2 43573 NULL
++handle_frequent_errors_43599 handle_frequent_errors 4 43599 NULL
 +lpfc_idiag_drbacc_read_reg_43606 lpfc_idiag_drbacc_read_reg 0-3 43606 NULL
 +proc_read_43614 proc_read 3 43614 NULL
++i915_gem_execbuffer_relocate_object_slow_43618 i915_gem_execbuffer_relocate_object_slow 0 43618 NULL nohasharray
++disable_dma_on_even_43618 disable_dma_on_even 0 43618 &i915_gem_execbuffer_relocate_object_slow_43618
++random_write_43656 random_write 3 43656 NULL
 +bio_integrity_tag_43658 bio_integrity_tag 3 43658 NULL
 +ext4_acl_count_43659 ext4_acl_count 0-1 43659 NULL
-+dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4-2 43679 NULL
-+calgary_map_page_43686 calgary_map_page 3-4 43686 NULL
++fs_path_copy_43673 fs_path_copy 0 43673 NULL
++dmam_declare_coherent_memory_43679 dmam_declare_coherent_memory 4 43679 NULL
++calgary_map_page_43686 calgary_map_page 4 43686 NULL
 +max77693_bulk_write_43698 max77693_bulk_write 2-3 43698 NULL
++wait_for_completion_interruptible_43723 wait_for_completion_interruptible 0 43723 NULL
 +drbd_md_first_sector_43729 drbd_md_first_sector 0 43729 NULL
++reset_card_proc_43731 reset_card_proc 0 43731 NULL
 +snd_rme32_playback_copy_43732 snd_rme32_playback_copy 5 43732 NULL
-+ocfs2_replace_clusters_43733 ocfs2_replace_clusters 5 43733 NULL
-+osdv1_attr_list_elem_size_43747 osdv1_attr_list_elem_size 0-1 43747 NULL
++ocfs2_replace_clusters_43733 ocfs2_replace_clusters 5-0 43733 NULL
++fuse_conn_congestion_threshold_write_43736 fuse_conn_congestion_threshold_write 3 43736 NULL
 +__bm_find_next_43748 __bm_find_next 2 43748 NULL
 +gigaset_initcs_43753 gigaset_initcs 2 43753 NULL
 +sctp_setsockopt_active_key_43755 sctp_setsockopt_active_key 3 43755 NULL
 +ocfs2_xattr_get_value_outside_43787 ocfs2_xattr_get_value_outside 0 43787 NULL nohasharray
 +byte_pos_43787 byte_pos 0-2 43787 &ocfs2_xattr_get_value_outside_43787
-+btrfs_copy_from_user_43806 btrfs_copy_from_user 3-1 43806 NULL
++btrfs_copy_from_user_43806 btrfs_copy_from_user 0-3-1 43806 NULL
 +ext4_read_block_bitmap_43814 ext4_read_block_bitmap 2 43814 NULL
-+div64_u64_safe_43815 div64_u64_safe 1-2 43815 NULL
++div64_u64_safe_43815 div64_u64_safe 2-1 43815 NULL
++ext4_split_extent_43818 ext4_split_extent 0 43818 NULL
++i915_gem_execbuffer_relocate_entry_43822 i915_gem_execbuffer_relocate_entry 0 43822 NULL
 +ieee80211_if_fmt_element_ttl_43825 ieee80211_if_fmt_element_ttl 3 43825 NULL
 +ieee80211_alloc_hw_43829 ieee80211_alloc_hw 1 43829 NULL
-+p54_download_eeprom_43842 p54_download_eeprom 4 43842 NULL
 +read_flush_43851 read_flush 3 43851 NULL
 +ocfs2_block_group_find_clear_bits_43874 ocfs2_block_group_find_clear_bits 4 43874 NULL
 +pm860x_bulk_write_43875 pm860x_bulk_write 2-3 43875 NULL
-+prism2_sta_send_mgmt_43916 prism2_sta_send_mgmt 5 43916 NULL
 +SendString_43928 SendString 3 43928 NULL
-+xen_register_gsi_43946 xen_register_gsi 1-2 43946 NULL
++xen_register_gsi_43946 xen_register_gsi 2-1 43946 NULL
 +stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3 43948 NULL
-+__get_required_blob_size_43980 __get_required_blob_size 0-2-3 43980 NULL
++perf_tp_event_43971 perf_tp_event 2 43971 NULL
++__get_required_blob_size_43980 __get_required_blob_size 0-3-2 43980 NULL
 +nla_reserve_43984 nla_reserve 3 43984 NULL
 +__clkdev_alloc_43990 __clkdev_alloc 1 43990 NULL
-+bcm_recvmsg_43992 bcm_recvmsg 4 43992 NULL nohasharray
-+scsi_command_size_43992 scsi_command_size 0 43992 &bcm_recvmsg_43992
++scsi_command_size_43992 scsi_command_size 0 43992 NULL nohasharray
++kvm_read_guest_virt_43992 kvm_read_guest_virt 4-2 43992 &scsi_command_size_43992 nohasharray
++bcm_recvmsg_43992 bcm_recvmsg 4 43992 &kvm_read_guest_virt_43992
++ulist_add_43994 ulist_add 0 43994 NULL
 +emit_flags_44006 emit_flags 4-3 44006 NULL
 +write_flush_procfs_44011 write_flush_procfs 3 44011 NULL
-+swiotlb_unmap_page_44063 swiotlb_unmap_page 2 44063 NULL
++fru_strlen_44046 fru_strlen 0 44046 NULL
++tree_insert_offset_44069 tree_insert_offset 0 44069 NULL
 +SYSC_add_key_44079 SYSC_add_key 4 44079 NULL
-+load_discard_44083 load_discard 3 44083 NULL
++btrfs_prev_leaf_44083 btrfs_prev_leaf 0 44083 NULL nohasharray
++load_discard_44083 load_discard 3 44083 &btrfs_prev_leaf_44083
++__vxge_hw_vpath_tim_configure_44093 __vxge_hw_vpath_tim_configure 2 44093 NULL
 +xlog_recover_add_to_cont_trans_44102 xlog_recover_add_to_cont_trans 4 44102 NULL
++skb_frag_dma_map_44112 skb_frag_dma_map 0 44112 NULL
 +tracing_set_trace_read_44122 tracing_set_trace_read 3 44122 NULL
 +SyS_process_vm_writev_44129 SyS_process_vm_writev 3-5 44129 NULL
 +vmw_gmr_bind_44130 vmw_gmr_bind 3 44130 NULL
++lookup_extent_data_ref_44136 lookup_extent_data_ref 0 44136 NULL
++ttm_get_pages_44142 ttm_get_pages 2 44142 NULL
 +scsi_get_resid_44147 scsi_get_resid 0 44147 NULL
 +ubifs_find_dirty_idx_leb_44169 ubifs_find_dirty_idx_leb 0 44169 NULL
 +ocfs2_xattr_bucket_find_44174 ocfs2_xattr_bucket_find 0 44174 NULL
 +SYSC_set_mempolicy_44176 SYSC_set_mempolicy 3 44176 NULL
++readreg_ipac_44186 readreg_ipac 0 44186 NULL
 +handle_eviocgbit_44193 handle_eviocgbit 3 44193 NULL
 +IO_APIC_get_PCI_irq_vector_44198 IO_APIC_get_PCI_irq_vector 0 44198 NULL
 +__set_free_44211 __set_free 2 44211 NULL
@@ -106905,306 +107550,361 @@ index 0000000..9a7096d
 +srp_alloc_iu_44227 srp_alloc_iu 2 44227 NULL
 +ioapic_register_intr_44238 ioapic_register_intr 1 44238 NULL
 +scsi_track_queue_full_44239 scsi_track_queue_full 2 44239 NULL
++sigma_action_write_regmap_44240 sigma_action_write_regmap 3 44240 NULL
 +tc3589x_gpio_irq_map_44245 tc3589x_gpio_irq_map 2 44245 NULL
-+enlarge_skb_44248 enlarge_skb 2 44248 NULL
++apei_resources_sub_44252 apei_resources_sub 0 44252 NULL
++byt_gpio_irq_map_44275 byt_gpio_irq_map 2 44275 NULL
++device_create_file_44285 device_create_file 0 44285 NULL
 +ufs_clusteracct_44293 ufs_clusteracct 3 44293 NULL
 +ocfs2_zero_range_for_truncate_44294 ocfs2_zero_range_for_truncate 3 44294 NULL
 +ath6kl_keepalive_read_44303 ath6kl_keepalive_read 3 44303 NULL
-+bitmap_scnprintf_44318 bitmap_scnprintf 2 44318 NULL
++bitmap_scnprintf_44318 bitmap_scnprintf 0-2 44318 NULL
 +dispatch_proc_write_44320 dispatch_proc_write 3 44320 NULL
-+ubi_eba_write_leb_st_44343 ubi_eba_write_leb_st 5 44343 NULL
++rs_init_44327 rs_init 1 44327 NULL
++create_free_space_inode_44332 create_free_space_inode 0 44332 NULL
++insert_into_bitmap_44340 insert_into_bitmap 0 44340 NULL
++ubi_eba_write_leb_st_44343 ubi_eba_write_leb_st 0-5 44343 NULL
++radix_tree_maybe_preload_44346 radix_tree_maybe_preload 0 44346 NULL
 +nfs_fscache_get_super_cookie_44355 nfs_fscache_get_super_cookie 3 44355 NULL nohasharray
 +blk_queue_init_tags_44355 blk_queue_init_tags 2 44355 &nfs_fscache_get_super_cookie_44355
 +__is_discarded_44359 __is_discarded 2 44359 NULL
++ipx_recvmsg_44366 ipx_recvmsg 4 44366 NULL
++alloc_requests_44372 alloc_requests 0 44372 NULL
 +rts_threshold_read_44384 rts_threshold_read 3 44384 NULL
++iterate_dir_item_44386 iterate_dir_item 0 44386 NULL
++mtip_hw_read_flags_44396 mtip_hw_read_flags 3 44396 NULL
 +aoedev_flush_44398 aoedev_flush 2 44398 NULL
++strlcpy_44400 strlcpy 3 44400 NULL
 +drm_buffer_alloc_44405 drm_buffer_alloc 2 44405 NULL
 +osst_do_scsi_44410 osst_do_scsi 4 44410 NULL
 +check_user_page_hwpoison_44412 check_user_page_hwpoison 1 44412 NULL
 +ieee80211_if_read_rc_rateidx_mcs_mask_5ghz_44423 ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 NULL
 +prandom_u32_state_44445 prandom_u32_state 0 44445 NULL
-+___alloc_bootmem_node_nopanic_44461 ___alloc_bootmem_node_nopanic 2-3 44461 NULL
++iwl_dbgfs_bf_params_write_44450 iwl_dbgfs_bf_params_write 3 44450 NULL
++write_file_debug_44476 write_file_debug 3 44476 NULL
 +btrfs_chunk_item_size_44478 btrfs_chunk_item_size 0-1 44478 NULL
 +sdio_align_size_44489 sdio_align_size 0-2 44489 NULL
 +bio_advance_44496 bio_advance 2 44496 NULL
 +ieee80211_if_read_dropped_frames_ttl_44500 ieee80211_if_read_dropped_frames_ttl 3 44500 NULL
++ac_register_board_44504 ac_register_board 3 44504 NULL
 +security_getprocattr_44505 security_getprocattr 0 44505 NULL nohasharray
 +iwl_dbgfs_sram_read_44505 iwl_dbgfs_sram_read 3 44505 &security_getprocattr_44505
 +spidev_write_44510 spidev_write 3 44510 NULL
-+sys_msgsnd_44537 sys_msgsnd 3 44537 NULL nohasharray
-+comm_write_44537 comm_write 3 44537 &sys_msgsnd_44537
++SyS_io_getevents_44519 SyS_io_getevents 3 44519 NULL
++ieee80211_rx_mgmt_assoc_resp_44525 ieee80211_rx_mgmt_assoc_resp 3 44525 NULL
++comm_write_44537 comm_write 3 44537 NULL
++xfs_log_calc_unit_res_44540 xfs_log_calc_unit_res 0-2 44540 NULL
++snd_pcm_drop_44542 snd_pcm_drop 0 44542 NULL
++dbg_chk_pnode_44555 dbg_chk_pnode 0 44555 NULL
++shmem_getpage_gfp_44556 shmem_getpage_gfp 0 44556 NULL
 +hash_ipport4_expire_44564 hash_ipport4_expire 3 44564 NULL
 +dgrp_config_proc_write_44571 dgrp_config_proc_write 3 44571 NULL
 +snd_pcm_alloc_vmalloc_buffer_44595 snd_pcm_alloc_vmalloc_buffer 2 44595 NULL
-+slip_compat_ioctl_44599 slip_compat_ioctl 4 44599 NULL
-+brcmf_sdbrcm_glom_len_44618 brcmf_sdbrcm_glom_len 0 44618 NULL
-+cfpkt_add_body_44630 cfpkt_add_body 3 44630 NULL
-+ext2_new_block_44645 ext2_new_block 2 44645 NULL
++btrfs_qgroup_account_ref_44604 btrfs_qgroup_account_ref 0 44604 NULL
++huge_page_shift_44618 huge_page_shift 0 44618 NULL
++sysfs_add_one_44629 sysfs_add_one 0 44629 NULL
++msb_get_free_block_44633 msb_get_free_block 2 44633 NULL
++ext2_new_block_44645 ext2_new_block 2-0 44645 NULL
 +alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
 +mpi_resize_44674 mpi_resize 2 44674 NULL
++sysfs_create_link_44685 sysfs_create_link 0 44685 NULL nohasharray
++__copy_user_intel_nocache_44685 __copy_user_intel_nocache 0-3 44685 &sysfs_create_link_44685
 +ts_read_44687 ts_read 3 44687 NULL
 +qib_get_user_pages_44689 qib_get_user_pages 1-2 44689 NULL
-+xfer_to_user_44713 xfer_to_user 3 44713 NULL
++lov_emerg_alloc_44698 lov_emerg_alloc 1 44698 NULL
++__ocfs2_rotate_tree_left_44705 __ocfs2_rotate_tree_left 0 44705 NULL
++xfer_to_user_44713 xfer_to_user 3 44713 NULL nohasharray
++__generic_block_fiemap_44713 __generic_block_fiemap 4 44713 &xfer_to_user_44713
 +_zd_iowrite32v_locked_44725 _zd_iowrite32v_locked 3 44725 NULL
 +clusterip_proc_write_44729 clusterip_proc_write 3 44729 NULL
 +fib_count_nexthops_44730 fib_count_nexthops 0 44730 NULL
++SyS_read_44732 SyS_read 3 44732 NULL
++vm_insert_mixed_44738 vm_insert_mixed 3 44738 NULL
 +key_tx_rx_count_read_44742 key_tx_rx_count_read 3 44742 NULL
-+WIL_GET_BITS_44747 WIL_GET_BITS 0-1-2-3 44747 NULL
-+set_brk_44749 set_brk 1 44749 NULL
++set_brk_44749 set_brk 1-2 44749 NULL
 +tnode_new_44757 tnode_new 3 44757 NULL nohasharray
 +pty_write_44757 pty_write 3 44757 &tnode_new_44757
-+__videobuf_copy_stream_44769 __videobuf_copy_stream 4 44769 NULL
++__videobuf_copy_stream_44769 __videobuf_copy_stream 4-0 44769 NULL
 +handsfree_ramp_44777 handsfree_ramp 2 44777 NULL
++irq_domain_add_legacy_44781 irq_domain_add_legacy 4-2 44781 NULL
 +sctp_setsockopt_44788 sctp_setsockopt 5 44788 NULL
 +rx_dropped_read_44799 rx_dropped_read 3 44799 NULL
 +qla4xxx_alloc_work_44813 qla4xxx_alloc_work 2 44813 NULL
 +mei_cl_read_start_44824 mei_cl_read_start 2 44824 NULL
 +rmap_write_protect_44833 rmap_write_protect 2 44833 NULL
 +sisusb_write_44834 sisusb_write 3 44834 NULL
-+nl80211_send_unprot_disassoc_44846 nl80211_send_unprot_disassoc 4 44846 NULL
 +kvm_read_hva_44847 kvm_read_hva 3 44847 NULL
 +cubic_root_44848 cubic_root 1 44848 NULL
++qib_verbs_send_dma_44850 qib_verbs_send_dma 6 44850 NULL
 +copydesc_user_44855 copydesc_user 3 44855 NULL
++i915_gem_execbuffer_relocate_44868 i915_gem_execbuffer_relocate 0 44868 NULL
++init_rs_44873 init_rs 1 44873 NULL
 +skb_availroom_44883 skb_availroom 0 44883 NULL
-+nf_bridge_encap_header_len_44890 nf_bridge_encap_header_len 0 44890 NULL
++ocfs2_wait_for_mask_44893 ocfs2_wait_for_mask 0 44893 NULL
 +do_tty_write_44896 do_tty_write 5 44896 NULL
++regmap_spi_read_44921 regmap_spi_read 3-5 44921 NULL
++_snd_pcm_hw_param_last_44947 _snd_pcm_hw_param_last 0 44947 NULL
++__add_delayed_refs_44977 __add_delayed_refs 0 44977 NULL
 +tx_queue_status_read_44978 tx_queue_status_read 3 44978 NULL
-+nf_nat_seq_adjust_44989 nf_nat_seq_adjust 4 44989 NULL
 +map_index_to_lba_44993 map_index_to_lba 0-1 44993 NULL
-+bytepos_delta_45017 bytepos_delta 0 45017 NULL
++send_chmod_45011 send_chmod 0 45011 NULL
++i915_gem_do_execbuffer_45012 i915_gem_do_execbuffer 0 45012 NULL
++bytepos_delta_45017 bytepos_delta 0-2 45017 NULL
 +read_block_bitmap_45021 read_block_bitmap 2 45021 NULL nohasharray
 +ptrace_writedata_45021 ptrace_writedata 4-3 45021 &read_block_bitmap_45021
++dm_kvzalloc_45025 dm_kvzalloc 1-2 45025 NULL
 +vhci_get_user_45039 vhci_get_user 3 45039 NULL
-+sel_write_user_45060 sel_write_user 3 45060 NULL
++sysfs_do_create_link_sd_45057 sysfs_do_create_link_sd 0 45057 NULL
++remap_oldmem_pfn_range_45060 remap_oldmem_pfn_range 2-3-4 45060 NULL nohasharray
++sel_write_user_45060 sel_write_user 3 45060 &remap_oldmem_pfn_range_45060
 +vmscan_swappiness_45062 vmscan_swappiness 0 45062 NULL
-+snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL nohasharray
-+do_video_ioctl_45069 do_video_ioctl 3 45069 &snd_mixart_BA0_read_45069
++snd_mixart_BA0_read_45069 snd_mixart_BA0_read 5 45069 NULL
 +kvm_mmu_page_get_gfn_45110 kvm_mmu_page_get_gfn 0-2 45110 NULL
 +pwr_missing_bcns_cnt_read_45113 pwr_missing_bcns_cnt_read 3 45113 NULL
 +usbdev_read_45114 usbdev_read 3 45114 NULL
-+isku_sysfs_write_reset_45133 isku_sysfs_write_reset 6 45133 NULL
 +send_to_tty_45141 send_to_tty 3 45141 NULL
 +stmpe_irq_map_45146 stmpe_irq_map 2 45146 NULL
-+crypto_aead_blocksize_45148 crypto_aead_blocksize 0 45148 NULL
++cfs_trace_daemon_command_usrstr_45147 cfs_trace_daemon_command_usrstr 2 45147 NULL
 +gen_bitmask_string_45149 gen_bitmask_string 6 45149 NULL
-+device_write_45156 device_write 3 45156 NULL nohasharray
-+ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3-4 45156 &device_write_45156
++ocfs2_remove_inode_range_45156 ocfs2_remove_inode_range 3-4 45156 NULL nohasharray
++device_write_45156 device_write 3 45156 &ocfs2_remove_inode_range_45156
 +ocfs2_dq_frozen_trigger_45159 ocfs2_dq_frozen_trigger 4 45159 NULL
++SYSC_write_45160 SYSC_write 3 45160 NULL
 +tomoyo_write_self_45161 tomoyo_write_self 3 45161 NULL
 +sta_agg_status_write_45164 sta_agg_status_write 3 45164 NULL
-+snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 NULL
++sctp_pack_cookie_45190 sctp_pack_cookie 6 45190 NULL nohasharray
++snd_sb_csp_load_user_45190 snd_sb_csp_load_user 3 45190 &sctp_pack_cookie_45190
 +num_clusters_in_group_45194 num_clusters_in_group 2 45194 NULL
-+add_child_45201 add_child 4 45201 NULL
++__radix_tree_preload_45197 __radix_tree_preload 0 45197 NULL
 +iso_alloc_urb_45206 iso_alloc_urb 4-5 45206 NULL
 +spi_alloc_master_45223 spi_alloc_master 2 45223 NULL
 +__dirty_45228 __dirty 2 45228 NULL
 +ieee80211_if_read_peer_45233 ieee80211_if_read_peer 3 45233 NULL
++event_enable_write_45238 event_enable_write 3 45238 NULL
 +prism2_pda_proc_read_45246 prism2_pda_proc_read 3 45246 NULL
 +input_mt_init_slots_45279 input_mt_init_slots 2 45279 NULL
-+vcc_compat_ioctl_45291 vcc_compat_ioctl 3 45291 NULL
++gfs2_fiemap_45282 gfs2_fiemap 4 45282 NULL
 +snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL
++e1000_tx_map_45309 e1000_tx_map 5 45309 NULL
 +pte_val_45313 pte_val 0 45313 NULL
-+__i2c_hid_command_45321 __i2c_hid_command 0 45321 NULL
 +copy_vm86_regs_from_user_45340 copy_vm86_regs_from_user 3 45340 NULL
-+lane2_associate_req_45398 lane2_associate_req 4 45398 NULL
-+keymap_store_45406 keymap_store 4 45406 NULL
-+ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 NULL nohasharray
-+paging64_gva_to_gpa_45421 paging64_gva_to_gpa 2 45421 &ieee80211_if_fmt_dot11MeshHWMProotInterval_45421
++null_alloc_repbuf_45375 null_alloc_repbuf 3 45375 NULL
++sock_recv_errqueue_45412 sock_recv_errqueue 3 45412 NULL
++paging64_gva_to_gpa_45421 paging64_gva_to_gpa 2 45421 NULL nohasharray
++ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 &paging64_gva_to_gpa_45421
++alloc_task_struct_node_45426 alloc_task_struct_node 1 45426 NULL
++ll_iocontrol_register_45430 ll_iocontrol_register 2 45430 NULL
 +tty_buffer_alloc_45437 tty_buffer_alloc 2 45437 NULL
-+intel_render_ring_init_dri_45446 intel_render_ring_init_dri 2-3 45446 NULL nohasharray
-+SYSC_mremap_45446 SYSC_mremap 5-1-2 45446 &intel_render_ring_init_dri_45446
++SYSC_mremap_45446 SYSC_mremap 5-1-2-3 45446 NULL
 +__node_remap_45458 __node_remap 4 45458 NULL
 +rds_ib_set_wr_signal_state_45463 rds_ib_set_wr_signal_state 0 45463 NULL
-+udp_manip_pkt_45467 udp_manip_pkt 4 45467 NULL
 +tracing_read_dyn_info_45468 tracing_read_dyn_info 3 45468 NULL
++snd_pcm_hwsync_45479 snd_pcm_hwsync 0 45479 NULL
 +arizona_init_fll_45503 arizona_init_fll 5 45503 NULL
 +rds_message_copy_from_user_45510 rds_message_copy_from_user 3 45510 NULL
-+sys_lgetxattr_45531 sys_lgetxattr 4 45531 NULL
++i40e_alloc_vfs_45511 i40e_alloc_vfs 2 45511 NULL
++__split_vma_45522 __split_vma 0 45522 NULL
 +cgroup_read_u64_45532 cgroup_read_u64 5 45532 NULL
 +copy_macs_45534 copy_macs 4 45534 NULL
 +nla_attr_size_45545 nla_attr_size 0-1 45545 NULL
 +v9fs_direct_read_45546 v9fs_direct_read 3 45546 NULL
 +cx18_copy_mdl_to_user_45549 cx18_copy_mdl_to_user 4 45549 NULL
-+atomic_long_sub_return_45551 atomic_long_sub_return 1 45551 NULL
 +ext3_group_first_block_no_45555 ext3_group_first_block_no 0-2 45555 NULL
 +stats_dot11ACKFailureCount_read_45558 stats_dot11ACKFailureCount_read 3 45558 NULL
 +_regmap_bus_raw_write_45559 _regmap_bus_raw_write 2 45559 NULL
 +posix_acl_xattr_size_45561 posix_acl_xattr_size 0-1 45561 NULL
 +venus_rmdir_45564 venus_rmdir 4 45564 NULL
++btrfs_find_free_ino_45585 btrfs_find_free_ino 0 45585 NULL
 +ipath_create_cq_45586 ipath_create_cq 2 45586 NULL
-+rdma_set_ib_paths_45592 rdma_set_ib_paths 3 45592 NULL
++ath6kl_keepalive_write_45600 ath6kl_keepalive_write 3 45600 NULL
 +hidraw_get_report_45609 hidraw_get_report 3 45609 NULL
-+audit_log_n_hex_45617 audit_log_n_hex 3 45617 NULL
-+ebitmap_next_positive_45651 ebitmap_next_positive 3 45651 NULL
++commit_cowonly_roots_45640 commit_cowonly_roots 0 45640 NULL
++ebitmap_next_positive_45651 ebitmap_next_positive 3-0 45651 NULL
++ext4_reserve_inode_write_45654 ext4_reserve_inode_write 0 45654 NULL
 +dma_map_cont_45668 dma_map_cont 5 45668 NULL
 +compat_mpctl_ioctl_45671 compat_mpctl_ioctl 2 45671 NULL
 +dgram_sendmsg_45679 dgram_sendmsg 4 45679 NULL
 +smk_write_ambient_45691 smk_write_ambient 3 45691 NULL
-+dm_compat_ctl_ioctl_45692 dm_compat_ctl_ioctl 3 45692 NULL
-+bscnl_emit_45699 bscnl_emit 2-5-0 45699 NULL nohasharray
-+unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 &bscnl_emit_45699
-+dvb_ca_en50221_init_45718 dvb_ca_en50221_init 4 45718 NULL
-+snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL
-+rw_copy_check_uvector_45748 rw_copy_check_uvector 3 45748 NULL nohasharray
++unix_dgram_sendmsg_45699 unix_dgram_sendmsg 4 45699 NULL nohasharray
++bscnl_emit_45699 bscnl_emit 0-2-5 45699 &unix_dgram_sendmsg_45699
++sg_proc_write_adio_45704 sg_proc_write_adio 3 45704 NULL
++snd_cs46xx_io_read_45734 snd_cs46xx_io_read 5 45734 NULL nohasharray
++task_cgroup_path_45734 task_cgroup_path 3 45734 &snd_cs46xx_io_read_45734
++rw_copy_check_uvector_45748 rw_copy_check_uvector 3-0 45748 NULL nohasharray
 +v4l2_ctrl_new_std_45748 v4l2_ctrl_new_std 5 45748 &rw_copy_check_uvector_45748
 +lkdtm_debugfs_read_45752 lkdtm_debugfs_read 3 45752 NULL
-+nilfs_compat_ioctl_45769 nilfs_compat_ioctl 3 45769 NULL
++btrfs_delete_delayed_dir_index_45757 btrfs_delete_delayed_dir_index 0 45757 NULL
 +alloc_ts_config_45775 alloc_ts_config 1 45775 NULL
++osc_checksum_type_seq_write_45785 osc_checksum_type_seq_write 3 45785 NULL
 +raw_setsockopt_45800 raw_setsockopt 5 45800 NULL
++rds_tcp_inc_copy_to_user_45804 rds_tcp_inc_copy_to_user 3 45804 NULL
 +lbs_rdbbp_read_45805 lbs_rdbbp_read 3 45805 NULL
 +pcpu_alloc_alloc_info_45813 pcpu_alloc_alloc_info 1-2 45813 NULL
++ll_max_readahead_mb_seq_write_45815 ll_max_readahead_mb_seq_write 3 45815 NULL
 +fm_v4l2_init_video_device_45821 fm_v4l2_init_video_device 2 45821 NULL
 +memcg_update_cache_size_45828 memcg_update_cache_size 2 45828 NULL
++task_state_char_45839 task_state_char 1 45839 NULL
++__ip_select_ident_45851 __ip_select_ident 3 45851 NULL
 +x509_process_extension_45854 x509_process_extension 5 45854 NULL
++efx_tx_queue_insert_45859 efx_tx_queue_insert 2 45859 NULL
 +isdn_write_45863 isdn_write 3 45863 NULL
 +unpack_orig_pfns_45867 unpack_orig_pfns 0 45867 NULL
++tpm_config_in_45880 tpm_config_in 0 45880 NULL
 +get_rdac_req_45882 get_rdac_req 3 45882 NULL
 +ocfs2_xattr_block_find_45891 ocfs2_xattr_block_find 0 45891 NULL
++online_page_cgroup_45894 online_page_cgroup 3 45894 NULL
++cfs_cpt_weight_45903 cfs_cpt_weight 0 45903 NULL
 +wm_adsp_region_to_reg_45915 wm_adsp_region_to_reg 0-2 45915 NULL
 +dbgfs_frame_45917 dbgfs_frame 3 45917 NULL
-+nf_nat_ftp_fmt_cmd_45926 nf_nat_ftp_fmt_cmd 0 45926 NULL
-+smp_scan_config_45934 smp_scan_config 1 45934 NULL
 +alloc_mr_45935 alloc_mr 1 45935 NULL
-+split_large_page_45941 split_large_page 2 45941 NULL
++kmem_cache_alloc_node_trace_45968 kmem_cache_alloc_node_trace 3 45968 NULL
++copy_to_45969 copy_to 3 45969 NULL
 +rb_simple_read_45972 rb_simple_read 3 45972 NULL
-+ezusb_writememory_45976 ezusb_writememory 4 45976 NULL
 +ioat2_dca_count_dca_slots_45984 ioat2_dca_count_dca_slots 0 45984 NULL
 +ore_calc_stripe_info_46023 ore_calc_stripe_info 2 46023 NULL
 +sierra_setup_urb_46029 sierra_setup_urb 5 46029 NULL
 +get_free_entries_46030 get_free_entries 1 46030 NULL
-+__access_remote_vm_46031 __access_remote_vm 0-5-3 46031 NULL
++__access_remote_vm_46031 __access_remote_vm 0-3-5 46031 NULL
 +snd_emu10k1x_ptr_read_46049 snd_emu10k1x_ptr_read 0 46049 NULL
 +acpi_register_gsi_xen_hvm_46052 acpi_register_gsi_xen_hvm 2 46052 NULL
-+line6_midibuf_bytes_used_46059 line6_midibuf_bytes_used 0 46059 NULL
-+__ocfs2_move_extent_46060 __ocfs2_move_extent 5-6 46060 NULL nohasharray
++__ocfs2_move_extent_46060 __ocfs2_move_extent 5-6-4-0-3 46060 NULL nohasharray
 +dma_tx_errors_read_46060 dma_tx_errors_read 3 46060 &__ocfs2_move_extent_46060
-+slhc_toss_46066 slhc_toss 0 46066 NULL
 +sel_commit_bools_write_46077 sel_commit_bools_write 3 46077 NULL
-+vfio_config_do_rw_46091 vfio_config_do_rw 3 46091 NULL
-+ata_host_alloc_46094 ata_host_alloc 2 46094 NULL
 +arizona_set_irq_wake_46101 arizona_set_irq_wake 2 46101 NULL
-+pkt_ctl_compat_ioctl_46110 pkt_ctl_compat_ioctl 3 46110 NULL
-+il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 NULL nohasharray
-+memcg_update_array_size_46111 memcg_update_array_size 1 46111 &il3945_ucode_general_stats_read_46111
++memcg_update_array_size_46111 memcg_update_array_size 1 46111 NULL nohasharray
++il3945_ucode_general_stats_read_46111 il3945_ucode_general_stats_read 3 46111 &memcg_update_array_size_46111
 +C_SYSC_writev_46113 C_SYSC_writev 3 46113 NULL
 +mlx4_ib_alloc_fast_reg_page_list_46119 mlx4_ib_alloc_fast_reg_page_list 2 46119 NULL
 +paging32_walk_addr_nested_46121 paging32_walk_addr_nested 3 46121 NULL
-+vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 2 46146 NULL
++replay_dir_deletes_46136 replay_dir_deletes 0 46136 NULL
++rtw_buf_update_46138 rtw_buf_update 4 46138 NULL
++vb2_dma_sg_get_userptr_46146 vb2_dma_sg_get_userptr 2-3 46146 NULL
 +__netlink_change_ngroups_46156 __netlink_change_ngroups 2 46156 NULL
++alloc_iova_46160 alloc_iova 2 46160 NULL
 +twl_direction_out_46182 twl_direction_out 2 46182 NULL
 +vxge_os_dma_malloc_46184 vxge_os_dma_malloc 2 46184 NULL
-+add_conn_list_46197 add_conn_list 3 46197 NULL
++fq_resize_46195 fq_resize 2 46195 NULL
++add_conn_list_46197 add_conn_list 3-0 46197 NULL
 +i2400m_op_msg_from_user_46213 i2400m_op_msg_from_user 4 46213 NULL
 +tm6000_i2c_recv_regs_46215 tm6000_i2c_recv_regs 5 46215 NULL
 +dsp_write_46218 dsp_write 2 46218 NULL
++xen_setup_msi_irqs_46245 xen_setup_msi_irqs 2 46245 NULL
 +mpi_read_raw_data_46248 mpi_read_raw_data 2 46248 NULL
-+nf_nat_ftp_46265 nf_nat_ftp 6 46265 NULL
 +ReadReg_46277 ReadReg 0 46277 NULL
-+batadv_iv_ogm_queue_add_46319 batadv_iv_ogm_queue_add 3 46319 NULL
-+qlcnic_83xx_sysfs_flash_bulk_write_46320 qlcnic_83xx_sysfs_flash_bulk_write 4 46320 NULL
++sg_proc_write_dressz_46316 sg_proc_write_dressz 3 46316 NULL
 +__hwahc_dev_set_key_46328 __hwahc_dev_set_key 5 46328 NULL nohasharray
 +compat_SyS_readv_46328 compat_SyS_readv 3 46328 &__hwahc_dev_set_key_46328
 +iwl_dbgfs_chain_noise_read_46355 iwl_dbgfs_chain_noise_read 3 46355 NULL
 +smk_write_direct_46363 smk_write_direct 3 46363 NULL
 +__iommu_calculate_agaw_46366 __iommu_calculate_agaw 2 46366 NULL
 +ubi_dump_flash_46381 ubi_dump_flash 4 46381 NULL
++mmap_ureg_46388 mmap_ureg 3 46388 NULL
++vma_adjust_46390 vma_adjust 0 46390 NULL
 +fuse_file_aio_write_46399 fuse_file_aio_write 4 46399 NULL
 +crypto_ablkcipher_reqsize_46411 crypto_ablkcipher_reqsize 0 46411 NULL
++ttm_page_pool_get_pages_46431 ttm_page_pool_get_pages 0-5 46431 NULL
++cfs_power2_roundup_46433 cfs_power2_roundup 0-1 46433 NULL
 +hash_ipportip6_expire_46443 hash_ipportip6_expire 3 46443 NULL
 +cp210x_set_config_46447 cp210x_set_config 4 46447 NULL
++parport_pc_fifo_write_block_46455 parport_pc_fifo_write_block 3 46455 NULL
++il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3 46458 NULL
 +filldir64_46469 filldir64 3 46469 NULL
++ocfs2_reserve_clusters_with_limit_46479 ocfs2_reserve_clusters_with_limit 0 46479 NULL
 +fill_in_write_vector_46498 fill_in_write_vector 0 46498 NULL
++p9pdu_vreadf_46500 p9pdu_vreadf 0 46500 NULL
 +pin_code_reply_46510 pin_code_reply 4 46510 NULL
 +mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
-+kmsg_read_46514 kmsg_read 3 46514 NULL
++nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 NULL nohasharray
++kmsg_read_46514 kmsg_read 3 46514 &nouveau_drm_ioctl_46514
 +bdx_rxdb_create_46525 bdx_rxdb_create 1 46525 NULL
 +nl80211_send_rx_assoc_46538 nl80211_send_rx_assoc 4 46538 NULL
 +pm860x_irq_domain_map_46553 pm860x_irq_domain_map 2 46553 NULL
-+mv_get_hc_count_46554 mv_get_hc_count 0 46554 NULL
 +link_send_sections_long_46556 link_send_sections_long 4 46556 NULL
-+irq_domain_associate_46564 irq_domain_associate 2 46564 NULL
-+dn_current_mss_46574 dn_current_mss 0 46574 NULL
++dn_current_mss_46574 dn_current_mss 0 46574 NULL nohasharray
++blk_flush_complete_seq_46574 blk_flush_complete_seq 2 46574 &dn_current_mss_46574
 +serverworks_create_gatt_pages_46582 serverworks_create_gatt_pages 1 46582 NULL
 +snd_compr_write_data_46592 snd_compr_write_data 3 46592 NULL
 +il3945_stats_flag_46606 il3945_stats_flag 0-3 46606 NULL
 +vscnprintf_46617 vscnprintf 0-2 46617 NULL
-+__kfifo_out_r_46623 __kfifo_out_r 0-3 46623 NULL
++__kfifo_out_r_46623 __kfifo_out_r 3-0 46623 NULL
 +request_key_async_with_auxdata_46624 request_key_async_with_auxdata 4 46624 NULL
++pci_enable_device_46642 pci_enable_device 0 46642 NULL
 +vfs_getxattr_alloc_46649 vfs_getxattr_alloc 0 46649 NULL
 +av7110_ipack_init_46655 av7110_ipack_init 2 46655 NULL
++e1000_tx_map_46672 e1000_tx_map 4 46672 NULL
 +alloc_data_packet_46698 alloc_data_packet 1 46698 NULL
 +__ilog2_u32_46706 __ilog2_u32 0 46706 NULL
 +erst_dbg_write_46715 erst_dbg_write 3 46715 NULL
++ide_read_status_46719 ide_read_status 0 46719 NULL
 +wl1271_rx_filter_alloc_field_46721 wl1271_rx_filter_alloc_field 5 46721 NULL
-+prepare_copy_46725 prepare_copy 2 46725 NULL
 +irq_domain_add_simple_46734 irq_domain_add_simple 2-3 46734 NULL
-+set_memory_wc_46747 set_memory_wc 1 46747 NULL
 +ext4_count_free_46754 ext4_count_free 2 46754 NULL nohasharray
 +pte_pfn_46754 pte_pfn 0 46754 &ext4_count_free_46754
 +hest_ghes_dev_register_46766 hest_ghes_dev_register 1 46766 NULL
 +int_hw_irq_en_46776 int_hw_irq_en 3 46776 NULL
 +regcache_lzo_sync_46777 regcache_lzo_sync 2 46777 NULL
-+_sys_packet_req_46793 _sys_packet_req 4 46793 NULL
 +_xfs_buf_get_pages_46811 _xfs_buf_get_pages 2 46811 NULL
++btrfs_insert_empty_items_46822 btrfs_insert_empty_items 0 46822 NULL
 +xfs_iroot_realloc_46826 xfs_iroot_realloc 2 46826 NULL
 +shmem_pwrite_fast_46842 shmem_pwrite_fast 3 46842 NULL
++readreg_46845 readreg 0 46845 NULL
 +spi_async_46857 spi_async 0 46857 NULL
 +vsnprintf_46863 vsnprintf 0 46863 NULL nohasharray
 +SyS_move_pages_46863 SyS_move_pages 2 46863 &vsnprintf_46863
 +nvme_alloc_queue_46865 nvme_alloc_queue 3 46865 NULL
-+sip_sprintf_addr_46872 sip_sprintf_addr 0 46872 NULL
 +rvmalloc_46873 rvmalloc 1 46873 NULL
-+qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 4-5 46874 NULL
-+hpi_read_word_nolock_46881 hpi_read_word_nolock 0 46881 NULL
++qp_memcpy_from_queue_iov_46874 qp_memcpy_from_queue_iov 5-4 46874 NULL
++lov_iocontrol_46876 lov_iocontrol 3 46876 NULL
 +stmpe_gpio_irq_unmap_46884 stmpe_gpio_irq_unmap 2 46884 NULL
 +ixgbe_dbg_reg_ops_write_46895 ixgbe_dbg_reg_ops_write 3 46895 NULL
 +sk_mem_pages_46896 sk_mem_pages 0-1 46896 NULL
-+ol_dqblk_off_46904 ol_dqblk_off 3-2 46904 NULL
++ol_dqblk_off_46904 ol_dqblk_off 2-3 46904 NULL
 +ieee80211_if_fmt_power_mode_46906 ieee80211_if_fmt_power_mode 3 46906 NULL
-+wlcore_alloc_hw_46917 wlcore_alloc_hw 1 46917 NULL
++wlcore_alloc_hw_46917 wlcore_alloc_hw 1-3 46917 NULL
 +fb_write_46924 fb_write 3 46924 NULL
-+btmrvl_curpsmode_read_46939 btmrvl_curpsmode_read 3 46939 NULL
++i915_gem_check_olr_46925 i915_gem_check_olr 0 46925 NULL
 +kvm_register_read_46948 kvm_register_read 0 46948 NULL
 +__sctp_setsockopt_connectx_46949 __sctp_setsockopt_connectx 3 46949 NULL
 +qla4xxx_post_aen_work_46953 qla4xxx_post_aen_work 3 46953 NULL
++SYSC_poll_46965 SYSC_poll 2 46965 NULL
 +crypto_tfm_alg_alignmask_46971 crypto_tfm_alg_alignmask 0 46971 NULL
 +mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
++strlcat_46985 strlcat 3 46985 NULL
++bitmap_file_clear_bit_46990 bitmap_file_clear_bit 2 46990 NULL
 +gfs2_xattr_system_set_46996 gfs2_xattr_system_set 4 46996 NULL nohasharray
 +sel_write_bool_46996 sel_write_bool 3 46996 &gfs2_xattr_system_set_46996
 +ttm_bo_io_47000 ttm_bo_io 5 47000 NULL
 +blk_rq_map_kern_47004 blk_rq_map_kern 4 47004 NULL
-+add_free_space_entry_47005 add_free_space_entry 2 47005 NULL
-+__map_single_47020 __map_single 3-4-7 47020 NULL
-+cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2 47024 NULL
-+swiotlb_sync_single_47031 swiotlb_sync_single 2 47031 NULL
-+set_dis_bypass_pfs_47038 set_dis_bypass_pfs 3 47038 NULL
++__map_single_47020 __map_single 3-4-7-0 47020 NULL
++cx231xx_init_bulk_47024 cx231xx_init_bulk 3-2-4 47024 NULL
 +fs_path_len_47060 fs_path_len 0 47060 NULL
-+ufs_new_fragments_47070 ufs_new_fragments 3-5-4 47070 NULL
++ufs_new_fragments_47070 ufs_new_fragments 4-3-5 47070 NULL nohasharray
++ext4_xattr_list_entries_47070 ext4_xattr_list_entries 0-4 47070 &ufs_new_fragments_47070
 +pipeline_dec_packet_in_read_47076 pipeline_dec_packet_in_read 3 47076 NULL
 +scsi_deactivate_tcq_47086 scsi_deactivate_tcq 2 47086 NULL
 +iwl_dump_nic_event_log_47089 iwl_dump_nic_event_log 0 47089 NULL
++ptlrpc_lprocfs_threads_max_seq_write_47104 ptlrpc_lprocfs_threads_max_seq_write 3 47104 NULL
++tboot_log_read_47110 tboot_log_read 3 47110 NULL
 +mousedev_read_47123 mousedev_read 3 47123 NULL
++ubi_compare_lebs_47141 ubi_compare_lebs 0 47141 NULL
 +ses_recv_diag_47143 ses_recv_diag 4 47143 NULL nohasharray
 +acpi_ut_initialize_buffer_47143 acpi_ut_initialize_buffer 2 47143 &ses_recv_diag_47143
-+persistent_ram_iomap_47156 persistent_ram_iomap 1-2 47156 NULL
 +mxms_headerlen_47161 mxms_headerlen 0 47161 NULL
 +rs_sta_dbgfs_rate_scale_data_read_47165 rs_sta_dbgfs_rate_scale_data_read 3 47165 NULL
++bpf_alloc_binary_47170 bpf_alloc_binary 1 47170 NULL
 +rts51x_ms_rw_47171 rts51x_ms_rw 3-4 47171 NULL
-+svc_pool_map_alloc_arrays_47181 svc_pool_map_alloc_arrays 2 47181 NULL
++btrfs_del_inode_ref_47181 btrfs_del_inode_ref 0 47181 NULL
 +can_set_system_xattr_47182 can_set_system_xattr 4 47182 NULL
-+ioremap_cache_47189 ioremap_cache 1-2 47189 NULL
-+gnttab_set_map_op_47206 gnttab_set_map_op 2 47206 NULL
-+l2headersize_47238 l2headersize 0 47238 NULL
 +options_write_47243 options_write 3 47243 NULL
 +portcntrs_1_read_47253 portcntrs_1_read 3 47253 NULL
 +da9052_disable_irq_nosync_47260 da9052_disable_irq_nosync 2 47260 NULL
-+ablkcipher_next_slow_47274 ablkcipher_next_slow 4-3 47274 NULL
-+tty_audit_log_47280 tty_audit_log 8 47280 NULL
++p9pdu_readf_47269 p9pdu_readf 0 47269 NULL
++ablkcipher_next_slow_47274 ablkcipher_next_slow 3-4 47274 NULL
 +gfs2_readpages_47285 gfs2_readpages 4 47285 NULL
 +vsnprintf_47291 vsnprintf 0 47291 NULL
-+SYSC_semop_47292 SYSC_semop 3 47292 NULL
 +tx_internal_desc_overflow_read_47300 tx_internal_desc_overflow_read 3 47300 NULL
-+SyS_madvise_47354 SyS_madvise 1 47354 NULL
++iterate_inode_ref_47322 iterate_inode_ref 0 47322 NULL
++SyS_madvise_47354 SyS_madvise 1-2 47354 NULL
 +ieee80211_if_read_dot11MeshHoldingTimeout_47356 ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 NULL
 +avc_get_hash_stats_47359 avc_get_hash_stats 0 47359 NULL
 +find_first_zero_bit_le_47369 find_first_zero_bit_le 2 47369 NULL
@@ -107215,79 +107915,104 @@ index 0000000..9a7096d
 +dgrp_net_write_47392 dgrp_net_write 3 47392 NULL
 +pfkey_sendmsg_47394 pfkey_sendmsg 4 47394 NULL
 +gfn_to_pfn_prot_47398 gfn_to_pfn_prot 2 47398 NULL
++lbs_wrmac_write_47400 lbs_wrmac_write 3 47400 NULL
 +ocfs2_resv_end_47408 ocfs2_resv_end 0 47408 NULL
 +sta_vht_capa_read_47409 sta_vht_capa_read 3 47409 NULL
 +crypto_ablkcipher_alignmask_47410 crypto_ablkcipher_alignmask 0 47410 NULL
++lbs_wrrf_write_47418 lbs_wrrf_write 3 47418 NULL
 +vzalloc_47421 vzalloc 1 47421 NULL
 +hash_ipportip4_expire_47426 hash_ipportip4_expire 3 47426 NULL
 +posix_acl_from_disk_47445 posix_acl_from_disk 2 47445 NULL
++numaq_apicid_to_cpu_present_47449 numaq_apicid_to_cpu_present 1 47449 NULL
++environ_read_47451 environ_read 3 47451 NULL
 +__load_mapping_47460 __load_mapping 2 47460 NULL
++try_lock_extent_47465 try_lock_extent 0 47465 NULL
 +nvme_trans_send_fw_cmd_47479 nvme_trans_send_fw_cmd 4 47479 NULL
-+newpart_47485 newpart 6 47485 NULL nohasharray
-+wb_force_mapping_47485 wb_force_mapping 2 47485 &newpart_47485
++wb_force_mapping_47485 wb_force_mapping 2 47485 NULL nohasharray
++newpart_47485 newpart 6-4 47485 &wb_force_mapping_47485
++mcp23s17_read_regs_47491 mcp23s17_read_regs 4 47491 NULL
 +core_sys_select_47494 core_sys_select 1 47494 NULL
-+alloc_arraycache_47505 alloc_arraycache 2 47505 NULL
++read_block_for_search_47502 read_block_for_search 0 47502 NULL
++alloc_arraycache_47505 alloc_arraycache 2-1 47505 NULL nohasharray
++btrfs_init_inode_security_47505 btrfs_init_inode_security 0 47505 &alloc_arraycache_47505
 +unlink_simple_47506 unlink_simple 3 47506 NULL
++pstore_decompress_47510 pstore_decompress 0 47510 NULL
 +ufs_inode_getblock_47512 ufs_inode_getblock 4 47512 NULL
++__proc_lnet_portal_rotor_47529 __proc_lnet_portal_rotor 5 47529 NULL
++snd_pcm_resume_47530 snd_pcm_resume 0 47530 NULL
 +vscnprintf_47533 vscnprintf 0-2 47533 NULL nohasharray
 +process_vm_rw_47533 process_vm_rw 3-5 47533 &vscnprintf_47533
-+oz_events_read_47535 oz_events_read 3 47535 NULL
++einj_check_trigger_header_47534 einj_check_trigger_header 0 47534 NULL
 +ieee80211_if_fmt_min_discovery_timeout_47539 ieee80211_if_fmt_min_discovery_timeout 3 47539 NULL
++ocfs2_resv_find_window_47557 ocfs2_resv_find_window 3 47557 NULL
 +read_ldt_47570 read_ldt 2 47570 NULL
-+_rtl_rx_get_padding_47572 _rtl_rx_get_padding 0 47572 NULL nohasharray
-+isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 &_rtl_rx_get_padding_47572
-+pci_iomap_47575 pci_iomap 3 47575 NULL
-+rpipe_get_idx_47579 rpipe_get_idx 2 47579 NULL
++isku_sysfs_read_last_set_47572 isku_sysfs_read_last_set 6 47572 NULL
++rpipe_get_idx_47579 rpipe_get_idx 2-0 47579 NULL
 +SYSC_fcntl64_47581 SYSC_fcntl64 3 47581 NULL
++vendorextnReadSection_47583 vendorextnReadSection 0 47583 NULL
++btrfs_stack_header_bytenr_47589 btrfs_stack_header_bytenr 0 47589 NULL
 +ext4_kvzalloc_47605 ext4_kvzalloc 1 47605 NULL
-+sctp_ssnmap_new_47608 sctp_ssnmap_new 1-2 47608 NULL
-+uea_request_47613 uea_request 4 47613 NULL
++sctp_ssnmap_new_47608 sctp_ssnmap_new 2-1 47608 NULL
 +cache_read_pipefs_47615 cache_read_pipefs 3 47615 NULL
 +twl4030_clear_set_47624 twl4030_clear_set 4 47624 NULL
 +irq_set_chip_47638 irq_set_chip 1 47638 NULL
-+__build_packet_message_47643 __build_packet_message 3-9 47643 NULL
++get_size_47644 get_size 1-2 47644 NULL
++snd_pcm_info_47699 snd_pcm_info 0 47699 NULL
++packet_recvmsg_47700 packet_recvmsg 4 47700 NULL nohasharray
++ipath_format_hwmsg_47700 ipath_format_hwmsg 2 47700 &packet_recvmsg_47700
 +global_rt_runtime_47712 global_rt_runtime 0 47712 NULL
 +save_microcode_47717 save_microcode 3 47717 NULL
-+bits_to_user_47733 bits_to_user 2-3 47733 NULL
++bits_to_user_47733 bits_to_user 3-2 47733 NULL
 +carl9170_debugfs_read_47738 carl9170_debugfs_read 3 47738 NULL
 +ir_prepare_write_buffer_47747 ir_prepare_write_buffer 3 47747 NULL
 +mvumi_alloc_mem_resource_47750 mvumi_alloc_mem_resource 3 47750 NULL
 +ext3_find_near_47752 ext3_find_near 0 47752 NULL
 +alloc_sched_domains_47756 alloc_sched_domains 1 47756 NULL
-+i915_wedged_write_47771 i915_wedged_write 3 47771 NULL
 +uwb_ie_dump_hex_47774 uwb_ie_dump_hex 4 47774 NULL
 +SyS_setgroups16_47780 SyS_setgroups16 1 47780 NULL
 +error_error_numll_frame_cts_start_read_47781 error_error_numll_frame_cts_start_read 3 47781 NULL
 +posix_acl_fix_xattr_from_user_47793 posix_acl_fix_xattr_from_user 2 47793 NULL
-+stmmac_set_bfsize_47834 stmmac_set_bfsize 0 47834 NULL
++W6692_empty_Bfifo_47804 W6692_empty_Bfifo 2 47804 NULL
++lov_packmd_47810 lov_packmd 0 47810 NULL
++pinconf_dbg_config_write_47835 pinconf_dbg_config_write 3 47835 NULL
 +KEY_SIZE_47855 KEY_SIZE 0 47855 NULL
 +ubifs_unpack_nnode_47866 ubifs_unpack_nnode 0 47866 NULL
 +vhci_read_47878 vhci_read 3 47878 NULL
++ubi_wl_put_peb_47886 ubi_wl_put_peb 0 47886 NULL
 +keyctl_instantiate_key_common_47889 keyctl_instantiate_key_common 4 47889 NULL
 +load_mapping_47904 load_mapping 3 47904 NULL
-+osd_req_read_sg_47905 osd_req_read_sg 5 47905 NULL
++btrfs_duplicate_item_47910 btrfs_duplicate_item 0 47910 NULL
++cfs_percpt_alloc_47918 cfs_percpt_alloc 2 47918 NULL
 +comedi_write_47926 comedi_write 3 47926 NULL
 +nvme_trans_get_blk_desc_len_47946 nvme_trans_get_blk_desc_len 0-2 47946 NULL
 +lp8788_irq_map_47964 lp8788_irq_map 2 47964 NULL
-+mempool_resize_47983 mempool_resize 2 47983 NULL nohasharray
-+iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 &mempool_resize_47983
++gether_get_ifname_47972 gether_get_ifname 3 47972 NULL
++iwl_dbgfs_ucode_tracing_read_47983 iwl_dbgfs_ucode_tracing_read 3 47983 NULL nohasharray
++mempool_resize_47983 mempool_resize 2 47983 &iwl_dbgfs_ucode_tracing_read_47983
 +dbg_port_buf_47990 dbg_port_buf 2 47990 NULL
 +ib_umad_write_47993 ib_umad_write 3 47993 NULL
++ocfs2_find_refcount_split_pos_48001 ocfs2_find_refcount_split_pos 0 48001 NULL
++lustre_cfg_len_48002 lustre_cfg_len 0 48002 NULL
++gdm_tty_recv_complete_48011 gdm_tty_recv_complete 2 48011 NULL
 +ffs_epfile_write_48014 ffs_epfile_write 3 48014 NULL
 +bio_integrity_set_tag_48035 bio_integrity_set_tag 3 48035 NULL
 +pppoe_sendmsg_48039 pppoe_sendmsg 4 48039 NULL
 +SYSC_writev_48040 SYSC_writev 3 48040 NULL
++btrfs_reserve_extent_48044 btrfs_reserve_extent 6 48044 NULL
 +wpan_phy_alloc_48056 wpan_phy_alloc 1 48056 NULL
++ocfs2_change_refcount_rec_48059 ocfs2_change_refcount_rec 0 48059 NULL
 +posix_acl_alloc_48063 posix_acl_alloc 1 48063 NULL
 +palmas_bulk_write_48068 palmas_bulk_write 2-3-5 48068 NULL
 +disc_write_48070 disc_write 3 48070 NULL
 +mmc_alloc_host_48097 mmc_alloc_host 1 48097 NULL
-+skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5 48102 NULL
++skb_copy_datagram_const_iovec_48102 skb_copy_datagram_const_iovec 4-2-5-0 48102 NULL
 +radio_isa_common_probe_48107 radio_isa_common_probe 3 48107 NULL
 +vmw_framebuffer_surface_dirty_48132 vmw_framebuffer_surface_dirty 6 48132 NULL
 +set_discoverable_48141 set_discoverable 4 48141 NULL
 +dn_fib_count_nhs_48145 dn_fib_count_nhs 0 48145 NULL
-+bitmap_onto_48152 bitmap_onto 4 48152 NULL
++get_cur_inode_state_48149 get_cur_inode_state 0 48149 NULL
++_add_to_r4w_48152 _add_to_r4w 4 48152 NULL nohasharray
++bitmap_onto_48152 bitmap_onto 4 48152 &_add_to_r4w_48152
 +isr_dma1_done_read_48159 isr_dma1_done_read 3 48159 NULL
 +c4iw_id_table_alloc_48163 c4iw_id_table_alloc 3 48163 NULL
 +ocfs2_find_next_zero_bit_unaligned_48170 ocfs2_find_next_zero_bit_unaligned 2-3 48170 NULL nohasharray
@@ -107295,382 +108020,467 @@ index 0000000..9a7096d
 +alloc_cc770dev_48186 alloc_cc770dev 1 48186 NULL
 +init_ipath_48187 init_ipath 1 48187 NULL
 +brcmf_sdio_chip_cm3_exitdl_48192 brcmf_sdio_chip_cm3_exitdl 4 48192 NULL
++cfg80211_process_deauth_48200 cfg80211_process_deauth 3 48200 NULL
++ext4_index_trans_blocks_48205 ext4_index_trans_blocks 0-2 48205 NULL
 +snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL
++ll_direct_IO_26_48216 ll_direct_IO_26 4 48216 NULL
 +is_block_in_journal_48223 is_block_in_journal 3 48223 NULL
 +uv_blade_nr_possible_cpus_48226 uv_blade_nr_possible_cpus 0 48226 NULL
 +nilfs_readpages_48229 nilfs_readpages 4 48229 NULL
 +read_file_recv_48232 read_file_recv 3 48232 NULL
-+unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL
++unaccount_shadowed_48233 unaccount_shadowed 2 48233 NULL nohasharray
++blk_rq_pos_48233 blk_rq_pos 0 48233 &unaccount_shadowed_48233
++nouveau_i2c_port_create__48240 nouveau_i2c_port_create_ 7 48240 NULL
 +nfsctl_transaction_read_48250 nfsctl_transaction_read 3 48250 NULL
++batadv_socket_read_48257 batadv_socket_read 3 48257 NULL
 +cache_write_pipefs_48270 cache_write_pipefs 3 48270 NULL
++trace_options_write_48275 trace_options_write 3 48275 NULL
 +send_set_info_48288 send_set_info 7 48288 NULL
-+set_disc_pwup_pfs_48300 set_disc_pwup_pfs 3 48300 NULL
 +lpfc_idiag_extacc_read_48301 lpfc_idiag_extacc_read 3 48301 NULL
 +timblogiw_read_48305 timblogiw_read 3 48305 NULL
 +hash_setkey_48310 hash_setkey 3 48310 NULL
++audio_set_intf_req_48319 audio_set_intf_req 0 48319 NULL
++kvm_mmu_pte_write_48340 kvm_mmu_pte_write 2 48340 NULL
 +__alloc_fd_48356 __alloc_fd 2 48356 NULL
 +skb_add_data_48363 skb_add_data 3 48363 NULL
 +tx_frag_init_called_read_48377 tx_frag_init_called_read 3 48377 NULL
-+ixgbe_pci_sriov_enable_48410 ixgbe_pci_sriov_enable 2 48410 NULL
 +lbs_debugfs_write_48413 lbs_debugfs_write 3 48413 NULL
++uhid_event_from_user_48417 uhid_event_from_user 2 48417 NULL
++div64_u64_rem_48418 div64_u64_rem 0-1-2 48418 NULL
++snd_power_wait_48422 snd_power_wait 0 48422 NULL
 +pwr_tx_without_ps_read_48423 pwr_tx_without_ps_read 3 48423 NULL
-+nfs4_alloc_pages_48426 nfs4_alloc_pages 1 48426 NULL
++hugepage_madvise_48435 hugepage_madvise 0 48435 NULL
 +print_filtered_48442 print_filtered 2-0 48442 NULL
 +tun_recvmsg_48463 tun_recvmsg 4 48463 NULL
 +compat_SyS_preadv64_48469 compat_SyS_preadv64 3 48469 NULL
++ipath_format_hwerrors_48487 ipath_format_hwerrors 5 48487 NULL
 +r8712_usbctrl_vendorreq_48489 r8712_usbctrl_vendorreq 6 48489 NULL
++ocfs2_refcount_cow_48495 ocfs2_refcount_cow 3 48495 NULL
 +send_control_msg_48498 send_control_msg 6 48498 NULL
 +mlx4_en_create_tx_ring_48501 mlx4_en_create_tx_ring 4 48501 NULL
 +count_masked_bytes_48507 count_masked_bytes 0-1 48507 NULL
 +diva_os_copy_to_user_48508 diva_os_copy_to_user 4 48508 NULL
 +brcmf_sdio_trap_info_48510 brcmf_sdio_trap_info 4 48510 NULL
 +phantom_get_free_48514 phantom_get_free 0 48514 NULL
-+wiimote_hid_send_48528 wiimote_hid_send 3 48528 NULL
++drbd_bm_capacity_48530 drbd_bm_capacity 0 48530 NULL
 +ext3_splice_branch_48531 ext3_splice_branch 6 48531 NULL
-+named_distribute_48544 named_distribute 4 48544 NULL
 +raid10_size_48571 raid10_size 0-2-3 48571 NULL
++llog_data_len_48607 llog_data_len 1 48607 NULL
 +ufs_dtogd_48616 ufs_dtogd 0-2 48616 NULL
 +do_ip_vs_set_ctl_48641 do_ip_vs_set_ctl 4 48641 NULL
++ll_rw_extents_stats_pp_seq_write_48651 ll_rw_extents_stats_pp_seq_write 3 48651 NULL
 +mtd_read_48655 mtd_read 0 48655 NULL
 +aes_encrypt_packets_read_48666 aes_encrypt_packets_read 3 48666 NULL
-+ore_get_rw_state_48667 ore_get_rw_state 4 48667 NULL
-+sm501_create_subdev_48668 sm501_create_subdev 3-4 48668 NULL nohasharray
-+sys_setgroups_48668 sys_setgroups 1 48668 &sm501_create_subdev_48668
++ore_get_rw_state_48667 ore_get_rw_state 5-4 48667 NULL
++sm501_create_subdev_48668 sm501_create_subdev 4-3 48668 NULL
++ubi_eba_unmap_leb_48671 ubi_eba_unmap_leb 0 48671 NULL
++hysdn_log_write_48694 hysdn_log_write 3 48694 NULL
 +altera_drscan_48698 altera_drscan 2 48698 NULL
 +kvm_set_irq_routing_48704 kvm_set_irq_routing 3 48704 NULL
++recv_msg_48709 recv_msg 4 48709 NULL
++lpfc_idiag_drbacc_write_48712 lpfc_idiag_drbacc_write 3 48712 NULL
 +SyS_lgetxattr_48719 SyS_lgetxattr 4 48719 NULL
 +ath6kl_usb_bmi_read_48745 ath6kl_usb_bmi_read 3 48745 NULL
 +ath6kl_regwrite_read_48747 ath6kl_regwrite_read 3 48747 NULL
-+l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 NULL
-+lua_sysfs_write_48797 lua_sysfs_write 6 48797 NULL
++event_buffer_read_48772 event_buffer_read 3 48772 NULL nohasharray
++l2cap_segment_sdu_48772 l2cap_segment_sdu 4 48772 &event_buffer_read_48772
++gfs2_direct_IO_48774 gfs2_direct_IO 4 48774 NULL
 +il3945_sta_dbgfs_stats_table_read_48802 il3945_sta_dbgfs_stats_table_read 3 48802 NULL
 +twa_change_queue_depth_48808 twa_change_queue_depth 2 48808 NULL
++register_ftrace_profiler_48816 register_ftrace_profiler 0 48816 NULL
 +atomic_counters_read_48827 atomic_counters_read 3 48827 NULL
-+efi_memory_uc_48828 efi_memory_uc 1 48828 NULL
 +azx_get_position_48841 azx_get_position 0 48841 NULL
-+vc_do_resize_48842 vc_do_resize 3-4 48842 NULL
-+viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 NULL nohasharray
-+C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 &viafb_dvp1_proc_write_48864
++vc_do_resize_48842 vc_do_resize 4-3 48842 NULL
++comedi_buf_write_alloc_48846 comedi_buf_write_alloc 0-2 48846 NULL
++suspend_dtim_interval_write_48854 suspend_dtim_interval_write 3 48854 NULL
++C_SYSC_pwritev64_48864 C_SYSC_pwritev64 3 48864 NULL nohasharray
++viafb_dvp1_proc_write_48864 viafb_dvp1_proc_write 3 48864 &C_SYSC_pwritev64_48864
 +__ffs_ep0_read_events_48868 __ffs_ep0_read_events 3 48868 NULL
-+sys_setgroups16_48882 sys_setgroups16 1 48882 NULL
 +ext2_alloc_branch_48889 ext2_alloc_branch 4 48889 NULL
 +crypto_cipher_ctxsize_48890 crypto_cipher_ctxsize 0 48890 NULL
++joydev_handle_JSIOCSAXMAP_48898 joydev_handle_JSIOCSAXMAP 3 48898 NULL
 +xdi_copy_to_user_48900 xdi_copy_to_user 4 48900 NULL
 +msg_hdr_sz_48908 msg_hdr_sz 0 48908 NULL
-+gdth_isa_probe_one_48925 gdth_isa_probe_one 1 48925 NULL
++snd_pcm_update_hw_ptr_48925 snd_pcm_update_hw_ptr 0 48925 NULL
 +sep_crypto_dma_48937 sep_crypto_dma 0 48937 NULL
++si5351_write_parameters_48940 si5351_write_parameters 2 48940 NULL
 +event_heart_beat_read_48961 event_heart_beat_read 3 48961 NULL
 +nand_ecc_test_run_48966 nand_ecc_test_run 1 48966 NULL
 +vmci_handle_arr_create_48971 vmci_handle_arr_create 1 48971 NULL
 +batadv_orig_hash_del_if_48972 batadv_orig_hash_del_if 2 48972 NULL
-+_alloc_set_attr_list_48991 _alloc_set_attr_list 4 48991 NULL
++btrfs_delete_delayed_insertion_item_48981 btrfs_delete_delayed_insertion_item 0 48981 NULL
 +rds_rm_size_48996 rds_rm_size 0-2 48996 NULL
 +sel_write_enforce_48998 sel_write_enforce 3 48998 NULL
++null_alloc_rs_49019 null_alloc_rs 2 49019 NULL
 +filemap_check_errors_49022 filemap_check_errors 0 49022 NULL
++aic_inb_49023 aic_inb 0 49023 NULL
 +transient_status_49027 transient_status 4 49027 NULL
-+ipath_reg_user_mr_49038 ipath_reg_user_mr 2-3 49038 NULL
++iwl_mvm_power_legacy_dbgfs_read_49038 iwl_mvm_power_legacy_dbgfs_read 4 49038 NULL nohasharray
++ipath_reg_user_mr_49038 ipath_reg_user_mr 2-3 49038 &iwl_mvm_power_legacy_dbgfs_read_49038
++aic7xxx_rem_scb_from_disc_list_49041 aic7xxx_rem_scb_from_disc_list 0 49041 NULL
 +setup_msi_irq_49052 setup_msi_irq 3-4 49052 NULL
 +ubi_read_49061 ubi_read 0 49061 NULL
 +scsi_register_49094 scsi_register 2 49094 NULL
 +paging64_walk_addr_nested_49100 paging64_walk_addr_nested 3 49100 NULL
 +compat_do_readv_writev_49102 compat_do_readv_writev 4 49102 NULL
-+check_exists_49119 check_exists 2 49119 NULL nohasharray
-+xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 &check_exists_49119
-+pt_read_49136 pt_read 3 49136 NULL
-+tipc_multicast_49144 tipc_multicast 5 49144 NULL
-+atyfb_setup_generic_49151 atyfb_setup_generic 3 49151 NULL
++xfrm_replay_state_esn_len_49119 xfrm_replay_state_esn_len 0 49119 NULL
++ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL
++qib_user_sdma_pin_pages_49136 qib_user_sdma_pin_pages 4-5-6 49136 NULL nohasharray
++pt_read_49136 pt_read 3 49136 &qib_user_sdma_pin_pages_49136
++read_file_49137 read_file 4 49137 NULL
 +ipwireless_tty_received_49154 ipwireless_tty_received 3 49154 NULL
 +f2fs_acl_count_49155 f2fs_acl_count 0-1 49155 NULL
 +ipw_queue_tx_init_49161 ipw_queue_tx_init 3 49161 NULL
 +ext4_free_clusters_after_init_49174 ext4_free_clusters_after_init 2 49174 NULL
++__jfs_setxattr_49175 __jfs_setxattr 5 49175 NULL
++ath6kl_bgscan_int_write_49178 ath6kl_bgscan_int_write 3 49178 NULL
 +dvb_dvr_ioctl_49182 dvb_dvr_ioctl 2 49182 NULL
++print_queue_49191 print_queue 0 49191 NULL
++root_nfs_cat_49192 root_nfs_cat 3 49192 NULL
 +iwl_dbgfs_ucode_general_stats_read_49199 iwl_dbgfs_ucode_general_stats_read 3 49199 NULL
 +il4965_rs_sta_dbgfs_stats_table_read_49206 il4965_rs_sta_dbgfs_stats_table_read 3 49206 NULL
 +do_jffs2_getxattr_49210 do_jffs2_getxattr 0 49210 NULL
 +resp_write_same_49217 resp_write_same 2 49217 NULL
 +nouveau_therm_create__49228 nouveau_therm_create_ 4 49228 NULL
-+nouveau_i2c_port_create__49237 nouveau_i2c_port_create_ 6 49237 NULL
 +hugetlb_cgroup_read_49259 hugetlb_cgroup_read 5 49259 NULL
 +ieee80211_if_read_rssi_threshold_49260 ieee80211_if_read_rssi_threshold 3 49260 NULL
 +isku_sysfs_read_keys_media_49268 isku_sysfs_read_keys_media 6 49268 NULL
-+osd_req_add_get_attr_list_49278 osd_req_add_get_attr_list 3 49278 NULL
++ptlrpc_check_set_49277 ptlrpc_check_set 0 49277 NULL
 +rx_filter_beacon_filter_read_49279 rx_filter_beacon_filter_read 3 49279 NULL
++__ext4_ext_dirty_49284 __ext4_ext_dirty 0 49284 NULL
++ext4_xattr_ibody_list_49287 ext4_xattr_ibody_list 3-0 49287 NULL
++viafb_dfph_proc_write_49288 viafb_dfph_proc_write 3 49288 NULL
 +uio_read_49300 uio_read 3 49300 NULL
 +ocfs2_resmap_find_free_bits_49301 ocfs2_resmap_find_free_bits 3 49301 NULL
 +isku_sysfs_read_keys_macro_49312 isku_sysfs_read_keys_macro 6 49312 NULL
-+SYSC_mincore_49319 SYSC_mincore 1 49319 NULL
++update_ref_for_cow_49313 update_ref_for_cow 0 49313 NULL
++SYSC_mincore_49319 SYSC_mincore 2-1 49319 NULL
 +fwtty_port_handler_49327 fwtty_port_handler 9 49327 NULL
-+srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-3-4 49330 NULL
-+cfpkt_setlen_49343 cfpkt_setlen 2 49343 NULL
++srpt_alloc_ioctx_ring_49330 srpt_alloc_ioctx_ring 2-4-3 49330 NULL
++__intel_map_single_49338 __intel_map_single 3-2 49338 NULL
++intel_ring_invalidate_all_caches_49346 intel_ring_invalidate_all_caches 0 49346 NULL
 +joydev_ioctl_common_49359 joydev_ioctl_common 2 49359 NULL
-+ocfs2_remove_btree_range_49370 ocfs2_remove_btree_range 4-5-3 49370 NULL
-+px_raw_event_49371 px_raw_event 4 49371 NULL
++ocfs2_remove_btree_range_49370 ocfs2_remove_btree_range 4-3-5 49370 NULL
 +iscsi_alloc_session_49390 iscsi_alloc_session 3 49390 NULL
-+applesmc_create_nodes_49392 applesmc_create_nodes 2 49392 NULL
++ext4_ext_index_trans_blocks_49396 ext4_ext_index_trans_blocks 0 49396 NULL
 +rx_streaming_always_read_49401 rx_streaming_always_read 3 49401 NULL
 +tnode_alloc_49407 tnode_alloc 1 49407 NULL
 +samples_to_bytes_49426 samples_to_bytes 0-2 49426 NULL
-+md_domain_init_49432 md_domain_init 2 49432 NULL
++ubi_add_to_av_49432 ubi_add_to_av 0 49432 NULL nohasharray
++md_domain_init_49432 md_domain_init 2 49432 &ubi_add_to_av_49432
 +compat_do_msg_fill_49440 compat_do_msg_fill 3 49440 NULL
 +get_lru_size_49441 get_lru_size 0 49441 NULL
++i915_gem_object_set_to_gtt_domain_49450 i915_gem_object_set_to_gtt_domain 0 49450 NULL
++ocfs2_merge_rec_left_49455 ocfs2_merge_rec_left 0 49455 NULL
++__hfsplus_getxattr_49460 __hfsplus_getxattr 0 49460 NULL
 +agp_3_5_isochronous_node_enable_49465 agp_3_5_isochronous_node_enable 3 49465 NULL
 +xfs_iformat_local_49472 xfs_iformat_local 4 49472 NULL
 +savu_sysfs_read_49473 savu_sysfs_read 6 49473 NULL
 +isr_decrypt_done_read_49490 isr_decrypt_done_read 3 49490 NULL
 +SyS_listxattr_49519 SyS_listxattr 3 49519 NULL
 +emulator_write_phys_49520 emulator_write_phys 2-4 49520 NULL
-+acpi_os_ioremap_49523 acpi_os_ioremap 1-2 49523 NULL
++btrfs_add_free_space_49524 btrfs_add_free_space 0 49524 NULL
 +smk_write_access_49561 smk_write_access 3 49561 NULL
 +ntfs_malloc_nofs_49572 ntfs_malloc_nofs 1 49572 NULL
 +alloc_chunk_49575 alloc_chunk 1 49575 NULL
 +sctp_setsockopt_default_send_param_49578 sctp_setsockopt_default_send_param 3 49578 NULL
++readfifo_49583 readfifo 1 49583 NULL
 +tap_write_49595 tap_write 3 49595 NULL
++create_task_io_context_49601 create_task_io_context 3 49601 NULL
 +isr_wakeups_read_49607 isr_wakeups_read 3 49607 NULL
 +btrfs_mksubvol_49616 btrfs_mksubvol 3 49616 NULL
 +heap_init_49617 heap_init 2 49617 NULL
 +smk_write_doi_49621 smk_write_doi 3 49621 NULL
++port_fops_read_49626 port_fops_read 3 49626 NULL
 +btrfsic_cmp_log_and_dev_bytenr_49628 btrfsic_cmp_log_and_dev_bytenr 2 49628 NULL
++__swab32p_49657 __swab32p 0 49657 NULL
++ubi_wl_flush_49682 ubi_wl_flush 0 49682 NULL
 +aa_simple_write_to_buffer_49683 aa_simple_write_to_buffer 3-4 49683 NULL
 +SyS_pwritev_49688 SyS_pwritev 3 49688 NULL
-+sys_gethostname_49698 sys_gethostname 2 49698 NULL
++__setup_irq_49696 __setup_irq 0 49696 NULL
 +cx2341x_ctrl_new_menu_49700 cx2341x_ctrl_new_menu 3 49700 NULL
++do_splice_to_49714 do_splice_to 4 49714 NULL
++write_pool_49718 write_pool 3 49718 NULL
 +dm_thin_insert_block_49720 dm_thin_insert_block 2-3 49720 NULL
++kvm_mmu_notifier_invalidate_page_49723 kvm_mmu_notifier_invalidate_page 3 49723 NULL
 +sep_create_dcb_dmatables_context_kernel_49728 sep_create_dcb_dmatables_context_kernel 6 49728 NULL
-+sys_fsetxattr_49736 sys_fsetxattr 4 49736 NULL
-+check_frame_49741 check_frame 0 49741 NULL
 +zd_usb_iowrite16v_49744 zd_usb_iowrite16v 3 49744 NULL
 +btrfs_chunk_num_stripes_49751 btrfs_chunk_num_stripes 0 49751 NULL
 +fuse_wr_pages_49753 fuse_wr_pages 0-1-2 49753 NULL
 +key_conf_keylen_read_49758 key_conf_keylen_read 3 49758 NULL
 +fuse_conn_waiting_read_49762 fuse_conn_waiting_read 3 49762 NULL
-+isku_sysfs_write_49767 isku_sysfs_write 6-5 49767 NULL
-+ceph_osdc_readpages_49789 ceph_osdc_readpages 10-4 49789 NULL
++w83977af_fir_interrupt_49775 w83977af_fir_interrupt 0 49775 NULL
++ceph_osdc_readpages_49789 ceph_osdc_readpages 0 49789 NULL
 +nfs4_acl_new_49806 nfs4_acl_new 1 49806 NULL
-+arch_gnttab_map_status_49812 arch_gnttab_map_status 3 49812 NULL
 +ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 3-6-0 49829 NULL
 +add_uuid_49831 add_uuid 4 49831 NULL
-+tcf_csum_ipv4_tcp_49834 tcf_csum_ipv4_tcp 3 49834 NULL
 +ath6kl_fwlog_block_read_49836 ath6kl_fwlog_block_read 3 49836 NULL
++iraw_loop_49842 iraw_loop 0-1 49842 NULL
 +twl4030_write_49846 twl4030_write 2 49846 NULL
 +scsi_dispatch_cmd_entry_49848 scsi_dispatch_cmd_entry 3 49848 NULL
 +timeradd_entry_49850 timeradd_entry 3 49850 NULL
++ubifs_destroy_tnc_subtree_49853 ubifs_destroy_tnc_subtree 0 49853 NULL
 +btrfs_subvolume_reserve_metadata_49859 btrfs_subvolume_reserve_metadata 3 49859 NULL
++fiemap_count_to_size_49869 fiemap_count_to_size 0-1 49869 NULL
 +sctp_setsockopt_bindx_49870 sctp_setsockopt_bindx 3 49870 NULL
++snd_mask_eq_49889 snd_mask_eq 0 49889 NULL
 +ceph_get_caps_49890 ceph_get_caps 0 49890 NULL
++osc_brw_49896 osc_brw 4 49896 NULL
 +__cow_file_range_49901 __cow_file_range 5 49901 NULL
 +__copy_from_user_inatomic_nocache_49921 __copy_from_user_inatomic_nocache 3 49921 NULL
++config_ep_by_speed_49939 config_ep_by_speed 0 49939 NULL
 +batadv_tt_realloc_packet_buff_49960 batadv_tt_realloc_packet_buff 4 49960 NULL
-+b43legacy_pio_read_49978 b43legacy_pio_read 0 49978 NULL
 +ieee80211_if_fmt_dtim_count_49987 ieee80211_if_fmt_dtim_count 3 49987 NULL
++drm_buffer_copy_from_user_49990 drm_buffer_copy_from_user 3 49990 NULL
 +sta2x11_swiotlb_alloc_coherent_49994 sta2x11_swiotlb_alloc_coherent 2 49994 NULL
 +l2cap_chan_send_49995 l2cap_chan_send 3 49995 NULL
 +__module_alloc_50004 __module_alloc 1 50004 NULL
 +dn_mss_from_pmtu_50011 dn_mss_from_pmtu 0-2 50011 NULL
 +ptrace_readdata_50020 ptrace_readdata 2-4 50020 NULL
 +isdn_read_50021 isdn_read 3 50021 NULL
++mdc_rename_pack_50023 mdc_rename_pack 4-6 50023 NULL
 +qp_alloc_queue_50028 qp_alloc_queue 1 50028 NULL
-+alloc_ebda_hpc_50046 alloc_ebda_hpc 1-2 50046 NULL
++ioread8_50049 ioread8 0 50049 NULL
++fuse_conn_max_background_write_50061 fuse_conn_max_background_write 3 50061 NULL
 +vmw_surface_destroy_size_50072 vmw_surface_destroy_size 0 50072 NULL
 +arch_setup_ht_irq_50073 arch_setup_ht_irq 1 50073 NULL
++__kfifo_dma_in_prepare_50081 __kfifo_dma_in_prepare 4 50081 NULL
 +dev_set_alias_50084 dev_set_alias 3 50084 NULL
-+pcpu_get_vm_areas_50085 pcpu_get_vm_areas 3 50085 NULL
++libcfs_ioctl_popdata_50087 libcfs_ioctl_popdata 3 50087 NULL
 +sock_setsockopt_50088 sock_setsockopt 5 50088 NULL
 +altera_swap_dr_50090 altera_swap_dr 2 50090 NULL
++android_set_cntry_50100 android_set_cntry 0 50100 NULL
++process_recorded_refs_50110 process_recorded_refs 0 50110 NULL
 +read_file_slot_50111 read_file_slot 3 50111 NULL
++xfs_dir3_sf_entsize_50112 xfs_dir3_sf_entsize 0-3 50112 NULL
++rx_streaming_interval_write_50120 rx_streaming_interval_write 3 50120 NULL
++ocfs2_search_one_group_50125 ocfs2_search_one_group 0 50125 NULL nohasharray
++jfs_direct_IO_50125 jfs_direct_IO 4 50125 &ocfs2_search_one_group_50125
 +SYSC_preadv_50134 SYSC_preadv 3 50134 NULL
 +copy_items_50140 copy_items 6 50140 NULL
 +tx_frag_need_fragmentation_read_50153 tx_frag_need_fragmentation_read 3 50153 NULL
-+set_cmd_header_50155 set_cmd_header 0 50155 NULL
 +reiserfs_bmap_count_50160 reiserfs_bmap_count 0 50160 NULL
-+kmalloc_node_50163 kmalloc_node 1 50163 NULL nohasharray
-+aac_nark_ioremap_50163 aac_nark_ioremap 2 50163 &kmalloc_node_50163
++kmalloc_node_50163 kmalloc_node 1-3 50163 NULL
 +rx_filter_ibss_filter_read_50167 rx_filter_ibss_filter_read 3 50167 NULL
++ahd_probe_stack_size_50168 ahd_probe_stack_size 0 50168 NULL
 +odev_update_50169 odev_update 2 50169 NULL
 +ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 ieee80211_if_fmt_dot11MeshHWMPRannInterval 3 50172 NULL nohasharray
-+ubi_resize_volume_50172 ubi_resize_volume 2 50172 &ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172
-+ib_send_cm_drep_50186 ib_send_cm_drep 3 50186 NULL
-+cfg80211_roamed_bss_50198 cfg80211_roamed_bss 4-6 50198 NULL
++xfs_get_blocks_direct_50172 xfs_get_blocks_direct 2 50172 &ieee80211_if_fmt_dot11MeshHWMPRannInterval_50172 nohasharray
++ubi_resize_volume_50172 ubi_resize_volume 2 50172 &xfs_get_blocks_direct_50172
++ext3_do_update_inode_50178 ext3_do_update_inode 0 50178 NULL
++cfg80211_roamed_bss_50198 cfg80211_roamed_bss 6-4 50198 NULL
++cyttsp4_probe_50201 cyttsp4_probe 4 50201 NULL
 +rx_rx_timeout_wa_read_50204 rx_rx_timeout_wa_read 3 50204 NULL
-+ieee80211_skb_resize_50211 ieee80211_skb_resize 3 50211 NULL
++compat_SyS_sendfile_50206 compat_SyS_sendfile 4 50206 NULL nohasharray
++mthca_buddy_init_50206 mthca_buddy_init 2 50206 &compat_SyS_sendfile_50206
++l2cap_sock_setsockopt_50207 l2cap_sock_setsockopt 5 50207 NULL
 +mon_bin_compat_ioctl_50234 mon_bin_compat_ioctl 3 50234 NULL
 +sg_kmalloc_50240 sg_kmalloc 1 50240 NULL
-+afs_extract_data_50261 afs_extract_data 5 50261 NULL
++vma_dup_policy_50269 vma_dup_policy 0 50269 NULL
 +rxrpc_setsockopt_50286 rxrpc_setsockopt 5 50286 NULL
-+soc_codec_reg_show_50302 soc_codec_reg_show 0 50302 NULL
++soc_codec_reg_show_50302 soc_codec_reg_show 0-3 50302 NULL
 +SYSC_flistxattr_50307 SYSC_flistxattr 3 50307 NULL
 +SYSC_sched_setaffinity_50310 SYSC_sched_setaffinity 2 50310 NULL
++iterate_irefs_50313 iterate_irefs 0 50313 NULL
 +soc_camera_read_50319 soc_camera_read 3 50319 NULL
 +do_launder_page_50329 do_launder_page 0 50329 NULL
 +nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL
 +lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3 50334 NULL
 +ocfs2_block_to_cluster_group_50337 ocfs2_block_to_cluster_group 2 50337 NULL nohasharray
 +snd_pcm_lib_writev_50337 snd_pcm_lib_writev 0-3 50337 &ocfs2_block_to_cluster_group_50337
-+roccat_common2_send_with_status_50343 roccat_common2_send_with_status 4 50343 NULL
 +tpm_read_50344 tpm_read 3 50344 NULL
 +sched_clock_remote_50347 sched_clock_remote 0 50347 NULL
++efx_nic_update_stats_50352 efx_nic_update_stats 2 50352 NULL
 +kvm_arch_create_memslot_50354 kvm_arch_create_memslot 2 50354 NULL
 +isdn_ppp_read_50356 isdn_ppp_read 4 50356 NULL
-+unpack_u16_chunk_50357 unpack_u16_chunk 0 50357 NULL
++ocfs2_figure_insert_type_50362 ocfs2_figure_insert_type 0 50362 NULL nohasharray
++iwl_dbgfs_echo_test_write_50362 iwl_dbgfs_echo_test_write 3 50362 &ocfs2_figure_insert_type_50362
 +xfrm_send_migrate_50365 xfrm_send_migrate 5 50365 NULL
 +roccat_common2_receive_50369 roccat_common2_receive 4 50369 NULL
 +sl_alloc_bufs_50380 sl_alloc_bufs 2 50380 NULL
 +hash_ip6_expire_50390 hash_ip6_expire 3 50390 NULL
++snd_mask_refine_last_50406 snd_mask_refine_last 0 50406 NULL
 +l2tp_ip_sendmsg_50411 l2tp_ip_sendmsg 4 50411 NULL
-+ceph_writepages_osd_request_50423 ceph_writepages_osd_request 5 50423 NULL
 +iscsi_create_conn_50425 iscsi_create_conn 2 50425 NULL
 +validate_acl_mac_addrs_50429 validate_acl_mac_addrs 0 50429 NULL
-+btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL
++btrfs_error_discard_extent_50444 btrfs_error_discard_extent 2 50444 NULL nohasharray
++ecryptfs_write_lower_page_segment_50444 ecryptfs_write_lower_page_segment 4 50444 &btrfs_error_discard_extent_50444
 +calc_csum_metadata_size_50448 calc_csum_metadata_size 0 50448 NULL
 +pgctrl_write_50453 pgctrl_write 3 50453 NULL
++device_create_sys_dev_entry_50458 device_create_sys_dev_entry 0 50458 NULL
 +force_mapping_50464 force_mapping 2 50464 NULL
++cfs_size_round_50472 cfs_size_round 0-1 50472 NULL
 +cdrom_read_cdda_50478 cdrom_read_cdda 4 50478 NULL
 +mei_io_cb_alloc_req_buf_50493 mei_io_cb_alloc_req_buf 2 50493 NULL
 +pwr_rcvd_awake_beacons_read_50505 pwr_rcvd_awake_beacons_read 3 50505 NULL
-+fwnet_receive_packet_50537 fwnet_receive_packet 9 50537 NULL
++__ctzdi2_50536 __ctzdi2 1 50536 NULL
 +ath6kl_set_ap_probe_resp_ies_50539 ath6kl_set_ap_probe_resp_ies 3 50539 NULL
-+hme_read_desc32_50574 hme_read_desc32 0 50574 NULL
++usbat_flash_write_data_50553 usbat_flash_write_data 4 50553 NULL
++self_check_peb_vid_hdr_50563 self_check_peb_vid_hdr 0 50563 NULL nohasharray
++ttm_agp_tt_create_50563 ttm_agp_tt_create 3 50563 &self_check_peb_vid_hdr_50563
 +fat_readpages_50582 fat_readpages 4 50582 NULL
 +iwl_dbgfs_missed_beacon_read_50584 iwl_dbgfs_missed_beacon_read 3 50584 NULL
 +build_inv_iommu_pages_50589 build_inv_iommu_pages 2-3 50589 NULL
-+sge_rx_50594 sge_rx 3 50594 NULL
++xillybus_write_50605 xillybus_write 3 50605 NULL
 +rx_rx_checksum_result_read_50617 rx_rx_checksum_result_read 3 50617 NULL
-+__ffs_50625 __ffs 0 50625 NULL
++ocfs2_split_extent_50618 ocfs2_split_extent 0 50618 NULL
++sparse_early_usemaps_alloc_node_50623 sparse_early_usemaps_alloc_node 4 50623 NULL
++__ffs_50625 __ffs 0-1 50625 NULL
 +regcache_rbtree_write_50629 regcache_rbtree_write 2 50629 NULL
 +simple_transaction_get_50633 simple_transaction_get 3 50633 NULL
-+ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL nohasharray
-+sys_readv_50664 sys_readv 3 50664 &ath6kl_tm_rx_event_50664
++ocfs2_do_insert_extent_50658 ocfs2_do_insert_extent 0 50658 NULL
++ath6kl_tm_rx_event_50664 ath6kl_tm_rx_event 3 50664 NULL
 +bnad_debugfs_read_50665 bnad_debugfs_read 3 50665 NULL
-+ext2_try_to_allocate_with_rsv_50669 ext2_try_to_allocate_with_rsv 4-2 50669 NULL
-+btmrvl_psstate_read_50683 btmrvl_psstate_read 3 50683 NULL
-+swiotlb_free_coherent_50690 swiotlb_free_coherent 4 50690 NULL
++ext2_try_to_allocate_with_rsv_50669 ext2_try_to_allocate_with_rsv 4-2-0 50669 NULL
++prism2_read_fid_reg_50689 prism2_read_fid_reg 0 50689 NULL nohasharray
++i2c_smbus_read_byte_data_50689 i2c_smbus_read_byte_data 0 50689 &prism2_read_fid_reg_50689
 +paging32_gva_to_gpa_50696 paging32_gva_to_gpa 2 50696 NULL
 +xfs_growfs_get_hdr_buf_50697 xfs_growfs_get_hdr_buf 3 50697 NULL
++dev_mem_read_50706 dev_mem_read 3 50706 NULL
 +blk_check_plugged_50736 blk_check_plugged 3 50736 NULL
 +__ext3_get_inode_loc_50744 __ext3_get_inode_loc 0 50744 NULL
-+skb_padto_50759 skb_padto 2 50759 NULL
++btrfs_truncate_free_space_cache_50769 btrfs_truncate_free_space_cache 0 50769 NULL
 +ocfs2_xattr_block_get_50773 ocfs2_xattr_block_get 0 50773 NULL
 +tm6000_read_write_usb_50774 tm6000_read_write_usb 7 50774 NULL
-+bio_alloc_map_data_50782 bio_alloc_map_data 1-2 50782 NULL
++bio_alloc_map_data_50782 bio_alloc_map_data 2-1 50782 NULL
 +tpm_write_50798 tpm_write 3 50798 NULL
 +write_flush_50803 write_flush 3 50803 NULL
 +dvb_play_50814 dvb_play 3 50814 NULL
 +dpcm_show_state_50827 dpcm_show_state 0 50827 NULL
 +acpi_ev_install_gpe_block_50829 acpi_ev_install_gpe_block 2 50829 NULL
-+create_mem_extents_50835 create_mem_extents 0 50835 NULL nohasharray
-+SetArea_50835 SetArea 4 50835 &create_mem_extents_50835
-+videobuf_dma_init_user_50839 videobuf_dma_init_user 3 50839 NULL
-+self_check_write_50856 self_check_write 5 50856 NULL
++SetArea_50835 SetArea 4 50835 NULL nohasharray
++create_mem_extents_50835 create_mem_extents 0 50835 &SetArea_50835 nohasharray
++mask_from_50835 mask_from 0-1-2 50835 &create_mem_extents_50835
++videobuf_dma_init_user_50839 videobuf_dma_init_user 3-4 50839 NULL
++btrfs_search_slot_for_read_50843 btrfs_search_slot_for_read 0 50843 NULL
++self_check_write_50856 self_check_write 0-5 50856 NULL
 +carl9170_debugfs_write_50857 carl9170_debugfs_write 3 50857 NULL
++__percpu_counter_init_50878 __percpu_counter_init 0 50878 NULL
++btrfs_insert_inode_ref_50884 btrfs_insert_inode_ref 0 50884 NULL
 +SyS_lgetxattr_50889 SyS_lgetxattr 4 50889 NULL
 +netlbl_secattr_catmap_walk_rng_50894 netlbl_secattr_catmap_walk_rng 0-2 50894 NULL
-+osd_req_write_sg_50908 osd_req_write_sg 5 50908 NULL
++__bdev_writeseg_50903 __bdev_writeseg 4 50903 NULL
 +xfs_iext_remove_50909 xfs_iext_remove 3 50909 NULL
 +blk_rq_cur_sectors_50910 blk_rq_cur_sectors 0 50910 NULL
 +hash_recvmsg_50924 hash_recvmsg 4 50924 NULL
 +chd_dec_fetch_cdata_50926 chd_dec_fetch_cdata 3 50926 NULL
++show_device_status_50947 show_device_status 0 50947 NULL
++irq_timeout_write_50950 irq_timeout_write 3 50950 NULL
 +ocfs2_add_refcount_flag_50952 ocfs2_add_refcount_flag 6 50952 NULL
++sdio_uart_write_50954 sdio_uart_write 3 50954 NULL
 +SyS_setxattr_50957 SyS_setxattr 4 50957 NULL
++btrfs_del_csums_50969 btrfs_del_csums 0 50969 NULL
++__btrfs_mod_ref_50973 __btrfs_mod_ref 0 50973 NULL
 +iwl_statistics_flag_50981 iwl_statistics_flag 0-3 50981 NULL
 +timeout_write_50991 timeout_write 3 50991 NULL
 +wm831x_irq_map_50995 wm831x_irq_map 2 50995 NULL
 +proc_write_51003 proc_write 3 51003 NULL
-+snd_pcm_default_page_ops_51021 snd_pcm_default_page_ops 2 51021 NULL
++jbd2_journal_extend_51012 jbd2_journal_extend 2-0 51012 NULL
 +lbs_dev_info_51023 lbs_dev_info 3 51023 NULL
-+fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 NULL nohasharray
-+ntfs_attr_find_51028 ntfs_attr_find 0 51028 &fuse_conn_congestion_threshold_read_51028
++ntfs_attr_find_51028 ntfs_attr_find 0 51028 NULL nohasharray
++fuse_conn_congestion_threshold_read_51028 fuse_conn_congestion_threshold_read 3 51028 &ntfs_attr_find_51028
 +BcmGetSectionValEndOffset_51039 BcmGetSectionValEndOffset 0 51039 NULL
 +dump_midi_51040 dump_midi 3 51040 NULL
++usb_get_descriptor_51041 usb_get_descriptor 0 51041 NULL
 +srpt_alloc_ioctx_51042 srpt_alloc_ioctx 2-3 51042 NULL
 +do_arpt_set_ctl_51053 do_arpt_set_ctl 4 51053 NULL
 +wusb_prf_64_51065 wusb_prf_64 7 51065 NULL
 +jbd2_journal_init_revoke_51088 jbd2_journal_init_revoke 2 51088 NULL
 +solo_enc_v4l2_init_51094 solo_enc_v4l2_init 2 51094 NULL
 +__ocfs2_find_path_51096 __ocfs2_find_path 0 51096 NULL
-+ti_recv_51110 ti_recv 3 51110 NULL
-+dgrp_net_read_51113 dgrp_net_read 3 51113 NULL
++btrfs_del_item_51110 btrfs_del_item 0 51110 NULL nohasharray
++ti_recv_51110 ti_recv 3 51110 &btrfs_del_item_51110
++uasp_prepare_r_request_51124 uasp_prepare_r_request 0 51124 NULL
 +nfs_map_name_to_uid_51132 nfs_map_name_to_uid 3 51132 NULL
 +alloc_rtllib_51136 alloc_rtllib 1 51136 NULL
 +simple_xattr_set_51140 simple_xattr_set 4 51140 NULL
 +set_dirty_51144 set_dirty 3 51144 NULL
 +xfs_trans_get_efd_51148 xfs_trans_get_efd 3 51148 NULL
-+compat_sys_pwritev64_51151 compat_sys_pwritev64 3 51151 NULL
-+blk_bio_map_sg_51213 blk_bio_map_sg 0 51213 NULL
++walk_page_buffers_51170 walk_page_buffers 0 51170 NULL
++snd_pcm_unlink_51210 snd_pcm_unlink 0 51210 NULL
++uhci_frame_skel_link_51213 uhci_frame_skel_link 2 51213 NULL
 +nf_ct_ext_create_51232 nf_ct_ext_create 3 51232 NULL
 +snd_pcm_write_51235 snd_pcm_write 3 51235 NULL
 +tipc_send_51238 tipc_send 4 51238 NULL
 +drm_property_create_51239 drm_property_create 4 51239 NULL
++__mxt_read_reg_51249 __mxt_read_reg 0 51249 NULL
 +st_read_51251 st_read 3 51251 NULL
 +compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL
++target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL
 +dvb_audio_write_51275 dvb_audio_write 3 51275 NULL
 +ipwireless_network_packet_received_51277 ipwireless_network_packet_received 4 51277 NULL
-+zone_reclaimable_pages_51283 zone_reclaimable_pages 0 51283 NULL
++zone_reclaimable_pages_51283 zone_reclaimable_pages 0 51283 NULL nohasharray
++__get_cur_name_and_parent_51283 __get_cur_name_and_parent 0 51283 &zone_reclaimable_pages_51283
 +pvr2_std_id_to_str_51288 pvr2_std_id_to_str 2 51288 NULL
 +bnad_debugfs_read_regrd_51308 bnad_debugfs_read_regrd 3 51308 NULL
 +get_cell_51316 get_cell 2 51316 NULL
 +init_map_ipmac_51317 init_map_ipmac 4-3-5 51317 NULL
++ocfs2_read_inode_block_51319 ocfs2_read_inode_block 0 51319 NULL
 +alloc_hippi_dev_51320 alloc_hippi_dev 1 51320 NULL
 +ext2_xattr_get_51327 ext2_xattr_get 0 51327 NULL
 +alloc_smp_req_51337 alloc_smp_req 1 51337 NULL nohasharray
-+compat_arch_ptrace_51337 compat_arch_ptrace 3-4 51337 &alloc_smp_req_51337
++compat_arch_ptrace_51337 compat_arch_ptrace 3 51337 &alloc_smp_req_51337
 +ipw_get_event_log_len_51341 ipw_get_event_log_len 0 51341 NULL
 +ieee80211_if_fmt_estab_plinks_51370 ieee80211_if_fmt_estab_plinks 3 51370 NULL
 +radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL
-+ieee80211_wx_set_gen_ie_51399 ieee80211_wx_set_gen_ie 3 51399 NULL
-+ceph_sync_read_51410 ceph_sync_read 3 51410 NULL
-+x86_swiotlb_free_coherent_51421 x86_swiotlb_free_coherent 4 51421 NULL
++pci_sriov_resource_alignment_51406 pci_sriov_resource_alignment 0 51406 NULL
++ceph_sync_read_51410 ceph_sync_read 3-0 51410 NULL
++get_first_ref_51413 get_first_ref 0 51413 NULL
++__btrfs_end_transaction_51420 __btrfs_end_transaction 0 51420 NULL
 +blk_register_region_51424 blk_register_region 1-2 51424 NULL
 +mwifiex_rdeeprom_read_51429 mwifiex_rdeeprom_read 3 51429 NULL
++hfsplus_brec_read_51436 hfsplus_brec_read 0 51436 NULL
 +ieee80211_if_read_dot11MeshHWMPRootMode_51441 ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 NULL
 +print_devstats_dot11ACKFailureCount_51443 print_devstats_dot11ACKFailureCount 3 51443 NULL
 +____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL
 +xfs_buf_get_uncached_51477 xfs_buf_get_uncached 2 51477 NULL
-+vaddr_51480 vaddr 0 51480 NULL
-+skb_inner_mac_header_51482 skb_inner_mac_header 0 51482 NULL nohasharray
-+btrfs_find_space_cluster_51482 btrfs_find_space_cluster 5 51482 &skb_inner_mac_header_51482
-+__cpa_process_fault_51502 __cpa_process_fault 2 51502 NULL
++btrfs_find_space_cluster_51482 btrfs_find_space_cluster 5 51482 NULL
++kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 4-2 51493 NULL
 +ieee80211_if_write_uapsd_queues_51526 ieee80211_if_write_uapsd_queues 3 51526 NULL
++key_search_51533 key_search 0 51533 NULL
 +load_pdptrs_51541 load_pdptrs 3 51541 NULL
 +__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 NULL
-+icmp_manip_pkt_51560 icmp_manip_pkt 4 51560 NULL
 +ixgb_get_eeprom_len_51586 ixgb_get_eeprom_len 0 51586 NULL
++get_cur_path_51589 get_cur_path 0 51589 NULL nohasharray
++snd_interval_refine_first_51589 snd_interval_refine_first 0 51589 &get_cur_path_51589
 +aac_convert_sgraw2_51598 aac_convert_sgraw2 4 51598 NULL
-+raw_ioctl_51607 raw_ioctl 3 51607 NULL
 +table_size_to_number_of_entries_51613 table_size_to_number_of_entries 0-1 51613 NULL
-+gnttab_end_foreign_access_51617 gnttab_end_foreign_access 3 51617 NULL
-+dns_resolve_server_name_to_ip_51632 dns_resolve_server_name_to_ip 0 51632 NULL
++extent_fiemap_51621 extent_fiemap 3 51621 NULL
 +sctp_auth_create_key_51641 sctp_auth_create_key 1 51641 NULL
 +iscsi_create_session_51647 iscsi_create_session 3 51647 NULL
 +get_new_cssid_51665 get_new_cssid 2 51665 NULL
 +ps_upsd_utilization_read_51669 ps_upsd_utilization_read 3 51669 NULL
 +sctp_setsockopt_associnfo_51684 sctp_setsockopt_associnfo 3 51684 NULL
-+sfi_sysfs_install_table_51688 sfi_sysfs_install_table 1 51688 NULL
 +host_mapping_level_51696 host_mapping_level 2 51696 NULL
 +sel_write_access_51704 sel_write_access 3 51704 NULL
 +tty_cdev_add_51714 tty_cdev_add 2-4 51714 NULL
 +v9fs_alloc_rdir_buf_51716 v9fs_alloc_rdir_buf 2 51716 NULL
 +drm_compat_ioctl_51717 drm_compat_ioctl 2 51717 NULL
 +sg_read_oxfer_51724 sg_read_oxfer 3 51724 NULL
-+hid_parse_report_51737 hid_parse_report 3 51737 NULL
-+get_user_pages_fast_51751 get_user_pages_fast 0-1-2 51751 NULL
++dbg_check_lpt_nodes_51727 dbg_check_lpt_nodes 0 51727 NULL
++cm4040_read_51732 cm4040_read 3 51732 NULL
++get_user_pages_fast_51751 get_user_pages_fast 1-2-0 51751 NULL
 +ifx_spi_insert_flip_string_51752 ifx_spi_insert_flip_string 3 51752 NULL
 +if_write_51756 if_write 3 51756 NULL
-+ioremap_prot_51764 ioremap_prot 1-2 51764 NULL
-+iio_buffer_add_channel_sysfs_51766 iio_buffer_add_channel_sysfs 0 51766 NULL
-+to_ratio_51809 to_ratio 2-1 51809 NULL
++ext4_ext_create_new_leaf_51763 ext4_ext_create_new_leaf 0 51763 NULL
++__fswab32_51781 __fswab32 0 51781 NULL
++to_ratio_51809 to_ratio 1-2 51809 NULL
 +qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
 +buffer_from_user_51826 buffer_from_user 3 51826 NULL
++max732x_irq_pending_51840 max732x_irq_pending 0 51840 NULL
 +ioread32_51847 ioread32 0 51847 NULL nohasharray
 +read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3 51847 &ioread32_51847
 +do_readv_writev_51849 do_readv_writev 4 51849 NULL
 +SYSC_sendto_51852 SYSC_sendto 6 51852 NULL
++bm_page_io_async_51858 bm_page_io_async 2 51858 NULL
 +pointer_size_read_51863 pointer_size_read 3 51863 NULL
 +mlx4_alloc_db_from_pgdir_51865 mlx4_alloc_db_from_pgdir 3 51865 NULL
 +get_indirect_ea_51869 get_indirect_ea 4 51869 NULL
 +user_read_51881 user_read 3 51881 NULL
-+memblock_alloc_51884 memblock_alloc 1-2 51884 NULL
 +dbAdjCtl_51888 dbAdjCtl 0 51888 NULL
 +SyS_mq_timedsend_51896 SyS_mq_timedsend 3 51896 NULL nohasharray
 +virt_to_phys_51896 virt_to_phys 0 51896 &SyS_mq_timedsend_51896
++commit_fs_roots_51898 commit_fs_roots 0 51898 NULL
 +wmi_set_ie_51919 wmi_set_ie 3 51919 NULL
 +dbg_status_buf_51930 dbg_status_buf 2 51930 NULL
 +__tcp_mtu_to_mss_51938 __tcp_mtu_to_mss 0-2 51938 NULL
@@ -107679,11 +108489,14 @@ index 0000000..9a7096d
 +scsi_get_vpd_page_51951 scsi_get_vpd_page 4 51951 NULL
 +arizona_free_irq_51969 arizona_free_irq 2 51969 NULL nohasharray
 +snd_mask_min_51969 snd_mask_min 0 51969 &arizona_free_irq_51969
++__blkdev_get_51972 __blkdev_get 0 51972 NULL nohasharray
++read_page_51972 read_page 2 51972 &__blkdev_get_51972
++get_zone_51981 get_zone 0-1 51981 NULL
 +ath6kl_sdio_alloc_prep_scat_req_51986 ath6kl_sdio_alloc_prep_scat_req 2 51986 NULL
++_c4iw_write_mem_dma_51991 _c4iw_write_mem_dma 3 51991 NULL
 +dwc3_mode_write_51997 dwc3_mode_write 3 51997 NULL
 +skb_copy_datagram_from_iovec_52014 skb_copy_datagram_from_iovec 4-2-5 52014 NULL
 +rdmalt_52022 rdmalt 0 52022 NULL
-+vxge_rx_alloc_52024 vxge_rx_alloc 3 52024 NULL
 +override_release_52032 override_release 2 52032 NULL
 +end_port_52042 end_port 0 52042 NULL
 +dma_rx_errors_read_52045 dma_rx_errors_read 3 52045 NULL
@@ -107692,181 +108505,224 @@ index 0000000..9a7096d
 +__fuse_request_alloc_52060 __fuse_request_alloc 1 52060 NULL
 +isofs_readpages_52067 isofs_readpages 4 52067 NULL
 +nsm_get_handle_52089 nsm_get_handle 4 52089 NULL
++ulist_add_merge_52096 ulist_add_merge 0 52096 NULL
 +o2net_debug_read_52105 o2net_debug_read 3 52105 NULL
-+smsdvb_stats_read_52114 smsdvb_stats_read 3 52114 NULL
++split_scan_timeout_write_52128 split_scan_timeout_write 3 52128 NULL
 +retry_count_read_52129 retry_count_read 3 52129 NULL
-+zram_meta_alloc_52140 zram_meta_alloc 1 52140 NULL
++snd_pcm_channel_info_user_52135 snd_pcm_channel_info_user 0 52135 NULL
++gdm_usb_hci_send_52138 gdm_usb_hci_send 3 52138 NULL
++sub_alloc_52140 sub_alloc 0 52140 NULL nohasharray
++zram_meta_alloc_52140 zram_meta_alloc 1 52140 &sub_alloc_52140
 +hysdn_conf_write_52145 hysdn_conf_write 3 52145 NULL nohasharray
-+ext2_alloc_blocks_52145 ext2_alloc_blocks 2 52145 &hysdn_conf_write_52145
++ext2_alloc_blocks_52145 ext2_alloc_blocks 2-0 52145 &hysdn_conf_write_52145
 +htable_size_52148 htable_size 0-1 52148 NULL
-+smk_write_load2_52155 smk_write_load2 3 52155 NULL nohasharray
-+__le16_to_cpup_52155 __le16_to_cpup 0 52155 &smk_write_load2_52155
-+alix_present_52165 alix_present 1 52165 NULL
++smk_write_load2_52155 smk_write_load2 3 52155 NULL
 +ieee80211_if_read_dot11MeshRetryTimeout_52168 ieee80211_if_read_dot11MeshRetryTimeout 3 52168 NULL
 +mga_compat_ioctl_52170 mga_compat_ioctl 2 52170 NULL
 +print_prefix_52176 print_prefix 0 52176 NULL
 +proc_pid_readlink_52186 proc_pid_readlink 3 52186 NULL
-+vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 5-6 52216 NULL
++vmci_qp_broker_alloc_52216 vmci_qp_broker_alloc 6-5 52216 NULL
 +do_dmabuf_dirty_ldu_52241 do_dmabuf_dirty_ldu 6 52241 NULL
-+fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL
++fuse_request_alloc_52243 fuse_request_alloc 1 52243 NULL nohasharray
++xfs_iomap_eof_align_last_fsb_52243 xfs_iomap_eof_align_last_fsb 3 52243 &fuse_request_alloc_52243
++ocfs2_try_to_merge_extent_52244 ocfs2_try_to_merge_extent 0 52244 NULL
 +pm80x_request_irq_52250 pm80x_request_irq 2 52250 NULL
 +mdiobus_alloc_size_52259 mdiobus_alloc_size 1 52259 NULL
 +shrink_slab_52261 shrink_slab 2-3 52261 NULL
 +hva_to_pfn_slow_52262 hva_to_pfn_slow 1 52262 NULL
 +sisusbcon_do_font_op_52271 sisusbcon_do_font_op 9 52271 NULL
-+atomic64_read_52300 atomic64_read 0 52300 NULL
-+ath6kl_wmi_get_new_buf_52304 ath6kl_wmi_get_new_buf 1 52304 NULL
++handle_supp_msgs_52284 handle_supp_msgs 4 52284 NULL
++kobject_set_name_vargs_52309 kobject_set_name_vargs 0 52309 NULL
 +read_file_reset_52310 read_file_reset 3 52310 NULL
-+request_asymmetric_key_52317 request_asymmetric_key 2-4 52317 NULL
++request_asymmetric_key_52317 request_asymmetric_key 4-2 52317 NULL
 +hwflags_read_52318 hwflags_read 3 52318 NULL
-+ntfs_rl_split_52328 ntfs_rl_split 2-4 52328 NULL
++snd_pcm_hw_free_52327 snd_pcm_hw_free 0 52327 NULL
++ntfs_rl_split_52328 ntfs_rl_split 4-2 52328 NULL
 +test_unaligned_bulk_52333 test_unaligned_bulk 3 52333 NULL
-+compat_SyS_preadv64_52351 compat_SyS_preadv64 3 52351 NULL
++hur_len_52339 hur_len 0 52339 NULL
 +bytes_to_frames_52362 bytes_to_frames 0-2 52362 NULL
 +copy_entries_to_user_52367 copy_entries_to_user 1 52367 NULL
++iwl_dump_fh_52371 iwl_dump_fh 0 52371 NULL
++hfsplus_find_attr_52374 hfsplus_find_attr 0 52374 NULL
++ocfs2_journal_access_eb_52377 ocfs2_journal_access_eb 0 52377 NULL
 +mq_emit_config_values_52378 mq_emit_config_values 3 52378 NULL
 +isdn_writebuf_stub_52383 isdn_writebuf_stub 4 52383 NULL
 +jfs_setxattr_52389 jfs_setxattr 4 52389 NULL
-+aer_inject_write_52399 aer_inject_write 3 52399 NULL
-+aac_rx_ioremap_52410 aac_rx_ioremap 2 52410 NULL
++aer_inject_write_52399 aer_inject_write 3 52399 NULL nohasharray
++cl_page_own_52399 cl_page_own 0 52399 &aer_inject_write_52399
 +cgroup_file_write_52417 cgroup_file_write 3 52417 NULL
 +line6_midibuf_init_52425 line6_midibuf_init 2 52425 NULL
++hso_serial_common_create_52428 hso_serial_common_create 4 52428 NULL
 +delay_status_52431 delay_status 5 52431 NULL
++ath6kl_delete_qos_write_52435 ath6kl_delete_qos_write 3 52435 NULL
 +ieee80211_if_fmt_num_sta_ps_52438 ieee80211_if_fmt_num_sta_ps 3 52438 NULL
-+nl80211_send_mgmt_tx_status_52445 nl80211_send_mgmt_tx_status 5 52445 NULL
-+ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1-2 52477 NULL
++acpi_nvs_for_each_region_52448 acpi_nvs_for_each_region 0 52448 NULL
++alauda_read_data_52452 alauda_read_data 3 52452 NULL
++ieee80211_alloc_txb_52477 ieee80211_alloc_txb 1 52477 NULL
++usb_tranzport_write_52479 usb_tranzport_write 3 52479 NULL
 +ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 3-4 52483 NULL
-+fd_do_rw_52495 fd_do_rw 3 52495 NULL nohasharray
-+skb_cow_head_52495 skb_cow_head 2 52495 &fd_do_rw_52495
-+qib_user_sdma_pin_pages_52498 qib_user_sdma_pin_pages 3-5 52498 NULL
++fd_do_rw_52495 fd_do_rw 3 52495 NULL
++qib_user_sdma_pin_pages_52498 qib_user_sdma_pin_pages 3-5-4 52498 NULL
 +int_tasklet_entry_52500 int_tasklet_entry 3 52500 NULL
-+qlcnic_83xx_sysfs_flash_write_52507 qlcnic_83xx_sysfs_flash_write 4 52507 NULL
++lmv_get_easize_52504 lmv_get_easize 0 52504 NULL
 +pm_qos_power_write_52513 pm_qos_power_write 3 52513 NULL
++bt_sock_stream_recvmsg_52518 bt_sock_stream_recvmsg 4 52518 NULL
 +dup_variable_bug_52525 dup_variable_bug 3 52525 NULL
++raw_recvmsg_52529 raw_recvmsg 4 52529 NULL
 +from_oblock_52546 from_oblock 0-1 52546 NULL
 +dccpprobe_read_52549 dccpprobe_read 3 52549 NULL
 +ocfs2_make_right_split_rec_52562 ocfs2_make_right_split_rec 3 52562 NULL
-+emit_code_52583 emit_code 0-3 52583 NULL
++debug_level_proc_write_52572 debug_level_proc_write 3 52572 NULL
 +isku_sysfs_read_macro_52587 isku_sysfs_read_macro 6 52587 NULL
++snd_pcm_sw_params_52594 snd_pcm_sw_params 0 52594 NULL
 +SyS_setsockopt_52610 SyS_setsockopt 5 52610 NULL
++ll_sa_entry_alloc_52611 ll_sa_entry_alloc 4 52611 NULL
++affs_set_blocksize_52625 affs_set_blocksize 2 52625 NULL
 +tps80031_writes_52638 tps80031_writes 3-4 52638 NULL
 +brcmf_sdio_assert_info_52653 brcmf_sdio_assert_info 4 52653 NULL
++perf_trace_sched_stat_template_52656 perf_trace_sched_stat_template 3 52656 NULL
++nvme_queue_extra_52661 nvme_queue_extra 0-1 52661 NULL
++htb_add_class_to_row_52663 htb_add_class_to_row 3 52663 NULL
++posix_acl_equiv_mode_52666 posix_acl_equiv_mode 0 52666 NULL
 +SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL
++ntfs_get_nr_significant_bytes_52688 ntfs_get_nr_significant_bytes 0 52688 NULL
 +nvd0_disp_pioc_create__52693 nvd0_disp_pioc_create_ 5 52693 NULL
++vendorextnWriteSection_52698 vendorextnWriteSection 0 52698 NULL
 +nouveau_client_create__52715 nouveau_client_create_ 5 52715 NULL
++__dm_stat_bio_52722 __dm_stat_bio 3 52722 NULL
 +cx25840_ir_rx_read_52724 cx25840_ir_rx_read 3 52724 NULL
-+blkcipher_next_slow_52733 blkcipher_next_slow 3-4 52733 NULL
++blkcipher_next_slow_52733 blkcipher_next_slow 4-3 52733 NULL
 +relay_alloc_page_array_52735 relay_alloc_page_array 1 52735 NULL
++hfcsusb_rx_frame_52745 hfcsusb_rx_frame 3 52745 NULL
 +carl9170_debugfs_vif_dump_read_52755 carl9170_debugfs_vif_dump_read 3 52755 NULL
 +ieee80211_if_read_beacon_timeout_52756 ieee80211_if_read_beacon_timeout 3 52756 NULL
-+copy_ctr_args_52761 copy_ctr_args 2 52761 NULL
++radeon_get_ib_value_52757 radeon_get_ib_value 0 52757 NULL
++nvme_trans_ext_inq_page_52776 nvme_trans_ext_inq_page 3 52776 NULL
 +pwr_rcvd_beacons_read_52836 pwr_rcvd_beacons_read 3 52836 NULL
++map_try_harder_52846 map_try_harder 2-3 52846 NULL
 +ext2_xattr_set_acl_52857 ext2_xattr_set_acl 4 52857 NULL
-+mon_bin_get_event_52863 mon_bin_get_event 4 52863 NULL
++process_deleted_xattr_52861 process_deleted_xattr 0 52861 NULL
++mon_bin_get_event_52863 mon_bin_get_event 6-4 52863 NULL
++twl6030_gpadc_write_52867 twl6030_gpadc_write 1 52867 NULL
++qib_decode_6120_err_52876 qib_decode_6120_err 3 52876 NULL
 +twlreg_write_52880 twlreg_write 3 52880 NULL
 +pvr2_ctrl_value_to_sym_internal_52881 pvr2_ctrl_value_to_sym_internal 5 52881 NULL
 +cache_read_procfs_52882 cache_read_procfs 3 52882 NULL
 +kvm_kvzalloc_52894 kvm_kvzalloc 1 52894 NULL
 +arizona_request_irq_52908 arizona_request_irq 2 52908 NULL
++create_vtbl_52909 create_vtbl 0 52909 NULL
++dio_bio_reap_52913 dio_bio_reap 0 52913 NULL
 +__kfifo_out_peek_r_52919 __kfifo_out_peek_r 3 52919 NULL
-+iblock_get_bio_52936 iblock_get_bio 3 52936 NULL nohasharray
-+__iio_device_attr_init_52936 __iio_device_attr_init 0 52936 &iblock_get_bio_52936
++iblock_get_bio_52936 iblock_get_bio 3 52936 NULL
 +__nodes_remap_52951 __nodes_remap 5 52951 NULL
 +send_packet_52960 send_packet 4 52960 NULL
 +ieee80211_if_fmt_fwded_mcast_52961 ieee80211_if_fmt_fwded_mcast 3 52961 NULL
-+hx8357_spi_write_then_read_52964 hx8357_spi_write_then_read 3 52964 NULL nohasharray
-+compat_sock_ioctl_52964 compat_sock_ioctl 3 52964 &hx8357_spi_write_then_read_52964
 +tx_tx_exch_read_52986 tx_tx_exch_read 3 52986 NULL
 +num_node_state_52989 num_node_state 0 52989 NULL
-+batadv_check_management_packet_52993 batadv_check_management_packet 3 52993 NULL
 +efivarfs_file_write_53000 efivarfs_file_write 3 53000 NULL
++uasp_alloc_stream_res_53015 uasp_alloc_stream_res 0 53015 NULL
 +btrfs_free_and_pin_reserved_extent_53016 btrfs_free_and_pin_reserved_extent 2 53016 NULL
 +tx_tx_exch_pending_read_53018 tx_tx_exch_pending_read 3 53018 NULL
 +ext4_meta_bg_first_group_53031 ext4_meta_bg_first_group 0-2 53031 NULL
++ocfs2_new_leaf_refcount_block_53036 ocfs2_new_leaf_refcount_block 0 53036 NULL
 +bio_cur_bytes_53037 bio_cur_bytes 0 53037 NULL
 +regcache_lzo_block_count_53056 regcache_lzo_block_count 0 53056 NULL
 +cfi_read_query_53066 cfi_read_query 0 53066 NULL
++iwl_dbgfs_interrupt_write_53069 iwl_dbgfs_interrupt_write 3 53069 NULL
 +mwifiex_debug_read_53074 mwifiex_debug_read 3 53074 NULL
++page_to_nid_53085 page_to_nid 0 53085 NULL
 +qib_resize_cq_53090 qib_resize_cq 2 53090 NULL
++insert_new_root_53097 insert_new_root 0 53097 NULL
 +verity_status_53120 verity_status 5 53120 NULL
++__copy_from_user_ll_nocache_nozero_53123 __copy_from_user_ll_nocache_nozero 0-3 53123 NULL
 +brcmf_usb_dl_cmd_53130 brcmf_usb_dl_cmd 4 53130 NULL
++btrfs_search_forward_53137 btrfs_search_forward 0 53137 NULL
 +ps_poll_ps_poll_max_ap_turn_read_53140 ps_poll_ps_poll_max_ap_turn_read 3 53140 NULL
 +ieee80211_bss_info_update_53170 ieee80211_bss_info_update 4 53170 NULL
 +btrfs_io_bio_alloc_53179 btrfs_io_bio_alloc 2 53179 NULL
 +clear_capture_buf_53192 clear_capture_buf 2 53192 NULL
++SyS_init_module_53202 SyS_init_module 2 53202 NULL
 +mtdoops_erase_block_53206 mtdoops_erase_block 2 53206 NULL
 +fixup_user_fault_53210 fixup_user_fault 3 53210 NULL
 +tx_tx_start_data_read_53219 tx_tx_start_data_read 3 53219 NULL
-+rbd_obj_method_sync_53252 rbd_obj_method_sync 8 53252 NULL
++ptlrpc_lprocfs_req_history_max_seq_write_53243 ptlrpc_lprocfs_req_history_max_seq_write 3 53243 NULL
++hfsplus_xattr_set_posix_acl_53249 hfsplus_xattr_set_posix_acl 4 53249 NULL
 +xfs_trans_read_buf_map_53258 xfs_trans_read_buf_map 5 53258 NULL
 +wil_write_file_ssid_53266 wil_write_file_ssid 3 53266 NULL
 +btrfs_file_extent_num_bytes_53269 btrfs_file_extent_num_bytes 0 53269 NULL
-+isku_sysfs_write_key_mask_53305 isku_sysfs_write_key_mask 6 53305 NULL
-+batadv_interface_rx_53325 batadv_interface_rx 4 53325 NULL
++tsk_fork_get_node_53271 tsk_fork_get_node 0 53271 NULL
++btrfs_find_highest_objectid_53284 btrfs_find_highest_objectid 0 53284 NULL
++setup_leaf_for_split_53312 setup_leaf_for_split 0 53312 NULL
++ftrace_profile_write_53327 ftrace_profile_write 3 53327 NULL
++setup_cluster_no_bitmap_53328 setup_cluster_no_bitmap 0 53328 NULL
 +gsm_control_reply_53333 gsm_control_reply 4 53333 NULL
 +vm_mmap_53339 vm_mmap 0 53339 NULL
++vendorextnIoctl_53350 vendorextnIoctl 0 53350 NULL nohasharray
++btrfs_find_all_roots_53350 btrfs_find_all_roots 0 53350 &vendorextnIoctl_53350
++read_6120_creg32_53363 read_6120_creg32 0 53363 NULL
 +sock_setbindtodevice_53369 sock_setbindtodevice 3 53369 NULL
 +get_random_bytes_arch_53370 get_random_bytes_arch 2 53370 NULL
-+iwl_pcie_txq_alloc_53413 iwl_pcie_txq_alloc 3 53413 NULL
++isolate_lru_page_53417 isolate_lru_page 0 53417 NULL
++i915_gem_execbuffer_relocate_object_53435 i915_gem_execbuffer_relocate_object 0 53435 NULL
 +isr_cmd_cmplt_read_53439 isr_cmd_cmplt_read 3 53439 NULL
 +mwifiex_info_read_53447 mwifiex_info_read 3 53447 NULL
 +apei_exec_run_optional_53452 apei_exec_run_optional 0 53452 NULL
-+acpi_tb_parse_root_table_53455 acpi_tb_parse_root_table 1 53455 NULL
-+n2_run_53459 n2_run 3 53459 NULL
 +paging64_prefetch_gpte_53468 paging64_prefetch_gpte 4 53468 NULL
-+rds_tcp_data_recv_53476 rds_tcp_data_recv 3 53476 NULL
 +iowarrior_read_53483 iowarrior_read 3 53483 NULL
 +osd_req_write_kern_53486 osd_req_write_kern 5 53486 NULL
 +do_verify_xattr_datum_53499 do_verify_xattr_datum 0 53499 NULL
++ext4_ext_grow_indepth_53503 ext4_ext_grow_indepth 0 53503 NULL
 +snd_pcm_format_physical_width_53505 snd_pcm_format_physical_width 0 53505 NULL
 +dbAllocNext_53506 dbAllocNext 0 53506 NULL
 +ocfs2_xattr_set_acl_53508 ocfs2_xattr_set_acl 4 53508 NULL
 +check_acl_53512 check_acl 0 53512 NULL
-+alloc_pages_exact_nid_53515 alloc_pages_exact_nid 2 53515 NULL
-+set_registers_53582 set_registers 3 53582 NULL nohasharray
-+SYSC_bind_53582 SYSC_bind 3 53582 &set_registers_53582
++send_utimes_53516 send_utimes 0 53516 NULL
++SYSC_bind_53582 SYSC_bind 3 53582 NULL
 +cifs_utf16_bytes_53593 cifs_utf16_bytes 0 53593 NULL
++proc_uid_map_write_53596 proc_uid_map_write 3 53596 NULL
 +gfn_to_pfn_async_53597 gfn_to_pfn_async 2 53597 NULL
-+___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1-2 53626 NULL
++pfkey_recvmsg_53604 pfkey_recvmsg 4 53604 NULL
++___alloc_bootmem_nopanic_53626 ___alloc_bootmem_nopanic 1 53626 NULL
 +xd_write_multiple_pages_53633 xd_write_multiple_pages 6-5 53633 NULL
-+ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 NULL
++stmpe_gpio_request_53634 stmpe_gpio_request 2 53634 NULL nohasharray
++ccid_getsockopt_builtin_ccids_53634 ccid_getsockopt_builtin_ccids 2 53634 &stmpe_gpio_request_53634
 +nr_sendmsg_53656 nr_sendmsg 4 53656 NULL
-+_preload_range_53676 _preload_range 2-3 53676 NULL
-+lowpan_fragment_xmit_53680 lowpan_fragment_xmit 3-4 53680 NULL
-+fuse_fill_write_pages_53682 fuse_fill_write_pages 4 53682 NULL
++fuse_fill_write_pages_53682 fuse_fill_write_pages 0-4 53682 NULL
 +v4l2_event_subscribe_53687 v4l2_event_subscribe 3 53687 NULL
-+igb_alloc_q_vector_53690 igb_alloc_q_vector 4-6 53690 NULL nohasharray
-+bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 &igb_alloc_q_vector_53690
++bdev_logical_block_size_53690 bdev_logical_block_size 0 53690 NULL nohasharray
++igb_alloc_q_vector_53690 igb_alloc_q_vector 6-4 53690 &bdev_logical_block_size_53690
 +find_overflow_devnum_53711 find_overflow_devnum 0 53711 NULL
 +bio_integrity_split_53714 bio_integrity_split 3 53714 NULL
 +__ocfs2_resv_find_window_53721 __ocfs2_resv_find_window 3 53721 NULL
++__proc_debug_mb_53732 __proc_debug_mb 5 53732 NULL
 +wdm_write_53735 wdm_write 3 53735 NULL
-+ext3_try_to_allocate_with_rsv_53737 ext3_try_to_allocate_with_rsv 5-3 53737 NULL
++ext3_try_to_allocate_with_rsv_53737 ext3_try_to_allocate_with_rsv 5-3-0 53737 NULL
 +da9052_disable_irq_53745 da9052_disable_irq 2 53745 NULL
-+amdtp_out_stream_get_max_payload_53755 amdtp_out_stream_get_max_payload 0 53755 NULL nohasharray
-+lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 &amdtp_out_stream_get_max_payload_53755
++lpfc_idiag_queacc_read_qe_53755 lpfc_idiag_queacc_read_qe 0-2 53755 NULL nohasharray
++amdtp_out_stream_get_max_payload_53755 amdtp_out_stream_get_max_payload 0 53755 &lpfc_idiag_queacc_read_qe_53755
 +ext2_acl_count_53773 ext2_acl_count 0-1 53773 NULL
 +__kfifo_dma_in_prepare_r_53792 __kfifo_dma_in_prepare_r 4-5 53792 NULL
-+qp_alloc_host_work_53798 qp_alloc_host_work 3-5 53798 NULL
-+__tty_alloc_driver_53799 __tty_alloc_driver 1 53799 NULL
++qp_alloc_host_work_53798 qp_alloc_host_work 5-3 53798 NULL
 +regmap_raw_write_53803 regmap_raw_write 2-4 53803 NULL
 +lpfc_idiag_ctlacc_read_reg_53809 lpfc_idiag_ctlacc_read_reg 0-3 53809 NULL
 +nls_nullsize_53815 nls_nullsize 0 53815 NULL
++insert_pfn_53816 insert_pfn 3-0 53816 NULL
++setup_data_read_53822 setup_data_read 3 53822 NULL
 +pms_read_53873 pms_read 3 53873 NULL
 +ieee80211_if_fmt_dropped_frames_congestion_53883 ieee80211_if_fmt_dropped_frames_congestion 3 53883 NULL
-+SyS_setgroups_53900 SyS_setgroups 1 53900 NULL nohasharray
-+ocfs2_rm_xattr_cluster_53900 ocfs2_rm_xattr_cluster 5-4-3 53900 &SyS_setgroups_53900
-+proc_file_read_53905 proc_file_read 3 53905 NULL
-+early_reserve_e820_53915 early_reserve_e820 1-2 53915 NULL
-+ocfs2_make_clusters_writable_53938 ocfs2_make_clusters_writable 4 53938 NULL
-+mthca_setup_cmd_doorbells_53954 mthca_setup_cmd_doorbells 2 53954 NULL
-+mlx4_num_eq_uar_53965 mlx4_num_eq_uar 0 53965 NULL
++ocfs2_rm_xattr_cluster_53900 ocfs2_rm_xattr_cluster 4-5-3 53900 NULL nohasharray
++SyS_setgroups_53900 SyS_setgroups 1 53900 &ocfs2_rm_xattr_cluster_53900
++azx_via_get_position_53916 azx_via_get_position 0 53916 NULL
++usb_serial_generic_write_53927 usb_serial_generic_write 4 53927 NULL
++ocfs2_make_clusters_writable_53938 ocfs2_make_clusters_writable 5-4-0 53938 NULL
 +idetape_chrdev_write_53976 idetape_chrdev_write 3 53976 NULL
 +mthca_reg_user_mr_53980 mthca_reg_user_mr 2-3 53980 NULL
 +__ocfs2_xattr_set_value_outside_53981 __ocfs2_xattr_set_value_outside 5 53981 NULL
 +ieee80211_if_fmt_dot11MeshHWMPperrMinInterval_53998 ieee80211_if_fmt_dot11MeshHWMPperrMinInterval 3 53998 NULL
-+snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 4-2-5 54018 NULL
-+cmpk_message_handle_tx_54024 cmpk_message_handle_tx 4 54024 NULL
++send_clone_54011 send_clone 0 54011 NULL
++hfsplus_attr_build_key_54013 hfsplus_attr_build_key 0 54013 NULL
++snd_pcm_lib_write_transfer_54018 snd_pcm_lib_write_transfer 5-2-4 54018 NULL
++mdc_kuc_write_54019 mdc_kuc_write 3 54019 NULL
 +ipxrtr_route_packet_54036 ipxrtr_route_packet 4 54036 NULL
 +pipeline_dec_packet_out_read_54052 pipeline_dec_packet_out_read 3 54052 NULL
 +nl80211_send_disconnected_54056 nl80211_send_disconnected 5 54056 NULL
@@ -107874,127 +108730,149 @@ index 0000000..9a7096d
 +btrfs_start_transaction_54066 btrfs_start_transaction 2 54066 NULL
 +_malloc_54077 _malloc 1 54077 NULL
 +bitmap_bitremap_54096 bitmap_bitremap 4 54096 NULL
-+altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL
-+create_xattr_54106 create_xattr 5 54106 NULL
-+inc_zcache_pers_zbytes_54107 inc_zcache_pers_zbytes 1 54107 NULL
++altera_set_ir_pre_54103 altera_set_ir_pre 2 54103 NULL nohasharray
++lustre_posix_acl_xattr_filter_54103 lustre_posix_acl_xattr_filter 2 54103 &altera_set_ir_pre_54103
++__comedi_buf_write_alloc_54112 __comedi_buf_write_alloc 0-2 54112 NULL
 +strn_len_54122 strn_len 0 54122 NULL
 +isku_receive_54130 isku_receive 4 54130 NULL
 +isr_host_acknowledges_read_54136 isr_host_acknowledges_read 3 54136 NULL
-+i2400m_zrealloc_2x_54166 i2400m_zrealloc_2x 3 54166 NULL nohasharray
-+memcpy_toiovec_54166 memcpy_toiovec 3 54166 &i2400m_zrealloc_2x_54166
++irq_blk_threshold_write_54138 irq_blk_threshold_write 3 54138 NULL
++memcpy_toiovec_54166 memcpy_toiovec 3 54166 NULL
 +nouveau_falcon_create__54169 nouveau_falcon_create_ 8 54169 NULL
-+acpi_os_read_memory_54186 acpi_os_read_memory 1-3 54186 NULL
-+SyS_ipc_54206 SyS_ipc 3 54206 NULL
++p9_client_prepare_req_54175 p9_client_prepare_req 3 54175 NULL
++devm_request_threaded_irq_54215 devm_request_threaded_irq 0 54215 NULL
++do_sys_poll_54221 do_sys_poll 2 54221 NULL
 +__register_chrdev_54223 __register_chrdev 2-3 54223 NULL
-+_format_mac_addr_54229 _format_mac_addr 2-0 54229 NULL
 +pi_read_regr_54231 pi_read_regr 0 54231 NULL
++mcp23s08_read_regs_54246 mcp23s08_read_regs 4 54246 NULL
 +reada_add_block_54247 reada_add_block 2 54247 NULL
-+xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 NULL
++write_file_spec_scan_ctl_54248 write_file_spec_scan_ctl 3 54248 NULL
++jbd2__journal_restart_54249 jbd2__journal_restart 0 54249 NULL
++barrier_all_devices_54254 barrier_all_devices 0 54254 NULL nohasharray
++xfs_dir2_sf_addname_hard_54254 xfs_dir2_sf_addname_hard 3 54254 &barrier_all_devices_54254
 +ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
 +wusb_prf_54261 wusb_prf 7 54261 NULL nohasharray
 +audio_write_54261 audio_write 4 54261 &wusb_prf_54261
 +mwifiex_getlog_read_54269 mwifiex_getlog_read 3 54269 NULL
++kstrtou16_from_user_54274 kstrtou16_from_user 2 54274 NULL
 +ubi_calc_data_len_54279 ubi_calc_data_len 0-3 54279 NULL
 +altera_set_dr_post_54291 altera_set_dr_post 2 54291 NULL
 +dlm_alloc_pagevec_54296 dlm_alloc_pagevec 1 54296 NULL
 +get_iovec_page_array_54298 get_iovec_page_array 6 54298 NULL
++ttm_mem_global_alloc_54299 ttm_mem_global_alloc 0 54299 NULL
++reclaim_pages_54301 reclaim_pages 3 54301 NULL
 +sprintf_54306 sprintf 0 54306 NULL
-+irq_domain_associate_many_54307 irq_domain_associate_many 2 54307 NULL
++bio_add_pc_page_54319 bio_add_pc_page 4 54319 NULL
 +br_fdb_fillbuf_54339 br_fdb_fillbuf 0 54339 NULL
 +__alloc_dev_table_54343 __alloc_dev_table 2 54343 NULL
-+_osd_realloc_seg_54352 _osd_realloc_seg 3 54352 NULL nohasharray
-+__get_free_pages_54352 __get_free_pages 0 54352 &_osd_realloc_seg_54352
++__get_free_pages_54352 __get_free_pages 0 54352 NULL
 +tcf_hash_create_54360 tcf_hash_create 4 54360 NULL
 +read_file_credit_dist_stats_54367 read_file_credit_dist_stats 3 54367 NULL
 +vfs_readlink_54368 vfs_readlink 3 54368 NULL
 +do_dccp_setsockopt_54377 do_dccp_setsockopt 5 54377 NULL nohasharray
 +intel_sdvo_write_cmd_54377 intel_sdvo_write_cmd 4 54377 &do_dccp_setsockopt_54377
-+ah_alloc_tmp_54378 ah_alloc_tmp 3-2 54378 NULL
-+gart_unmap_page_54379 gart_unmap_page 2-3 54379 NULL
-+snd_pcm_oss_read2_54387 snd_pcm_oss_read2 0-3 54387 NULL
-+i386_mmap_check_54388 i386_mmap_check 0 54388 NULL
-+__do_krealloc_54389 __do_krealloc 2 54389 NULL
++ah_alloc_tmp_54378 ah_alloc_tmp 2-3 54378 NULL
++gart_unmap_page_54379 gart_unmap_page 3-2 54379 NULL
++snd_pcm_oss_read2_54387 snd_pcm_oss_read2 3-0 54387 NULL
 +iwl_dbgfs_power_save_status_read_54392 iwl_dbgfs_power_save_status_read 3 54392 NULL
-+copy_gadget_strings_54417 copy_gadget_strings 2-3 54417 NULL
-+swiotlb_tbl_sync_single_54486 swiotlb_tbl_sync_single 2 54486 NULL
++efx_nic_describe_stats_54407 efx_nic_describe_stats 2 54407 NULL
++ll_ra_count_get_54410 ll_ra_count_get 3 54410 NULL
++copy_gadget_strings_54417 copy_gadget_strings 3-2 54417 NULL
++btrfs_inc_extent_ref_54442 btrfs_inc_extent_ref 0 54442 NULL
++sparse_early_mem_maps_alloc_node_54485 sparse_early_mem_maps_alloc_node 4 54485 NULL
 +simple_strtoull_54493 simple_strtoull 0 54493 NULL
-+swiotlb_tbl_map_single_54495 swiotlb_tbl_map_single 3-0 54495 NULL
++swiotlb_tbl_map_single_54495 swiotlb_tbl_map_single 0 54495 NULL
 +btrfs_ordered_sum_size_54509 btrfs_ordered_sum_size 0-2 54509 NULL
-+cgroup_write_X64_54514 cgroup_write_X64 5 54514 NULL nohasharray
-+xen_bus_to_phys_54514 xen_bus_to_phys 0 54514 &cgroup_write_X64_54514
++cgroup_write_X64_54514 cgroup_write_X64 5 54514 NULL
 +rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL
 +vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4 54525 NULL
 +viacam_read_54526 viacam_read 3 54526 NULL
 +unix_dgram_connect_54535 unix_dgram_connect 3 54535 NULL
 +setsockopt_54539 setsockopt 5 54539 NULL
-+mwifiex_usb_submit_rx_urb_54558 mwifiex_usb_submit_rx_urb 2 54558 NULL
-+SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 NULL
++i915_reset_gen7_sol_offsets_54547 i915_reset_gen7_sol_offsets 0 54547 NULL
++lbs_lowsnr_write_54549 lbs_lowsnr_write 3 54549 NULL
++i915_gem_get_seqno_54555 i915_gem_get_seqno 0 54555 NULL
++btrfs_update_inode_item_54561 btrfs_update_inode_item 0 54561 NULL nohasharray
++SYSC_setsockopt_54561 SYSC_setsockopt 5 54561 &btrfs_update_inode_item_54561
 +nfsd_vfs_write_54577 nfsd_vfs_write 6 54577 NULL
 +fw_iso_buffer_init_54582 fw_iso_buffer_init 3 54582 NULL
 +nvme_npages_54601 nvme_npages 0-1 54601 NULL
-+fwSendNullPacket_54618 fwSendNullPacket 2 54618 NULL
++irq_pkt_threshold_write_54605 irq_pkt_threshold_write 3 54605 NULL
++devm_gen_pool_create_54607 devm_gen_pool_create 3 54607 NULL
++port_fops_write_54627 port_fops_write 3 54627 NULL
 +irq_timeout_read_54653 irq_timeout_read 3 54653 NULL
 +dns_resolver_read_54658 dns_resolver_read 3 54658 NULL
 +twl6030_interrupt_mask_54659 twl6030_interrupt_mask 2 54659 NULL
 +kvm_read_cr3_54662 kvm_read_cr3 0 54662 NULL
++bus_add_device_54665 bus_add_device 0 54665 NULL
++cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL
 +bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
 +vring_new_virtqueue_54673 vring_new_virtqueue 2 54673 NULL
 +evm_read_key_54674 evm_read_key 3 54674 NULL
-+resource_string_54699 resource_string 0 54699 NULL
++fs_path_add_path_54680 fs_path_add_path 0 54680 NULL
 +platform_get_irq_byname_54700 platform_get_irq_byname 0 54700 NULL
-+rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL nohasharray
-+compat_SyS_readv_54711 compat_SyS_readv 3 54711 &rfkill_fop_read_54711
-+_add_sg_continuation_descriptor_54721 _add_sg_continuation_descriptor 3 54721 NULL
++__btrfs_inc_extent_ref_54706 __btrfs_inc_extent_ref 7-0 54706 NULL
++rfkill_fop_read_54711 rfkill_fop_read 3 54711 NULL
++clk_divider_set_rate_54726 clk_divider_set_rate 3-2 54726 NULL
 +ocfs2_control_write_54737 ocfs2_control_write 3 54737 NULL
 +kzalloc_54740 kzalloc 1 54740 NULL
 +wep_iv_read_54744 wep_iv_read 3 54744 NULL
++lpfc_idiag_pcicfg_write_54749 lpfc_idiag_pcicfg_write 3 54749 NULL
 +iio_event_chrdev_read_54757 iio_event_chrdev_read 3 54757 NULL
-+batadv_iv_ogm_aggregate_new_54761 batadv_iv_ogm_aggregate_new 2 54761 NULL
 +adis16480_show_firmware_date_54762 adis16480_show_firmware_date 3 54762 NULL
++ldsem_atomic_update_54774 ldsem_atomic_update 1-0 54774 NULL
++gpiochip_add_54781 gpiochip_add 0 54781 NULL
 +flexcop_device_kmalloc_54793 flexcop_device_kmalloc 1 54793 NULL
 +domain_init_54797 domain_init 2 54797 NULL
 +ext3_find_goal_54801 ext3_find_goal 0 54801 NULL
 +get_dev_size_54807 get_dev_size 0 54807 NULL
 +nfsd_write_54809 nfsd_write 6 54809 NULL
 +aes_decrypt_fail_read_54815 aes_decrypt_fail_read 3 54815 NULL nohasharray
-+crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &aes_decrypt_fail_read_54815
++kvzalloc_54815 kvzalloc 1 54815 &aes_decrypt_fail_read_54815 nohasharray
++crypto_tfm_ctx_alignment_54815 crypto_tfm_ctx_alignment 0 54815 &kvzalloc_54815
 +generic_perform_write_54832 generic_perform_write 3 54832 NULL
 +write_rio_54837 write_rio 3 54837 NULL
-+ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 NULL nohasharray
-+nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 &ext3_acl_from_disk_54839
++nouveau_engctx_create__54839 nouveau_engctx_create_ 8 54839 NULL nohasharray
++ext3_acl_from_disk_54839 ext3_acl_from_disk 2 54839 &nouveau_engctx_create__54839
 +ufx_ops_write_54848 ufx_ops_write 3 54848 NULL
 +printer_read_54851 printer_read 3 54851 NULL
 +qib_reg_user_mr_54858 qib_reg_user_mr 2-3 54858 NULL
 +alloc_ep_req_54860 alloc_ep_req 2 54860 NULL
 +broadsheet_spiflash_rewrite_sector_54864 broadsheet_spiflash_rewrite_sector 2 54864 NULL
 +prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL
-+tcf_csum_ipv6_tcp_54877 tcf_csum_ipv6_tcp 4 54877 NULL
-+iscsi_pool_init_54913 iscsi_pool_init 2-4 54913 NULL
++iscsi_pool_init_54913 iscsi_pool_init 4-2 54913 NULL nohasharray
++kobject_set_name_vargs_54913 kobject_set_name_vargs 0 54913 &iscsi_pool_init_54913
 +btrfs_stack_chunk_num_stripes_54923 btrfs_stack_chunk_num_stripes 0 54923 NULL
++bio_add_page_54933 bio_add_page 0-3 54933 NULL
 +mxms_structlen_54939 mxms_structlen 0 54939 NULL
 +add_port_54941 add_port 2 54941 NULL
-+virtblk_add_buf_wait_54943 virtblk_add_buf_wait 3-4 54943 NULL
-+wl12xx_cmd_build_probe_req_54946 wl12xx_cmd_build_probe_req 6-8 54946 NULL
 +ath9k_dump_btcoex_54949 ath9k_dump_btcoex 0 54949 NULL
++alauda_write_data_54967 alauda_write_data 3 54967 NULL
 +c4_add_card_54968 c4_add_card 3 54968 NULL
 +iwl_pcie_dump_fh_54975 iwl_pcie_dump_fh 0 54975 NULL
-+__proc_file_read_54978 __proc_file_read 3 54978 NULL
++ubi_change_vtbl_record_54979 ubi_change_vtbl_record 0 54979 NULL
 +ext3_xattr_get_54989 ext3_xattr_get 0 54989 NULL
-+Bus_to_Virtual_54991 Bus_to_Virtual 1 54991 NULL
++rds_ib_inc_copy_to_user_55007 rds_ib_inc_copy_to_user 3 55007 NULL
 +mem_cgroup_get_lru_size_55008 mem_cgroup_get_lru_size 0 55008 NULL
 +cx231xx_v4l2_read_55014 cx231xx_v4l2_read 3 55014 NULL
 +paging32_get_level1_sp_gpa_55022 paging32_get_level1_sp_gpa 0 55022 NULL
 +error_error_null_Frame_tx_start_read_55024 error_error_null_Frame_tx_start_read 3 55024 NULL
-+__netdev_alloc_skb_ip_align_55067 __netdev_alloc_skb_ip_align 2 55067 NULL
++dgap_do_bios_load_55025 dgap_do_bios_load 3 55025 NULL
++btrfs_init_acl_55028 btrfs_init_acl 0 55028 NULL
++write_ctree_super_55039 write_ctree_super 0 55039 NULL
++ext4_ext_handle_uninitialized_extents_55059 ext4_ext_handle_uninitialized_extents 0-6 55059 NULL
 +apei_exec_run_55075 apei_exec_run 0 55075 NULL
 +bitmap_storage_alloc_55077 bitmap_storage_alloc 2 55077 NULL
-+hx8357_spi_write_array_55095 hx8357_spi_write_array 3 55095 NULL
++snd_pcm_capture_hw_avail_55086 snd_pcm_capture_hw_avail 0 55086 NULL nohasharray
++read_dma_55086 read_dma 3 55086 &snd_pcm_capture_hw_avail_55086
 +rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read_55106 rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 NULL
-+corrupt_data_55120 corrupt_data 0 55120 NULL
++corrupt_data_55120 corrupt_data 0-3 55120 NULL
 +crypto_ahash_setkey_55134 crypto_ahash_setkey 3 55134 NULL
-+ocfs2_prepare_refcount_change_for_del_55137 ocfs2_prepare_refcount_change_for_del 3 55137 NULL nohasharray
++ocfs2_prepare_refcount_change_for_del_55137 ocfs2_prepare_refcount_change_for_del 3-0 55137 NULL nohasharray
 +filldir_55137 filldir 3 55137 &ocfs2_prepare_refcount_change_for_del_55137
++validate_vid_hdr_55145 validate_vid_hdr 0 55145 NULL
 +ocfs2_truncate_file_55148 ocfs2_truncate_file 3 55148 NULL
++npages_to_npools_55149 npages_to_npools 0-1 55149 NULL
 +ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3 55150 NULL
 +mtd_get_fact_prot_info_55186 mtd_get_fact_prot_info 0 55186 NULL
 +sel_write_relabel_55195 sel_write_relabel 3 55195 NULL
@@ -108003,528 +108881,594 @@ index 0000000..9a7096d
 +__kfifo_dma_out_prepare_r_55211 __kfifo_dma_out_prepare_r 4-5 55211 NULL
 +do_raw_setsockopt_55215 do_raw_setsockopt 5 55215 NULL
 +qxl_alloc_client_monitors_config_55216 qxl_alloc_client_monitors_config 2 55216 NULL
-+nouveau_mc_create__55217 nouveau_mc_create_ 4 55217 NULL
-+dump_command_55220 dump_command 1 55220 NULL
 +dbAllocDmap_55227 dbAllocDmap 0 55227 NULL
-+tipc_port_reject_sections_55229 tipc_port_reject_sections 5 55229 NULL
 +hash_netport6_expire_55232 hash_netport6_expire 3 55232 NULL
-+register_unifi_sdio_55239 register_unifi_sdio 2 55239 NULL
 +memcpy_fromiovec_55247 memcpy_fromiovec 3 55247 NULL
-+persistent_ram_new_55286 persistent_ram_new 1-2 55286 NULL
-+ptrace_request_55288 ptrace_request 3-4 55288 NULL
++lbs_failcount_write_55276 lbs_failcount_write 3 55276 NULL
++persistent_ram_new_55286 persistent_ram_new 2-1 55286 NULL
++ptrace_request_55288 ptrace_request 3 55288 NULL
 +rx_streaming_interval_read_55291 rx_streaming_interval_read 3 55291 NULL
++lov_get_stripecnt_55297 lov_get_stripecnt 0-3 55297 NULL
 +gsm_control_modem_55303 gsm_control_modem 3 55303 NULL
-+qp_alloc_guest_work_55305 qp_alloc_guest_work 3-5 55305 NULL nohasharray
-+__get_vm_area_node_55305 __get_vm_area_node 1 55305 &qp_alloc_guest_work_55305
++wimax_msg_len_55304 wimax_msg_len 0 55304 NULL
++__get_vm_area_node_55305 __get_vm_area_node 6 55305 NULL nohasharray
++qp_alloc_guest_work_55305 qp_alloc_guest_work 5-3 55305 &__get_vm_area_node_55305
++__vxge_hw_vpath_initialize_55328 __vxge_hw_vpath_initialize 2 55328 NULL
 +do_shmat_55336 do_shmat 5 55336 NULL
 +vme_user_read_55338 vme_user_read 3 55338 NULL
-+__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 NULL nohasharray
-+sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 &__wa_xfer_setup_sizes_55342
-+__memblock_alloc_base_55359 __memblock_alloc_base 1-2 55359 NULL
-+acpi_system_read_event_55362 acpi_system_read_event 3 55362 NULL
-+nf_nat_ipv4_manip_pkt_55387 nf_nat_ipv4_manip_pkt 2 55387 NULL
++sctp_datamsg_from_user_55342 sctp_datamsg_from_user 4 55342 NULL nohasharray
++__wa_xfer_setup_sizes_55342 __wa_xfer_setup_sizes 0 55342 &sctp_datamsg_from_user_55342
++iterate_inode_extrefs_55362 iterate_inode_extrefs 0 55362 NULL nohasharray
++acpi_system_read_event_55362 acpi_system_read_event 3 55362 &iterate_inode_extrefs_55362
++cw1200_sdio_align_size_55391 cw1200_sdio_align_size 2 55391 NULL
++__domain_mapping_55393 __domain_mapping 5 55393 NULL
 +iwl_dbgfs_plcp_delta_read_55407 iwl_dbgfs_plcp_delta_read 3 55407 NULL
 +si476x_radio_read_rds_blckcnt_blob_55427 si476x_radio_read_rds_blckcnt_blob 3 55427 NULL
-+alloc_skb_55439 alloc_skb 1 55439 NULL
++SyS_read_55449 SyS_read 3 55449 NULL
++add_relation_rb_55451 add_relation_rb 0 55451 NULL
 +__vxge_hw_channel_allocate_55462 __vxge_hw_channel_allocate 3 55462 NULL
-+isdnhdlc_decode_55466 isdnhdlc_decode 0 55466 NULL
 +cx23888_ir_rx_read_55473 cx23888_ir_rx_read 3 55473 NULL
-+batadv_unicast_push_and_fill_skb_55474 batadv_unicast_push_and_fill_skb 2 55474 NULL
 +snd_pcm_lib_write_55483 snd_pcm_lib_write 0-3 55483 NULL
 +i2o_pool_alloc_55485 i2o_pool_alloc 4 55485 NULL
-+ocfs2_rec_clusters_55501 ocfs2_rec_clusters 0 55501 NULL
++ocfs2_rec_clusters_55501 ocfs2_rec_clusters 0 55501 NULL nohasharray
++ras_stride_increase_window_55501 ras_stride_increase_window 3 55501 &ocfs2_rec_clusters_55501
 +ext4_flex_bg_size_55502 ext4_flex_bg_size 0 55502 NULL
-+cfpkt_pad_trail_55511 cfpkt_pad_trail 2 55511 NULL nohasharray
-+tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 &cfpkt_pad_trail_55511
-+ea_get_55522 ea_get 0 55522 NULL
++tx_tx_done_int_template_read_55511 tx_tx_done_int_template_read 3 55511 NULL
++ea_get_55522 ea_get 3-0 55522 NULL
 +buffer_size_55534 buffer_size 0 55534 NULL
 +set_msr_interception_55538 set_msr_interception 2 55538 NULL
 +tty_port_register_device_55543 tty_port_register_device 3 55543 NULL
++dgap_do_config_load_55548 dgap_do_config_load 2 55548 NULL
++dm_stats_list_55551 dm_stats_list 4 55551 NULL
++gfs2_bitfit_55566 gfs2_bitfit 2-3-0 55566 NULL
 +hash_netport4_expire_55584 hash_netport4_expire 3 55584 NULL
 +add_partition_55588 add_partition 2 55588 NULL
++kstrtou8_from_user_55599 kstrtou8_from_user 2 55599 NULL
 +SyS_keyctl_55602 SyS_keyctl 4 55602 NULL
-+free_pages_55603 free_pages 1 55603 NULL
++allocate_without_wrapping_disk_55607 allocate_without_wrapping_disk 4 55607 NULL
 +macvtap_put_user_55609 macvtap_put_user 4 55609 NULL
 +selinux_setprocattr_55611 selinux_setprocattr 4 55611 NULL
 +edge_tty_recv_55622 edge_tty_recv 3 55622 NULL
++snd_pcm_hw_param_last_55624 snd_pcm_hw_param_last 0 55624 NULL
 +reiserfs_xattr_get_55628 reiserfs_xattr_get 0 55628 NULL nohasharray
 +pktgen_if_write_55628 pktgen_if_write 3 55628 &reiserfs_xattr_get_55628
++osc_obd_max_pages_per_rpc_seq_write_55636 osc_obd_max_pages_per_rpc_seq_write 3 55636 NULL
 +dvb_dmxdev_set_buffer_size_55643 dvb_dmxdev_set_buffer_size 2 55643 NULL
 +mlx4_buddy_alloc_55647 mlx4_buddy_alloc 2 55647 NULL
 +xfs_bmbt_maxrecs_55649 xfs_bmbt_maxrecs 0-2 55649 NULL
-+ib_umad_compat_ioctl_55650 ib_umad_compat_ioctl 3 55650 NULL
-+cfg80211_send_rx_assoc_55651 cfg80211_send_rx_assoc 4 55651 NULL
-+read_oldmem_55658 read_oldmem 3 55658 NULL
 +lpfc_idiag_queinfo_read_55662 lpfc_idiag_queinfo_read 3 55662 NULL
 +il_dbgfs_tx_queue_read_55668 il_dbgfs_tx_queue_read 3 55668 NULL
++btrfs_reloc_cow_block_55672 btrfs_reloc_cow_block 0 55672 NULL
 +get_info_55681 get_info 3 55681 NULL
-+wil_vring_alloc_skb_55703 wil_vring_alloc_skb 4 55703 NULL
-+__videobuf_alloc_uncached_55711 __videobuf_alloc_uncached 1 55711 NULL
++iwl_dbgfs_plcp_delta_write_55682 iwl_dbgfs_plcp_delta_write 3 55682 NULL
 +pm8001_store_update_fw_55716 pm8001_store_update_fw 4 55716 NULL
-+mtdswap_init_55719 mtdswap_init 2 55719 NULL
++ocfs2_lock_refcount_tree_55719 ocfs2_lock_refcount_tree 0 55719 NULL nohasharray
++mtdswap_init_55719 mtdswap_init 2 55719 &ocfs2_lock_refcount_tree_55719
 +tap_pwup_write_55723 tap_pwup_write 3 55723 NULL
 +__iio_allocate_kfifo_55738 __iio_allocate_kfifo 2 55738 NULL
 +set_local_name_55757 set_local_name 4 55757 NULL
-+strlen_55778 strlen 0 55778 NULL
-+set_spte_55783 set_spte 5-4 55783 NULL
++strlen_55778 strlen 0 55778 NULL nohasharray
++is_idx_node_in_tnc_55778 is_idx_node_in_tnc 0 55778 &strlen_55778
++set_spte_55783 set_spte 4-5 55783 NULL
 +req_bio_endio_55786 req_bio_endio 3 55786 NULL nohasharray
 +conf_read_55786 conf_read 3 55786 &req_bio_endio_55786
 +uwb_rc_neh_grok_event_55799 uwb_rc_neh_grok_event 3 55799 NULL
-+sb16_copy_from_user_55836 sb16_copy_from_user 10-6-7 55836 NULL
++sb16_copy_from_user_55836 sb16_copy_from_user 7-6-10 55836 NULL
++ept_gva_to_gpa_55848 ept_gva_to_gpa 2 55848 NULL
 +ip_hdrlen_55849 ip_hdrlen 0 55849 NULL
 +hcd_alloc_coherent_55862 hcd_alloc_coherent 5 55862 NULL
 +shmem_setxattr_55867 shmem_setxattr 4 55867 NULL
++__check_block_validity_55869 __check_block_validity 0 55869 NULL
 +hsc_write_55875 hsc_write 3 55875 NULL
 +pm_qos_power_read_55891 pm_qos_power_read 3 55891 NULL
 +snd_pcm_hw_param_value_min_55917 snd_pcm_hw_param_value_min 0 55917 NULL
++ext2_direct_IO_55932 ext2_direct_IO 4 55932 NULL
 +paging64_page_fault_55942 paging64_page_fault 2 55942 NULL
++kvm_write_guest_virt_system_55944 kvm_write_guest_virt_system 4-2 55944 NULL
 +sel_read_policy_55947 sel_read_policy 3 55947 NULL
 +ceph_get_direct_page_vector_55956 ceph_get_direct_page_vector 2 55956 NULL
-+simple_read_from_buffer_55957 simple_read_from_buffer 2-5 55957 NULL
++simple_read_from_buffer_55957 simple_read_from_buffer 5-2 55957 NULL
 +tx_tx_imm_resp_read_55964 tx_tx_imm_resp_read 3 55964 NULL
-+ssb_bus_pcmciabus_register_56020 ssb_bus_pcmciabus_register 3 56020 NULL
++wa_xfer_create_subset_sg_55992 wa_xfer_create_subset_sg 2-3 55992 NULL
 +nvme_alloc_iod_56027 nvme_alloc_iod 1-2 56027 NULL
 +dccp_sendmsg_56058 dccp_sendmsg 4 56058 NULL
 +__set_discard_56081 __set_discard 2 56081 NULL
 +pscsi_get_bio_56103 pscsi_get_bio 1 56103 NULL
 +usb_alloc_stream_buffers_56123 usb_alloc_stream_buffers 3 56123 NULL
-+kmem_zalloc_large_56128 kmem_zalloc_large 1 56128 NULL
 +sel_read_handle_status_56139 sel_read_handle_status 3 56139 NULL
-+map_addr_56144 map_addr 7 56144 NULL
++write_file_frameerrors_56145 write_file_frameerrors 3 56145 NULL
++add_extent_mapping_56157 add_extent_mapping 0 56157 NULL
 +__i2c_transfer_56162 __i2c_transfer 0 56162 NULL
 +rawv6_setsockopt_56165 rawv6_setsockopt 5 56165 NULL
-+create_irq_nr_56180 create_irq_nr 1 56180 NULL
++create_irq_nr_56180 create_irq_nr 1-0-2 56180 NULL
 +ath9k_dump_legacy_btcoex_56194 ath9k_dump_legacy_btcoex 0 56194 NULL
-+skb_headroom_56200 skb_headroom 0 56200 NULL
-+usb_dump_iad_descriptor_56204 usb_dump_iad_descriptor 0 56204 NULL
++ocfs2_journal_access_gd_56209 ocfs2_journal_access_gd 0 56209 NULL
++update_space_info_56213 update_space_info 0 56213 NULL
 +ncp_read_bounce_size_56221 ncp_read_bounce_size 0-1 56221 NULL
 +vring_add_indirect_56222 vring_add_indirect 4 56222 NULL
 +ocfs2_find_xe_in_bucket_56224 ocfs2_find_xe_in_bucket 0 56224 NULL
-+cp210x_get_config_56229 cp210x_get_config 4 56229 NULL
 +do_ipt_set_ctl_56238 do_ipt_set_ctl 4 56238 NULL
 +fd_copyin_56247 fd_copyin 3 56247 NULL
 +sk_rmem_schedule_56255 sk_rmem_schedule 3 56255 NULL
++p9pdu_vreadf_56271 p9pdu_vreadf 0 56271 NULL
 +il4965_ucode_general_stats_read_56277 il4965_ucode_general_stats_read 3 56277 NULL
 +ieee80211_if_fmt_user_power_level_56283 ieee80211_if_fmt_user_power_level 3 56283 NULL
 +RESIZE_IF_NEEDED_56286 RESIZE_IF_NEEDED 2 56286 NULL
 +dvb_aplay_56296 dvb_aplay 3 56296 NULL
 +btmrvl_hscfgcmd_read_56303 btmrvl_hscfgcmd_read 3 56303 NULL
-+compat_cdrom_read_audio_56304 compat_cdrom_read_audio 4 56304 NULL
++speakup_file_write_56310 speakup_file_write 3 56310 NULL
 +pipeline_pre_to_defrag_swi_read_56321 pipeline_pre_to_defrag_swi_read 3 56321 NULL
 +journal_init_revoke_table_56331 journal_init_revoke_table 1 56331 NULL
 +snd_rawmidi_read_56337 snd_rawmidi_read 3 56337 NULL
-+sixpack_compat_ioctl_56346 sixpack_compat_ioctl 4 56346 NULL
++ipv6_recv_error_56347 ipv6_recv_error 3 56347 NULL
 +vxge_os_dma_malloc_async_56348 vxge_os_dma_malloc_async 3 56348 NULL
-+iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 4 56368 NULL
++mite_device_bytes_transferred_56355 mite_device_bytes_transferred 0 56355 NULL
++iov_iter_copy_from_user_atomic_56368 iov_iter_copy_from_user_atomic 0-4 56368 NULL
 +dev_read_56369 dev_read 3 56369 NULL
++ath10k_read_simulate_fw_crash_56371 ath10k_read_simulate_fw_crash 3 56371 NULL
++ata_qc_complete_multiple_56376 ata_qc_complete_multiple 2 56376 NULL
++snd_pcm_common_ioctl1_56382 snd_pcm_common_ioctl1 0 56382 NULL
 +write_gssp_56404 write_gssp 3 56404 NULL
 +ocfs2_control_read_56405 ocfs2_control_read 3 56405 NULL
-+__get_vm_area_caller_56416 __get_vm_area_caller 1 56416 NULL nohasharray
-+acpi_os_write_memory_56416 acpi_os_write_memory 1-3 56416 &__get_vm_area_caller_56416
-+store_msg_56417 store_msg 3 56417 NULL
++do_get_write_access_56410 do_get_write_access 0 56410 NULL
++i915_gem_object_sync_56417 i915_gem_object_sync 0 56417 NULL nohasharray
++store_msg_56417 store_msg 3 56417 &i915_gem_object_sync_56417
 +pppol2tp_sendmsg_56420 pppol2tp_sendmsg 4 56420 NULL
 +fl_create_56435 fl_create 5 56435 NULL
 +gnttab_map_56439 gnttab_map 2 56439 NULL
-+cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2 56453 NULL
++cx231xx_init_isoc_56453 cx231xx_init_isoc 3-2-4 56453 NULL
 +set_connectable_56458 set_connectable 4 56458 NULL
 +osd_req_list_partition_objects_56464 osd_req_list_partition_objects 5 56464 NULL
 +putused_user_56467 putused_user 3 56467 NULL
++lbs_rdmac_write_56471 lbs_rdmac_write 3 56471 NULL
 +calc_linear_pos_56472 calc_linear_pos 0-3 56472 NULL
 +global_rt_period_56476 global_rt_period 0 56476 NULL
 +crypto_shash_alignmask_56486 crypto_shash_alignmask 0 56486 NULL
 +ieee80211_rx_mgmt_probe_beacon_56491 ieee80211_rx_mgmt_probe_beacon 3 56491 NULL
++cfs_access_process_vm_56503 cfs_access_process_vm 2-4-0 56503 NULL
 +init_map_ip_56508 init_map_ip 5 56508 NULL
-+cfg80211_connect_result_56515 cfg80211_connect_result 4-6 56515 NULL
++lustre_posix_acl_xattr_reduce_space_56512 lustre_posix_acl_xattr_reduce_space 3 56512 NULL
++ext4_zeroout_es_56514 ext4_zeroout_es 0 56514 NULL
++cfg80211_connect_result_56515 cfg80211_connect_result 6-4 56515 NULL
 +ip_options_get_56538 ip_options_get 4 56538 NULL
++ll_wr_track_id_56544 ll_wr_track_id 2 56544 NULL
++vb2_queue_or_prepare_buf_56547 vb2_queue_or_prepare_buf 0 56547 NULL
 +ocfs2_change_extent_flag_56549 ocfs2_change_extent_flag 5 56549 NULL
 +alloc_apertures_56561 alloc_apertures 1 56561 NULL
 +rs_sta_dbgfs_stats_table_read_56573 rs_sta_dbgfs_stats_table_read 3 56573 NULL
 +portcntrs_2_read_56586 portcntrs_2_read 3 56586 NULL
 +event_filter_write_56609 event_filter_write 3 56609 NULL
++nvme_trans_log_temperature_56613 nvme_trans_log_temperature 3 56613 NULL
 +gather_array_56641 gather_array 3 56641 NULL
++lookup_extent_backref_56644 lookup_extent_backref 9-0 56644 NULL
 +uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3 56651 NULL
-+da9055_gpio_to_irq_56686 da9055_gpio_to_irq 2 56686 NULL nohasharray
-+snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 &da9055_gpio_to_irq_56686
++tg3_nvram_write_block_56666 tg3_nvram_write_block 3 56666 NULL
++btrfs_cow_block_56678 btrfs_cow_block 0 56678 NULL
++snd_gus_dram_read_56686 snd_gus_dram_read 4 56686 NULL nohasharray
++da9055_gpio_to_irq_56686 da9055_gpio_to_irq 2 56686 &snd_gus_dram_read_56686
 +build_map_info_56696 build_map_info 2 56696 NULL
-+dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3 56702 NULL
++dvb_ringbuffer_read_user_56702 dvb_ringbuffer_read_user 3-0 56702 NULL
 +sta_flags_read_56710 sta_flags_read 3 56710 NULL
 +ipv6_getsockopt_sticky_56711 ipv6_getsockopt_sticky 5 56711 NULL
 +__wa_xfer_setup_segs_56725 __wa_xfer_setup_segs 2 56725 NULL
-+pcpu_populate_chunk_56741 pcpu_populate_chunk 2-3 56741 NULL
++__copy_from_user_ll_56738 __copy_from_user_ll 0-3 56738 NULL
++pcpu_populate_chunk_56741 pcpu_populate_chunk 3-2 56741 NULL
 +drm_agp_bind_pages_56748 drm_agp_bind_pages 3 56748 NULL
 +btrfsic_map_block_56751 btrfsic_map_block 2 56751 NULL
-+alloc_iommu_56778 alloc_iommu 2-3 56778 NULL
-+__carl9170_rx_56784 __carl9170_rx 3 56784 NULL
-+hash_lookup_56792 hash_lookup 2 56792 NULL
++alloc_iommu_56778 alloc_iommu 2-3-0 56778 NULL
++hash_lookup_56792 hash_lookup 2 56792 NULL nohasharray
++ttm_alloc_new_pages_56792 ttm_alloc_new_pages 5 56792 &hash_lookup_56792
 +do_syslog_56807 do_syslog 3 56807 NULL
++ext4_ext_rm_idx_56827 ext4_ext_rm_idx 0 56827 NULL
 +mtdchar_write_56831 mtdchar_write 3 56831 NULL nohasharray
 +ntfs_rl_realloc_56831 ntfs_rl_realloc 3 56831 &mtdchar_write_56831
-+snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4 56847 NULL
++sysctl_sync_threshold_56835 sysctl_sync_threshold 0 56835 NULL
++snd_rawmidi_kernel_write1_56847 snd_rawmidi_kernel_write1 4-0 56847 NULL
 +si476x_radio_read_agc_blob_56849 si476x_radio_read_agc_blob 3 56849 NULL
 +wb_lookup_56858 wb_lookup 2 56858 NULL
 +ext3_xattr_ibody_get_56880 ext3_xattr_ibody_get 0 56880 NULL
 +pvr2_debugifc_print_status_56890 pvr2_debugifc_print_status 3 56890 NULL
 +debug_debug3_read_56894 debug_debug3_read 3 56894 NULL
 +batadv_tt_update_changes_56895 batadv_tt_update_changes 3 56895 NULL
++hfsplus_find_cat_56899 hfsplus_find_cat 0 56899 NULL
++hfsplus_setxattr_56902 hfsplus_setxattr 4 56902 NULL
++__bitmap_clear_bits_56912 __bitmap_clear_bits 3 56912 NULL
 +strcspn_56913 strcspn 0 56913 NULL
 +__kfifo_out_56927 __kfifo_out 0-3 56927 NULL
-+check_header_56930 check_header 2 56930 NULL
-+journal_init_revoke_56933 journal_init_revoke 2 56933 NULL
++CopyBufferToControlPacket_56933 CopyBufferToControlPacket 0 56933 NULL nohasharray
++journal_init_revoke_56933 journal_init_revoke 2 56933 &CopyBufferToControlPacket_56933
++nouveau_xtensa_create__56952 nouveau_xtensa_create_ 8 56952 NULL
 +diva_get_driver_info_56967 diva_get_driver_info 0 56967 NULL
 +nouveau_device_create__56984 nouveau_device_create_ 6 56984 NULL
++sptlrpc_secflags2str_56995 sptlrpc_secflags2str 3 56995 NULL
 +vlsi_alloc_ring_57003 vlsi_alloc_ring 3-4 57003 NULL
 +btrfs_super_csum_size_57004 btrfs_super_csum_size 0 57004 NULL
 +aircable_process_packet_57027 aircable_process_packet 4 57027 NULL
-+ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 NULL nohasharray
-+skb_network_offset_57043 skb_network_offset 0 57043 &ieee80211_if_fmt_state_57043
++i915_gem_evict_everything_57038 i915_gem_evict_everything 0 57038 NULL
++skb_network_offset_57043 skb_network_offset 0 57043 NULL nohasharray
++ieee80211_if_fmt_state_57043 ieee80211_if_fmt_state 3 57043 &skb_network_offset_57043
 +bytes_to_samples_57049 bytes_to_samples 0-2 57049 NULL
 +xfs_buf_read_map_57053 xfs_buf_read_map 3 57053 NULL
-+autofs_dev_ioctl_compat_57059 autofs_dev_ioctl_compat 3 57059 NULL
++__wl_get_peb_57058 __wl_get_peb 0 57058 NULL
 +cx2341x_ctrl_new_std_57061 cx2341x_ctrl_new_std 4 57061 NULL
 +sca3000_read_data_57064 sca3000_read_data 4 57064 NULL
 +pcmcia_replace_cis_57066 pcmcia_replace_cis 3 57066 NULL
-+sis190_try_rx_copy_57069 sis190_try_rx_copy 3 57069 NULL
 +tracing_set_trace_write_57096 tracing_set_trace_write 3 57096 NULL
++altera_get_note_57099 altera_get_note 6 57099 NULL
++hpfs_readpages_57106 hpfs_readpages 4 57106 NULL
++snd_pcm_hw_params_old_user_57108 snd_pcm_hw_params_old_user 0 57108 NULL
 +crypto_compress_ctxsize_57109 crypto_compress_ctxsize 0 57109 NULL
 +sysfs_write_file_57116 sysfs_write_file 3 57116 NULL
 +cipso_v4_gentag_loc_57119 cipso_v4_gentag_loc 0 57119 NULL
 +nl80211_send_deauth_57136 nl80211_send_deauth 4 57136 NULL nohasharray
-+ima_show_htable_value_57136 ima_show_htable_value 2 57136 &nl80211_send_deauth_57136 nohasharray
-+rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &ima_show_htable_value_57136
++rds_ib_sub_signaled_57136 rds_ib_sub_signaled 2 57136 &nl80211_send_deauth_57136 nohasharray
++ima_show_htable_value_57136 ima_show_htable_value 2 57136 &rds_ib_sub_signaled_57136
 +snd_sonicvibes_getdmac_57140 snd_sonicvibes_getdmac 0 57140 NULL
++changed_inode_57156 changed_inode 0 57156 NULL
 +udl_prime_create_57159 udl_prime_create 2 57159 NULL
 +__ipath_get_user_pages_57166 __ipath_get_user_pages 1-2 57166 NULL
 +stk_prepare_sio_buffers_57168 stk_prepare_sio_buffers 2 57168 NULL
 +rx_hw_stuck_read_57179 rx_hw_stuck_read 3 57179 NULL
++ocfs2_claim_metadata_57192 ocfs2_claim_metadata 0 57192 NULL
 +tt3650_ci_msg_57219 tt3650_ci_msg 4 57219 NULL
 +dma_fifo_alloc_57236 dma_fifo_alloc 5-3-2 57236 NULL
-+flush_space_57241 flush_space 3 57241 NULL
++flush_space_57241 flush_space 3-0 57241 NULL
++rsxx_cram_write_57244 rsxx_cram_write 3 57244 NULL
 +ieee80211_if_fmt_tsf_57249 ieee80211_if_fmt_tsf 3 57249 NULL
 +oprofilefs_ulong_from_user_57251 oprofilefs_ulong_from_user 3 57251 NULL
 +alloc_flex_gd_57259 alloc_flex_gd 1 57259 NULL
-+security_mmap_file_57268 security_mmap_file 0 57268 NULL
++lbs_sleepparams_write_57283 lbs_sleepparams_write 3 57283 NULL
 +pstore_file_read_57288 pstore_file_read 3 57288 NULL
 +snd_pcm_read_57289 snd_pcm_read 3 57289 NULL
-+ath6kl_buf_alloc_57304 ath6kl_buf_alloc 1 57304 NULL
 +fw_file_size_57307 fw_file_size 0 57307 NULL
 +ftdi_elan_write_57309 ftdi_elan_write 3 57309 NULL
++write_file_regval_57313 write_file_regval 3 57313 NULL
 +__mxt_write_reg_57326 __mxt_write_reg 3 57326 NULL
 +ocfs2_xattr_shrink_size_57328 ocfs2_xattr_shrink_size 3 57328 NULL
-+check_mirror_57342 check_mirror 1-2 57342 NULL nohasharray
-+usblp_read_57342 usblp_read 3 57342 &check_mirror_57342
++usblp_read_57342 usblp_read 3 57342 NULL
 +print_devstats_dot11RTSFailureCount_57347 print_devstats_dot11RTSFailureCount 3 57347 NULL
++dio_send_cur_page_57348 dio_send_cur_page 0 57348 NULL
 +tipc_bclink_stats_57372 tipc_bclink_stats 2 57372 NULL
 +max8997_irq_domain_map_57375 max8997_irq_domain_map 2 57375 NULL
 +tty_register_device_attr_57381 tty_register_device_attr 2 57381 NULL
 +read_file_blob_57406 read_file_blob 3 57406 NULL
 +enclosure_register_57412 enclosure_register 3 57412 NULL
-+gre_manip_pkt_57416 gre_manip_pkt 4 57416 NULL
-+compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL nohasharray
-+alloc_ftrace_hash_57431 alloc_ftrace_hash 1 57431 &compat_keyctl_instantiate_key_iov_57431
++compat_keyctl_instantiate_key_iov_57431 compat_keyctl_instantiate_key_iov 3 57431 NULL
 +copy_to_user_fromio_57432 copy_to_user_fromio 3 57432 NULL
-+sys_pselect6_57449 sys_pselect6 1 57449 NULL
-+ReadReg_57453 ReadReg 0 57453 NULL
 +__roundup_pow_of_two_57461 __roundup_pow_of_two 0 57461 NULL
-+crypto_tfm_alg_blocksize_57463 crypto_tfm_alg_blocksize 0 57463 NULL nohasharray
-+send_midi_async_57463 send_midi_async 3 57463 &crypto_tfm_alg_blocksize_57463
-+sisusb_clear_vram_57466 sisusb_clear_vram 3-2 57466 NULL
++crypto_tfm_alg_blocksize_57463 crypto_tfm_alg_blocksize 0 57463 NULL
++sisusb_clear_vram_57466 sisusb_clear_vram 2-3 57466 NULL
++blk_flush_cur_seq_57467 blk_flush_cur_seq 0 57467 NULL
 +ieee80211_if_read_flags_57470 ieee80211_if_read_flags 3 57470 NULL nohasharray
 +sep_lock_user_pages_57470 sep_lock_user_pages 2-3 57470 &ieee80211_if_read_flags_57470
-+ocfs2_write_cluster_57483 ocfs2_write_cluster 8-2-9 57483 NULL
++ocfs2_write_cluster_57483 ocfs2_write_cluster 9-8-2 57483 NULL
 +bnad_debugfs_write_regwr_57500 bnad_debugfs_write_regwr 3 57500 NULL
 +skb_headlen_57501 skb_headlen 0 57501 NULL
 +copy_in_user_57502 copy_in_user 3 57502 NULL
-+ks8842_read32_57505 ks8842_read32 0 57505 NULL nohasharray
-+ckhdid_printf_57505 ckhdid_printf 2 57505 &ks8842_read32_57505
++ckhdid_printf_57505 ckhdid_printf 2 57505 NULL
 +init_tag_map_57515 init_tag_map 3 57515 NULL
 +wil_read_file_ssid_57517 wil_read_file_ssid 3 57517 NULL nohasharray
-+il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517
++il_dbgfs_force_reset_read_57517 il_dbgfs_force_reset_read 3 57517 &wil_read_file_ssid_57517 nohasharray
++btrfs_insert_inode_extref_57517 btrfs_insert_inode_extref 0 57517 &il_dbgfs_force_reset_read_57517
++cmm_read_57520 cmm_read 3 57520 NULL
 +inode_permission_57531 inode_permission 0 57531 NULL
-+acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL nohasharray
-+DoC_Probe_57534 DoC_Probe 1 57534 &acpi_dev_get_resources_57534
-+ext4_group_first_block_no_57559 ext4_group_first_block_no 0-2 57559 NULL
++acpi_dev_get_resources_57534 acpi_dev_get_resources 0 57534 NULL
++ptlrpc_lprocfs_hp_ratio_seq_write_57537 ptlrpc_lprocfs_hp_ratio_seq_write 3 57537 NULL
++ReadHDLCPnP_57559 ReadHDLCPnP 0 57559 NULL nohasharray
++ext4_group_first_block_no_57559 ext4_group_first_block_no 0-2 57559 &ReadHDLCPnP_57559
++obd_unpackmd_57563 obd_unpackmd 0 57563 NULL
 +snd_pcm_playback_ioctl1_57569 snd_pcm_playback_ioctl1 0 57569 NULL
-+uio_find_mem_index_57584 uio_find_mem_index 0 57584 NULL
++get_bridge_ifindices_57579 get_bridge_ifindices 0 57579 NULL
++ldlm_cli_enqueue_local_57582 ldlm_cli_enqueue_local 11 57582 NULL
++il_dbgfs_interrupt_write_57591 il_dbgfs_interrupt_write 3 57591 NULL
 +read_file_spectral_fft_period_57593 read_file_spectral_fft_period 3 57593 NULL
 +wm831x_gpio_to_irq_57614 wm831x_gpio_to_irq 2 57614 NULL
-+sk_stream_alloc_skb_57622 sk_stream_alloc_skb 2 57622 NULL
++vma_kernel_pagesize_57616 vma_kernel_pagesize 0 57616 NULL
 +tx_tx_retry_template_read_57623 tx_tx_retry_template_read 3 57623 NULL
-+osdmap_set_max_osd_57630 osdmap_set_max_osd 2 57630 NULL nohasharray
-+sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 &osdmap_set_max_osd_57630
++sisusbcon_putcs_57630 sisusbcon_putcs 3 57630 NULL
 +mem_read_57631 mem_read 3 57631 NULL
 +tc3589x_irq_map_57639 tc3589x_irq_map 2 57639 NULL
-+sys_mq_timedsend_57661 sys_mq_timedsend 3 57661 NULL
 +r3964_write_57662 r3964_write 4 57662 NULL
 +proc_ns_readlink_57664 proc_ns_readlink 3 57664 NULL
 +__lgwrite_57669 __lgwrite 4 57669 NULL
-+ieee80211_MFIE_rate_len_57692 ieee80211_MFIE_rate_len 0 57692 NULL
 +f1x_match_to_this_node_57695 f1x_match_to_this_node 3 57695 NULL
-+check_prefree_segments_57702 check_prefree_segments 2 57702 NULL
 +i2400m_rx_stats_read_57706 i2400m_rx_stats_read 3 57706 NULL
++snd_interval_value_57713 snd_interval_value 0 57713 NULL
 +ieee80211_if_read_dot11MeshHWMPconfirmationInterval_57722 ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 NULL
++i915_gem_object_get_pages_57734 i915_gem_object_get_pages 0 57734 NULL
 +nouveau_gpio_create__57735 nouveau_gpio_create_ 4-5 57735 NULL
-+compat_sys_set_mempolicy_57742 compat_sys_set_mempolicy 3 57742 NULL
++compat_sys_set_mempolicy_57742 compat_sys_set_mempolicy 3 57742 NULL nohasharray
++pppol2tp_recvmsg_57742 pppol2tp_recvmsg 4 57742 &compat_sys_set_mempolicy_57742
 +ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval_57762 ieee80211_if_fmt_dot11MeshHWMPpreqMinInterval 3 57762 NULL
-+SYSC_process_vm_writev_57776 SYSC_process_vm_writev 3-5 57776 NULL
++SYSC_process_vm_writev_57776 SYSC_process_vm_writev 5-3 57776 NULL
++apei_exec_collect_resources_57788 apei_exec_collect_resources 0 57788 NULL
 +ld2_57794 ld2 0 57794 NULL
 +ivtv_read_57796 ivtv_read 3 57796 NULL
 +generic_ptrace_peekdata_57806 generic_ptrace_peekdata 2 57806 NULL
 +ipath_user_sdma_num_pages_57813 ipath_user_sdma_num_pages 0 57813 NULL
-+usb_dump_config_57817 usb_dump_config 0 57817 NULL
 +bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3 57830 NULL
-+copy_to_user_57835 copy_to_user 3 57835 NULL
++copy_to_user_57835 copy_to_user 3-0 57835 NULL
 +flash_read_57843 flash_read 3 57843 NULL
++kiblnd_create_tx_pool_57846 kiblnd_create_tx_pool 2 57846 NULL
++process_all_new_xattrs_57881 process_all_new_xattrs 0 57881 NULL
 +xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL
-+emi26_writememory_57908 emi26_writememory 4 57908 NULL
-+iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL
++iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2 57910 NULL nohasharray
++atomic_add_return_unchecked_57910 atomic_add_return_unchecked 0-1 57910 &iio_read_first_n_kfifo_57910
 +memcg_caches_array_size_57918 memcg_caches_array_size 0-1 57918 NULL
-+twl_i2c_write_57923 twl_i2c_write 4-3 57923 NULL
++twl_i2c_write_57923 twl_i2c_write 3-4 57923 NULL
 +__snd_gf1_look16_57925 __snd_gf1_look16 0 57925 NULL
 +sel_read_handle_unknown_57933 sel_read_handle_unknown 3 57933 NULL
++nvc0_vm_create_57942 nvc0_vm_create 2-3 57942 NULL
++xfs_mru_cache_create_57943 xfs_mru_cache_create 3 57943 NULL
 +key_algorithm_read_57946 key_algorithm_read 3 57946 NULL
 +ip_set_alloc_57953 ip_set_alloc 1 57953 NULL nohasharray
 +ioat3_dca_count_dca_slots_57953 ioat3_dca_count_dca_slots 0 57953 &ip_set_alloc_57953
-+i915_cache_sharing_write_57961 i915_cache_sharing_write 3 57961 NULL
-+hfc_empty_fifo_57972 hfc_empty_fifo 2 57972 NULL
 +c2_reg_user_mr_57982 c2_reg_user_mr 2-3 57982 NULL
++interleave_nodes_57992 interleave_nodes 0 57992 NULL
++do_rx_dma_57996 do_rx_dma 5 57996 NULL
 +rx_reset_counter_read_58001 rx_reset_counter_read 3 58001 NULL
-+regcache_rbtree_insert_to_block_58009 regcache_rbtree_insert_to_block 5 58009 NULL
 +iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3 58023 NULL
 +io_playback_transfer_58030 io_playback_transfer 4 58030 NULL
++ext4_block_bitmap_58033 ext4_block_bitmap 0 58033 NULL
 +mce_async_out_58056 mce_async_out 3 58056 NULL
 +ocfs2_find_leaf_58065 ocfs2_find_leaf 0 58065 NULL
 +dt3155_alloc_coherent_58073 dt3155_alloc_coherent 2 58073 NULL
 +cm4040_write_58079 cm4040_write 3 58079 NULL
-+udi_log_event_58105 udi_log_event 3 58105 NULL
-+savemem_58129 savemem 3 58129 NULL
-+slhc_init_58135 slhc_init 1-2 58135 NULL nohasharray
-+ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 &slhc_init_58135
++ipv6_flowlabel_opt_58135 ipv6_flowlabel_opt 3 58135 NULL nohasharray
++slhc_init_58135 slhc_init 2-1 58135 &ipv6_flowlabel_opt_58135
++ocfs2_reserve_clusters_58164 ocfs2_reserve_clusters 0 58164 NULL
++ext4_bg_num_gdb_58171 ext4_bg_num_gdb 0 58171 NULL
 +garmin_write_bulk_58191 garmin_write_bulk 3 58191 NULL
-+asix_write_cmd_58192 asix_write_cmd 5 58192 NULL
 +ieee80211_if_fmt_flags_58205 ieee80211_if_fmt_flags 3 58205 NULL
-+hva_to_pfn_58241 hva_to_pfn 1 58241 NULL
++sysfs_add_file_mode_58222 sysfs_add_file_mode 0 58222 NULL
++hva_to_pfn_58241 hva_to_pfn 1-0 58241 NULL
 +btrfsic_create_link_to_next_block_58246 btrfsic_create_link_to_next_block 4 58246 NULL
 +read_file_debug_58256 read_file_debug 3 58256 NULL
++osc_max_dirty_mb_seq_write_58263 osc_max_dirty_mb_seq_write 3 58263 NULL
 +cfg80211_mgmt_tx_status_58266 cfg80211_mgmt_tx_status 4 58266 NULL
 +profile_load_58267 profile_load 3 58267 NULL
++kstrtos8_from_user_58268 kstrtos8_from_user 2 58268 NULL
 +acpi_ds_build_internal_package_obj_58271 acpi_ds_build_internal_package_obj 3 58271 NULL
-+r100_mm_rreg_58276 r100_mm_rreg 0 58276 NULL
 +iscsi_decode_text_input_58292 iscsi_decode_text_input 4 58292 NULL
++intel_alloc_coherent_58302 intel_alloc_coherent 2 58302 NULL
 +ieee80211_if_read_dot11MeshTTL_58307 ieee80211_if_read_dot11MeshTTL 3 58307 NULL
++i915_wait_seqno_58309 i915_wait_seqno 0 58309 NULL
 +tx_tx_start_int_templates_read_58324 tx_tx_start_int_templates_read 3 58324 NULL
-+pcim_iomap_58334 pcim_iomap 3 58334 NULL
++ext4_ext_truncate_extend_restart_58331 ext4_ext_truncate_extend_restart 3 58331 NULL
 +diva_init_dma_map_58336 diva_init_dma_map 3 58336 NULL
-+next_pidmap_58347 next_pidmap 2 58347 NULL
++__copy_from_user_swizzled_58337 __copy_from_user_swizzled 2-4 58337 NULL
++next_pidmap_58347 next_pidmap 2-0 58347 NULL
 +SyS_migrate_pages_58348 SyS_migrate_pages 2 58348 NULL
-+vmalloc_to_sg_58354 vmalloc_to_sg 2 58354 NULL
 +save_hint_58359 save_hint 2 58359 NULL
-+brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 NULL
++vmw_ttm_tt_create_58369 vmw_ttm_tt_create 2 58369 NULL nohasharray
++brcmf_debugfs_sdio_counter_read_58369 brcmf_debugfs_sdio_counter_read 3 58369 &vmw_ttm_tt_create_58369
 +hash_ipportnet6_expire_58379 hash_ipportnet6_expire 3 58379 NULL
 +il_dbgfs_status_read_58388 il_dbgfs_status_read 3 58388 NULL
-+kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3 58406 NULL
++_drbd_md_sync_page_io_58403 _drbd_md_sync_page_io 6 58403 NULL
++kvm_mmu_write_protect_pt_masked_58406 kvm_mmu_write_protect_pt_masked 3-4 58406 NULL nohasharray
++idetape_pad_zeros_58406 idetape_pad_zeros 2 58406 &kvm_mmu_write_protect_pt_masked_58406
 +i2400m_pld_size_58415 i2400m_pld_size 0 58415 NULL
 +__mlx4_alloc_mtt_range_58418 __mlx4_alloc_mtt_range 2 58418 NULL
-+__iio_add_chan_devattr_58451 __iio_add_chan_devattr 0 58451 NULL
 +capabilities_read_58457 capabilities_read 3 58457 NULL
 +batadv_iv_ogm_aggr_packet_58462 batadv_iv_ogm_aggr_packet 3 58462 NULL
 +lpfc_idiag_baracc_read_58466 lpfc_idiag_baracc_read 3 58466 NULL nohasharray
 +compat_do_ipt_set_ctl_58466 compat_do_ipt_set_ctl 4 58466 &lpfc_idiag_baracc_read_58466
++nv_rd08_58472 nv_rd08 0 58472 NULL
 +snd_gf1_read_addr_58483 snd_gf1_read_addr 0 58483 NULL
 +snd_rme96_capture_copy_58484 snd_rme96_capture_copy 5 58484 NULL
-+batadv_bla_is_backbone_gw_58488 batadv_bla_is_backbone_gw 3 58488 NULL
-+memblock_alloc_try_nid_58493 memblock_alloc_try_nid 1-2 58493 NULL
++btrfs_cont_expand_58498 btrfs_cont_expand 2-3 58498 NULL
 +rndis_add_response_58544 rndis_add_response 2 58544 NULL
 +__clear_discard_58546 __clear_discard 2 58546 NULL
 +wrap_max_58548 wrap_max 0-1-2 58548 NULL
 +wep_decrypt_fail_read_58567 wep_decrypt_fail_read 3 58567 NULL
-+sip_sprintf_addr_port_58574 sip_sprintf_addr_port 0 58574 NULL
 +scnprint_mac_oui_58578 scnprint_mac_oui 3-0 58578 NULL
++get_rhf_errstring_58582 get_rhf_errstring 3 58582 NULL
 +ea_read_inline_58589 ea_read_inline 0 58589 NULL
 +isku_sysfs_read_keys_thumbster_58590 isku_sysfs_read_keys_thumbster 6 58590 NULL
 +xip_file_read_58592 xip_file_read 3 58592 NULL
-+gdth_search_isa_58595 gdth_search_isa 1 58595 NULL
++ecryptfs_write_end_58594 ecryptfs_write_end 5-3 58594 NULL
++radeon_bo_size_58606 radeon_bo_size 0 58606 NULL
 +ebt_buf_count_58607 ebt_buf_count 0 58607 NULL
++xfs_iomap_write_delay_58616 xfs_iomap_write_delay 2 58616 NULL
 +skb_copy_to_page_nocache_58624 skb_copy_to_page_nocache 6 58624 NULL
-+module_alloc_update_bounds_rx_58634 module_alloc_update_bounds_rx 1 58634 NULL nohasharray
-+efi_ioremap_58634 efi_ioremap 1-2 58634 &module_alloc_update_bounds_rx_58634
++filemap_fdatawrite_range_58630 filemap_fdatawrite_range 0 58630 NULL
++module_alloc_update_bounds_rx_58634 module_alloc_update_bounds_rx 1 58634 NULL
 +tx_tx_start_fw_gen_read_58648 tx_tx_start_fw_gen_read 3 58648 NULL
 +ocfs2_block_to_cluster_start_58653 ocfs2_block_to_cluster_start 2 58653 NULL
++iwl_dbgfs_rx_handlers_write_58655 iwl_dbgfs_rx_handlers_write 3 58655 NULL
 +__gfn_to_pfn_58671 __gfn_to_pfn 2 58671 NULL
-+iwl_trans_send_cmd_58681 iwl_trans_send_cmd 0 58681 NULL
-+find_zero_58685 find_zero 0-1 58685 NULL nohasharray
-+mcs7830_set_reg_async_58685 mcs7830_set_reg_async 3 58685 &find_zero_58685
++find_zero_58685 find_zero 0-1 58685 NULL
 +uwb_bce_print_IEs_58686 uwb_bce_print_IEs 4 58686 NULL
-+pci_alloc_consistent_58688 pci_alloc_consistent 0 58688 NULL
-+tps6586x_writes_58689 tps6586x_writes 3-2 58689 NULL
-+vmalloc_node_58700 vmalloc_node 1 58700 NULL
-+acpi_map_58725 acpi_map 1-2 58725 NULL
++tps6586x_writes_58689 tps6586x_writes 2-3 58689 NULL
++vmalloc_node_58700 vmalloc_node 1-2 58700 NULL
++vx_send_msg_58711 vx_send_msg 0 58711 NULL
++i915_gem_execbuffer_reserve_58722 i915_gem_execbuffer_reserve 0 58722 NULL
 +da9052_gpio_to_irq_58729 da9052_gpio_to_irq 2 58729 NULL
-+csum_exist_in_range_58730 csum_exist_in_range 2 58730 NULL
++csum_exist_in_range_58730 csum_exist_in_range 2-3 58730 NULL
 +frames_to_bytes_58741 frames_to_bytes 0-2 58741 NULL
 +ieee80211_if_write_tkip_mic_test_58748 ieee80211_if_write_tkip_mic_test 3 58748 NULL
 +agp_allocate_memory_58761 agp_allocate_memory 2 58761 NULL
 +oblock_to_dblock_58762 oblock_to_dblock 0-2 58762 NULL
-+__do_config_autodelink_58763 __do_config_autodelink 3 58763 NULL
 +regmap_calc_reg_len_58795 regmap_calc_reg_len 0 58795 NULL
 +raw_send_hdrinc_58803 raw_send_hdrinc 4 58803 NULL
-+isku_sysfs_read_58806 isku_sysfs_read 6-5 58806 NULL
++isku_sysfs_read_58806 isku_sysfs_read 5 58806 NULL
++write_file_58812 write_file 4 58812 NULL
 +ep_read_58813 ep_read 3 58813 NULL
 +command_write_58841 command_write 3 58841 NULL
-+ocfs2_truncate_log_append_58850 ocfs2_truncate_log_append 3 58850 NULL
++ocfs2_truncate_log_append_58850 ocfs2_truncate_log_append 3-0 58850 NULL
 +ath6kl_wmi_send_action_cmd_58860 ath6kl_wmi_send_action_cmd 7 58860 NULL
 +gs_alloc_req_58883 gs_alloc_req 2 58883 NULL
-+cs553x_init_one_58886 cs553x_init_one 3 58886 NULL
-+raw_ctl_compat_ioctl_58905 raw_ctl_compat_ioctl 3 58905 NULL
++esas2r_change_queue_depth_58886 esas2r_change_queue_depth 2 58886 NULL
++lprocfs_wr_pinger_recov_58914 lprocfs_wr_pinger_recov 3 58914 NULL
 +print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL
-+tun_chr_compat_ioctl_58921 tun_chr_compat_ioctl 3 58921 NULL
 +pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3 58926 NULL
-+st5481_isoc_flatten_58952 st5481_isoc_flatten 0 58952 NULL
++SyS_pread64_58935 SyS_pread64 3 58935 NULL
++wait_table_hash_nr_entries_58962 wait_table_hash_nr_entries 0 58962 NULL
 +ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout_58965 ieee80211_if_fmt_dot11MeshHWMPactivePathToRootTimeout 3 58965 NULL
-+idx_to_kaddr_58968 idx_to_kaddr 0 58968 NULL
 +crypto_aead_ivsize_58970 crypto_aead_ivsize 0 58970 NULL
++__mem_cgroup_try_charge_58976 __mem_cgroup_try_charge 0 58976 NULL
++init_list_58990 init_list 3 58990 NULL
 +remap_to_cache_dirty_58991 remap_to_cache_dirty 4-3 58991 NULL
-+handle_rx_packet_58993 handle_rx_packet 3 58993 NULL
-+edac_align_ptr_59003 edac_align_ptr 0 59003 NULL
 +ep_write_59008 ep_write 3 59008 NULL
-+i915_ring_stop_write_59010 i915_ring_stop_write 3 59010 NULL
++lpfc_idiag_baracc_write_59014 lpfc_idiag_baracc_write 3 59014 NULL
 +SyS_preadv_59029 SyS_preadv 3 59029 NULL
 +init_pci_cap_msi_perm_59033 init_pci_cap_msi_perm 2 59033 NULL
 +selinux_transaction_write_59038 selinux_transaction_write 3 59038 NULL
 +crypto_aead_reqsize_59039 crypto_aead_reqsize 0 59039 NULL
-+regmap_bulk_write_59049 regmap_bulk_write 4-2 59049 NULL
-+vfio_device_fops_compat_ioctl_59111 vfio_device_fops_compat_ioctl 3 59111 NULL
++regmap_bulk_write_59049 regmap_bulk_write 2-4 59049 NULL
++sysfs_link_sibling_59078 sysfs_link_sibling 0 59078 NULL
++do_perf_sw_event_59099 do_perf_sw_event 3 59099 NULL
 +mmc_sd_num_wr_blocks_59112 mmc_sd_num_wr_blocks 0 59112 NULL
 +scsi_io_completion_59122 scsi_io_completion 2 59122 NULL
++init_status_page_59124 init_status_page 0 59124 NULL
 +nfc_llcp_send_i_frame_59130 nfc_llcp_send_i_frame 3 59130 NULL
-+__iio_add_event_config_attrs_59136 __iio_add_event_config_attrs 0 59136 NULL
-+framebuffer_alloc_59145 framebuffer_alloc 1 59145 NULL nohasharray
-+print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 &framebuffer_alloc_59145
++print_devstats_dot11RTSSuccessCount_59145 print_devstats_dot11RTSSuccessCount 3 59145 NULL nohasharray
++framebuffer_alloc_59145 framebuffer_alloc 1 59145 &print_devstats_dot11RTSSuccessCount_59145
++ocfs2_claim_local_alloc_bits_59147 ocfs2_claim_local_alloc_bits 0 59147 NULL
 +radeon_compat_ioctl_59150 radeon_compat_ioctl 2 59150 NULL
 +pvr2_hdw_report_clients_59152 pvr2_hdw_report_clients 3 59152 NULL
++ksize_59176 ksize 0 59176 NULL
 +setup_window_59178 setup_window 4-2-5-7 59178 NULL
-+ocfs2_move_extent_59187 ocfs2_move_extent 3 59187 NULL
++ocfs2_move_extent_59187 ocfs2_move_extent 3-5-2 59187 NULL
++validate_exec_list_59204 validate_exec_list 0 59204 NULL
 +xfs_iext_realloc_indirect_59211 xfs_iext_realloc_indirect 2 59211 NULL
-+fast_rx_path_59214 fast_rx_path 3 59214 NULL
-+inftl_partscan_59216 inftl_partscan 0 59216 NULL
-+skb_transport_header_59223 skb_transport_header 0 59223 NULL
++check_mapped_selector_name_59216 check_mapped_selector_name 5 59216 NULL
 +dt3155_read_59226 dt3155_read 3 59226 NULL
 +paging64_gpte_to_gfn_lvl_59229 paging64_gpte_to_gfn_lvl 0-1-2 59229 NULL
 +tty_prepare_flip_string_flags_59240 tty_prepare_flip_string_flags 4 59240 NULL
-+solo_v4l2_read_59247 solo_v4l2_read 3 59247 NULL
 +nla_len_59258 nla_len 0 59258 NULL
-+btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4 59304 NULL
++drbd_bm_write_page_59290 drbd_bm_write_page 2 59290 NULL
++__push_leaf_right_59302 __push_leaf_right 0 59302 NULL
++btrfs_insert_dir_item_59304 btrfs_insert_dir_item 4-0 59304 NULL
 +fd_copyout_59323 fd_copyout 3 59323 NULL
 +read_9287_modal_eeprom_59327 read_9287_modal_eeprom 3 59327 NULL
 +rx_defrag_in_process_called_read_59338 rx_defrag_in_process_called_read 3 59338 NULL
 +paging64_get_level1_sp_gpa_59346 paging64_get_level1_sp_gpa 0 59346 NULL nohasharray
 +xfs_attrmulti_attr_set_59346 xfs_attrmulti_attr_set 4 59346 &paging64_get_level1_sp_gpa_59346
++__map_request_59350 __map_request 0 59350 NULL
 +xfs_dir2_sf_entsize_59366 xfs_dir2_sf_entsize 0-2 59366 NULL
++blk_flush_policy_59368 blk_flush_policy 0 59368 NULL
++f2fs_fallocate_59377 f2fs_fallocate 3-4 59377 NULL
 +pvr2_debugifc_print_info_59380 pvr2_debugifc_print_info 3 59380 NULL
-+fc_frame_alloc_fill_59394 fc_frame_alloc_fill 2 59394 NULL
++ocfs2_replay_truncate_records_59382 ocfs2_replay_truncate_records 0 59382 NULL
++journal_init_dev_59384 journal_init_dev 5 59384 NULL
 +isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6 59412 NULL
++pci_ctrl_read_59424 pci_ctrl_read 0 59424 NULL
 +vxge_hw_ring_rxds_per_block_get_59425 vxge_hw_ring_rxds_per_block_get 0 59425 NULL
-+squashfs_read_data_59440 squashfs_read_data 6 59440 NULL
++snd_pcm_tstamp_59431 snd_pcm_tstamp 0 59431 NULL
 +SyS_sched_setaffinity_59442 SyS_sched_setaffinity 2 59442 NULL
-+fs_path_ensure_buf_59445 fs_path_ensure_buf 2 59445 NULL
++fs_path_ensure_buf_59445 fs_path_ensure_buf 2-0 59445 NULL
 +descriptor_loc_59446 descriptor_loc 3 59446 NULL
-+do_compat_semctl_59449 do_compat_semctl 4 59449 NULL
-+virtqueue_add_buf_59470 virtqueue_add_buf 3-4 59470 NULL
++block_rsv_use_bytes_59464 block_rsv_use_bytes 0 59464 NULL
++shrink_tnc_trees_59481 shrink_tnc_trees 0 59481 NULL
++btrfs_del_dir_entries_in_log_59490 btrfs_del_dir_entries_in_log 0 59490 NULL
 +ib_copy_from_udata_59502 ib_copy_from_udata 3 59502 NULL
-+nfsd_nrpools_59503 nfsd_nrpools 0 59503 NULL
-+rds_pin_pages_59507 rds_pin_pages 0-1-2 59507 NULL
++rds_pin_pages_59507 rds_pin_pages 1-2 59507 NULL
++ext4_resize_fs_59543 ext4_resize_fs 2 59543 NULL
 +mpi_get_nbits_59551 mpi_get_nbits 0 59551 NULL
 +tunables_write_59563 tunables_write 3 59563 NULL
++__copy_from_user_ll_nozero_59571 __copy_from_user_ll_nozero 0-3 59571 NULL
++write_pbl_59583 write_pbl 4 59583 NULL
 +memdup_user_59590 memdup_user 2 59590 NULL
 +tps6586x_irq_get_virq_59601 tps6586x_irq_get_virq 2 59601 NULL
-+mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL
++mem_fwlog_free_mem_blks_read_59616 mem_fwlog_free_mem_blks_read 3 59616 NULL nohasharray
++xrcdn_free_res_59616 xrcdn_free_res 5 59616 &mem_fwlog_free_mem_blks_read_59616
++ath6kl_endpoint_stats_write_59621 ath6kl_endpoint_stats_write 3 59621 NULL
 +mtrr_write_59622 mtrr_write 3 59622 NULL
++ocfs2_adjust_rightmost_branch_59623 ocfs2_adjust_rightmost_branch 0 59623 NULL
 +find_first_zero_bit_59636 find_first_zero_bit 0-2 59636 NULL
 +SyS_setdomainname_59646 SyS_setdomainname 2 59646 NULL
-+hidraw_read_59650 hidraw_read 3 59650 NULL nohasharray
-+ubifs_setxattr_59650 ubifs_setxattr 4 59650 &hidraw_read_59650
++hidraw_read_59650 hidraw_read 3 59650 NULL
 +v9fs_xattr_set_acl_59651 v9fs_xattr_set_acl 4 59651 NULL
 +paravirt_sched_clock_59660 paravirt_sched_clock 0 59660 NULL
 +__devcgroup_check_permission_59665 __devcgroup_check_permission 0 59665 NULL
 +iwl_dbgfs_mac_params_read_59666 iwl_dbgfs_mac_params_read 3 59666 NULL
 +alloc_dca_provider_59670 alloc_dca_provider 2 59670 NULL
-+can_nocow_odirect_59681 can_nocow_odirect 3 59681 NULL
-+sriov_enable_59689 sriov_enable 2 59689 NULL
 +mic_calc_failure_read_59700 mic_calc_failure_read 3 59700 NULL
++ioperm_get_59701 ioperm_get 4-3 59701 NULL
++snd_pcm_info_user_59711 snd_pcm_info_user 0 59711 NULL
 +prism2_info_scanresults_59729 prism2_info_scanresults 3 59729 NULL
 +ieee80211_if_read_fwded_unicast_59740 ieee80211_if_read_fwded_unicast 3 59740 NULL
++fat_direct_IO_59741 fat_direct_IO 4 59741 NULL
 +qib_decode_7220_sdma_errs_59745 qib_decode_7220_sdma_errs 4 59745 NULL
 +strnlen_59746 strnlen 0 59746 NULL
-+sctp_manip_pkt_59749 sctp_manip_pkt 4 59749 NULL
-+ext3_acl_count_59754 ext3_acl_count 0-1 59754 NULL
++process_all_refs_59754 process_all_refs 0 59754 NULL nohasharray
++ext3_acl_count_59754 ext3_acl_count 0-1 59754 &process_all_refs_59754
++process_new_xattr_59755 process_new_xattr 0 59755 NULL
 +long_retry_limit_read_59766 long_retry_limit_read 3 59766 NULL
 +venus_remove_59781 venus_remove 4 59781 NULL
 +mei_nfc_recv_59784 mei_nfc_recv 3 59784 NULL
-+C_SYSC_preadv_59801 C_SYSC_preadv 3 59801 NULL
++xlog_do_recover_59789 xlog_do_recover 3 59789 NULL
++msb_get_zone_from_lba_59800 msb_get_zone_from_lba 0-1 59800 NULL
 +ipw_write_59807 ipw_write 3 59807 NULL
-+rtllib_wx_set_gen_ie_59808 rtllib_wx_set_gen_ie 3 59808 NULL
 +scsi_init_shared_tag_map_59812 scsi_init_shared_tag_map 2 59812 NULL
 +ieee80211_if_read_dot11MeshHWMPmaxPREQretries_59829 ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 NULL
 +gspca_dev_probe2_59833 gspca_dev_probe2 4 59833 NULL
++fs64_to_cpu_59845 fs64_to_cpu 0 59845 NULL
 +regmap_raw_write_async_59849 regmap_raw_write_async 2-4 59849 NULL
++intel_ring_wait_request_59865 intel_ring_wait_request 0 59865 NULL
 +pvr2_ioread_set_sync_key_59882 pvr2_ioread_set_sync_key 3 59882 NULL
 +shmem_zero_setup_59885 shmem_zero_setup 0 59885 NULL nohasharray
 +start_transaction_59885 start_transaction 2 59885 &shmem_zero_setup_59885
++l2cap_sock_recvmsg_59886 l2cap_sock_recvmsg 4 59886 NULL
 +ffs_prepare_buffer_59892 ffs_prepare_buffer 2 59892 NULL
++ocfs2_extend_rotate_transaction_59894 ocfs2_extend_rotate_transaction 0 59894 NULL
 +swiotlb_map_page_59909 swiotlb_map_page 3 59909 NULL
++aic7xxx_abort_waiting_scb_59932 aic7xxx_abort_waiting_scb 0 59932 NULL
++kvm_mmu_notifier_invalidate_range_start_59944 kvm_mmu_notifier_invalidate_range_start 3-4 59944 NULL
++ocfs2_expand_inline_ref_root_59945 ocfs2_expand_inline_ref_root 0 59945 NULL
 +il_dbgfs_rxon_flags_read_59950 il_dbgfs_rxon_flags_read 3 59950 NULL nohasharray
 +dapm_widget_power_read_file_59950 dapm_widget_power_read_file 3 59950 &il_dbgfs_rxon_flags_read_59950
 +lookup_node_59953 lookup_node 2 59953 NULL
-+il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL nohasharray
-+compat_ipmi_ioctl_59956 compat_ipmi_ioctl 3 59956 &il_dbgfs_missed_beacon_read_59956
++il_dbgfs_missed_beacon_read_59956 il_dbgfs_missed_beacon_read 3 59956 NULL
 +kvm_set_cr3_59965 kvm_set_cr3 2 59965 NULL
-+fb_getput_cmap_59971 fb_getput_cmap 3 59971 NULL
 +__arch_hweight16_59975 __arch_hweight16 0 59975 NULL
 +osd_req_read_kern_59990 osd_req_read_kern 5 59990 NULL
 +ghash_async_setkey_60001 ghash_async_setkey 3 60001 NULL
 +ieee80211_if_fmt_dot11MeshAwakeWindowDuration_60006 ieee80211_if_fmt_dot11MeshAwakeWindowDuration 3 60006 NULL
 +rawsock_sendmsg_60010 rawsock_sendmsg 4 60010 NULL
 +mthca_init_cq_60011 mthca_init_cq 2 60011 NULL
-+register_device_60015 register_device 2-3 60015 NULL
 +osd_req_list_dev_partitions_60027 osd_req_list_dev_partitions 4 60027 NULL
 +xlog_bread_offset_60030 xlog_bread_offset 3 60030 NULL
-+sys_sched_getaffinity_60033 sys_sched_getaffinity 2 60033 NULL
 +bio_integrity_hw_sectors_60039 bio_integrity_hw_sectors 0-2 60039 NULL
 +do_ip6t_set_ctl_60040 do_ip6t_set_ctl 4 60040 NULL
 +vcs_size_60050 vcs_size 0 60050 NULL nohasharray
 +pin_2_irq_60050 pin_2_irq 0-3 60050 &vcs_size_60050
 +gru_alloc_gts_60056 gru_alloc_gts 3-2 60056 NULL
++open_cur_inode_file_60057 open_cur_inode_file 0 60057 NULL
 +compat_writev_60063 compat_writev 3 60063 NULL
-+ieee80211_build_probe_req_60064 ieee80211_build_probe_req 6-8 60064 NULL
++ath6kl_listen_int_write_60066 ath6kl_listen_int_write 3 60066 NULL
 +c4iw_num_stags_60073 c4iw_num_stags 0 60073 NULL
 +mp_register_gsi_60079 mp_register_gsi 2 60079 NULL
 +rxrpc_kernel_send_data_60083 rxrpc_kernel_send_data 3 60083 NULL
 +ieee80211_if_fmt_fwded_frames_60103 ieee80211_if_fmt_fwded_frames 3 60103 NULL
 +SYSC_msgsnd_60113 SYSC_msgsnd 3 60113 NULL
-+ttm_bo_kmap_60118 ttm_bo_kmap 3-2 60118 NULL
++nfs_idmap_request_key_60124 nfs_idmap_request_key 2 60124 NULL
++__mutex_lock_common_60134 __mutex_lock_common 0 60134 NULL
++ld_usb_read_60156 ld_usb_read 3 60156 NULL
 +jmb38x_ms_count_slots_60164 jmb38x_ms_count_slots 0 60164 NULL
 +init_state_60165 init_state 2 60165 NULL
 +sg_build_sgat_60179 sg_build_sgat 3 60179 NULL nohasharray
 +jffs2_alloc_full_dirent_60179 jffs2_alloc_full_dirent 1 60179 &sg_build_sgat_60179
 +fuse_async_req_send_60183 fuse_async_req_send 0-3 60183 NULL
 +rx_rx_tkip_replays_read_60193 rx_rx_tkip_replays_read 3 60193 NULL
-+svc_compat_ioctl_60194 svc_compat_ioctl 3 60194 NULL
-+qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL nohasharray
-+ib_send_cm_mra_60202 ib_send_cm_mra 4 60202 &qib_reg_phys_mr_60202
-+set_tap_pfs_60203 set_tap_pfs 3 60203 NULL
-+ieee80211_mgmt_tx_60209 ieee80211_mgmt_tx 7 60209 NULL
++qib_reg_phys_mr_60202 qib_reg_phys_mr 3 60202 NULL
 +btrfs_get_token_16_60220 btrfs_get_token_16 0 60220 NULL
 +arizona_map_irq_60230 arizona_map_irq 2 60230 NULL nohasharray
-+__phys_addr_nodebug_60230 __phys_addr_nodebug 0-1 60230 &arizona_map_irq_60230
++__phys_addr_nodebug_60230 __phys_addr_nodebug 0 60230 &arizona_map_irq_60230
 +wm831x_irq_60254 wm831x_irq 2 60254 NULL
-+compat_sys_fcntl64_60256 compat_sys_fcntl64 3 60256 NULL
++irq_alloc_domain_generic_chips_60264 irq_alloc_domain_generic_chips 3-2 60264 NULL
 +printer_write_60276 printer_write 3 60276 NULL
-+__pskb_pull_tail_60287 __pskb_pull_tail 2 60287 NULL
++alloc_irq_pin_list_60277 alloc_irq_pin_list 1 60277 NULL
 +do_xip_mapping_read_60297 do_xip_mapping_read 5 60297 NULL
 +getDataLength_60301 getDataLength 0 60301 NULL
-+ceph_parse_server_name_60318 ceph_parse_server_name 2 60318 NULL
-+__kfifo_from_user_r_60345 __kfifo_from_user_r 3-5 60345 NULL
++xfs_next_bit_60322 xfs_next_bit 0-3 60322 NULL
++inorder_to_tree_60331 inorder_to_tree 1-0 60331 NULL
++usb_alphatrack_write_60341 usb_alphatrack_write 3 60341 NULL
++__kfifo_from_user_r_60345 __kfifo_from_user_r 5-3 60345 NULL
++max_unfragmented_pages_60362 max_unfragmented_pages 0 60362 NULL
 +dccp_setsockopt_60367 dccp_setsockopt 5 60367 NULL
-+ubi_eba_atomic_leb_change_60379 ubi_eba_atomic_leb_change 5 60379 NULL
++ubi_eba_atomic_leb_change_60379 ubi_eba_atomic_leb_change 0-5 60379 NULL
 +instruction_pointer_60384 instruction_pointer 0 60384 NULL
 +drop_outstanding_extent_60390 drop_outstanding_extent 0 60390 NULL
 +mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
@@ -108535,243 +109479,308 @@ index 0000000..9a7096d
 +excessive_retries_read_60425 excessive_retries_read 3 60425 NULL
 +tstats_write_60432 tstats_write 3 60432 NULL nohasharray
 +kmalloc_60432 kmalloc 1 60432 &tstats_write_60432
-+tipc_buf_acquire_60437 tipc_buf_acquire 1 60437 NULL
-+rx_data_60442 rx_data 4 60442 NULL nohasharray
-+scaled_div32_60442 scaled_div32 1-2 60442 &rx_data_60442
-+tcf_csum_ipv4_igmp_60446 tcf_csum_ipv4_igmp 3 60446 NULL
++scaled_div32_60442 scaled_div32 2-1-0 60442 NULL
 +snd_hda_get_num_raw_conns_60462 snd_hda_get_num_raw_conns 0 60462 NULL
 +crypto_shash_setkey_60483 crypto_shash_setkey 3 60483 NULL
-+ath_tx_init_60515 ath_tx_init 2 60515 NULL
-+hysdn_sched_rx_60533 hysdn_sched_rx 3 60533 NULL
++lustre_msg_early_size_60496 lustre_msg_early_size 0 60496 NULL
 +v9fs_fid_readn_60544 v9fs_fid_readn 4 60544 NULL
 +nonpaging_map_60551 nonpaging_map 4 60551 NULL
-+nfsd_hashsize_60562 nfsd_hashsize 0 60562 NULL
++osc_lockless_truncate_seq_write_60553 osc_lockless_truncate_seq_write 3 60553 NULL
++tracing_entries_write_60563 tracing_entries_write 3 60563 NULL
 +hash_net6_expire_60598 hash_net6_expire 3 60598 NULL
++btrfs_add_delayed_tree_ref_60602 btrfs_add_delayed_tree_ref 0 60602 NULL
 +skb_transport_offset_60619 skb_transport_offset 0 60619 NULL
 +wl1273_fm_fops_write_60621 wl1273_fm_fops_write 3 60621 NULL
++usb_control_msg_60624 usb_control_msg 0 60624 NULL
 +acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
++free_dind_blocks_60635 free_dind_blocks 0 60635 NULL
 +ubifs_recover_leb_60639 ubifs_recover_leb 3 60639 NULL
-+fb_get_fscreeninfo_60640 fb_get_fscreeninfo 3 60640 NULL
++__proc_lnet_stats_60647 __proc_lnet_stats 5 60647 NULL
++mv_ffc64_60648 mv_ffc64 1 60648 NULL
 +if_sdio_host_to_card_60666 if_sdio_host_to_card 4 60666 NULL
++run_clustered_refs_60668 run_clustered_refs 0 60668 NULL
 +ieee80211_if_read_dot11MeshConfirmTimeout_60670 ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 NULL
-+read_vbt_r10_60679 read_vbt_r10 1 60679 NULL
++btrfs_reserve_extent_60674 btrfs_reserve_extent 5-0 60674 NULL
 +init_data_container_60709 init_data_container 1 60709 NULL
++vga_rcrt_60731 vga_rcrt 0 60731 NULL
 +snd_ice1712_ds_read_60754 snd_ice1712_ds_read 0 60754 NULL
 +raid_status_60755 raid_status 5 60755 NULL
 +sel_write_checkreqprot_60774 sel_write_checkreqprot 3 60774 NULL
 +opticon_write_60775 opticon_write 4 60775 NULL
 +acl_alloc_num_60778 acl_alloc_num 1-2 60778 NULL
 +snd_pcm_oss_readv3_60792 snd_pcm_oss_readv3 3 60792 NULL
++block_rsv_migrate_bytes_60843 block_rsv_migrate_bytes 0 60843 NULL
 +pwr_tx_with_ps_read_60851 pwr_tx_with_ps_read 3 60851 NULL
-+alloc_buf_60864 alloc_buf 3-2 60864 NULL
++alloc_buf_60864 alloc_buf 2-3 60864 NULL
 +generic_writepages_60871 generic_writepages 0 60871 NULL
++tipc_createport_60875 tipc_createport 4 60875 NULL
++ubifs_read_one_lp_60882 ubifs_read_one_lp 0 60882 NULL
 +ext4_update_inline_data_60888 ext4_update_inline_data 3 60888 NULL
 +iio_debugfs_read_reg_60908 iio_debugfs_read_reg 3 60908 NULL
++libcfs_sock_ioctl_60915 libcfs_sock_ioctl 0 60915 NULL
 +mgt_set_varlen_60916 mgt_set_varlen 4 60916 NULL
 +scrub_chunk_60926 scrub_chunk 5 60926 NULL
-+sys_mlock_60932 sys_mlock 1 60932 NULL
++submit_extent_page_60928 submit_extent_page 5 60928 NULL
 +pti_char_write_60960 pti_char_write 3 60960 NULL
-+mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL
++mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 3-2 60961 NULL
 +__a2mp_build_60987 __a2mp_build 3 60987 NULL
 +hsc_msg_alloc_60990 hsc_msg_alloc 1 60990 NULL
 +ath6kl_lrssi_roam_read_61022 ath6kl_lrssi_roam_read 3 61022 NULL
++graph_depth_write_61024 graph_depth_write 3 61024 NULL
++sdhci_pltfm_register_61031 sdhci_pltfm_register 3 61031 NULL
++lpfc_idiag_queacc_write_61043 lpfc_idiag_queacc_write 3 61043 NULL
 +symtab_init_61050 symtab_init 2 61050 NULL
 +fuse_send_write_61053 fuse_send_write 0-4 61053 NULL
++snd_pcm_pause_61054 snd_pcm_pause 0 61054 NULL
 +bitmap_scnlistprintf_61062 bitmap_scnlistprintf 0-4-2 61062 NULL
 +ahash_align_buffer_size_61070 ahash_align_buffer_size 0-1-2 61070 NULL
++journal_stop_61080 journal_stop 0 61080 NULL
++snd_pcm_update_hw_ptr0_61084 snd_pcm_update_hw_ptr0 0 61084 NULL
 +get_derived_key_61100 get_derived_key 4 61100 NULL
++mem_cgroup_cache_charge_61101 mem_cgroup_cache_charge 0 61101 NULL
++i40e_calculate_l2fpm_size_61104 i40e_calculate_l2fpm_size 0-1-2-3-4 61104 NULL
 +alloc_chrdev_region_61112 alloc_chrdev_region 0 61112 NULL
-+p80211_headerlen_61119 p80211_headerlen 0 61119 NULL nohasharray
-+__probe_kernel_read_61119 __probe_kernel_read 3 61119 &p80211_headerlen_61119
++__probe_kernel_read_61119 __probe_kernel_read 3 61119 NULL
 +vmemmap_alloc_block_buf_61126 vmemmap_alloc_block_buf 1 61126 NULL
 +afs_proc_cells_write_61139 afs_proc_cells_write 3 61139 NULL
 +brcmf_sdio_chip_cr4_exitdl_61143 brcmf_sdio_chip_cr4_exitdl 4 61143 NULL
 +__vmalloc_61168 __vmalloc 1 61168 NULL
 +event_oom_late_read_61175 event_oom_late_read 3 61175 NULL nohasharray
 +pair_device_61175 pair_device 4 61175 &event_oom_late_read_61175
-+sys_lsetxattr_61177 sys_lsetxattr 4 61177 NULL
++dio_bio_add_page_61178 dio_bio_add_page 0 61178 NULL
++btrfs_reloc_post_snapshot_61189 btrfs_reloc_post_snapshot 0 61189 NULL
 +SyS_prctl_61202 SyS_prctl 4 61202 NULL
 +arch_hibernation_header_save_61212 arch_hibernation_header_save 0 61212 NULL
 +smk_read_ambient_61220 smk_read_ambient 3 61220 NULL
-+btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 NULL
-+vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 NULL
-+sys_add_key_61288 sys_add_key 4 61288 NULL nohasharray
-+nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 &sys_add_key_61288
++__verify_planes_array_61249 __verify_planes_array 0 61249 NULL
++find_get_pages_tag_61270 find_get_pages_tag 0 61270 NULL nohasharray
++ifalias_store_61270 ifalias_store 4 61270 &find_get_pages_tag_61270 nohasharray
++btrfs_bio_alloc_61270 btrfs_bio_alloc 3 61270 &ifalias_store_61270
++kick_a_thread_61273 kick_a_thread 0 61273 NULL
++hfsplus_getxattr_finder_info_61283 hfsplus_getxattr_finder_info 0 61283 NULL nohasharray
++vortex_adbdma_getlinearpos_61283 vortex_adbdma_getlinearpos 0 61283 &hfsplus_getxattr_finder_info_61283
++nvme_trans_copy_to_user_61288 nvme_trans_copy_to_user 3 61288 NULL
 +ext4_issue_discard_61305 ext4_issue_discard 2 61305 NULL
 +xfer_from_user_61307 xfer_from_user 3 61307 NULL
++ocfs2_get_sector_61309 ocfs2_get_sector 4 61309 NULL
 +timespec_to_ns_61317 timespec_to_ns 0 61317 NULL
 +xfrm_user_sec_ctx_size_61320 xfrm_user_sec_ctx_size 0 61320 NULL
-+C_SYSC_msgsnd_61330 C_SYSC_msgsnd 2-3 61330 NULL
-+st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 NULL
-+rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 NULL
++C_SYSC_msgsnd_61330 C_SYSC_msgsnd 3 61330 NULL
++write_file_spectral_short_repeat_61335 write_file_spectral_short_repeat 3 61335 NULL
++__fls_61340 __fls 0 61340 NULL nohasharray
++st5481_setup_isocpipes_61340 st5481_setup_isocpipes 6-4 61340 &__fls_61340
++do_splice_direct_61341 do_splice_direct 5 61341 NULL nohasharray
++rx_rx_wa_ba_not_expected_read_61341 rx_rx_wa_ba_not_expected_read 3 61341 &do_splice_direct_61341
++__dm_get_reserved_ios_61342 __dm_get_reserved_ios 0-2-3 61342 NULL
 +f1x_map_sysaddr_to_csrow_61344 f1x_map_sysaddr_to_csrow 2 61344 NULL
++kvm_apic_id_61363 kvm_apic_id 0 61363 NULL
 +debug_debug4_read_61367 debug_debug4_read 3 61367 NULL
-+sys_ptrace_61369 sys_ptrace 3 61369 NULL
-+change_xattr_61390 change_xattr 5 61390 NULL
++get_inode_info_61387 get_inode_info 0 61387 NULL
++system_enable_write_61396 system_enable_write 3 61396 NULL
 +size_entry_mwt_61400 size_entry_mwt 0 61400 NULL
-+dma_ops_area_alloc_61440 dma_ops_area_alloc 3-4-5 61440 NULL
++xfs_zero_remaining_bytes_61423 xfs_zero_remaining_bytes 3 61423 NULL
++i915_emit_box_61436 i915_emit_box 0 61436 NULL
++dma_ops_area_alloc_61440 dma_ops_area_alloc 3-4-5-0 61440 NULL
 +tc3589x_irq_unmap_61447 tc3589x_irq_unmap 2 61447 NULL
 +unix_stream_sendmsg_61455 unix_stream_sendmsg 4 61455 NULL
-+snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 4-2-5 61483 NULL
++snd_pcm_lib_writev_transfer_61483 snd_pcm_lib_writev_transfer 5-4-2 61483 NULL
 +btrfs_item_size_61485 btrfs_item_size 0 61485 NULL
++ocfs2_get_refcount_rec_61514 ocfs2_get_refcount_rec 0 61514 NULL
++__vmalloc_area_node_61525 __vmalloc_area_node 4 61525 NULL
 +erst_errno_61526 erst_errno 0 61526 NULL
 +ntfs_attr_lookup_61539 ntfs_attr_lookup 0 61539 NULL
 +get_ohm_of_thermistor_61545 get_ohm_of_thermistor 2 61545 NULL
++trace_options_core_write_61551 trace_options_core_write 3 61551 NULL
 +o2hb_pop_count_61553 o2hb_pop_count 2 61553 NULL
 +dvb_net_ioctl_61559 dvb_net_ioctl 2 61559 NULL
++parport_pc_fifo_write_block_dma_61568 parport_pc_fifo_write_block_dma 3 61568 NULL
++fan_proc_write_61569 fan_proc_write 3 61569 NULL
 +ieee80211_if_read_rc_rateidx_mask_2ghz_61570 ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 NULL
++ldlm_pool_rw_atomic_seq_write_61572 ldlm_pool_rw_atomic_seq_write 3 61572 NULL
 +seq_open_private_61589 seq_open_private 3 61589 NULL
-+__get_vm_area_61599 __get_vm_area 1 61599 NULL
++ept_gpte_to_gfn_lvl_61591 ept_gpte_to_gfn_lvl 0-2-1 61591 NULL
++netlink_recvmsg_61600 netlink_recvmsg 4 61600 NULL
 +nfs4_init_uniform_client_string_61601 nfs4_init_uniform_client_string 3 61601 NULL
-+ncp_compat_ioctl_61608 ncp_compat_ioctl 3 61608 NULL
 +configfs_write_file_61621 configfs_write_file 3 61621 NULL
 +ieee80211_if_fmt_hw_queues_61629 ieee80211_if_fmt_hw_queues 3 61629 NULL
 +i2o_parm_table_get_61635 i2o_parm_table_get 6 61635 NULL
 +snd_pcm_oss_read3_61643 snd_pcm_oss_read3 0-3 61643 NULL
 +resize_stripes_61650 resize_stripes 2 61650 NULL
-+ttm_page_pool_free_61661 ttm_page_pool_free 2 61661 NULL
++ttm_page_pool_free_61661 ttm_page_pool_free 2-0 61661 NULL
 +insert_one_name_61668 insert_one_name 7 61668 NULL
++snd_pcm_playback_avail_61671 snd_pcm_playback_avail 0 61671 NULL
++qib_format_hwmsg_61679 qib_format_hwmsg 2 61679 NULL
 +lock_loop_61681 lock_loop 1 61681 NULL
 +__do_tune_cpucache_61684 __do_tune_cpucache 2 61684 NULL
 +filter_read_61692 filter_read 3 61692 NULL
++prog_page_61711 prog_page 2 61711 NULL
 +iov_length_61716 iov_length 0 61716 NULL
 +fragmentation_threshold_read_61718 fragmentation_threshold_read 3 61718 NULL
++null_alloc_reqbuf_61719 null_alloc_reqbuf 3 61719 NULL
 +read_file_interrupt_61742 read_file_interrupt 3 61742 NULL nohasharray
 +read_file_regval_61742 read_file_regval 3 61742 &read_file_interrupt_61742
 +SyS_sendto_61763 SyS_sendto 6 61763 NULL
-+batadv_dat_snoop_incoming_arp_reply_61801 batadv_dat_snoop_incoming_arp_reply 3 61801 NULL
++gfs2_meta_wait_61773 gfs2_meta_wait 0 61773 NULL
++num_counter_active_61789 num_counter_active 0 61789 NULL
++mls_compute_context_len_61812 mls_compute_context_len 0 61812 NULL
 +tps80031_irq_init_61830 tps80031_irq_init 3 61830 NULL
 +bfad_debugfs_write_regwr_61841 bfad_debugfs_write_regwr 3 61841 NULL
-+fs_path_prepare_for_add_61854 fs_path_prepare_for_add 2 61854 NULL
++regcache_sync_block_61846 regcache_sync_block 4-5 61846 NULL
++fs_path_prepare_for_add_61854 fs_path_prepare_for_add 2-0 61854 NULL
 +evdev_compute_buffer_size_61863 evdev_compute_buffer_size 0 61863 NULL
 +SYSC_lsetxattr_61869 SYSC_lsetxattr 4 61869 NULL
 +get_fw_name_61874 get_fw_name 3 61874 NULL
-+free_init_pages_61875 free_init_pages 2 61875 NULL
-+twl4030_sih_setup_61878 twl4030_sih_setup 3 61878 NULL
-+ieee80211_rtl_auth_challenge_61897 ieee80211_rtl_auth_challenge 3 61897 NULL
-+ax25_addr_size_61899 ax25_addr_size 0 61899 NULL nohasharray
-+cxgb4_pktgl_to_skb_61899 cxgb4_pktgl_to_skb 2 61899 &ax25_addr_size_61899
++twl4030_sih_setup_61878 twl4030_sih_setup 3-0 61878 NULL
++btrfs_ioctl_clone_61886 btrfs_ioctl_clone 4-3-5 61886 NULL
++lprocfs_write_frac_u64_helper_61897 lprocfs_write_frac_u64_helper 2 61897 NULL
++lov_mds_md_stripecnt_61899 lov_mds_md_stripecnt 0-1 61899 NULL
 +clear_refs_write_61904 clear_refs_write 3 61904 NULL
 +rx_filter_arp_filter_read_61914 rx_filter_arp_filter_read 3 61914 NULL
-+au0828_init_isoc_61917 au0828_init_isoc 3-2 61917 NULL
++au0828_init_isoc_61917 au0828_init_isoc 3-2-4 61917 NULL
 +sctp_sendmsg_61919 sctp_sendmsg 4 61919 NULL
-+send_bulk_static_data_61932 send_bulk_static_data 3 61932 NULL
++ocfs2_reserve_new_metadata_blocks_61926 ocfs2_reserve_new_metadata_blocks 0 61926 NULL
 +SyS_kexec_load_61946 SyS_kexec_load 2 61946 NULL
 +gfn_to_pfn_memslot_atomic_61947 gfn_to_pfn_memslot_atomic 2 61947 NULL
 +il4965_ucode_rx_stats_read_61948 il4965_ucode_rx_stats_read 3 61948 NULL
 +squashfs_read_id_index_table_61961 squashfs_read_id_index_table 4 61961 NULL
++fix_read_error_61965 fix_read_error 4 61965 NULL
 +mlx4_alloc_mtt_range_61966 mlx4_alloc_mtt_range 2 61966 NULL
 +ocfs2_quota_write_61972 ocfs2_quota_write 5-4 61972 NULL
++fd_locked_ioctl_61978 fd_locked_ioctl 3 61978 NULL
 +cow_file_range_61979 cow_file_range 3 61979 NULL
 +module_alloc_exec_61991 module_alloc_exec 1 61991 NULL
-+virtnet_send_command_61993 virtnet_send_command 5-6 61993 NULL
++dequeue_event_62000 dequeue_event 3 62000 NULL
 +xt_compat_match_offset_62011 xt_compat_match_offset 0 62011 NULL
 +SyS_setxattr_62019 SyS_setxattr 4 62019 NULL
 +jffs2_do_unlink_62020 jffs2_do_unlink 4 62020 NULL
 +SYSC_select_62024 SYSC_select 1 62024 NULL
 +pmcraid_build_passthrough_ioadls_62034 pmcraid_build_passthrough_ioadls 2 62034 NULL
-+ppp_tx_cp_62044 ppp_tx_cp 5 62044 NULL
 +sctp_user_addto_chunk_62047 sctp_user_addto_chunk 2-3 62047 NULL
 +do_pselect_62061 do_pselect 1 62061 NULL
-+pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2-3 62074 NULL
++pcpu_alloc_bootmem_62074 pcpu_alloc_bootmem 2 62074 NULL
 +get_domain_for_dev_62099 get_domain_for_dev 2 62099 NULL
-+ipath_user_sdma_pin_pages_62100 ipath_user_sdma_pin_pages 3-5 62100 NULL
++ipath_user_sdma_pin_pages_62100 ipath_user_sdma_pin_pages 3-5-4 62100 NULL
 +jffs2_security_setxattr_62107 jffs2_security_setxattr 4 62107 NULL
++btrfs_direct_IO_62114 btrfs_direct_IO 4 62114 NULL
++generic_block_fiemap_62122 generic_block_fiemap 4 62122 NULL
 +llc_ui_header_len_62131 llc_ui_header_len 0 62131 NULL
-+qib_diag_write_62133 qib_diag_write 3 62133 NULL
-+ql_status_62135 ql_status 5 62135 NULL
++qib_diag_write_62133 qib_diag_write 3 62133 NULL nohasharray
++kobject_add_varg_62133 kobject_add_varg 0 62133 &qib_diag_write_62133
++ql_status_62135 ql_status 5 62135 NULL nohasharray
++device_add_attrs_62135 device_add_attrs 0 62135 &ql_status_62135
 +video_usercopy_62151 video_usercopy 2 62151 NULL
++wrmWithLock_62164 wrmWithLock 0 62164 NULL
 +SyS_getxattr_62166 SyS_getxattr 4 62166 NULL
 +prism54_wpa_bss_ie_get_62173 prism54_wpa_bss_ie_get 0 62173 NULL
++write_file_dfs_62180 write_file_dfs 3 62180 NULL
 +alloc_upcall_62186 alloc_upcall 2 62186 NULL
 +btrfs_xattr_acl_set_62203 btrfs_xattr_acl_set 4 62203 NULL
 +sock_kmalloc_62205 sock_kmalloc 2 62205 NULL
 +SYSC_setgroups16_62232 SYSC_setgroups16 1 62232 NULL
 +nfsd_read_file_62241 nfsd_read_file 6 62241 NULL
 +allocate_partition_62245 allocate_partition 4 62245 NULL
++security_file_permission_62278 security_file_permission 0 62278 NULL
++get_random_int_62279 get_random_int 0 62279 NULL
 +__qib_get_user_pages_62287 __qib_get_user_pages 1-2 62287 NULL
 +il_dbgfs_sram_read_62296 il_dbgfs_sram_read 3 62296 NULL
 +sparse_early_usemaps_alloc_pgdat_section_62304 sparse_early_usemaps_alloc_pgdat_section 2 62304 NULL
++ocfs2_find_victim_alloc_group_62306 ocfs2_find_victim_alloc_group 0 62306 NULL
 +subsystem_filter_read_62310 subsystem_filter_read 3 62310 NULL
-+udf_sb_alloc_partition_maps_62313 udf_sb_alloc_partition_maps 2 62313 NULL
++timespec_to_jiffies_62321 timespec_to_jiffies 0 62321 NULL
 +Wb35Reg_BurstWrite_62327 Wb35Reg_BurstWrite 4 62327 NULL
 +subseq_list_62332 subseq_list 3-0 62332 NULL
++ll_statahead_max_seq_write_62333 ll_statahead_max_seq_write 3 62333 NULL
 +flash_write_62354 flash_write 3 62354 NULL
-+set_wd_exp_mode_pfs_62372 set_wd_exp_mode_pfs 3 62372 NULL
-+twl_get_num_slaves_62386 twl_get_num_slaves 0 62386 NULL
++xfpregs_set_62363 xfpregs_set 4 62363 NULL
 +rx_rx_timeout_read_62389 rx_rx_timeout_read 3 62389 NULL
 +altera_irscan_62396 altera_irscan 2 62396 NULL
 +set_ssp_62411 set_ssp 4 62411 NULL
-+unmap_single_62423 unmap_single 2 62423 NULL
-+netdev_alloc_skb_62437 netdev_alloc_skb 2 62437 NULL
-+e1000_check_copybreak_62448 e1000_check_copybreak 3 62448 NULL
-+ip_vs_icmp_xmit_v6_62477 ip_vs_icmp_xmit_v6 4 62477 NULL
-+ceph_dns_resolve_name_62488 ceph_dns_resolve_name 2 62488 NULL
-+remove_mapping_62491 remove_mapping 2 62491 NULL
 +mlx4_en_create_rx_ring_62498 mlx4_en_create_rx_ring 3 62498 NULL
 +ext_rts51x_sd_execute_read_data_62501 ext_rts51x_sd_execute_read_data 9 62501 NULL
-+i915_next_seqno_read_62524 i915_next_seqno_read 3 62524 NULL nohasharray
-+pep_sendmsg_62524 pep_sendmsg 4 62524 &i915_next_seqno_read_62524
-+test_iso_queue_62534 test_iso_queue 5 62534 NULL
++ocfs2_path_bh_journal_access_62504 ocfs2_path_bh_journal_access 0 62504 NULL
++pep_sendmsg_62524 pep_sendmsg 4 62524 NULL
++test_iso_queue_62534 test_iso_queue 5 62534 NULL nohasharray
++__kmalloc_node_track_caller_62534 __kmalloc_node_track_caller 3 62534 &test_iso_queue_62534
 +debugfs_read_62535 debugfs_read 3 62535 NULL
 +sco_sock_sendmsg_62542 sco_sock_sendmsg 4 62542 NULL
 +qib_refresh_qsfp_cache_62547 qib_refresh_qsfp_cache 0 62547 NULL
 +xfrm_user_policy_62573 xfrm_user_policy 4 62573 NULL
-+compat_SyS_rt_sigpending_62580 compat_SyS_rt_sigpending 2 62580 NULL
 +get_subdir_62581 get_subdir 3 62581 NULL
-+nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 NULL nohasharray
-+prism2_send_mgmt_62605 prism2_send_mgmt 4 62605 &nfsd_vfs_read_62605
-+iommu_area_alloc_62619 iommu_area_alloc 2-3-4-7 62619 NULL
-+ems_pcmcia_add_card_62627 ems_pcmcia_add_card 2 62627 NULL
-+compat_rangeinfo_62630 compat_rangeinfo 2 62630 NULL
++nfsd_vfs_read_62605 nfsd_vfs_read 6 62605 NULL
++get_desc_base_62617 get_desc_base 0 62617 NULL
++iommu_area_alloc_62619 iommu_area_alloc 2-3-4-7-0 62619 NULL
++vfs_fsync_range_62635 vfs_fsync_range 0 62635 NULL
 +lpfc_sli4_queue_alloc_62646 lpfc_sli4_queue_alloc 3 62646 NULL
-+memblock_alloc_nid_62652 memblock_alloc_nid 1-2 62652 NULL
-+ima_file_mmap_62663 ima_file_mmap 0 62663 NULL
 +write_62671 write 3 62671 NULL
++ocfs2_wait_for_mask_interruptible_62675 ocfs2_wait_for_mask_interruptible 0 62675 NULL
 +printer_req_alloc_62687 printer_req_alloc 2 62687 NULL
++ext4_ind_map_blocks_62690 ext4_ind_map_blocks 0 62690 NULL
++htb_remove_class_from_row_62692 htb_remove_class_from_row 3 62692 NULL
 +qla4_83xx_rd_reg_62693 qla4_83xx_rd_reg 0 62693 NULL
-+ioremap_wc_62695 ioremap_wc 1-2 62695 NULL
 +bioset_integrity_create_62708 bioset_integrity_create 2 62708 NULL
++gfs2_log_write_62717 gfs2_log_write 3 62717 NULL
 +rdm_62719 rdm 0 62719 NULL
++obd_ioctl_popdata_62741 obd_ioctl_popdata 3 62741 NULL
 +key_replays_read_62746 key_replays_read 3 62746 NULL
-+init_chip_wc_pat_62768 init_chip_wc_pat 2 62768 NULL
++lov_verify_lmm_62747 lov_verify_lmm 2 62747 NULL
++mwifiex_rdeeprom_write_62754 mwifiex_rdeeprom_write 3 62754 NULL
 +ax25_sendmsg_62770 ax25_sendmsg 4 62770 NULL
 +page_key_alloc_62771 page_key_alloc 0 62771 NULL
-+C_SYSC_ipc_62776 C_SYSC_ipc 5-3-6-4 62776 NULL
++C_SYSC_ipc_62776 C_SYSC_ipc 3 62776 NULL
 +SyS_sched_getaffinity_62786 SyS_sched_getaffinity 2 62786 NULL
++dm_stats_account_io_62787 dm_stats_account_io 3 62787 NULL
++posix_acl_valid_62788 posix_acl_valid 0 62788 NULL
++is_first_ref_62805 is_first_ref 0 62805 NULL
 +tracing_total_entries_read_62817 tracing_total_entries_read 3 62817 NULL
++name_cache_insert_62822 name_cache_insert 0 62822 NULL
++BeceemEEPROMBulkRead_62835 BeceemEEPROMBulkRead 0 62835 NULL
 +__rounddown_pow_of_two_62836 __rounddown_pow_of_two 0 62836 NULL
 +bio_get_nr_vecs_62838 bio_get_nr_vecs 0 62838 NULL
 +xlog_recover_add_to_trans_62839 xlog_recover_add_to_trans 4 62839 NULL
 +rx_fcs_err_read_62844 rx_fcs_err_read 3 62844 NULL
 +set_swbp_62853 set_swbp 3 62853 NULL
-+hpi_read_word_62862 hpi_read_word 0 62862 NULL
++read_nic_io_dword_62859 read_nic_io_dword 0 62859 NULL
++l2tp_ip6_recvmsg_62874 l2tp_ip6_recvmsg 4 62874 NULL
 +aoechr_write_62883 aoechr_write 3 62883 NULL
-+resize_info_buffer_62889 resize_info_buffer 2 62889 NULL
 +if_spi_host_to_card_62890 if_spi_host_to_card 4 62890 NULL
++ocfs2_validate_gd_parent_62905 ocfs2_validate_gd_parent 0 62905 NULL
 +mempool_create_slab_pool_62907 mempool_create_slab_pool 1 62907 NULL
 +getdqbuf_62908 getdqbuf 1 62908 NULL
 +try_async_pf_62914 try_async_pf 3 62914 NULL nohasharray
-+SyS_remap_file_pages_62914 SyS_remap_file_pages 1 62914 &try_async_pf_62914
++SyS_remap_file_pages_62914 SyS_remap_file_pages 1-2 62914 &try_async_pf_62914
++ll_statahead_agl_seq_write_62928 ll_statahead_agl_seq_write 3 62928 NULL
++atomic64_sub_return_62941 atomic64_sub_return 1 62941 NULL
 +agp_create_user_memory_62955 agp_create_user_memory 1 62955 NULL
-+__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 NULL
++send_write_62969 send_write 0-3 62969 NULL
++__ext3_journal_stop_63017 __ext3_journal_stop 0 63017 NULL
++kstrtoull_from_user_63026 kstrtoull_from_user 2 63026 NULL
++PTR_ERR_63033 PTR_ERR 0 63033 NULL nohasharray
++__vb2_perform_fileio_63033 __vb2_perform_fileio 3 63033 &PTR_ERR_63033
 +pipeline_defrag_to_csum_swi_read_63037 pipeline_defrag_to_csum_swi_read 3 63037 NULL
 +scsi_host_alloc_63041 scsi_host_alloc 2 63041 NULL
-+gso_pskb_expand_head_63052 gso_pskb_expand_head 2 63052 NULL
++run_delayed_tree_ref_63042 run_delayed_tree_ref 0 63042 NULL
 +unlink1_63059 unlink1 3 63059 NULL
++__do_munmap_63063 __do_munmap 0 63063 NULL
 +xen_set_nslabs_63066 xen_set_nslabs 0 63066 NULL
-+ocfs2_decrease_refcount_63078 ocfs2_decrease_refcount 3 63078 NULL
-+sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5-2-3 63087 NULL
++iwl_dbgfs_fw_rx_stats_read_63070 iwl_dbgfs_fw_rx_stats_read 3 63070 NULL
++ocfs2_decrease_refcount_63078 ocfs2_decrease_refcount 4-3-0 63078 NULL
++find_extent_in_eb_63082 find_extent_in_eb 0 63082 NULL
++sep_prepare_input_output_dma_table_in_dcb_63087 sep_prepare_input_output_dma_table_in_dcb 4-5-3-2 63087 NULL
++__ocfs2_flush_truncate_log_63097 __ocfs2_flush_truncate_log 0 63097 NULL
 +iwl_dbgfs_sensitivity_read_63116 iwl_dbgfs_sensitivity_read 3 63116 NULL
++ext4_chunk_trans_blocks_63123 ext4_chunk_trans_blocks 0-2 63123 NULL
 +alloc_cblock_63133 alloc_cblock 2 63133 NULL
-+ib_send_cm_rtu_63138 ib_send_cm_rtu 3 63138 NULL
-+xen_zap_pfn_range_63149 xen_zap_pfn_range 1 63149 NULL
++snd_pcm_status_user_63140 snd_pcm_status_user 0 63140 NULL
++ubifs_change_one_lp_63157 ubifs_change_one_lp 0 63157 NULL
 +smk_write_revoke_subj_63173 smk_write_revoke_subj 3 63173 NULL
 +SyS_syslog_63178 SyS_syslog 3 63178 NULL
++security_policydb_len_63198 security_policydb_len 0 63198 NULL
 +vme_master_read_63221 vme_master_read 0 63221 NULL
 +SyS_gethostname_63227 SyS_gethostname 2 63227 NULL
 +module_alloc_update_bounds_rw_63233 module_alloc_update_bounds_rw 1 63233 NULL
 +ptp_read_63251 ptp_read 4 63251 NULL
++xfs_dir2_leaf_getdents_63262 xfs_dir2_leaf_getdents 3 63262 NULL
++ntfs_attr_can_be_non_resident_63267 ntfs_attr_can_be_non_resident 0 63267 NULL
 +raid5_resize_63306 raid5_resize 2 63306 NULL
 +proc_info_read_63344 proc_info_read 3 63344 NULL
 +ps_upsd_max_sptime_read_63362 ps_upsd_max_sptime_read 3 63362 NULL
@@ -108781,102 +109790,125 @@ index 0000000..9a7096d
 +rxpipe_missed_beacon_host_int_trig_rx_data_read_63405 rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 NULL
 +nouveau_event_create_63411 nouveau_event_create 1 63411 NULL
 +l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 4 63427 NULL
-+sep_prepare_input_output_dma_table_63429 sep_prepare_input_output_dma_table 2-4-3 63429 NULL
-+kone_send_63435 kone_send 4 63435 NULL
-+gfn_to_hva_many_63437 gfn_to_hva_many 0-2 63437 NULL
++sep_prepare_input_output_dma_table_63429 sep_prepare_input_output_dma_table 3-4-2 63429 NULL
++gfn_to_hva_many_63437 gfn_to_hva_many 2-0 63437 NULL
 +nfsd_symlink_63442 nfsd_symlink 6 63442 NULL
-+ipv6_is_mld_63461 ipv6_is_mld 3 63461 NULL
++lookup_dir_item_inode_63447 lookup_dir_item_inode 0 63447 NULL
++i915_gem_object_get_fence_63455 i915_gem_object_get_fence 0 63455 NULL
++__do_kmalloc_node_63461 __do_kmalloc_node 3 63461 NULL
++si5351_bulk_write_63468 si5351_bulk_write 2-3 63468 NULL
 +snd_info_entry_write_63474 snd_info_entry_write 3 63474 NULL
++do_work_63483 do_work 0 63483 NULL
 +reada_find_extent_63486 reada_find_extent 2 63486 NULL
-+read_kcore_63488 read_kcore 3 63488 NULL
++__copy_from_user_ll_nocache_63487 __copy_from_user_ll_nocache 0-3 63487 NULL
++read_kcore_63488 read_kcore 3 63488 NULL nohasharray
++alloc_reserved_tree_block_63488 alloc_reserved_tree_block 0 63488 &read_kcore_63488
 +save_hint_63497 save_hint 2 63497 NULL
++wl1271_tx_min_rate_get_63498 wl1271_tx_min_rate_get 2 63498 NULL
++sis_voice_irq_63501 sis_voice_irq 1 63501 NULL
 +snd_pcm_plug_write_transfer_63503 snd_pcm_plug_write_transfer 0-3 63503 NULL
-+ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4 63534 NULL
++efx_mcdi_rpc_async_63529 efx_mcdi_rpc_async 5-4 63529 NULL
++ubi_more_leb_change_data_63534 ubi_more_leb_change_data 4-0 63534 NULL
++write_file_spectral_period_63536 write_file_spectral_period 3 63536 NULL
 +if_sdio_read_scratch_63540 if_sdio_read_scratch 0 63540 NULL
 +append_to_buffer_63550 append_to_buffer 3 63550 NULL
 +dbg_leb_write_63555 dbg_leb_write 4-5 63555 NULL nohasharray
-+kvm_write_guest_page_63555 kvm_write_guest_page 5-2 63555 &dbg_leb_write_63555
++kvm_write_guest_page_63555 kvm_write_guest_page 2-5 63555 &dbg_leb_write_63555
 +ubifs_lpt_scan_nolock_63572 ubifs_lpt_scan_nolock 0 63572 NULL
 +iwch_reg_user_mr_63575 iwch_reg_user_mr 2-3 63575 NULL
 +ocfs2_calc_trunc_pos_63576 ocfs2_calc_trunc_pos 4 63576 NULL
 +rproc_alloc_63577 rproc_alloc 5 63577 NULL
 +ext3_clear_blocks_63597 ext3_clear_blocks 4-5 63597 NULL
++write_debug_level_63613 write_debug_level 3 63613 NULL
 +module_alloc_63630 module_alloc 1 63630 NULL
 +ntfs_malloc_nofs_nofail_63631 ntfs_malloc_nofs_nofail 1 63631 NULL
 +symbol_build_supp_rates_63634 symbol_build_supp_rates 0 63634 NULL
-+_ubh_find_next_zero_bit__63640 _ubh_find_next_zero_bit_ 4-5-3 63640 NULL
++_ubh_find_next_zero_bit__63640 _ubh_find_next_zero_bit_ 3-5-4 63640 NULL
++ext4_ext_get_access_63642 ext4_ext_get_access 0 63642 NULL
 +proc_loginuid_write_63648 proc_loginuid_write 3 63648 NULL
 +ValidateDSDParamsChecksum_63654 ValidateDSDParamsChecksum 3 63654 NULL
++ldlm_cli_enqueue_63657 ldlm_cli_enqueue 8 63657 NULL
 +hidraw_ioctl_63658 hidraw_ioctl 2 63658 NULL
 +vbi_read_63673 vbi_read 3 63673 NULL nohasharray
 +xen_register_pirq_63673 xen_register_pirq 1-2 63673 &vbi_read_63673
-+alloc_tty_driver_63681 alloc_tty_driver 1 63681 NULL
-+mkiss_compat_ioctl_63686 mkiss_compat_ioctl 4 63686 NULL
++write_file_spectral_fft_period_63696 write_file_spectral_fft_period 3 63696 NULL
++bin_search_63697 bin_search 0 63697 NULL
 +arizona_irq_map_63709 arizona_irq_map 2 63709 NULL
++ocfs2_et_root_journal_access_63713 ocfs2_et_root_journal_access 0 63713 NULL
 +nouveau_object_create__63715 nouveau_object_create_ 5 63715 NULL
-+btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4 63720 NULL
++btrfs_insert_delayed_dir_index_63720 btrfs_insert_delayed_dir_index 4-0 63720 NULL
 +selinux_secctx_to_secid_63744 selinux_secctx_to_secid 2 63744 NULL
 +snd_pcm_oss_read1_63771 snd_pcm_oss_read1 3 63771 NULL
++snd_pcm_link_63772 snd_pcm_link 0 63772 NULL
 +snd_opl4_mem_proc_read_63774 snd_opl4_mem_proc_read 5 63774 NULL
-+spidev_compat_ioctl_63778 spidev_compat_ioctl 2-3 63778 NULL
-+snapshot_compat_ioctl_63792 snapshot_compat_ioctl 3 63792 NULL
-+kovaplus_sysfs_write_63795 kovaplus_sysfs_write 6 63795 NULL
++spidev_compat_ioctl_63778 spidev_compat_ioctl 2 63778 NULL
 +mwifiex_11n_create_rx_reorder_tbl_63806 mwifiex_11n_create_rx_reorder_tbl 4 63806 NULL
 +copy_nodes_to_user_63807 copy_nodes_to_user 2 63807 NULL
-+dec_zcache_eph_zbytes_63817 dec_zcache_eph_zbytes 1 63817 NULL
 +prepare_copy_63826 prepare_copy 2 63826 NULL
 +sel_write_load_63830 sel_write_load 3 63830 NULL
++ll_readlink_63836 ll_readlink 3 63836 NULL
++IsSectionWritable_63842 IsSectionWritable 0 63842 NULL
 +proc_pid_attr_write_63845 proc_pid_attr_write 3 63845 NULL
-+init_map_ipmac_63896 init_map_ipmac 4-3 63896 NULL
 +divas_write_63901 divas_write 3 63901 NULL
-+xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 NULL
-+uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-3-2 63922 NULL
++IsOffsetWritable_63902 IsOffsetWritable 0 63902 NULL nohasharray
++xhci_alloc_stream_info_63902 xhci_alloc_stream_info 3 63902 &IsOffsetWritable_63902
++uvc_alloc_urb_buffers_63922 uvc_alloc_urb_buffers 0-2-3 63922 NULL
 +snd_compr_write_63923 snd_compr_write 3 63923 NULL
 +acpi_ev_get_gpe_xrupt_block_63924 acpi_ev_get_gpe_xrupt_block 1 63924 NULL
 +tipc_send2port_63935 tipc_send2port 5 63935 NULL
 +afs_send_simple_reply_63940 afs_send_simple_reply 3 63940 NULL
 +__team_options_register_63941 __team_options_register 3 63941 NULL
 +macvtap_recvmsg_63949 macvtap_recvmsg 4 63949 NULL
-+ieee80211_if_fmt_rc_rateidx_mcs_mask_2ghz_63968 ieee80211_if_fmt_rc_rateidx_mcs_mask_2ghz 3 63968 NULL
-+ieee80211_authentication_req_63973 ieee80211_authentication_req 3 63973 NULL
++generic_acl_init_63955 generic_acl_init 0 63955 NULL
++domain_pfn_mapping_63957 domain_pfn_mapping 4 63957 NULL
 +diva_xdi_write_63975 diva_xdi_write 4 63975 NULL
++rs_extent_to_bm_page_63996 rs_extent_to_bm_page 0-1 63996 NULL
 +read_file_frameerrors_64001 read_file_frameerrors 3 64001 NULL
-+kmemdup_64015 kmemdup 2 64015 NULL
++hfsplus_security_setxattr_64009 hfsplus_security_setxattr 4 64009 NULL
++C_SYSC_sendfile64_64017 C_SYSC_sendfile64 4 64017 NULL
 +SyS_rt_sigpending_64018 SyS_rt_sigpending 2 64018 NULL
-+tcf_csum_skb_nextlayer_64025 tcf_csum_skb_nextlayer 3 64025 NULL nohasharray
-+offset_to_vaddr_64025 offset_to_vaddr 0-2 64025 &tcf_csum_skb_nextlayer_64025
++offset_to_vaddr_64025 offset_to_vaddr 0-2 64025 NULL
 +dbAllocDmapLev_64030 dbAllocDmapLev 0 64030 NULL
 +resize_async_buffer_64031 resize_async_buffer 4 64031 NULL
 +SyS_fsetxattr_64039 SyS_fsetxattr 4 64039 NULL
-+sep_lli_table_secure_dma_64042 sep_lli_table_secure_dma 2-3 64042 NULL
 +tfrc_calc_x_reverse_lookup_64057 tfrc_calc_x_reverse_lookup 0 64057 NULL
++__sock_create_64069 __sock_create 0 64069 NULL
 +get_u8_64076 get_u8 0 64076 NULL
++xilly_malloc_64077 xilly_malloc 2 64077 NULL
++btrfs_copy_root_64079 btrfs_copy_root 0 64079 NULL
 +sl_realloc_bufs_64086 sl_realloc_bufs 2 64086 NULL
-+vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 NULL
++clear_update_marker_64088 clear_update_marker 0 64088 NULL nohasharray
++vmci_handle_arr_get_size_64088 vmci_handle_arr_get_size 0 64088 &clear_update_marker_64088
 +lbs_highrssi_read_64089 lbs_highrssi_read 3 64089 NULL
 +SyS_set_mempolicy_64096 SyS_set_mempolicy 3 64096 NULL
 +SyS_mq_timedsend_64107 SyS_mq_timedsend 3 64107 NULL
++rdma_addr_size_64116 rdma_addr_size 0 64116 NULL
 +do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL
++bypass_wd_write_64120 bypass_wd_write 3 64120 NULL
 +ol_quota_entries_per_block_64122 ol_quota_entries_per_block 0 64122 NULL
 +ext4_prepare_inline_data_64124 ext4_prepare_inline_data 3 64124 NULL
-+init_bch_64130 init_bch 1-2 64130 NULL
-+SYSC_ptrace_64136 SYSC_ptrace 3-4 64136 NULL
-+uea_idma_write_64139 uea_idma_write 3 64139 NULL
++init_bch_64130 init_bch 2-1 64130 NULL
++SYSC_ptrace_64136 SYSC_ptrace 3 64136 NULL
 +ablkcipher_copy_iv_64140 ablkcipher_copy_iv 3 64140 NULL
 +dlfb_ops_write_64150 dlfb_ops_write 3 64150 NULL
 +__comedi_buf_alloc_64155 __comedi_buf_alloc 3 64155 NULL
-+cpumask_scnprintf_64170 cpumask_scnprintf 2 64170 NULL
++cpumask_scnprintf_64170 cpumask_scnprintf 0-2 64170 NULL
++ocfs2_reserve_blocks_for_rec_trunc_64206 ocfs2_reserve_blocks_for_rec_trunc 0 64206 NULL
++xfs_vm_direct_IO_64223 xfs_vm_direct_IO 4 64223 NULL
 +read_pulse_64227 read_pulse 0-3 64227 NULL
-+header_len_64232 header_len 0 64232 NULL
-+redrat3_transmit_ir_64244 redrat3_transmit_ir 3 64244 NULL
++ea_len_64229 ea_len 0 64229 NULL
++btrfs_make_block_group_64241 btrfs_make_block_group 0 64241 NULL
++__btrfs_update_delayed_inode_64248 __btrfs_update_delayed_inode 0 64248 NULL
 +io_capture_transfer_64276 io_capture_transfer 4 64276 NULL
 +btrfs_file_extent_offset_64278 btrfs_file_extent_offset 0 64278 NULL
++btrfs_next_item_64285 btrfs_next_item 0 64285 NULL
 +sta_current_tx_rate_read_64286 sta_current_tx_rate_read 3 64286 NULL
 +event_id_read_64288 event_id_read 3 64288 NULL nohasharray
 +xfs_dir_cilookup_result_64288 xfs_dir_cilookup_result 3 64288 &event_id_read_64288
 +ocfs2_block_check_validate_bhs_64302 ocfs2_block_check_validate_bhs 0 64302 NULL
++snd_hda_get_sub_nodes_64304 snd_hda_get_sub_nodes 0 64304 NULL
 +error_error_bar_retry_read_64305 error_error_bar_retry_read 3 64305 NULL
-+ffz_64324 ffz 0 64324 NULL
++ffz_64324 ffz 0-1 64324 NULL
 +map_region_64328 map_region 1 64328 NULL
 +sisusbcon_clear_64329 sisusbcon_clear 4-3-5 64329 NULL
 +ts_write_64336 ts_write 3 64336 NULL
@@ -108884,7 +109916,9 @@ index 0000000..9a7096d
 +do_write_orph_node_64343 do_write_orph_node 2 64343 NULL
 +ft1000_read_reg_64352 ft1000_read_reg 0 64352 NULL
 +bnx2x_vfop_mcast_cmd_64354 bnx2x_vfop_mcast_cmd 5 64354 NULL
++user_regset_copyin_64360 user_regset_copyin 7 64360 NULL
 +wlc_phy_loadsampletable_nphy_64367 wlc_phy_loadsampletable_nphy 3 64367 NULL
++reg_create_64372 reg_create 5 64372 NULL
 +ilo_write_64378 ilo_write 3 64378 NULL
 +btrfs_map_block_64379 btrfs_map_block 3 64379 NULL
 +vmcs_readl_64381 vmcs_readl 0 64381 NULL
@@ -108898,41 +109932,54 @@ index 0000000..9a7096d
 +oom_adj_write_64428 oom_adj_write 3 64428 NULL
 +ext4_trim_extent_64431 ext4_trim_extent 4 64431 NULL nohasharray
 +read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3 64431 &ext4_trim_extent_64431
-+cap_capable_64462 cap_capable 0 64462 NULL
-+ip_vs_create_timeout_table_64478 ip_vs_create_timeout_table 2 64478 NULL
++ax25_recvmsg_64441 ax25_recvmsg 4 64441 NULL
 +single_open_size_64483 single_open_size 4 64483 NULL
 +p54_parse_rssical_64493 p54_parse_rssical 3 64493 NULL
 +msg_data_sz_64503 msg_data_sz 0 64503 NULL
-+handle_abnormal_pfn_64505 handle_abnormal_pfn 3 64505 NULL nohasharray
-+remove_uuid_64505 remove_uuid 4 64505 &handle_abnormal_pfn_64505
++remove_uuid_64505 remove_uuid 4 64505 NULL nohasharray
++handle_abnormal_pfn_64505 handle_abnormal_pfn 3 64505 &remove_uuid_64505
 +crypto_blkcipher_alignmask_64520 crypto_blkcipher_alignmask 0 64520 NULL
 +opera1_usb_i2c_msgxfer_64521 opera1_usb_i2c_msgxfer 4 64521 NULL
++iwl_dbgfs_ucode_tracing_write_64524 iwl_dbgfs_ucode_tracing_write 3 64524 NULL
 +ses_send_diag_64527 ses_send_diag 4 64527 NULL
 +prctl_set_mm_64538 prctl_set_mm 3 64538 NULL
 +SyS_bind_64544 SyS_bind 3 64544 NULL
-+rbd_obj_read_sync_64554 rbd_obj_read_sync 3-4 64554 NULL
-+__spi_sync_64561 __spi_sync 0 64561 NULL
++rbd_obj_read_sync_64554 rbd_obj_read_sync 4-3 64554 NULL
++__btrfs_prealloc_file_range_64557 __btrfs_prealloc_file_range 3-0 64557 NULL
++__spi_sync_64561 __spi_sync 0 64561 NULL nohasharray
++ll_max_rw_chunk_seq_write_64561 ll_max_rw_chunk_seq_write 3 64561 &__spi_sync_64561
 +__apei_exec_run_64563 __apei_exec_run 0 64563 NULL
++kstrtoul_from_user_64569 kstrtoul_from_user 2 64569 NULL
++do_erase_64574 do_erase 4 64574 NULL
 +fanotify_write_64623 fanotify_write 3 64623 NULL
++ocfs2_remove_refcount_extent_64631 ocfs2_remove_refcount_extent 0 64631 NULL
 +to_dblock_64655 to_dblock 0-1 64655 NULL
 +regmap_read_debugfs_64658 regmap_read_debugfs 5 64658 NULL
 +ocfs2_read_xattr_block_64661 ocfs2_read_xattr_block 0 64661 NULL nohasharray
-+tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661
++tlbflush_read_file_64661 tlbflush_read_file 3 64661 &ocfs2_read_xattr_block_64661 nohasharray
++pool_create_64661 pool_create 3 64661 &tlbflush_read_file_64661
 +efx_tsoh_get_buffer_64664 efx_tsoh_get_buffer 3 64664 NULL
 +rx_rx_out_of_mpdu_nodes_read_64668 rx_rx_out_of_mpdu_nodes_read 3 64668 NULL
 +nr_free_zone_pages_64680 nr_free_zone_pages 0 64680 NULL
-+sec_bulk_write_64691 sec_bulk_write 2-3 64691 NULL
-+__feat_register_sp_64712 __feat_register_sp 6 64712 NULL
++sec_bulk_write_64691 sec_bulk_write 2-3 64691 NULL nohasharray
++mremap_to_64691 mremap_to 0-3 64691 &sec_bulk_write_64691
++pfn_to_hpa_64703 pfn_to_hpa 0-1 64703 NULL
++ip_select_ident_more_64707 ip_select_ident_more 4 64707 NULL
 +snd_pcm_oss_capture_position_fixup_64713 snd_pcm_oss_capture_position_fixup 0 64713 NULL
 +dapm_bias_read_file_64715 dapm_bias_read_file 3 64715 NULL
 +atomic_add_return_64720 atomic_add_return 0-1 64720 NULL
 +i2400m_msg_to_dev_64722 i2400m_msg_to_dev 3 64722 NULL
++AscGetChipVersion_64737 AscGetChipVersion 0 64737 NULL
 +squashfs_read_inode_lookup_table_64739 squashfs_read_inode_lookup_table 4 64739 NULL
++perf_swevent_event_64745 perf_swevent_event 2 64745 NULL
 +bio_map_kern_64751 bio_map_kern 3 64751 NULL
 +rt2x00debug_write_csr_64753 rt2x00debug_write_csr 3 64753 NULL
++message_for_md_64777 message_for_md 5 64777 NULL
 +isr_low_rssi_read_64789 isr_low_rssi_read 3 64789 NULL
 +regmap_reg_ranges_read_file_64798 regmap_reg_ranges_read_file 3 64798 NULL
 +nfsctl_transaction_write_64800 nfsctl_transaction_write 3 64800 NULL
++rfkill_fop_write_64808 rfkill_fop_write 3 64808 NULL
++proc_projid_map_write_64810 proc_projid_map_write 3 64810 NULL
 +megaraid_change_queue_depth_64815 megaraid_change_queue_depth 2 64815 NULL
 +ecryptfs_send_miscdev_64816 ecryptfs_send_miscdev 2 64816 NULL
 +vaddr_get_pfn_64818 vaddr_get_pfn 1 64818 NULL
@@ -108940,68 +109987,78 @@ index 0000000..9a7096d
 +do_kimage_alloc_64827 do_kimage_alloc 3 64827 NULL
 +altera_set_dr_pre_64862 altera_set_dr_pre 2 64862 NULL
 +gfn_to_pfn_64870 gfn_to_pfn 2 64870 NULL
++lprocfs_write_u64_helper_64880 lprocfs_write_u64_helper 2 64880 NULL
 +ffs_epfile_io_64886 ffs_epfile_io 3 64886 NULL
++mk_pid_64894 mk_pid 0-3 64894 NULL
 +ieee80211_if_read_ave_beacon_64924 ieee80211_if_read_ave_beacon 3 64924 NULL
++usb_reset_and_verify_device_64933 usb_reset_and_verify_device 0 64933 NULL
 +ubifs_wbuf_write_nolock_64946 ubifs_wbuf_write_nolock 3 64946 NULL
-+snd_rawmidi_ioctl_compat_64954 snd_rawmidi_ioctl_compat 3 64954 NULL
 +ip_options_get_from_user_64958 ip_options_get_from_user 4 64958 NULL
 +acpi_os_install_interrupt_handler_64968 acpi_os_install_interrupt_handler 1 64968 NULL
 +traceprobe_probes_write_64969 traceprobe_probes_write 3 64969 NULL
 +suspend_dtim_interval_read_64971 suspend_dtim_interval_read 3 64971 NULL
 +ext2_group_first_block_no_64972 ext2_group_first_block_no 0-2 64972 NULL
-+pskb_pull_65005 pskb_pull 2 65005 NULL
-+unifi_write_65012 unifi_write 3 65012 NULL
 +crypto_ahash_digestsize_65014 crypto_ahash_digestsize 0 65014 NULL
-+nfs_readdata_alloc_65015 nfs_readdata_alloc 2 65015 NULL
 +insert_dent_65034 insert_dent 7 65034 NULL
-+compat_put_ushort_65040 compat_put_ushort 1 65040 NULL
-+brcmf_sdcard_rwdata_65041 brcmf_sdcard_rwdata 5 65041 NULL
-+tty_audit_log_65043 tty_audit_log 8 65043 NULL
-+compat_cmdtest_65064 compat_cmdtest 2 65064 NULL
-+count_run_65072 count_run 0-2-4 65072 NULL nohasharray
-+bnx2fc_process_l2_frame_compl_65072 bnx2fc_process_l2_frame_compl 3 65072 &count_run_65072
-+__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2-3 65076 NULL
++snd_hda_get_pin_label_65035 snd_hda_get_pin_label 5 65035 NULL
++ext4_ind_trans_blocks_65053 ext4_ind_trans_blocks 0-2 65053 NULL
++pcibios_enable_device_65059 pcibios_enable_device 0 65059 NULL
++make_idx_node_65068 make_idx_node 0 65068 NULL
++count_run_65072 count_run 0-2-4-5 65072 NULL
++__alloc_bootmem_node_high_65076 __alloc_bootmem_node_high 2 65076 NULL
 +ocfs2_truncate_cluster_pages_65086 ocfs2_truncate_cluster_pages 2 65086 NULL
-+ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 0 65090 NULL
-+C_SYSC_semctl_65091 C_SYSC_semctl 4 65091 NULL
-+ssb_bus_register_65183 ssb_bus_register 3 65183 NULL
++send_create_inode_65090 send_create_inode 0 65090 NULL nohasharray
++ath9k_dump_mci_btcoex_65090 ath9k_dump_mci_btcoex 0 65090 &send_create_inode_65090
++uasp_alloc_cmd_65097 uasp_alloc_cmd 0 65097 NULL
++__ext3_journal_dirty_metadata_65103 __ext3_journal_dirty_metadata 0 65103 NULL
++generic_ocp_write_65107 generic_ocp_write 4 65107 NULL
++kswapd_shrink_zone_65174 kswapd_shrink_zone 4 65174 NULL
++i2c_smbus_xfer_emulated_65183 i2c_smbus_xfer_emulated 0 65183 NULL
++btrfs_run_delayed_items_nr_65204 btrfs_run_delayed_items_nr 0 65204 NULL
 +rx_rx_done_read_65217 rx_rx_done_read 3 65217 NULL
 +print_endpoint_stat_65232 print_endpoint_stat 3-4-0 65232 NULL
++journal_get_write_access_65243 journal_get_write_access 0 65243 NULL
 +whci_n_caps_65247 whci_n_caps 0 65247 NULL
-+atomic_long_read_65263 atomic_long_read 0 65263 NULL
 +kmem_zalloc_greedy_65268 kmem_zalloc_greedy 3-2 65268 NULL
 +kmalloc_parameter_65279 kmalloc_parameter 1 65279 NULL
 +compat_core_sys_select_65285 compat_core_sys_select 1 65285 NULL
++get_unaligned_le16_65293 get_unaligned_le16 0 65293 NULL
 +mpi_set_buffer_65294 mpi_set_buffer 3 65294 NULL
 +redirected_tty_write_65297 redirected_tty_write 3 65297 NULL
 +get_var_len_65304 get_var_len 0 65304 NULL
 +unpack_array_65318 unpack_array 0 65318 NULL
 +pci_vpd_find_tag_65325 pci_vpd_find_tag 0-2 65325 NULL
 +dccp_setsockopt_service_65336 dccp_setsockopt_service 4 65336 NULL
-+init_list_set_65351 init_list_set 2-3 65351 NULL
++init_list_set_65351 init_list_set 3-2 65351 NULL
 +dma_rx_requested_read_65354 dma_rx_requested_read 3 65354 NULL
 +batadv_tt_save_orig_buffer_65361 batadv_tt_save_orig_buffer 4 65361 NULL
 +alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL
 +__ext4_new_inode_65370 __ext4_new_inode 5 65370 NULL
-+strchr_65372 strchr 0 65372 NULL nohasharray
-+SyS_writev_65372 SyS_writev 3 65372 &strchr_65372
-+__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1-2 65397 NULL
++SyS_writev_65372 SyS_writev 3 65372 NULL
++mi_set_context_65395 mi_set_context 0 65395 NULL
++__alloc_bootmem_nopanic_65397 __alloc_bootmem_nopanic 1 65397 NULL
 +trace_seq_to_user_65398 trace_seq_to_user 3 65398 NULL
 +mtd_get_device_size_65400 mtd_get_device_size 0 65400 NULL
-+iio_device_add_channel_sysfs_65406 iio_device_add_channel_sysfs 0 65406 NULL
-+ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 3-4 65410 NULL
-+drm_calloc_large_65421 drm_calloc_large 1-2 65421 NULL
++__read_vmcore_65402 __read_vmcore 2 65402 NULL
++usb_ep_enable_65405 usb_ep_enable 0 65405 NULL
++ocfs2_write_begin_nolock_65410 ocfs2_write_begin_nolock 4-3 65410 NULL
++drm_calloc_large_65421 drm_calloc_large 2-1 65421 NULL
++device_add_groups_65423 device_add_groups 0 65423 NULL
 +xpc_kzalloc_cacheline_aligned_65433 xpc_kzalloc_cacheline_aligned 1 65433 NULL
++vmalloc_to_pfn_65437 vmalloc_to_pfn 0 65437 NULL
 +usb_alloc_coherent_65444 usb_alloc_coherent 2 65444 NULL
-+ath_rx_edma_init_65483 ath_rx_edma_init 2 65483 NULL
++il_dbgfs_wd_timeout_write_65464 il_dbgfs_wd_timeout_write 3 65464 NULL
++ext4_es_zeroout_65465 ext4_es_zeroout 0 65465 NULL
++clear_user_65470 clear_user 2 65470 NULL
 +dpcm_state_read_file_65489 dpcm_state_read_file 3 65489 NULL
-+alloc_dr_65495 alloc_dr 2 65495 NULL
++lookup_inline_extent_backref_65493 lookup_inline_extent_backref 9-0 65493 NULL
++nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL
 diff --git a/tools/gcc/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin.c
 new file mode 100644
-index 0000000..03d0c84
+index 0000000..a3f9702
 --- /dev/null
 +++ b/tools/gcc/size_overflow_plugin.c
-@@ -0,0 +1,2113 @@
+@@ -0,0 +1,3870 @@
 +/*
 + * Copyright 2011, 2012, 2013 by Emese Revfy <re.emese@gmail.com>
 + * Licensed under the GPL v2, or (at your option) v3
@@ -109040,6 +110097,30 @@ index 0000000..03d0c84
 +
 +#if BUILDING_GCC_VERSION >= 4008
 +#define TODO_dump_func 0
++#define TODO_dump_cgraph 0
++#endif
++
++#define __unused __attribute__((__unused__))
++#define ASM_NAME(node) IDENTIFIER_POINTER(DECL_ASSEMBLER_NAME(node))
++#define NAME(node) IDENTIFIER_POINTER(DECL_NAME(node))
++#define NAME_LEN(node) IDENTIFIER_LENGTH(DECL_NAME(node))
++#define BEFORE_STMT true
++#define AFTER_STMT false
++#define CREATE_NEW_VAR NULL_TREE
++#define CODES_LIMIT 32
++#define MAX_PARAM 31
++#define VEC_LEN 128
++#define MY_STMT GF_PLF_1
++#define NO_CAST_CHECK GF_PLF_2
++#define RET_CHECK NULL_TREE
++#define CANNOT_FIND_ARG 32
++#define WRONG_NODE 32
++#define NOT_INTENTIONAL_ASM NULL
++#define MIN_CHECK true
++#define MAX_CHECK false
++
++#if BUILDING_GCC_VERSION == 4005
++#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE)))
 +#endif
 +
 +struct size_overflow_hash {
@@ -109054,44 +110135,56 @@ index 0000000..03d0c84
 +	MARK_NO, MARK_YES, MARK_NOT_INTENTIONAL, MARK_TURN_OFF
 +};
 +
-+enum err_code_conditions {
-+	CAST_ONLY, FROM_CONST
-+};
++static unsigned int call_count;
 +
-+static unsigned int call_count = 0;
++struct visited {
++	struct visited *next;
++	const_tree fndecl;
++	unsigned int num;
++	const_gimple first_stmt;
++};
 +
-+#define __unused __attribute__((__unused__))
-+#define NAME(node) IDENTIFIER_POINTER(DECL_NAME(node))
-+#define NAME_LEN(node) IDENTIFIER_LENGTH(DECL_NAME(node))
-+#define BEFORE_STMT true
-+#define AFTER_STMT false
-+#define CREATE_NEW_VAR NULL_TREE
-+#define CODES_LIMIT 32
-+#define MAX_PARAM 31
-+#define MY_STMT GF_PLF_1
-+#define NO_CAST_CHECK GF_PLF_2
-+#define FROM_ARG true
-+#define FROM_RET false
++struct next_cgraph_node {
++	struct next_cgraph_node *next;
++	struct cgraph_node *current_function;
++	tree callee_fndecl;
++	unsigned int num;
++};
 +
-+#if BUILDING_GCC_VERSION == 4005
-+#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE)))
++struct interesting_node {
++	struct interesting_node *next;
++	gimple first_stmt;
++	const_tree fndecl;
++	tree node;
++#if BUILDING_GCC_VERSION <= 4007
++	VEC(tree, gc) *last_nodes;
++#else
++	vec<tree, va_gc> *last_nodes;
 +#endif
++	unsigned int num;
++	enum mark intentional_attr_decl;
++	enum mark intentional_attr_cur_fndecl;
++	gimple intentional_mark_from_gimple;
++};
 +
 +int plugin_is_GPL_compatible;
 +void debug_gimple_stmt(gimple gs);
 +
-+static tree expand(struct pointer_set_t *visited, tree lhs);
-+static enum mark pre_expand(struct pointer_set_t *visited, bool *search_err_code, const_tree lhs);
 +static tree report_size_overflow_decl;
 +static const_tree const_char_ptr_type_node;
-+static unsigned int handle_function(void);
-+static void check_size_overflow(gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before);
++
++static tree expand(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs);
++static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs);
++static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs);
++static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs);
++static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs);
++
++static void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before);
 +static tree get_size_overflow_type(gimple stmt, const_tree node);
 +static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3);
-+static void print_missing_msg(tree func, unsigned int argnum);
 +
 +static struct plugin_info size_overflow_plugin_info = {
-+	.version	= "20130822beta",
++	.version	= "20131203beta",
 +	.help		= "no-size-overflow\tturn off size overflow checking\n",
 +};
 +
@@ -109124,14 +110217,9 @@ index 0000000..03d0c84
 +	return NULL_TREE;
 +}
 +
-+static const char* get_asm_name(tree node)
-+{
-+	return IDENTIFIER_POINTER(DECL_ASSEMBLER_NAME(node));
-+}
-+
 +static tree handle_intentional_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
 +{
-+	unsigned int arg_count, arg_num;
++	unsigned int arg_count;
 +	enum tree_code code = TREE_CODE(*node);
 +
 +	switch (code) {
@@ -109143,11 +110231,6 @@ index 0000000..03d0c84
 +		arg_count = type_num_arguments(*node);
 +		break;
 +	case FIELD_DECL:
-+		arg_num = TREE_INT_CST_LOW(TREE_VALUE(args));
-+		if (arg_num != 0) {
-+			*no_add_attrs = true;
-+			error("%s: %qE attribute parameter can only be 0 in structure fields", __func__, name);
-+		}
 +		return NULL_TREE;
 +	default:
 +		*no_add_attrs = true;
@@ -109200,55 +110283,70 @@ index 0000000..03d0c84
 +	register_attribute(&intentional_overflow_attr);
 +}
 +
-+// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html
-+static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed)
++static bool is_bool(const_tree node)
 +{
-+#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); }
-+#define cwmixa( in ) { cwfold( in, m, k, h ); }
-+#define cwmixb( in ) { cwfold( in, n, h, k ); }
-+
-+	unsigned int m = 0x57559429;
-+	unsigned int n = 0x5052acdb;
-+	const unsigned int *key4 = (const unsigned int *)key;
-+	unsigned int h = len;
-+	unsigned int k = len + seed + n;
-+	unsigned long long p;
++	const_tree type;
 +
-+	while (len >= 8) {
-+		cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2;
-+		len -= 8;
-+	}
-+	if (len >= 4) {
-+		cwmixb(key4[0]) key4 += 1;
-+		len -= 4;
-+	}
-+	if (len)
-+		cwmixa(key4[0] & ((1 << (len * 8)) - 1 ));
-+	cwmixb(h ^ (k + n));
-+	return k ^ h;
++	if (node == NULL_TREE)
++		return false;
 +
-+#undef cwfold
-+#undef cwmixa
-+#undef cwmixb
++	type = TREE_TYPE(node);
++	if (!INTEGRAL_TYPE_P(type))
++		return false;
++	if (TREE_CODE(type) == BOOLEAN_TYPE)
++		return true;
++	if (TYPE_PRECISION(type) == 1)
++		return true;
++	return false;
 +}
 +
-+static inline unsigned int get_hash_num(const char *fndecl, const char *tree_codes, unsigned int len, unsigned int seed)
++static bool skip_types(const_tree var)
 +{
-+	unsigned int fn = CrapWow(fndecl, strlen(fndecl), seed) & 0xffff;
-+	unsigned int codes = CrapWow(tree_codes, len, seed) & 0xffff;
-+	return fn ^ codes;
-+}
++	tree type;
++	enum tree_code code;
 +
-+static inline tree get_original_function_decl(tree fndecl)
-+{
-+	if (DECL_ABSTRACT_ORIGIN(fndecl))
-+		return DECL_ABSTRACT_ORIGIN(fndecl);
-+	return fndecl;
++	if (is_gimple_constant(var))
++		return true;
++
++	switch (TREE_CODE(var)) {
++		case ADDR_EXPR:
++#if BUILDING_GCC_VERSION >= 4006
++		case MEM_REF:
++#endif
++		case ARRAY_REF:
++		case BIT_FIELD_REF:
++		case INDIRECT_REF:
++		case TARGET_MEM_REF:
++		case COMPONENT_REF:
++		case VAR_DECL:
++		case VIEW_CONVERT_EXPR:
++			return true;
++		default:
++			break;
++	}
++
++	code = TREE_CODE(var);
++	gcc_assert(code == SSA_NAME || code == PARM_DECL);
++
++	type = TREE_TYPE(var);
++	switch (TREE_CODE(type)) {
++		case INTEGER_TYPE:
++		case ENUMERAL_TYPE:
++			return false;
++		case BOOLEAN_TYPE:
++			return is_bool(var);
++		default:
++			return true;
++	}
 +}
 +
 +static inline gimple get_def_stmt(const_tree node)
 +{
 +	gcc_assert(node != NULL_TREE);
++
++	if (skip_types(node))
++		return NULL;
++
 +	if (TREE_CODE(node) != SSA_NAME)
 +		return NULL;
 +	return SSA_NAME_DEF_STMT(node);
@@ -109291,163 +110389,149 @@ index 0000000..03d0c84
 +	}
 +}
 +
-+static size_t add_type_codes(const_tree type, unsigned char *tree_codes, size_t len)
++struct function_hash {
++	size_t tree_codes_len;
++	unsigned char tree_codes[CODES_LIMIT];
++	tree fndecl;
++	unsigned int hash;
++};
++
++// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html
++static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed)
++{
++#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); }
++#define cwmixa( in ) { cwfold( in, m, k, h ); }
++#define cwmixb( in ) { cwfold( in, n, h, k ); }
++
++	unsigned int m = 0x57559429;
++	unsigned int n = 0x5052acdb;
++	const unsigned int *key4 = (const unsigned int *)key;
++	unsigned int h = len;
++	unsigned int k = len + seed + n;
++	unsigned long long p;
++
++	while (len >= 8) {
++		cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2;
++		len -= 8;
++	}
++	if (len >= 4) {
++		cwmixb(key4[0]) key4 += 1;
++		len -= 4;
++	}
++	if (len)
++		cwmixa(key4[0] & ((1 << (len * 8)) - 1 ));
++	cwmixb(h ^ (k + n));
++	return k ^ h;
++
++#undef cwfold
++#undef cwmixa
++#undef cwmixb
++}
++
++static void set_hash(const char *fn_name, struct function_hash *fn_hash_data)
++{
++	unsigned int fn, codes, seed = 0;
++
++	fn = CrapWow(fn_name, strlen(fn_name), seed) & 0xffff;
++	codes = CrapWow((const char*)fn_hash_data->tree_codes, fn_hash_data->tree_codes_len, seed) & 0xffff;
++
++	fn_hash_data->hash = fn ^ codes;
++}
++
++static void set_node_codes(const_tree type, struct function_hash *fn_hash_data)
 +{
 +	gcc_assert(type != NULL_TREE);
++	gcc_assert(TREE_CODE_CLASS(TREE_CODE(type)) == tcc_type);
 +
-+	while (type && len < CODES_LIMIT) {
-+		tree_codes[len] = get_tree_code(type);
-+		len++;
++	while (type && fn_hash_data->tree_codes_len < CODES_LIMIT) {
++		fn_hash_data->tree_codes[fn_hash_data->tree_codes_len] = get_tree_code(type);
++		fn_hash_data->tree_codes_len++;
 +		type = TREE_TYPE(type);
 +	}
-+	return len;
 +}
 +
-+static unsigned int get_function_decl(const_tree fndecl, unsigned char *tree_codes)
++static void set_result_codes(const_tree node, struct function_hash *fn_hash_data)
 +{
-+	const_tree arg, result, arg_field, type = TREE_TYPE(fndecl);
-+	enum tree_code code = TREE_CODE(type);
-+	size_t len = 0;
++	const_tree result;
 +
-+	gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE);
++	gcc_assert(node != NULL_TREE);
 +
-+	arg = TYPE_ARG_TYPES(type);
-+	// skip builtins __builtin_constant_p
-+	if (!arg && DECL_BUILT_IN(fndecl))
-+		return 0;
++	if (DECL_P(node)) {
++		result = DECL_RESULT(node);
++		if (result != NULL_TREE)
++			return set_node_codes(TREE_TYPE(result), fn_hash_data);
++		return set_result_codes(TREE_TYPE(node), fn_hash_data);
++	}
 +
-+	if (TREE_CODE_CLASS(code) == tcc_type)
-+		result = type;
-+	else
-+		result = DECL_RESULT(fndecl);
++	gcc_assert(TYPE_P(node));
 +
-+	gcc_assert(result != NULL_TREE);
-+	len = add_type_codes(TREE_TYPE(result), tree_codes, len);
++	if (TREE_CODE(node) == FUNCTION_TYPE)
++		return set_result_codes(TREE_TYPE(node), fn_hash_data);
 +
-+	if (arg == NULL_TREE) {
-+		gcc_assert(CODE_CONTAINS_STRUCT(TREE_CODE(fndecl), TS_DECL_NON_COMMON));
-+		arg_field = DECL_ARGUMENT_FLD(fndecl);
-+		if (arg_field == NULL_TREE)
-+			return 0;
-+		arg = TREE_TYPE(arg_field);
-+		len = add_type_codes(arg, tree_codes, len);
-+		gcc_assert(len != 0);
-+		return len;
-+	}
++	return set_node_codes(node, fn_hash_data);
++}
 +
-+	gcc_assert(arg != NULL_TREE && TREE_CODE(arg) == TREE_LIST);
-+	while (arg && len < CODES_LIMIT) {
-+		len = add_type_codes(TREE_VALUE(arg), tree_codes, len);
-+		arg = TREE_CHAIN(arg);
-+	}
++static void set_function_codes(struct function_hash *fn_hash_data)
++{
++	const_tree arg, type = TREE_TYPE(fn_hash_data->fndecl);
++	enum tree_code code = TREE_CODE(type);
 +
-+	gcc_assert(len != 0);
-+	return len;
++	gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE);
++
++	set_result_codes(fn_hash_data->fndecl, fn_hash_data);
++
++	for (arg = TYPE_ARG_TYPES(type); arg != NULL_TREE && fn_hash_data->tree_codes_len < CODES_LIMIT; arg = TREE_CHAIN(arg))
++		set_node_codes(TREE_VALUE(arg), fn_hash_data);
 +}
 +
 +static const struct size_overflow_hash *get_function_hash(tree fndecl)
 +{
-+	unsigned int hash;
 +	const struct size_overflow_hash *entry;
-+	unsigned char tree_codes[CODES_LIMIT];
-+	size_t len;
++	struct function_hash fn_hash_data;
 +	const char *func_name;
 +
-+	fndecl = get_original_function_decl(fndecl);
-+	len = get_function_decl(fndecl, tree_codes);
-+	if (len == 0)
++	// skip builtins __builtin_constant_p
++	if (DECL_BUILT_IN(fndecl))
 +		return NULL;
 +
-+	func_name = get_asm_name(fndecl);
-+	hash = get_hash_num(func_name, (const char*) tree_codes, len, 0);
++	fn_hash_data.fndecl = fndecl;
++	fn_hash_data.tree_codes_len = 0;
++
++	set_function_codes(&fn_hash_data);
++	gcc_assert(fn_hash_data.tree_codes_len != 0);
++
++	func_name = ASM_NAME(fn_hash_data.fndecl);
++	set_hash(func_name, &fn_hash_data);
++
++	entry = size_overflow_hash[fn_hash_data.hash];
 +
-+	entry = size_overflow_hash[hash];
 +	while (entry) {
 +		if (!strcmp(entry->name, func_name))
 +			return entry;
 +		entry = entry->next;
 +	}
-+
 +	return NULL;
 +}
 +
-+static bool is_bool(const_tree node)
-+{
-+	const_tree type;
-+
-+	if (node == NULL_TREE)
-+		return false;
-+
-+	type = TREE_TYPE(node);
-+	if (!INTEGRAL_TYPE_P(type))
-+		return false;
-+	if (TREE_CODE(type) == BOOLEAN_TYPE)
-+		return true;
-+	if (TYPE_PRECISION(type) == 1)
-+		return true;
-+	return false;
-+}
-+
-+static bool skip_types(const_tree var)
++static void print_missing_msg(tree func, unsigned int argnum)
 +{
-+	tree type;
-+
-+	if (is_gimple_constant(var))
-+		return true;
-+
-+	switch (TREE_CODE(var)) {
-+		case ADDR_EXPR:
-+#if BUILDING_GCC_VERSION >= 4006
-+		case MEM_REF:
-+#endif
-+		case ARRAY_REF:
-+		case BIT_FIELD_REF:
-+		case INDIRECT_REF:
-+		case TARGET_MEM_REF:
-+			return true;
-+		case PARM_DECL:
-+		case VAR_DECL:
-+		case COMPONENT_REF:
-+			return false;
-+		default:
-+			break;
-+	}
++	location_t loc;
++	const char *curfunc;
++	struct function_hash fn_hash_data;
 +
-+	gcc_assert(TREE_CODE(var) == SSA_NAME);
++	fn_hash_data.fndecl = DECL_ORIGIN(func);
++	fn_hash_data.tree_codes_len = 0;
 +
-+	type = TREE_TYPE(var);
-+	switch (TREE_CODE(type)) {
-+		case INTEGER_TYPE:
-+		case ENUMERAL_TYPE:
-+			return false;
-+		case BOOLEAN_TYPE:
-+			return is_bool(var);
-+		default:
-+			break;
-+	}
++	loc = DECL_SOURCE_LOCATION(fn_hash_data.fndecl);
++	curfunc = ASM_NAME(fn_hash_data.fndecl);
 +
-+	gcc_assert(TREE_CODE(type) == POINTER_TYPE);
++	set_function_codes(&fn_hash_data);
++	set_hash(curfunc, &fn_hash_data);
 +
-+	type = TREE_TYPE(type);
-+	gcc_assert(type != NULL_TREE);
-+	switch (TREE_CODE(type)) {
-+		case RECORD_TYPE:
-+		case POINTER_TYPE:
-+		case ARRAY_TYPE:
-+			return true;
-+		case VOID_TYPE:
-+		case INTEGER_TYPE:
-+		case UNION_TYPE:
-+			return false;
-+		default:
-+			break;
-+	}
-+
-+	debug_tree((tree)var);
-+	gcc_unreachable();
++	inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, fn_hash_data.hash);
 +}
 +
-+static unsigned int find_arg_number(const_tree arg, tree func)
++static unsigned int find_arg_number_tree(const_tree arg, const_tree func)
 +{
 +	tree var;
 +	unsigned int argnum = 1;
@@ -109462,7 +110546,7 @@ index 0000000..03d0c84
 +			return argnum;
 +	}
 +
-+	return 0;
++	return CANNOT_FIND_ARG;
 +}
 +
 +static tree create_new_var(tree type)
@@ -109484,7 +110568,7 @@ index 0000000..03d0c84
 +
 +	gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2)));
 +	assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2);
-+	gimple_set_lhs(assign, make_ssa_name(lhs, assign));
++	gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
 +
 +	gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
 +	update_stmt(assign);
@@ -109505,11 +110589,10 @@ index 0000000..03d0c84
 +{
 +	switch (gimple_code(stmt)) {
 +	case GIMPLE_ASSIGN:
++	case GIMPLE_CALL:
 +		return gimple_get_lhs(stmt);
 +	case GIMPLE_PHI:
 +		return gimple_phi_result(stmt);
-+	case GIMPLE_CALL:
-+		return gimple_call_lhs(stmt);
 +	default:
 +		return NULL_TREE;
 +	}
@@ -109547,7 +110630,7 @@ index 0000000..03d0c84
 +		gcc_unreachable();
 +
 +	def_stmt = get_def_stmt(rhs);
-+	if (skip_cast(dst_type, rhs, force) && gimple_plf(def_stmt, MY_STMT))
++	if (def_stmt && gimple_code(def_stmt) != GIMPLE_NOP && skip_cast(dst_type, rhs, force) && gimple_plf(def_stmt, MY_STMT))
 +		return def_stmt;
 +
 +	if (lhs == CREATE_NEW_VAR)
@@ -109560,15 +110643,13 @@ index 0000000..03d0c84
 +		gimple_set_location(assign, loc);
 +	}
 +
-+	gimple_set_lhs(assign, make_ssa_name(lhs, assign));
++	gimple_assign_set_lhs(assign, make_ssa_name(lhs, assign));
 +
 +	if (before)
 +		gsi_insert_before(gsi, assign, GSI_NEW_STMT);
 +	else
 +		gsi_insert_after(gsi, assign, GSI_NEW_STMT);
 +	update_stmt(assign);
-+	gimple_set_plf(assign, MY_STMT, true);
-+
 +	return assign;
 +}
 +
@@ -109576,13 +110657,14 @@ index 0000000..03d0c84
 +{
 +	gimple_stmt_iterator gsi;
 +	tree lhs;
-+	const_gimple new_stmt;
++	gimple new_stmt;
 +
 +	if (rhs == NULL_TREE)
 +		return NULL_TREE;
 +
 +	gsi = gsi_for_stmt(stmt);
 +	new_stmt = build_cast_stmt(size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before, false);
++	gimple_set_plf(new_stmt, MY_STMT, true);
 +
 +	lhs = get_lhs(new_stmt);
 +	gcc_assert(lhs != NULL_TREE);
@@ -109600,25 +110682,8 @@ index 0000000..03d0c84
 +
 +	gsi = gsi_for_stmt(stmt);
 +	cast_stmt = build_cast_stmt(intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
-+	return gimple_get_lhs(cast_stmt);
-+}
-+
-+static void check_function_hash(const_gimple stmt)
-+{
-+	tree func;
-+	const struct size_overflow_hash *hash;
-+
-+	if (gimple_code(stmt) != GIMPLE_CALL)
-+		return;
-+
-+	func = gimple_call_fndecl(stmt);
-+	//fs/xattr.c D.34222_15 = D.34219_14 (dentry_3(D), name_7(D), 0B, 0);
-+	if (func == NULL_TREE)
-+		return;
-+
-+	hash = get_function_hash(func);
-+	if (!hash)
-+		print_missing_msg(func, 0);
++	gimple_set_plf(cast_stmt, MY_STMT, true);
++	return gimple_assign_lhs(cast_stmt);
 +}
 +
 +static tree create_assign(struct pointer_set_t *visited, gimple oldstmt, tree rhs1, bool before)
@@ -109637,8 +110702,6 @@ index 0000000..03d0c84
 +		lhs = rhs1;
 +		break;
 +	case GIMPLE_CALL:
-+		lhs = gimple_call_lhs(oldstmt);
-+		break;
 +	case GIMPLE_ASSIGN:
 +		lhs = gimple_get_lhs(oldstmt);
 +		break;
@@ -109679,7 +110742,7 @@ index 0000000..03d0c84
 +{
 +	gimple stmt;
 +	gimple_stmt_iterator gsi;
-+	tree size_overflow_type, new_var, lhs = gimple_get_lhs(oldstmt);
++	tree size_overflow_type, new_var, lhs = gimple_assign_lhs(oldstmt);
 +
 +	if (gimple_plf(oldstmt, MY_STMT))
 +		return lhs;
@@ -109704,7 +110767,7 @@ index 0000000..03d0c84
 +
 +	new_var = create_new_var(size_overflow_type);
 +	new_var = make_ssa_name(new_var, stmt);
-+	gimple_set_lhs(stmt, new_var);
++	gimple_assign_set_lhs(stmt, new_var);
 +
 +	if (rhs1 != NULL_TREE)
 +		gimple_assign_set_rhs1(stmt, rhs1);
@@ -109722,79 +110785,101 @@ index 0000000..03d0c84
 +	gsi_insert_after(&gsi, stmt, GSI_SAME_STMT);
 +	update_stmt(stmt);
 +	pointer_set_insert(visited, oldstmt);
-+	return gimple_get_lhs(stmt);
++	return gimple_assign_lhs(stmt);
 +}
 +
-+static tree cast_parm_decl(tree phi_ssa_name, tree arg, tree size_overflow_type)
++static tree cast_parm_decl(tree phi_ssa_name, tree arg, tree size_overflow_type, basic_block bb)
 +{
-+	basic_block first_bb;
 +	gimple assign;
 +	gimple_stmt_iterator gsi;
++	basic_block first_bb;
 +
-+	first_bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
-+	gcc_assert(dom_info_available_p(CDI_DOMINATORS));
-+	set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR);
++	gcc_assert(SSA_NAME_IS_DEFAULT_DEF(arg));
++
++	if (bb->index == 0) {
++		first_bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
++		gcc_assert(dom_info_available_p(CDI_DOMINATORS));
++		set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR);
++		bb = first_bb;
++	}
 +
-+	gsi = gsi_start_bb(first_bb);
++	gsi = gsi_after_labels(bb);
 +	assign = build_cast_stmt(size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false);
-+	return gimple_get_lhs(assign);
++	gimple_set_plf(assign, MY_STMT, true);
++
++	return gimple_assign_lhs(assign);
 +}
 +
-+static tree use_phi_ssa_name(tree phi_ssa_name, tree new_arg)
++static tree use_phi_ssa_name(tree ssa_name_var, tree new_arg)
 +{
 +	gimple_stmt_iterator gsi;
-+	const_gimple assign;
-+	gimple def_stmt = get_def_stmt(new_arg);
++	gimple assign, def_stmt = get_def_stmt(new_arg);
 +
 +	if (gimple_code(def_stmt) == GIMPLE_PHI) {
 +		gsi = gsi_after_labels(gimple_bb(def_stmt));
-+		assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, phi_ssa_name, &gsi, BEFORE_STMT, true);
++		assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, BEFORE_STMT, true);
 +	} else {
 +		gsi = gsi_for_stmt(def_stmt);
-+		assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, phi_ssa_name, &gsi, AFTER_STMT, true);
++		assign = build_cast_stmt(TREE_TYPE(new_arg), new_arg, ssa_name_var, &gsi, AFTER_STMT, true);
 +	}
 +
-+	return gimple_get_lhs(assign);
++	gimple_set_plf(assign, MY_STMT, true);
++	return gimple_assign_lhs(assign);
 +}
 +
-+static tree cast_visited_phi_arg(tree phi_ssa_name, tree arg, tree size_overflow_type)
++static tree cast_visited_phi_arg(tree ssa_name_var, tree arg, tree size_overflow_type)
 +{
 +	basic_block bb;
 +	gimple_stmt_iterator gsi;
-+	const_gimple assign, def_stmt;
++	const_gimple def_stmt;
++	gimple assign;
 +
 +	def_stmt = get_def_stmt(arg);
 +	bb = gimple_bb(def_stmt);
 +	gcc_assert(bb->index != 0);
 +	gsi = gsi_after_labels(bb);
 +
-+	assign = build_cast_stmt(size_overflow_type, arg, phi_ssa_name, &gsi, BEFORE_STMT, false);
-+	return gimple_get_lhs(assign);
++	assign = build_cast_stmt(size_overflow_type, arg, ssa_name_var, &gsi, BEFORE_STMT, false);
++	gimple_set_plf(assign, MY_STMT, true);
++	return gimple_assign_lhs(assign);
 +}
 +
-+static tree create_new_phi_arg(tree phi_ssa_name, tree new_arg, tree arg, gimple oldstmt)
++static tree create_new_phi_arg(tree ssa_name_var, tree new_arg, gimple oldstmt, unsigned int i)
 +{
 +	tree size_overflow_type;
-+	const_gimple def_stmt = get_def_stmt(arg);
++	tree arg;
++	const_gimple def_stmt;
 +
-+	if (phi_ssa_name != NULL_TREE)
-+		phi_ssa_name = SSA_NAME_VAR(phi_ssa_name);
++	if (new_arg != NULL_TREE && is_gimple_constant(new_arg))
++		return new_arg;
 +
++	arg = gimple_phi_arg_def(oldstmt, i);
++	def_stmt = get_def_stmt(arg);
++	gcc_assert(def_stmt != NULL);
 +	size_overflow_type = get_size_overflow_type(oldstmt, arg);
 +
-+	if (new_arg != NULL_TREE) {
-+		gcc_assert(types_compatible_p(TREE_TYPE(new_arg), size_overflow_type));
-+		return use_phi_ssa_name(phi_ssa_name, new_arg);
++	switch (gimple_code(def_stmt)) {
++	case GIMPLE_PHI:
++		return cast_visited_phi_arg(ssa_name_var, arg, size_overflow_type);
++	case GIMPLE_NOP: {
++		basic_block bb;
++
++		bb = gimple_phi_arg_edge(oldstmt, i)->src;
++		return cast_parm_decl(ssa_name_var, arg, size_overflow_type, bb);
 +	}
++	case GIMPLE_ASM: {
++		gimple_stmt_iterator gsi;
++		gimple assign, stmt = get_def_stmt(arg);
 +
-+	switch(gimple_code(def_stmt)) {
-+	case GIMPLE_PHI:
-+		return cast_visited_phi_arg(phi_ssa_name, arg, size_overflow_type);
-+	case GIMPLE_NOP:
-+		return cast_parm_decl(phi_ssa_name, arg, size_overflow_type);
++		gsi = gsi_for_stmt(stmt);
++		assign = build_cast_stmt(size_overflow_type, arg, ssa_name_var, &gsi, AFTER_STMT, false);
++		gimple_set_plf(assign, MY_STMT, true);
++		return gimple_assign_lhs(assign);
++	}
 +	default:
-+		debug_gimple_stmt((gimple)def_stmt);
-+		gcc_unreachable();
++		gcc_assert(new_arg != NULL_TREE);
++		gcc_assert(types_compatible_p(TREE_TYPE(new_arg), size_overflow_type));
++		return use_phi_ssa_name(ssa_name_var, new_arg);
 +	}
 +}
 +
@@ -109807,6 +110892,13 @@ index 0000000..03d0c84
 +
 +	bb = gsi_bb(gsi);
 +
++	if (result == NULL_TREE) {
++		tree old_result = gimple_phi_result(oldstmt);
++		tree size_overflow_type = get_size_overflow_type(oldstmt, old_result);
++
++		result = create_new_var(size_overflow_type);
++	}
++
 +	phi = create_phi_node(result, bb);
 +	gimple_phi_set_result(phi, make_ssa_name(result, phi));
 +	seq = phi_nodes(bb);
@@ -109820,45 +110912,102 @@ index 0000000..03d0c84
 +	return phi;
 +}
 +
-+static tree handle_phi(struct pointer_set_t *visited, tree orig_result)
++#if BUILDING_GCC_VERSION <= 4007
++static tree create_new_phi_node(VEC(tree, gc) *args, tree ssa_name_var, gimple oldstmt)
++#else
++static tree create_new_phi_node(vec<tree, va_gc> *args, tree ssa_name_var, gimple oldstmt)
++#endif
 +{
-+	gimple new_phi = NULL;
-+	gimple oldstmt = get_def_stmt(orig_result);
-+	tree phi_ssa_name = NULL_TREE;
++	gimple new_phi;
 +	unsigned int i;
++	tree arg, result;
++	location_t loc = gimple_location(oldstmt);
++
++#if BUILDING_GCC_VERSION <= 4007
++	gcc_assert(!VEC_empty(tree, args));
++#else
++	gcc_assert(!args->is_empty());
++#endif
++
++	new_phi = overflow_create_phi_node(oldstmt, ssa_name_var);
++	result = gimple_phi_result(new_phi);
++	ssa_name_var = SSA_NAME_VAR(result);
++
++
++#if BUILDING_GCC_VERSION == 4005
++	for (i = 0; i < VEC_length(tree, args); i++) {
++		arg = VEC_index(tree, args, i);
++#elif BUILDING_GCC_VERSION <= 4007
++	FOR_EACH_VEC_ELT(tree, args, i, arg) {
++#else
++	FOR_EACH_VEC_ELT(*args, i, arg) {
++#endif
++		arg = create_new_phi_arg(ssa_name_var, arg, oldstmt, i);
++		add_phi_arg(new_phi, arg, gimple_phi_arg_edge(oldstmt, i), loc);
++	}
++
++#if BUILDING_GCC_VERSION <= 4007
++	VEC_free(tree, gc, args);
++#else
++	vec_free(args);
++#endif
++	update_stmt(new_phi);
++	return result;
++}
++
++static tree handle_phi(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree orig_result)
++{
++	tree ssa_name_var = NULL_TREE;
++#if BUILDING_GCC_VERSION <= 4007
++	VEC(tree, gc) *args;
++#else
++	vec<tree, va_gc> *args;
++#endif
++	gimple oldstmt = get_def_stmt(orig_result);
++	unsigned int i, len = gimple_phi_num_args(oldstmt);
 +
 +	pointer_set_insert(visited, oldstmt);
-+	for (i = 0; i < gimple_phi_num_args(oldstmt); i++) {
++#if BUILDING_GCC_VERSION <= 4007
++	args = VEC_alloc(tree, gc, len);
++#else
++	vec_alloc(args, len);
++#endif
++	for (i = 0; i < len; i++) {
 +		tree arg, new_arg;
 +
 +		arg = gimple_phi_arg_def(oldstmt, i);
++		new_arg = expand(visited, caller_node, arg);
++
++		if (ssa_name_var == NULL_TREE && new_arg != NULL_TREE)
++			ssa_name_var = SSA_NAME_VAR(new_arg);
 +
-+		new_arg = expand(visited, arg);
-+		new_arg = create_new_phi_arg(phi_ssa_name, new_arg, arg, oldstmt);
-+		if (i == 0) {
-+			phi_ssa_name = new_arg;
-+			new_phi = overflow_create_phi_node(oldstmt, SSA_NAME_VAR(phi_ssa_name));
++		if (is_gimple_constant(arg)) {
++			tree size_overflow_type = get_size_overflow_type(oldstmt, arg);
++
++			new_arg = cast_a_tree(size_overflow_type, arg);
 +		}
 +
-+		gcc_assert(new_phi != NULL);
-+		add_phi_arg(new_phi, new_arg, gimple_phi_arg_edge(oldstmt, i), gimple_location(oldstmt));
++#if BUILDING_GCC_VERSION <= 4007
++		VEC_safe_push(tree, gc, args, new_arg);
++#else
++		vec_safe_push(args, new_arg);
++#endif
 +	}
 +
-+	gcc_assert(new_phi != NULL);
-+	update_stmt(new_phi);
-+	return gimple_phi_result(new_phi);
++	return create_new_phi_node(args, ssa_name_var, oldstmt);
 +}
 +
 +static tree change_assign_rhs(gimple stmt, const_tree orig_rhs, tree new_rhs)
 +{
-+	const_gimple assign;
++	gimple assign;
 +	gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
 +	tree origtype = TREE_TYPE(orig_rhs);
 +
-+	gcc_assert(gimple_code(stmt) == GIMPLE_ASSIGN);
++	gcc_assert(is_gimple_assign(stmt));
 +
 +	assign = build_cast_stmt(origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
-+	return gimple_get_lhs(assign);
++	gimple_set_plf(assign, MY_STMT, true);
++	return gimple_assign_lhs(assign);
 +}
 +
 +static bool is_a_cast_and_const_overflow(const_tree no_const_rhs)
@@ -109867,11 +111016,11 @@ index 0000000..03d0c84
 +	enum machine_mode lhs_mode, rhs_mode;
 +	gimple def_stmt = get_def_stmt(no_const_rhs);
 +
-+	if (!gimple_assign_cast_p(def_stmt))
++	if (!def_stmt || !gimple_assign_cast_p(def_stmt))
 +		return false;
 +
 +	rhs1 = gimple_assign_rhs1(def_stmt);
-+	lhs = gimple_get_lhs(def_stmt);
++	lhs = gimple_assign_lhs(def_stmt);
 +	rhs1_type = TREE_TYPE(rhs1);
 +	lhs_type = TREE_TYPE(lhs);
 +	rhs_mode = TYPE_MODE(rhs1_type);
@@ -109885,7 +111034,7 @@ index 0000000..03d0c84
 +static tree create_cast_assign(struct pointer_set_t *visited, gimple stmt)
 +{
 +	tree rhs1 = gimple_assign_rhs1(stmt);
-+	tree lhs = gimple_get_lhs(stmt);
++	tree lhs = gimple_assign_lhs(stmt);
 +	const_tree rhs1_type = TREE_TYPE(rhs1);
 +	const_tree lhs_type = TREE_TYPE(lhs);
 +
@@ -109902,12 +111051,11 @@ index 0000000..03d0c84
 +
 +	FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
 +		const_gimple use_stmt = USE_STMT(use_p);
++
 +		if (use_stmt == NULL)
 +			return true;
 +		if (is_gimple_debug(use_stmt))
 +			continue;
-+		if (!(gimple_bb(use_stmt)->flags & BB_REACHABLE))
-+			continue;
 +		return false;
 +	}
 +	return true;
@@ -109931,7 +111079,7 @@ index 0000000..03d0c84
 +		return false;
 +
 +	def_stmt = get_def_stmt(rhs1);
-+	if (!def_stmt || gimple_code(def_stmt) != GIMPLE_ASSIGN || gimple_num_ops(def_stmt) != 3)
++	if (!def_stmt || !is_gimple_assign(def_stmt) || gimple_num_ops(def_stmt) != 3)
 +		return false;
 +
 +	if (gimple_assign_rhs_code(def_stmt) != PLUS_EXPR)
@@ -109965,10 +111113,10 @@ index 0000000..03d0c84
 +	return false;
 +}
 +
-+static tree create_cast_overflow_check(struct pointer_set_t *visited, tree new_rhs1, gimple stmt)
++static tree create_cast_overflow_check(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree new_rhs1, gimple stmt)
 +{
 +	bool cast_lhs, cast_rhs;
-+	tree lhs = gimple_get_lhs(stmt);
++	tree lhs = gimple_assign_lhs(stmt);
 +	tree rhs = gimple_assign_rhs1(stmt);
 +	const_tree lhs_type = TREE_TYPE(lhs);
 +	const_tree rhs_type = TREE_TYPE(rhs);
@@ -110010,17 +111158,17 @@ index 0000000..03d0c84
 +		return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
 +
 +	if (cast_lhs && !skip_lhs_cast_check(stmt))
-+		check_size_overflow(stmt, TREE_TYPE(new_rhs1), new_rhs1, lhs, BEFORE_STMT);
++		check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, lhs, BEFORE_STMT);
 +
 +	if (cast_rhs)
-+		check_size_overflow(stmt, TREE_TYPE(new_rhs1), new_rhs1, rhs, BEFORE_STMT);
++		check_size_overflow(caller_node, stmt, TREE_TYPE(new_rhs1), new_rhs1, rhs, BEFORE_STMT);
 +
 +	return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
 +}
 +
-+static tree handle_unary_rhs(struct pointer_set_t *visited, gimple stmt)
++static tree handle_unary_rhs(struct pointer_set_t *visited, struct cgraph_node *caller_node, gimple stmt)
 +{
-+	tree rhs1, new_rhs1, lhs = gimple_get_lhs(stmt);
++	tree rhs1, new_rhs1, lhs = gimple_assign_lhs(stmt);
 +
 +	if (gimple_plf(stmt, MY_STMT))
 +		return lhs;
@@ -110029,7 +111177,7 @@ index 0000000..03d0c84
 +	if (TREE_CODE(TREE_TYPE(rhs1)) == POINTER_TYPE)
 +		return create_assign(visited, stmt, lhs, AFTER_STMT);
 +
-+	new_rhs1 = expand(visited, rhs1);
++	new_rhs1 = expand(visited, caller_node, rhs1);
 +
 +	if (new_rhs1 == NULL_TREE)
 +		return create_cast_assign(visited, stmt);
@@ -110041,19 +111189,19 @@ index 0000000..03d0c84
 +		tree size_overflow_type = get_size_overflow_type(stmt, rhs1);
 +
 +		new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
-+		check_size_overflow(stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
++		check_size_overflow(caller_node, stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
 +		return create_assign(visited, stmt, lhs, AFTER_STMT);
 +	}
 +
 +	if (!gimple_assign_cast_p(stmt))
 +		return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
 +
-+	return create_cast_overflow_check(visited, new_rhs1, stmt);
++	return create_cast_overflow_check(visited, caller_node, new_rhs1, stmt);
 +}
 +
-+static tree handle_unary_ops(struct pointer_set_t *visited, gimple stmt)
++static tree handle_unary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, gimple stmt)
 +{
-+	tree rhs1, lhs = gimple_get_lhs(stmt);
++	tree rhs1, lhs = gimple_assign_lhs(stmt);
 +	gimple def_stmt = get_def_stmt(lhs);
 +
 +	gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP);
@@ -110064,7 +111212,7 @@ index 0000000..03d0c84
 +
 +	switch (TREE_CODE(rhs1)) {
 +	case SSA_NAME:
-+		return handle_unary_rhs(visited, def_stmt);
++		return handle_unary_rhs(visited, caller_node, def_stmt);
 +	case ARRAY_REF:
 +	case BIT_FIELD_REF:
 +	case ADDR_EXPR:
@@ -110074,6 +111222,7 @@ index 0000000..03d0c84
 +	case MEM_REF:
 +#endif
 +	case TARGET_MEM_REF:
++	case VIEW_CONVERT_EXPR:
 +		return create_assign(visited, def_stmt, lhs, AFTER_STMT);
 +	case PARM_DECL:
 +	case VAR_DECL:
@@ -110113,7 +111262,21 @@ index 0000000..03d0c84
 +	return build1(ADDR_EXPR, ptr_type_node, string);
 +}
 +
-+static void insert_cond_result(basic_block bb_true, const_gimple stmt, const_tree arg, bool min)
++#if BUILDING_GCC_VERSION <= 4006
++struct cgraph_node *cgraph_get_create_node(tree decl);
++
++struct cgraph_node *cgraph_get_create_node(tree decl)
++{
++	struct cgraph_node *node;
++
++	node = cgraph_get_node(decl);
++	if (node)
++		return node;
++	return cgraph_node(decl);
++}
++#endif
++
++static void insert_cond_result(struct cgraph_node *caller_node, basic_block bb_true, const_gimple stmt, const_tree arg, bool min)
 +{
 +	gimple func_stmt;
 +	const_gimple def_stmt;
@@ -110122,6 +111285,9 @@ index 0000000..03d0c84
 +	expanded_location xloc;
 +	char *ssa_name_buf;
 +	int len;
++	struct cgraph_edge *edge;
++	struct cgraph_node *callee_node;
++	int frequency;
 +	gimple_stmt_iterator gsi = gsi_start_bb(bb_true);
 +
 +	def_stmt = get_def_stmt(arg);
@@ -110151,8 +111317,17 @@ index 0000000..03d0c84
 +
 +	// void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
 +	func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name);
-+
 +	gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING);
++
++	callee_node = cgraph_get_create_node(report_size_overflow_decl);
++	frequency = compute_call_stmt_bb_frequency(current_function_decl, bb_true);
++
++#if BUILDING_GCC_VERSION <= 4006
++	edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency, bb_true->loop_depth);
++#else
++	edge = cgraph_create_edge(caller_node, callee_node, func_stmt, bb_true->count, frequency);
++#endif
++	gcc_assert(edge != NULL);
 +}
 +
 +static void __unused print_the_code_insertions(const_gimple stmt)
@@ -110162,7 +111337,7 @@ index 0000000..03d0c84
 +	inform(loc, "Integer size_overflow check applied here.");
 +}
 +
-+static void insert_check_size_overflow(gimple stmt, enum tree_code cond_code, tree arg, tree type_value, bool before, bool min)
++static void insert_check_size_overflow(struct cgraph_node *caller_node, gimple stmt, enum tree_code cond_code, tree arg, tree type_value, bool before, bool min)
 +{
 +	basic_block cond_bb, join_bb, bb_true;
 +	edge e;
@@ -110195,12 +111370,12 @@ index 0000000..03d0c84
 +	}
 +
 +	insert_cond(cond_bb, arg, cond_code, type_value);
-+	insert_cond_result(bb_true, stmt, arg, min);
++	insert_cond_result(caller_node, bb_true, stmt, arg, min);
 +
 +//	print_the_code_insertions(stmt);
 +}
 +
-+static void check_size_overflow(gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before)
++static void check_size_overflow(struct cgraph_node *caller_node, gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before)
 +{
 +	const_tree rhs_type = TREE_TYPE(rhs);
 +	tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min;
@@ -110227,8 +111402,8 @@ index 0000000..03d0c84
 +	gcc_assert(types_compatible_p(cast_rhs_type, type_max_type));
 +	gcc_assert(types_compatible_p(type_max_type, type_min_type));
 +
-+	insert_check_size_overflow(stmt, GT_EXPR, cast_rhs, type_max, before, false);
-+	insert_check_size_overflow(stmt, LT_EXPR, cast_rhs, type_min, before, true);
++	insert_check_size_overflow(caller_node, stmt, GT_EXPR, cast_rhs, type_max, before, MAX_CHECK);
++	insert_check_size_overflow(caller_node, stmt, LT_EXPR, cast_rhs, type_min, before, MIN_CHECK);
 +}
 +
 +static bool is_a_constant_overflow(const_gimple stmt, const_tree rhs)
@@ -110246,6 +111421,8 @@ index 0000000..03d0c84
 +	gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt;
 +
 +	def_stmt = get_def_stmt(var);
++	if (!gimple_assign_cast_p(def_stmt))
++		return NULL_TREE;
 +	gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && gimple_plf(def_stmt, MY_STMT) && gimple_assign_cast_p(def_stmt));
 +
 +	rhs1 = gimple_assign_rhs1(def_stmt);
@@ -110270,13 +111447,13 @@ index 0000000..03d0c84
 +	}
 +}
 +
-+static tree handle_intentional_overflow(struct pointer_set_t *visited, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2)
++static tree handle_intentional_overflow(struct pointer_set_t *visited, struct cgraph_node *caller_node, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs2)
 +{
 +	tree new_rhs, orig_rhs;
 +	void (*gimple_assign_set_rhs)(gimple, tree);
 +	tree rhs1 = gimple_assign_rhs1(stmt);
 +	tree rhs2 = gimple_assign_rhs2(stmt);
-+	tree lhs = gimple_get_lhs(stmt);
++	tree lhs = gimple_assign_lhs(stmt);
 +
 +	if (!check_overflow)
 +		return create_assign(visited, stmt, lhs, AFTER_STMT);
@@ -110292,7 +111469,7 @@ index 0000000..03d0c84
 +		gimple_assign_set_rhs = &gimple_assign_set_rhs2;
 +	}
 +
-+	check_size_overflow(stmt, TREE_TYPE(change_rhs), change_rhs, orig_rhs, BEFORE_STMT);
++	check_size_overflow(caller_node, stmt, TREE_TYPE(change_rhs), change_rhs, orig_rhs, BEFORE_STMT);
 +
 +	new_rhs = change_assign_rhs(stmt, orig_rhs, change_rhs);
 +	gimple_assign_set_rhs(stmt, new_rhs);
@@ -110324,8 +111501,8 @@ index 0000000..03d0c84
 +
 +	rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
 +	rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt);
-+	rhs1_def_stmt_lhs = gimple_get_lhs(rhs1_def_stmt);
-+	rhs2_def_stmt_lhs = gimple_get_lhs(rhs2_def_stmt);
++	rhs1_def_stmt_lhs = gimple_assign_lhs(rhs1_def_stmt);
++	rhs2_def_stmt_lhs = gimple_assign_lhs(rhs2_def_stmt);
 +	rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1));
 +	rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1));
 +	rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs));
@@ -110340,7 +111517,7 @@ index 0000000..03d0c84
 +	return true;
 +}
 +
-+static tree handle_integer_truncation(struct pointer_set_t *visited, const_tree lhs)
++static tree handle_integer_truncation(struct pointer_set_t *visited, struct cgraph_node *caller_node, const_tree lhs)
 +{
 +	tree new_rhs1, new_rhs2;
 +	tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs;
@@ -110351,20 +111528,23 @@ index 0000000..03d0c84
 +	if (!is_subtraction_special(stmt))
 +		return NULL_TREE;
 +
-+	new_rhs1 = expand(visited, rhs1);
-+	new_rhs2 = expand(visited, rhs2);
++	new_rhs1 = expand(visited, caller_node, rhs1);
++	new_rhs2 = expand(visited, caller_node, rhs2);
 +
 +	new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs1);
 +	new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs2);
 +
++	if (new_rhs1_def_stmt_rhs1 == NULL_TREE || new_rhs2_def_stmt_rhs1 == NULL_TREE)
++		return NULL_TREE;
++
 +	if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) {
 +		new_rhs1_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs1_def_stmt_rhs1);
 +		new_rhs2_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs2_def_stmt_rhs1);
 +	}
 +
 +	assign = create_binary_assign(MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1);
-+	new_lhs = gimple_get_lhs(assign);
-+	check_size_overflow(assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT);
++	new_lhs = gimple_assign_lhs(assign);
++	check_size_overflow(caller_node, assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT);
 +
 +	return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
 +}
@@ -110380,13 +111560,13 @@ index 0000000..03d0c84
 +		return false;
 +
 +	def_stmt = get_def_stmt(rhs);
-+	if (gimple_code(def_stmt) != GIMPLE_ASSIGN || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR)
++	if (!is_gimple_assign(def_stmt) || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR)
 +		return false;
 +
 +	return true;
 +}
 +
-+static tree handle_binary_ops(struct pointer_set_t *visited, tree lhs)
++static tree handle_binary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs)
 +{
 +	tree rhs1, rhs2, new_lhs;
 +	gimple def_stmt = get_def_stmt(lhs);
@@ -110415,40 +111595,40 @@ index 0000000..03d0c84
 +		break;
 +	}
 +
-+	new_lhs = handle_integer_truncation(visited, lhs);
++	new_lhs = handle_integer_truncation(visited, caller_node, lhs);
 +	if (new_lhs != NULL_TREE)
 +		return new_lhs;
 +
 +	if (TREE_CODE(rhs1) == SSA_NAME)
-+		new_rhs1 = expand(visited, rhs1);
++		new_rhs1 = expand(visited, caller_node, rhs1);
 +	if (TREE_CODE(rhs2) == SSA_NAME)
-+		new_rhs2 = expand(visited, rhs2);
++		new_rhs2 = expand(visited, caller_node, rhs2);
 +
 +	if (is_a_neg_overflow(def_stmt, rhs2))
-+		return handle_intentional_overflow(visited, true, def_stmt, new_rhs1, NULL_TREE);
++		return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs1, NULL_TREE);
 +	if (is_a_neg_overflow(def_stmt, rhs1))
-+		return handle_intentional_overflow(visited, true, def_stmt, new_rhs2, new_rhs2);
++		return handle_intentional_overflow(visited, caller_node, true, def_stmt, new_rhs2, new_rhs2);
 +
 +
 +	if (is_a_constant_overflow(def_stmt, rhs2))
-+		return handle_intentional_overflow(visited, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, NULL_TREE);
++		return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, NULL_TREE);
 +	if (is_a_constant_overflow(def_stmt, rhs1))
-+		return handle_intentional_overflow(visited, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, new_rhs2);
++		return handle_intentional_overflow(visited, caller_node, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, new_rhs2);
 +
 +	return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
 +}
 +
 +#if BUILDING_GCC_VERSION >= 4007
-+static tree get_new_rhs(struct pointer_set_t *visited, tree size_overflow_type, tree rhs)
++static tree get_new_rhs(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree size_overflow_type, tree rhs)
 +{
 +	if (is_gimple_constant(rhs))
 +		return cast_a_tree(size_overflow_type, rhs);
 +	if (TREE_CODE(rhs) != SSA_NAME)
 +		return NULL_TREE;
-+	return expand(visited, rhs);
++	return expand(visited, caller_node, rhs);
 +}
 +
-+static tree handle_ternary_ops(struct pointer_set_t *visited, tree lhs)
++static tree handle_ternary_ops(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs)
 +{
 +	tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type;
 +	gimple def_stmt = get_def_stmt(lhs);
@@ -110458,9 +111638,9 @@ index 0000000..03d0c84
 +	rhs1 = gimple_assign_rhs1(def_stmt);
 +	rhs2 = gimple_assign_rhs2(def_stmt);
 +	rhs3 = gimple_assign_rhs3(def_stmt);
-+	new_rhs1 = get_new_rhs(visited, size_overflow_type, rhs1);
-+	new_rhs2 = get_new_rhs(visited, size_overflow_type, rhs2);
-+	new_rhs3 = get_new_rhs(visited, size_overflow_type, rhs3);
++	new_rhs1 = get_new_rhs(visited, caller_node, size_overflow_type, rhs1);
++	new_rhs2 = get_new_rhs(visited, caller_node, size_overflow_type, rhs2);
++	new_rhs3 = get_new_rhs(visited, caller_node, size_overflow_type, rhs3);
 +
 +	return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
 +}
@@ -110494,9 +111674,13 @@ index 0000000..03d0c84
 +		else
 +			new_type = intTI_type_node;
 +		break;
++	case TImode:
++		gcc_assert(!TYPE_UNSIGNED(type));
++		new_type = intTI_type_node;
++		break;
 +	default:
 +		debug_tree((tree)node);
-+		error("%s: unsupported gcc configuration.", __func__);
++		error("%s: unsupported gcc configuration (%qE).", __func__, current_function_decl);
 +		gcc_unreachable();
 +	}
 +
@@ -110529,13 +111713,10 @@ index 0000000..03d0c84
 +	return get_lhs(next_stmt);
 +}
 +
-+static tree expand(struct pointer_set_t *visited, tree lhs)
++static tree expand(struct pointer_set_t *visited, struct cgraph_node *caller_node, tree lhs)
 +{
 +	gimple def_stmt;
 +
-+	if (skip_types(lhs))
-+		return NULL_TREE;
-+
 +	def_stmt = get_def_stmt(lhs);
 +
 +	if (!def_stmt || gimple_code(def_stmt) == GIMPLE_NOP)
@@ -110549,19 +111730,19 @@ index 0000000..03d0c84
 +
 +	switch (gimple_code(def_stmt)) {
 +	case GIMPLE_PHI:
-+		return handle_phi(visited, lhs);
++		return handle_phi(visited, caller_node, lhs);
 +	case GIMPLE_CALL:
 +	case GIMPLE_ASM:
 +		return create_assign(visited, def_stmt, lhs, AFTER_STMT);
 +	case GIMPLE_ASSIGN:
 +		switch (gimple_num_ops(def_stmt)) {
 +		case 2:
-+			return handle_unary_ops(visited, def_stmt);
++			return handle_unary_ops(visited, caller_node, def_stmt);
 +		case 3:
-+			return handle_binary_ops(visited, lhs);
++			return handle_binary_ops(visited, caller_node, lhs);
 +#if BUILDING_GCC_VERSION >= 4007
 +		case 4:
-+			return handle_ternary_ops(visited, lhs);
++			return handle_ternary_ops(visited, caller_node, lhs);
 +#endif
 +		}
 +	default:
@@ -110571,107 +111752,409 @@ index 0000000..03d0c84
 +	}
 +}
 +
-+static tree get_new_tree(gimple stmt, const_tree orig_node, tree new_node)
++static tree cast_to_orig_type(gimple stmt, const_tree orig_node, tree new_node)
 +{
 +	const_gimple assign;
 +	tree orig_type = TREE_TYPE(orig_node);
 +	gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
 +
 +	assign = build_cast_stmt(orig_type, new_node, CREATE_NEW_VAR, &gsi, BEFORE_STMT, false);
-+	return gimple_get_lhs(assign);
++	return gimple_assign_lhs(assign);
 +}
 +
-+static void change_function_arg(gimple stmt, const_tree orig_arg, unsigned int argnum, tree new_arg)
++static void change_orig_node(struct interesting_node *cur_node, tree new_node)
 +{
-+	gimple_call_set_arg(stmt, argnum, get_new_tree(stmt, orig_arg, new_arg));
-+	update_stmt(stmt);
-+}
++	void (*set_rhs)(gimple, tree);
++	gimple stmt = cur_node->first_stmt;
++	const_tree orig_node = cur_node->node;
++
++	switch (gimple_code(stmt)) {
++	case GIMPLE_RETURN:
++		gimple_return_set_retval(stmt, cast_to_orig_type(stmt, orig_node, new_node));
++		break;
++	case GIMPLE_CALL:
++		gimple_call_set_arg(stmt, cur_node->num - 1, cast_to_orig_type(stmt, orig_node, new_node));
++		break;
++	case GIMPLE_ASSIGN:
++		switch (cur_node->num) {
++		case 1:
++			set_rhs = &gimple_assign_set_rhs1;
++			break;
++		case 2:
++			set_rhs = &gimple_assign_set_rhs2;
++			break;
++#if BUILDING_GCC_VERSION > 4005
++		case 3:
++			set_rhs = &gimple_assign_set_rhs3;
++			break;
++#endif
++		default:
++			gcc_unreachable();
++		}
++
++		set_rhs(stmt, cast_to_orig_type(stmt, orig_node, new_node));
++		break;
++	default:
++		debug_gimple_stmt(stmt);
++		gcc_unreachable();
++	}
 +
-+static void change_function_return(gimple stmt, const_tree orig_ret, tree new_ret)
-+{
-+	gimple_return_set_retval(stmt, get_new_tree(stmt, orig_ret, new_ret));
 +	update_stmt(stmt);
 +}
 +
-+static bool get_function_arg(unsigned int* argnum, const_tree fndecl)
++static unsigned int get_correct_arg_count(unsigned int argnum, tree fndecl)
 +{
++	const struct size_overflow_hash *hash;
++	unsigned int new_argnum;
 +	tree arg;
 +	const_tree origarg;
 +
-+	if (!DECL_ABSTRACT_ORIGIN(fndecl))
-+		return true;
++	if (argnum == 0)
++		return argnum;
 +
-+	origarg = DECL_ARGUMENTS(DECL_ABSTRACT_ORIGIN(fndecl));
-+	while (origarg && *argnum) {
-+		(*argnum)--;
-+		origarg = TREE_CHAIN(origarg);
-+	}
++	hash = get_function_hash(fndecl);
++	if (hash && hash->param & (1U << argnum))
++		return argnum;
 +
-+	gcc_assert(*argnum == 0);
++	if (DECL_EXTERNAL(fndecl))
++		return argnum;
 +
++	origarg = DECL_ARGUMENTS(DECL_ORIGIN(fndecl));
++	argnum--;
++	while (origarg && argnum) {
++		origarg = TREE_CHAIN(origarg);
++		argnum--;
++	}
++	gcc_assert(argnum == 0);
 +	gcc_assert(origarg != NULL_TREE);
-+	*argnum = 0;
-+	for (arg = DECL_ARGUMENTS(fndecl); arg; arg = TREE_CHAIN(arg), (*argnum)++)
++
++	for (arg = DECL_ARGUMENTS(fndecl), new_argnum = 1; arg; arg = TREE_CHAIN(arg), new_argnum++)
 +		if (operand_equal_p(origarg, arg, 0) || !strcmp(NAME(origarg), NAME(arg)))
++			return new_argnum;
++
++	return CANNOT_FIND_ARG;
++}
++
++// Don't want to duplicate entries in next_cgraph_node
++static bool is_in_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, const_tree fndecl, unsigned int num)
++{
++	const_tree new_callee_fndecl;
++	struct next_cgraph_node *cur_node;
++
++	if (fndecl == RET_CHECK)
++#if BUILDING_GCC_VERSION <= 4007
++		new_callee_fndecl = node->decl;
++#else
++		new_callee_fndecl = node->symbol.decl;
++#endif
++	else
++		new_callee_fndecl = fndecl;
++
++	for (cur_node = head; cur_node; cur_node = cur_node->next) {
++#if BUILDING_GCC_VERSION <= 4007
++		if (!operand_equal_p(cur_node->current_function->decl, node->decl, 0))
++#else
++		if (!operand_equal_p(cur_node->current_function->symbol.decl, node->symbol.decl, 0))
++#endif
++			continue;
++		if (!operand_equal_p(cur_node->callee_fndecl, new_callee_fndecl, 0))
++			continue;
++		if (num == cur_node->num)
 +			return true;
++	}
++	return false;
++}
++
++/* Add a next_cgraph_node into the list for handle_function().
++ * handle_function()  iterates over all the next cgraph nodes and
++ * starts the overflow check insertion process.
++ */
++static struct next_cgraph_node *create_new_next_cgraph_node(struct next_cgraph_node *head, struct cgraph_node *node, tree fndecl, unsigned int num)
++{
++	struct next_cgraph_node *new_node;
++
++	if (is_in_next_cgraph_node(head, node, fndecl, num))
++		return head;
++
++	new_node = (struct next_cgraph_node *)xmalloc(sizeof(*new_node));
++	new_node->current_function = node;
++	new_node->next = NULL;
++	new_node->num = num;
++	if (fndecl == RET_CHECK)
++#if BUILDING_GCC_VERSION <= 4007
++		new_node->callee_fndecl = node->decl;
++#else
++		new_node->callee_fndecl = node->symbol.decl;
++#endif
++	else
++		new_node->callee_fndecl = fndecl;
++
++	if (!head)
++		return new_node;
++
++	new_node->next = head;
++	return new_node;
++}
++
++static struct next_cgraph_node *create_new_next_cgraph_nodes(struct next_cgraph_node *head, struct cgraph_node *node, unsigned int num)
++{
++	struct cgraph_edge *e;
++
++	if (num == 0)
++		return create_new_next_cgraph_node(head, node, RET_CHECK, num);
++
++	for (e = node->callers; e; e = e->next_caller) {
++		tree fndecl = gimple_call_fndecl(e->call_stmt);
++
++		gcc_assert(fndecl != NULL_TREE);
++		head = create_new_next_cgraph_node(head, e->caller, fndecl, num);
++	}
++
++	return head;
++}
++
++static bool is_a_return_check(const_tree node)
++{
++	if (TREE_CODE(node) == FUNCTION_DECL)
++		return true;
++
++	gcc_assert(TREE_CODE(node) == PARM_DECL);
++	return false;
++}
++
++static bool is_in_hash_table(tree fndecl, unsigned int num)
++{
++	const struct size_overflow_hash *hash;
++
++	hash = get_function_hash(fndecl);
++	if (hash && (hash->param & (1U << num)))
++		return true;
 +	return false;
 +}
 +
-+static enum mark walk_phi(struct pointer_set_t *visited, bool *search_err_code, const_tree result)
++struct missing_functions {
++	struct missing_functions *next;
++	const_tree node;
++	tree fndecl;
++};
++
++static struct missing_functions *create_new_missing_function(struct missing_functions *missing_fn_head, tree node)
++{
++	struct missing_functions *new_function;
++
++	new_function = (struct missing_functions *)xmalloc(sizeof(*new_function));
++	new_function->node = node;
++	new_function->next = NULL;
++
++	if (TREE_CODE(node) == FUNCTION_DECL)
++		new_function->fndecl = node;
++	else
++		new_function->fndecl = current_function_decl;
++	gcc_assert(new_function->fndecl);
++
++	if (!missing_fn_head)
++		return new_function;
++
++	new_function->next = missing_fn_head;
++	return new_function;
++}
++
++/* Check if the function has a size_overflow attribute or it is in the size_overflow hash table.
++ * If the function is missing everywhere then print the missing message into stderr.
++ */
++static bool is_missing_function(tree orig_fndecl, unsigned int num)
++{
++	switch (DECL_FUNCTION_CODE(orig_fndecl)) {
++#if BUILDING_GCC_VERSION >= 4008
++	case BUILT_IN_BSWAP16:
++#endif
++	case BUILT_IN_BSWAP32:
++	case BUILT_IN_BSWAP64:
++	case BUILT_IN_EXPECT:
++	case BUILT_IN_MEMCMP:
++		return false;
++	default:
++		break;
++	}
++
++	// skip test.c
++	if (strcmp(NAME(current_function_decl), "coolmalloc")) {
++		if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(orig_fndecl)))
++			warning(0, "unnecessary size_overflow attribute on: %s\n", NAME(orig_fndecl));
++	}
++
++	if (is_in_hash_table(orig_fndecl, num))
++		return false;
++
++	print_missing_msg(orig_fndecl, num);
++	return true;
++}
++
++// Get the argnum of a function decl, if node is a return then the argnum is 0
++static unsigned int get_function_num(const_tree node, const_tree orig_fndecl)
++{
++	if (is_a_return_check(node))
++		return 0;
++	else
++		return find_arg_number_tree(node, orig_fndecl);
++}
++
++/* If the function is missing from the hash table and it is a static function
++ * then create a next_cgraph_node from it for handle_function()
++ */
++static struct next_cgraph_node *check_missing_overflow_attribute_and_create_next_node(struct next_cgraph_node *cnodes, struct missing_functions *missing_fn_head)
++{
++	unsigned int num;
++	tree orig_fndecl;
++	struct cgraph_node *next_node = NULL;
++
++	orig_fndecl = DECL_ORIGIN(missing_fn_head->fndecl);
++
++	num = get_function_num(missing_fn_head->node, orig_fndecl);
++	if (num == CANNOT_FIND_ARG)
++		return cnodes;
++
++	if (!is_missing_function(orig_fndecl, num))
++		return cnodes;
++
++	next_node = cgraph_get_node(missing_fn_head->fndecl);
++	if (next_node && next_node->local.local)
++		cnodes = create_new_next_cgraph_nodes(cnodes, next_node, num);
++	return cnodes;
++}
++
++/* Search for missing size_overflow attributes on the last nodes in ipa and collect them
++ * into the next_cgraph_node list. They will be the next interesting returns or callees.
++ */
++static struct next_cgraph_node *search_overflow_attribute(struct next_cgraph_node *cnodes, struct interesting_node *cur_node)
++{
++	unsigned int i;
++	tree node;
++	struct missing_functions *cur, *missing_fn_head = NULL;
++
++#if BUILDING_GCC_VERSION == 4005
++	for (i = 0; i < VEC_length(tree, cur_node->last_nodes); i++) {
++		node = VEC_index(tree, cur_node->last_nodes, i);
++#elif BUILDING_GCC_VERSION <= 4007
++	FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, node) {
++#else
++	FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, node) {
++#endif
++		switch (TREE_CODE(node)) {
++		case PARM_DECL:
++			if (TREE_CODE(TREE_TYPE(node)) != INTEGER_TYPE)
++				break;
++		case FUNCTION_DECL:
++			missing_fn_head = create_new_missing_function(missing_fn_head, node);
++			break;
++		default:
++			break;
++		}
++	}
++
++	while (missing_fn_head) {
++		cnodes = check_missing_overflow_attribute_and_create_next_node(cnodes, missing_fn_head);
++
++		cur = missing_fn_head->next;
++		free(missing_fn_head);
++		missing_fn_head = cur;
++	}
++
++	return cnodes;
++}
++
++static void walk_phi_set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree result)
 +{
 +	gimple phi = get_def_stmt(result);
 +	unsigned int i, n = gimple_phi_num_args(phi);
 +
-+	if (!phi)
-+		return MARK_NO;
-+
 +	pointer_set_insert(visited, phi);
 +	for (i = 0; i < n; i++) {
-+		enum mark marked;
 +		const_tree arg = gimple_phi_arg_def(phi, i);
-+		marked = pre_expand(visited, search_err_code, arg);
-+		if (marked != MARK_NO)
-+			return marked;
++
++		set_conditions(visited, interesting_conditions, arg);
 +	}
-+	return MARK_NO;
 +}
 +
-+static enum mark walk_unary_ops(struct pointer_set_t *visited, bool *search_err_code, const_tree lhs)
++enum conditions {
++	FROM_CONST, NOT_UNARY, CAST
++};
++
++// Search for constants, cast assignments and binary/ternary assignments
++static void set_conditions(struct pointer_set_t *visited, bool *interesting_conditions, const_tree lhs)
 +{
 +	gimple def_stmt = get_def_stmt(lhs);
-+	const_tree rhs;
++
++	if (is_gimple_constant(lhs)) {
++		interesting_conditions[FROM_CONST] = true;
++		return;
++	}
 +
 +	if (!def_stmt)
-+		return MARK_NO;
++		return;
 +
-+	rhs = gimple_assign_rhs1(def_stmt);
++	if (pointer_set_contains(visited, def_stmt))
++		return;
 +
-+	def_stmt = get_def_stmt(rhs);
-+	if (is_gimple_constant(rhs))
-+		search_err_code[FROM_CONST] = true;
++	switch (gimple_code(def_stmt)) {
++	case GIMPLE_NOP:
++	case GIMPLE_CALL:
++	case GIMPLE_ASM:
++		return;
++	case GIMPLE_PHI:
++		return walk_phi_set_conditions(visited, interesting_conditions, lhs);
++	case GIMPLE_ASSIGN:
++		if (gimple_num_ops(def_stmt) == 2) {
++			const_tree rhs = gimple_assign_rhs1(def_stmt);
 +
-+	return pre_expand(visited, search_err_code, rhs);
++			if (gimple_assign_cast_p(def_stmt))
++				interesting_conditions[CAST] = true;
++
++			return set_conditions(visited, interesting_conditions, rhs);
++		} else {
++			interesting_conditions[NOT_UNARY] = true;
++			return;
++		}
++	default:
++		debug_gimple_stmt(def_stmt);
++		gcc_unreachable();
++	}
 +}
 +
-+static enum mark walk_binary_ops(struct pointer_set_t *visited, bool *search_err_code, const_tree lhs)
++// determine whether duplication will be necessary or not.
++static void search_interesting_conditions(struct interesting_node *cur_node, bool *interesting_conditions)
 +{
-+	gimple def_stmt = get_def_stmt(lhs);
-+	const_tree rhs1, rhs2;
-+	enum mark marked;
++	struct pointer_set_t *visited;
 +
-+	if (!def_stmt)
-+		return MARK_NO;
++	if (gimple_assign_cast_p(cur_node->first_stmt))
++		interesting_conditions[CAST] = true;
++	else if (is_gimple_assign(cur_node->first_stmt) && gimple_num_ops(cur_node->first_stmt) > 2)
++		interesting_conditions[NOT_UNARY] = true;
 +
-+	search_err_code[CAST_ONLY] = false;
++	visited = pointer_set_create();
++	set_conditions(visited, interesting_conditions, cur_node->node);
++	pointer_set_destroy(visited);
++}
 +
-+	rhs1 = gimple_assign_rhs1(def_stmt);
-+	rhs2 = gimple_assign_rhs2(def_stmt);
-+	marked = pre_expand(visited, search_err_code, rhs1);
-+	if (marked != MARK_NO)
-+		return marked;
-+	return pre_expand(visited, search_err_code, rhs2);
++// Remove the size_overflow asm stmt and create an assignment from the input and output of the asm
++static void replace_size_overflow_asm_with_assign(gimple asm_stmt, tree lhs, tree rhs)
++{
++	gimple assign;
++	gimple_stmt_iterator gsi;
++
++	// already removed
++	if (gimple_bb(asm_stmt) == NULL)
++		return;
++	gsi = gsi_for_stmt(asm_stmt);
++
++	assign = gimple_build_assign(lhs, rhs);
++	gsi_insert_before(&gsi, assign, GSI_SAME_STMT);
++	SSA_NAME_DEF_STMT(lhs) = assign;
++
++	gsi_remove(&gsi, true);
 +}
 +
++// Get the field decl of a component ref for intentional_overflow checking
 +static const_tree search_field_decl(const_tree comp_ref)
 +{
 +	const_tree field = NULL_TREE;
@@ -110686,142 +112169,397 @@ index 0000000..03d0c84
 +	return field;
 +}
 +
-+static enum mark mark_status(const_tree fndecl, unsigned int argnum)
++/* Get the fndecl of an interesting stmt, the fndecl is the caller function if the interesting
++ * stmt is a return otherwise it is the callee function.
++ */
++static const_tree get_interesting_orig_fndecl(const_gimple stmt, unsigned int argnum)
 +{
-+	const_tree attr, p;
++	const_tree fndecl;
++
++	if (argnum == 0)
++		fndecl = current_function_decl;
++	else
++		fndecl = gimple_call_fndecl(stmt);
 +
-+	// mm/filemap.c D.35286_51 = D.35283_46 (file_10(D), mapping_11, pos_1, D.35273_50, D.35285_49, page.14_48, fsdata.15_47);
 +	if (fndecl == NULL_TREE)
-+		return MARK_NO;
++		return NULL_TREE;
++
++	return DECL_ORIGIN(fndecl);
++}
++
++/* Get the param of the intentional_overflow attribute.
++ *   * 0: MARK_NOT_INTENTIONAL
++ *   * 1..MAX_PARAM: MARK_YES
++ *   * -1: MARK_TURN_OFF
++ */
++static tree get_attribute_param(const_tree decl)
++{
++	const_tree attr;
++
++	if (decl == NULL_TREE)
++		return NULL_TREE;
 +
-+	attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(fndecl));
++	attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(decl));
 +	if (!attr || !TREE_VALUE(attr))
-+		return MARK_NO;
++		return NULL_TREE;
++
++	return TREE_VALUE(attr);
++}
++
++// MARK_TURN_OFF
++static bool is_turn_off_intentional_attr(const_tree decl)
++{
++	const_tree param_head;
++
++	param_head = get_attribute_param(decl);
++	if (param_head == NULL_TREE)
++		return false;
++
++	if (TREE_INT_CST_HIGH(TREE_VALUE(param_head)) == -1)
++		return true;
++	return false;
++}
++
++// MARK_NOT_INTENTIONAL
++static bool is_end_intentional_intentional_attr(const_tree decl, unsigned int argnum)
++{
++	const_tree param_head;
++
++	if (argnum == 0)
++		return false;
++
++	param_head = get_attribute_param(decl);
++	if (param_head == NULL_TREE)
++		return false;
++
++	if (!TREE_INT_CST_LOW(TREE_VALUE(param_head)))
++		return true;
++	return false;
++}
 +
-+	p = TREE_VALUE(attr);
-+	if (TREE_INT_CST_HIGH(TREE_VALUE(p)) == -1)
-+		return MARK_TURN_OFF;
-+	if (!TREE_INT_CST_LOW(TREE_VALUE(p)))
-+		return MARK_NOT_INTENTIONAL;
-+	if (argnum == 0) {
-+		gcc_assert(current_function_decl == fndecl);
++// MARK_YES
++static bool is_yes_intentional_attr(const_tree decl, unsigned int argnum)
++{
++	tree param, param_head;
++
++	if (argnum == 0)
++		return false;
++
++	param_head = get_attribute_param(decl);
++	for (param = param_head; param; param = TREE_CHAIN(param))
++		if (argnum == TREE_INT_CST_LOW(TREE_VALUE(param)))
++			return true;
++	return false;
++}
++
++static bool is_size_overflow_intentional_asm_turn_off(const_gimple stmt)
++{
++	const char *str;
++
++	if (!stmt)
++		return false;
++
++	str = gimple_asm_string(stmt);
++	return !strcmp(str, "# size_overflow MARK_TURN_OFF\n\t");
++}
++
++static bool is_size_overflow_intentional_asm_yes(const_gimple stmt)
++{
++	const char *str;
++
++	if (!stmt)
++		return false;
++
++	str = gimple_asm_string(stmt);
++	return !strcmp(str, "# size_overflow MARK_YES\n\t");
++}
++
++static bool is_size_overflow_asm(const_gimple stmt)
++{
++	const char *str;
++
++	if (!stmt)
++		return false;
++
++	str = gimple_asm_string(stmt);
++	return !strncmp(str, "# size_overflow", 15);
++}
++
++static void print_missing_intentional(enum mark callee_attr, enum mark caller_attr, const_tree decl, unsigned int argnum)
++{
++	location_t loc;
++
++	if (caller_attr == MARK_NO || caller_attr == MARK_NOT_INTENTIONAL || caller_attr == MARK_TURN_OFF)
++		return;
++
++	if (callee_attr == MARK_NOT_INTENTIONAL || callee_attr == MARK_YES)
++		return;
++
++	loc = DECL_SOURCE_LOCATION(decl);
++	inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", NAME(decl), argnum);
++}
++
++/* Get the type of the intentional_overflow attribute of a node
++ *  * MARK_TURN_OFF
++ *  * MARK_YES
++ *  * MARK_NO
++ *  * MARK_NOT_INTENTIONAL
++ */
++static enum mark get_intentional_attr_type(const_tree node)
++{
++	const_tree cur_decl;
++
++	if (node == NULL_TREE)
 +		return MARK_NO;
-+	}
 +
-+	do {
-+		if (argnum == TREE_INT_CST_LOW(TREE_VALUE(p)))
++	switch (TREE_CODE(node)) {
++	case COMPONENT_REF:
++		cur_decl = search_field_decl(node);
++		if (is_turn_off_intentional_attr(cur_decl))
++			return MARK_TURN_OFF;
++		if (is_end_intentional_intentional_attr(cur_decl, 1))
 +			return MARK_YES;
-+		p = TREE_CHAIN(p);
-+	} while (p);
++		break;
++	case PARM_DECL: {
++		unsigned int argnum;
 +
++		cur_decl = DECL_ORIGIN(current_function_decl);
++		argnum = find_arg_number_tree(node, cur_decl);
++		if (argnum == CANNOT_FIND_ARG)
++			return MARK_NO;
++		if (is_yes_intentional_attr(cur_decl, argnum))
++			return MARK_YES;
++		if (is_end_intentional_intentional_attr(cur_decl, argnum))
++			return MARK_NOT_INTENTIONAL;
++		break;
++	}
++	case FUNCTION_DECL:
++		if (is_turn_off_intentional_attr(DECL_ORIGIN(node)))
++			return MARK_TURN_OFF;
++		break;
++	default:
++		break;
++	}
 +	return MARK_NO;
 +}
 +
-+static void print_missing_msg(tree func, unsigned int argnum)
++// Search for the intentional_overflow attribute on the last nodes
++static enum mark search_last_nodes_intentional(struct interesting_node *cur_node)
 +{
-+	unsigned int new_hash;
-+	size_t len;
-+	unsigned char tree_codes[CODES_LIMIT];
-+	location_t loc;
-+	const char *curfunc;
++	unsigned int i;
++	tree last_node;
++	enum mark mark = MARK_NO;
 +
-+	func = get_original_function_decl(func);
-+	loc = DECL_SOURCE_LOCATION(func);
-+	curfunc = get_asm_name(func);
++#if BUILDING_GCC_VERSION == 4005
++	for (i = 0; i < VEC_length(tree, cur_node->last_nodes); i++) {
++		last_node = VEC_index(tree, cur_node->last_nodes, i);
++#elif BUILDING_GCC_VERSION <= 4007
++	FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, last_node) {
++#else
++	FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, last_node) {
++#endif
++		mark = get_intentional_attr_type(last_node);
++		if (mark != MARK_NO)
++			break;
++	}
++	return mark;
++}
++
++/* Check the intentional kind of size_overflow asm stmt (created by the gimple pass) and
++ * set the appropriate intentional_overflow type. Delete the asm stmt in the end.
++ */
++static bool is_intentional_attribute_from_gimple(struct interesting_node *cur_node)
++{
++	const_tree input, output;
++
++	if (!cur_node->intentional_mark_from_gimple)
++		return false;
++
++	if (is_size_overflow_intentional_asm_yes(cur_node->intentional_mark_from_gimple))
++		cur_node->intentional_attr_cur_fndecl = MARK_YES;
++	else
++		cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
++
++	// skip param decls
++	if (gimple_asm_noutputs(cur_node->intentional_mark_from_gimple) == 0)
++		return true;
++	input = gimple_asm_input_op(cur_node->intentional_mark_from_gimple, 0);
++	output = gimple_asm_output_op(cur_node->intentional_mark_from_gimple, 0);
 +
-+	len = get_function_decl(func, tree_codes);
-+	new_hash = get_hash_num(curfunc, (const char *) tree_codes, len, 0);
-+	inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, new_hash);
++	replace_size_overflow_asm_with_assign(cur_node->intentional_mark_from_gimple, TREE_VALUE(output), TREE_VALUE(input));
++	return true;
 +}
 +
-+static unsigned int search_missing_attribute(const_tree arg)
++/* Search intentional_overflow attribute on caller and on callee too.
++ * 0</MARK_YES: no dup, search size_overflow and intentional_overflow attributes
++ * 0/MARK_NOT_INTENTIONAL: no dup, search size_overflow attribute (int)
++ * -1/MARK_TURN_OFF: no dup, no search, current_function_decl -> no dup
++*/
++static void check_intentional_attribute_ipa(struct interesting_node *cur_node)
 +{
-+	unsigned int argnum;
-+	const struct size_overflow_hash *hash;
-+	const_tree type = TREE_TYPE(arg);
-+	tree func = get_original_function_decl(current_function_decl);
++	const_tree fndecl;
 +
-+	gcc_assert(TREE_CODE(arg) != COMPONENT_REF);
++	if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
++		cur_node->intentional_attr_cur_fndecl = MARK_TURN_OFF;
++		return;
++	}
 +
-+	if (TREE_CODE(type) == POINTER_TYPE)
-+		return 0;
++	if (gimple_code(cur_node->first_stmt) == GIMPLE_ASM) {
++		cur_node->intentional_attr_cur_fndecl = MARK_NOT_INTENTIONAL;
++		return;
++	}
 +
-+	argnum = find_arg_number(arg, func);
-+	if (argnum == 0)
-+		return 0;
++	if (gimple_code(cur_node->first_stmt) == GIMPLE_ASSIGN)
++		return;
 +
-+	if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(func)))
-+		return argnum;
++	fndecl = get_interesting_orig_fndecl(cur_node->first_stmt, cur_node->num);
++	if (is_turn_off_intentional_attr(fndecl)) {
++		cur_node->intentional_attr_decl = MARK_TURN_OFF;
++		return;
++	}
 +
-+	hash = get_function_hash(func);
-+	if (!hash || !(hash->param & (1U << argnum))) {
-+		print_missing_msg(func, argnum);
-+		return 0;
++	if (is_end_intentional_intentional_attr(fndecl, cur_node->num))
++		cur_node->intentional_attr_decl = MARK_NOT_INTENTIONAL;
++	else if (is_yes_intentional_attr(fndecl, cur_node->num))
++		cur_node->intentional_attr_decl = MARK_YES;
++
++	if (is_intentional_attribute_from_gimple(cur_node))
++		return;
++
++	cur_node->intentional_attr_cur_fndecl = search_last_nodes_intentional(cur_node);
++	print_missing_intentional(cur_node->intentional_attr_decl, cur_node->intentional_attr_cur_fndecl, cur_node->fndecl, cur_node->num);
++}
++
++// e.g., 3.8.2, 64, arch/x86/ia32/ia32_signal.c copy_siginfo_from_user32(): compat_ptr() u32 max
++static bool skip_asm(const_tree arg)
++{
++	gimple def_stmt = get_def_stmt(arg);
++
++	if (!def_stmt || !gimple_assign_cast_p(def_stmt))
++		return false;
++
++	def_stmt = get_def_stmt(gimple_assign_rhs1(def_stmt));
++	return def_stmt && gimple_code(def_stmt) == GIMPLE_ASM;
++}
++
++static void walk_use_def_phi(struct pointer_set_t *visited, struct interesting_node *cur_node, tree result)
++{
++	gimple phi = get_def_stmt(result);
++	unsigned int i, n = gimple_phi_num_args(phi);
++
++	pointer_set_insert(visited, phi);
++	for (i = 0; i < n; i++) {
++		tree arg = gimple_phi_arg_def(phi, i);
++
++		walk_use_def(visited, cur_node, arg);
 +	}
-+	return argnum;
 +}
 +
-+static enum mark is_already_marked(const_tree lhs)
++static void walk_use_def_binary(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
 +{
-+	unsigned int argnum;
-+	const_tree fndecl;
++	gimple def_stmt = get_def_stmt(lhs);
++	tree rhs1, rhs2;
 +
-+	argnum = search_missing_attribute(lhs);
-+	fndecl = get_original_function_decl(current_function_decl);
-+	if (argnum && mark_status(fndecl, argnum) == MARK_YES)
-+		return MARK_YES;
-+	return MARK_NO;
++	rhs1 = gimple_assign_rhs1(def_stmt);
++	rhs2 = gimple_assign_rhs2(def_stmt);
++
++	walk_use_def(visited, cur_node, rhs1);
++	walk_use_def(visited, cur_node, rhs2);
 +}
 +
-+static enum mark pre_expand(struct pointer_set_t *visited, bool *search_err_code, const_tree lhs)
++static void insert_last_node(struct interesting_node *cur_node, tree node)
 +{
-+	const_gimple def_stmt;
++	unsigned int i;
++	tree element;
++	enum tree_code code;
 +
-+	if (skip_types(lhs))
-+		return MARK_NO;
++	gcc_assert(node != NULL_TREE);
 +
-+	if (TREE_CODE(lhs) == PARM_DECL)
-+		return is_already_marked(lhs);
++	if (is_gimple_constant(node))
++		return;
 +
-+	if (TREE_CODE(lhs) == COMPONENT_REF) {
-+		const_tree field, attr;
++	code = TREE_CODE(node);
++	if (code == VAR_DECL) {
++		node = DECL_ORIGIN(node);
++		code = TREE_CODE(node);
++	}
 +
-+		field = search_field_decl(lhs);
-+		attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(field));
-+		if (!attr || !TREE_VALUE(attr))
-+			return MARK_NO;
-+		return MARK_YES;
++	if (code != PARM_DECL && code != FUNCTION_DECL && code != COMPONENT_REF)
++		return;
++
++#if BUILDING_GCC_VERSION == 4005
++	for (i = 0; i < VEC_length(tree, cur_node->last_nodes); i++) {
++		element = VEC_index(tree, cur_node->last_nodes, i);
++#elif BUILDING_GCC_VERSION <= 4007
++	FOR_EACH_VEC_ELT(tree, cur_node->last_nodes, i, element) {
++#else
++	FOR_EACH_VEC_ELT(*cur_node->last_nodes, i, element) {
++#endif
++		if (operand_equal_p(node, element, 0))
++			return;
 +	}
 +
-+	def_stmt = get_def_stmt(lhs);
++#if BUILDING_GCC_VERSION <= 4007
++	gcc_assert(VEC_length(tree, cur_node->last_nodes) < VEC_LEN);
++	VEC_safe_push(tree, gc, cur_node->last_nodes, node);
++#else
++	gcc_assert(cur_node->last_nodes->length() < VEC_LEN);
++	vec_safe_push(cur_node->last_nodes, node);
++#endif
++}
++
++// a size_overflow asm stmt in the control flow doesn't stop the recursion
++static void handle_asm_stmt(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs, const_gimple stmt)
++{
++	const_tree asm_lhs;
++
++	if (!is_size_overflow_asm(stmt))
++		return walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
++
++	asm_lhs = gimple_asm_input_op(stmt, 0);
++	walk_use_def(visited, cur_node, TREE_VALUE(asm_lhs));
++}
++
++/* collect the parm_decls and fndecls (for checking a missing size_overflow attribute (ret or arg) or intentional_overflow)
++ * and component refs (for checking the intentional_overflow attribute).
++ */
++static void walk_use_def(struct pointer_set_t *visited, struct interesting_node *cur_node, tree lhs)
++{
++	const_gimple def_stmt;
++
++	if (TREE_CODE(lhs) != SSA_NAME) {
++		insert_last_node(cur_node, lhs);
++		return;
++	}
 +
++	def_stmt = get_def_stmt(lhs);
 +	if (!def_stmt)
-+		return MARK_NO;
++		return;
 +
-+	if (pointer_set_contains(visited, def_stmt))
-+		return MARK_NO;
++	if (pointer_set_insert(visited, def_stmt))
++		return;
 +
 +	switch (gimple_code(def_stmt)) {
 +	case GIMPLE_NOP:
-+		if (TREE_CODE(SSA_NAME_VAR(lhs)) == PARM_DECL)
-+			return is_already_marked(lhs);
-+		return MARK_NO;
-+	case GIMPLE_PHI:
-+		return walk_phi(visited, search_err_code, lhs);
-+	case GIMPLE_CALL:
-+		if (mark_status((gimple_call_fndecl(def_stmt)), 0) == MARK_TURN_OFF)
-+			return MARK_TURN_OFF;
-+		check_function_hash(def_stmt);
-+		return MARK_NO;
++		return walk_use_def(visited, cur_node, SSA_NAME_VAR(lhs));
 +	case GIMPLE_ASM:
-+		search_err_code[CAST_ONLY] = false;
-+		return MARK_NO;
++		return handle_asm_stmt(visited, cur_node, lhs, def_stmt);
++	case GIMPLE_CALL: {
++		tree fndecl = gimple_call_fndecl(def_stmt);
++
++		if (fndecl == NULL_TREE)
++			return;
++		insert_last_node(cur_node, fndecl);
++		return;
++	}
++	case GIMPLE_PHI:
++		return walk_use_def_phi(visited, cur_node, lhs);
 +	case GIMPLE_ASSIGN:
 +		switch (gimple_num_ops(def_stmt)) {
 +		case 2:
-+			return walk_unary_ops(visited, search_err_code, lhs);
++			return walk_use_def(visited, cur_node, gimple_assign_rhs1(def_stmt));
 +		case 3:
-+			return walk_binary_ops(visited, search_err_code, lhs);
++			return walk_use_def_binary(visited, cur_node, lhs);
 +		}
 +	default:
 +		debug_gimple_stmt((gimple)def_stmt);
@@ -110830,220 +112568,1200 @@ index 0000000..03d0c84
 +	}
 +}
 +
-+// e.g., 3.8.2, 64, arch/x86/ia32/ia32_signal.c copy_siginfo_from_user32(): compat_ptr() u32 max
-+static bool skip_asm(const_tree arg)
++// Collect all the last nodes for checking the intentional_overflow and size_overflow attributes
++static void set_last_nodes(struct interesting_node *cur_node)
 +{
-+	gimple def_stmt = get_def_stmt(arg);
++	struct pointer_set_t *visited;
 +
-+	if (!def_stmt || !gimple_assign_cast_p(def_stmt))
-+		return false;
++	visited = pointer_set_create();
++	walk_use_def(visited, cur_node, cur_node->node);
++	pointer_set_destroy(visited);
++}
 +
-+	def_stmt = get_def_stmt(gimple_assign_rhs1(def_stmt));
-+	return def_stmt && gimple_code(def_stmt) == GIMPLE_ASM;
++/* This function calls the main recursion function (expand) that duplicates the stmts. Before that it checks the intentional_overflow attribute and asm stmts,
++ * it decides whether the duplication is necessary or not and it searches for missing size_overflow attributes. After expand() it changes the orig node to the duplicated node
++ * in the original stmt (first stmt) and it inserts the overflow check for the arg of the callee or for the return value.
++ * If there is a mark_turn_off intentional attribute on the caller or the callee then there is no duplication and missing size_overflow attribute check anywhere.
++ * There is only missing size_overflow attribute checking if the intentional_overflow attribute is the mark_no type.
++ * Stmt duplication is unnecessary if there are no binary/ternary assignements or if the unary assignment isn't a cast.
++ * It skips the possible error codes too. If the def_stmts trace back to a constant and there are no binary/ternary assigments then we assume that it is some kind of error code.
++ */
++static struct next_cgraph_node *handle_interesting_stmt(struct next_cgraph_node *cnodes, struct interesting_node *cur_node, struct cgraph_node *caller_node)
++{
++	struct pointer_set_t *visited;
++	bool interesting_conditions[3] = {false, false, false};
++	tree new_node, orig_node = cur_node->node;
++
++	set_last_nodes(cur_node);
++
++	check_intentional_attribute_ipa(cur_node);
++	if (cur_node->intentional_attr_decl == MARK_TURN_OFF || cur_node->intentional_attr_cur_fndecl == MARK_TURN_OFF)
++		return cnodes;
++
++	search_interesting_conditions(cur_node, interesting_conditions);
++
++	// error code
++	if (interesting_conditions[CAST] && interesting_conditions[FROM_CONST] && !interesting_conditions[NOT_UNARY])
++		return cnodes;
++
++	cnodes = search_overflow_attribute(cnodes, cur_node);
++
++	if (cur_node->intentional_attr_cur_fndecl != MARK_NO)
++		return cnodes;
++
++	// unnecessary overflow check
++	if (!interesting_conditions[CAST] && !interesting_conditions[NOT_UNARY])
++		return cnodes;
++
++	visited = pointer_set_create();
++	new_node = expand(visited, caller_node, orig_node);
++	pointer_set_destroy(visited);
++
++	if (new_node == NULL_TREE)
++		return cnodes;
++
++	change_orig_node(cur_node, new_node);
++	check_size_overflow(caller_node, cur_node->first_stmt, TREE_TYPE(new_node), new_node, orig_node, BEFORE_STMT);
++
++	return cnodes;
 +}
 +
-+/*
-+0</MARK_YES: no dup, search attributes (so, int)
-+0/MARK_NOT_INTENTIONAL: no dup, search attribute (int)
-+-1/MARK_TURN_OFF: no dup, no search, current_function_decl -> no dup
-+*/
++// Check visited interesting nodes.
++static bool is_in_interesting_node(struct interesting_node *head, const_gimple first_stmt, const_tree node, unsigned int num)
++{
++	struct interesting_node *cur;
++
++	for (cur = head; cur; cur = cur->next) {
++		if (!operand_equal_p(node, cur->node, 0))
++			continue;
++		if (num != cur->num)
++			continue;
++		if (first_stmt == cur->first_stmt)
++			return true;
++	}
++	return false;
++}
++
++/* Create an interesting node. The ipa pass starts to duplicate from these stmts.
++   first_stmt: it is the call or assignment or ret stmt, change_orig_node() will change the original node (retval, or function arg) in this
++   last_nodes: they are the last stmts in the recursion (they haven't a def_stmt). They are useful in the missing size_overflow attribute check and
++               the intentional_overflow attribute check. They are collected by set_last_nodes().
++   num: arg count of a call stmt or 0 when it is a ret
++   node: the recursion starts from here, it is a call arg or a return value
++   fndecl: the fndecl of the interesting node when the node is an arg. it is the fndecl of the callee function otherwise it is the fndecl of the caller (current_function_fndecl) function.
++   intentional_attr_decl: intentional_overflow attribute of the callee function
++   intentional_attr_cur_fndecl: intentional_overflow attribute of the caller function
++   intentional_mark_from_gimple: the intentional overflow type of size_overflow asm stmt from gimple if it exists
++ */
++static struct interesting_node *create_new_interesting_node(struct interesting_node *head, gimple first_stmt, tree node, unsigned int num, gimple asm_stmt)
++{
++	struct interesting_node *new_node;
++	tree fndecl;
++	enum gimple_code code;
++
++	gcc_assert(node != NULL_TREE);
++	code = gimple_code(first_stmt);
++	gcc_assert(code == GIMPLE_CALL || code == GIMPLE_ASM || code == GIMPLE_ASSIGN || code == GIMPLE_RETURN);
++
++	if (num == CANNOT_FIND_ARG)
++		return head;
++
++	if (skip_types(node))
++		return head;
++
++	if (skip_asm(node))
++		return head;
++
++	if (is_gimple_call(first_stmt))
++		fndecl = gimple_call_fndecl(first_stmt);
++	else
++		fndecl = current_function_decl;
++
++	if (fndecl == NULL_TREE)
++		return head;
++
++	if (is_in_interesting_node(head, first_stmt, node, num))
++		return head;
++
++	new_node = (struct interesting_node *)xmalloc(sizeof(*new_node));
++
++	new_node->next = NULL;
++	new_node->first_stmt = first_stmt;
++#if BUILDING_GCC_VERSION <= 4007
++	new_node->last_nodes = VEC_alloc(tree, gc, VEC_LEN);
++#else
++	vec_alloc(new_node->last_nodes, VEC_LEN);
++#endif
++	new_node->num = num;
++	new_node->node = node;
++	new_node->fndecl = fndecl;
++	new_node->intentional_attr_decl = MARK_NO;
++	new_node->intentional_attr_cur_fndecl = MARK_NO;
++	new_node->intentional_mark_from_gimple = asm_stmt;
++
++	if (!head)
++		return new_node;
++
++	new_node->next = head;
++	return new_node;
++}
++
++/* Check the ret stmts in the functions on the next cgraph node list (these functions will be in the hash table and they are reachable from ipa).
++ * If the ret stmt is in the next cgraph node list then it's an interesting ret.
++ */
++static struct interesting_node *handle_stmt_by_cgraph_nodes_ret(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
++{
++	struct next_cgraph_node *cur_node;
++	tree ret = gimple_return_retval(stmt);
++
++	if (ret == NULL_TREE)
++		return head;
++
++	for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
++		if (!operand_equal_p(cur_node->callee_fndecl, DECL_ORIGIN(current_function_decl), 0))
++			continue;
++		if (cur_node->num == 0)
++			head = create_new_interesting_node(head, stmt, ret, 0, NOT_INTENTIONAL_ASM);
++	}
++
++	return head;
++}
++
++/* Check the call stmts in the functions on the next cgraph node list (these functions will be in the hash table and they are reachable from ipa).
++ * If the call stmt is in the next cgraph node list then it's an interesting call.
++ */
++static struct interesting_node *handle_stmt_by_cgraph_nodes_call(struct interesting_node *head, gimple stmt, struct next_cgraph_node *next_node)
++{
++	unsigned int argnum;
++	tree fndecl, arg;
++	struct next_cgraph_node *cur_node;
++
++	fndecl = gimple_call_fndecl(stmt);
++	if (fndecl == NULL_TREE)
++		return head;
++
++	for (cur_node = next_node; cur_node; cur_node = cur_node->next) {
++		if (!operand_equal_p(cur_node->callee_fndecl, fndecl, 0))
++			continue;
++		argnum = get_correct_arg_count(cur_node->num, fndecl);
++		gcc_assert(argnum != CANNOT_FIND_ARG);
++		if (argnum == 0)
++			continue;
++
++		arg = gimple_call_arg(stmt, argnum - 1);
++		head = create_new_interesting_node(head, stmt, arg, argnum, NOT_INTENTIONAL_ASM);
++	}
++
++	return head;
++}
++
++static unsigned int check_ops(const_tree orig_node, const_tree node, unsigned int ret_count)
++{
++	if (!operand_equal_p(orig_node, node, 0))
++		return WRONG_NODE;
++	if (skip_types(node))
++		return WRONG_NODE;
++	return ret_count;
++}
++
++// Get the index of the rhs node in an assignment
++static unsigned int get_assign_ops_count(const_gimple stmt, tree node)
++{
++	const_tree rhs1, rhs2;
++	unsigned int ret;
++
++	gcc_assert(stmt);
++	gcc_assert(is_gimple_assign(stmt));
++
++	rhs1 = gimple_assign_rhs1(stmt);
++	gcc_assert(rhs1 != NULL_TREE);
++
++	switch (gimple_num_ops(stmt)) {
++	case 2:
++		return check_ops(node, rhs1, 1);
++	case 3:
++		ret = check_ops(node, rhs1, 1);
++		if (ret != WRONG_NODE)
++			return ret;
++
++		rhs2 = gimple_assign_rhs2(stmt);
++		gcc_assert(rhs2 != NULL_TREE);
++		return check_ops(node, rhs2, 2);
++	default:
++		gcc_unreachable();
++	}
++}
++
++// Find the correct arg number of a call stmt. It is needed when the interesting function is a cloned function.
++static unsigned int find_arg_number_gimple(const_tree arg, const_gimple stmt)
++{
++	unsigned int i;
++
++	if (gimple_call_fndecl(stmt) == NULL_TREE)
++		return CANNOT_FIND_ARG;
++
++	for (i = 0; i < gimple_call_num_args(stmt); i++) {
++		tree node;
++
++		node = gimple_call_arg(stmt, i);
++		if (!operand_equal_p(arg, node, 0))
++			continue;
++		if (!skip_types(node))
++			return i + 1;
++	}
++
++	return CANNOT_FIND_ARG;
++}
++
++/* starting from the size_overflow asm stmt collect interesting stmts. They can be
++ * any of return, call or assignment stmts (because of inlining).
++ */
++static struct interesting_node *get_interesting_ret_or_call(struct pointer_set_t *visited, struct interesting_node *head, tree node, gimple intentional_asm)
++{
++	use_operand_p use_p;
++	imm_use_iterator imm_iter;
++	unsigned int argnum;
++
++	if (is_size_overflow_intentional_asm_turn_off(intentional_asm))
++		return head;
++
++	gcc_assert(TREE_CODE(node) == SSA_NAME);
++
++	if (pointer_set_insert(visited, node))
++		return head;
++
++	FOR_EACH_IMM_USE_FAST(use_p, imm_iter, node) {
++		gimple stmt = USE_STMT(use_p);
++
++		if (stmt == NULL)
++			return head;
++		if (is_gimple_debug(stmt))
++			continue;
++
++		switch (gimple_code(stmt)) {
++		case GIMPLE_CALL:
++			argnum = find_arg_number_gimple(node, stmt);
++			head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
++			break;
++		case GIMPLE_RETURN:
++			head = create_new_interesting_node(head, stmt, node, 0, intentional_asm);
++			break;
++		case GIMPLE_ASSIGN:
++			argnum = get_assign_ops_count(stmt, node);
++			head = create_new_interesting_node(head, stmt, node, argnum, intentional_asm);
++			break;
++		case GIMPLE_PHI: {
++			tree result = gimple_phi_result(stmt);
++			head = get_interesting_ret_or_call(visited, head, result, intentional_asm);
++			break;
++		}
++		case GIMPLE_ASM:
++			if (gimple_asm_noutputs(stmt) != 0)
++				break;
++			if (!is_size_overflow_asm(stmt))
++				break;
++			head = create_new_interesting_node(head, stmt, node, 1, intentional_asm);
++			break;
++		case GIMPLE_COND:
++		case GIMPLE_SWITCH:
++			break;
++		default:
++			debug_gimple_stmt(stmt);
++			gcc_unreachable();
++			break;
++		}
++	}
++	return head;
++}
++
++static void remove_size_overflow_asm(gimple stmt)
++{
++	gimple_stmt_iterator gsi;
++	tree input, output;
++
++	if (gimple_code(stmt) != GIMPLE_ASM)
++		return;
++	if (!is_size_overflow_asm(stmt))
++		return;
++
++	if (gimple_asm_noutputs(stmt) == 0) {
++		gsi = gsi_for_stmt(stmt);
++		gsi_remove(&gsi, true);
++		return;
++	}
 +
-+static bool search_attributes(tree fndecl, const_tree arg, unsigned int argnum, bool where)
++	input = gimple_asm_input_op(stmt, 0);
++	output = gimple_asm_output_op(stmt, 0);
++	replace_size_overflow_asm_with_assign(stmt, TREE_VALUE(output), TREE_VALUE(input));
++}
++
++/* handle the size_overflow asm stmts from the gimple pass and collect the interesting stmts.
++ * If the asm stmt is a parm_decl kind (noutputs == 0) then remove it.
++ * If it is a simple asm stmt then replace it with an assignment from the asm input to the asm output.
++ */
++static struct interesting_node *handle_stmt_by_size_overflow_asm(gimple stmt, struct interesting_node *head)
 +{
++	const_tree output;
 +	struct pointer_set_t *visited;
-+	enum mark is_marked, is_found;
-+	location_t loc;
-+	bool search_err_code[2] = {true, false};
++	gimple intentional_asm = NOT_INTENTIONAL_ASM;
 +
-+	is_marked = mark_status(current_function_decl, 0);
-+	if (is_marked == MARK_TURN_OFF)
-+		return true;
++	if (!is_size_overflow_asm(stmt))
++		return head;
 +
-+	is_marked = mark_status(fndecl, argnum + 1);
-+	if (is_marked == MARK_TURN_OFF || is_marked == MARK_NOT_INTENTIONAL)
-+		return true;
++	if (is_size_overflow_intentional_asm_yes(stmt) || is_size_overflow_intentional_asm_turn_off(stmt))
++		intentional_asm = stmt;
++
++	gcc_assert(gimple_asm_ninputs(stmt) == 1);
++
++	if (gimple_asm_noutputs(stmt) == 0) {
++		const_tree input = gimple_asm_input_op(stmt, 0);
++
++		remove_size_overflow_asm(stmt);
++		if (is_gimple_constant(TREE_VALUE(input)))
++			return head;
++
++		visited = pointer_set_create();
++		head = get_interesting_ret_or_call(visited, head, TREE_VALUE(input), intentional_asm);
++		pointer_set_destroy(visited);
++		return head;
++	}
++
++	if (!is_size_overflow_intentional_asm_yes(stmt) && !is_size_overflow_intentional_asm_turn_off(stmt))
++		remove_size_overflow_asm(stmt);
 +
 +	visited = pointer_set_create();
-+	is_found = pre_expand(visited, search_err_code, arg);
++	output = gimple_asm_output_op(stmt, 0);
++	head = get_interesting_ret_or_call(visited, head, TREE_VALUE(output), intentional_asm);
 +	pointer_set_destroy(visited);
++	return head;
++}
 +
-+	if (where == FROM_RET && search_err_code[CAST_ONLY] && search_err_code[FROM_CONST])
-+		return true;
++/* Iterate over all the stmts of a function and look for the size_overflow asm stmts (they were created in the gimple pass)
++ * or a call stmt or a return stmt and store them in the interesting_node list
++ */
++static struct interesting_node *collect_interesting_stmts(struct next_cgraph_node *next_node)
++{
++	basic_block bb;
++	struct interesting_node *head = NULL;
 +
-+	if (where == FROM_ARG && skip_asm(arg))
-+		return true;
++	FOR_ALL_BB(bb) {
++		gimple_stmt_iterator gsi;
 +
-+	if (is_found == MARK_TURN_OFF)
-+		return true;
++		for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
++			enum gimple_code code;
++			gimple stmt = gsi_stmt(gsi);
 +
-+	if ((is_found == MARK_YES && is_marked == MARK_YES))
-+		return true;
++			code = gimple_code(stmt);
 +
-+	if (is_found == MARK_YES) {
-+		loc = DECL_SOURCE_LOCATION(fndecl);
-+		inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", get_asm_name(fndecl), argnum + 1);
-+		return true;
++			if (code == GIMPLE_ASM)
++				head = handle_stmt_by_size_overflow_asm(stmt, head);
++
++			if (!next_node)
++				continue;
++			if (code == GIMPLE_CALL)
++				head = handle_stmt_by_cgraph_nodes_call(head, stmt, next_node);
++			if (code == GIMPLE_RETURN)
++				head = handle_stmt_by_cgraph_nodes_ret(head, stmt, next_node);
++		}
++	}
++	return head;
++}
++
++static void set_current_function_decl(tree fndecl)
++{
++	gcc_assert(fndecl != NULL_TREE);
++
++	push_cfun(DECL_STRUCT_FUNCTION(fndecl));
++	calculate_dominance_info(CDI_DOMINATORS);
++	current_function_decl = fndecl;
++}
++
++static void unset_current_function_decl(void)
++{
++	free_dominance_info(CDI_DOMINATORS);
++	pop_cfun();
++	current_function_decl = NULL_TREE;
++}
++
++static void free_interesting_node(struct interesting_node *head)
++{
++	struct interesting_node *cur;
++
++	while (head) {
++		cur = head->next;
++#if BUILDING_GCC_VERSION <= 4007
++		VEC_free(tree, gc, head->last_nodes);
++#else
++		vec_free(head->last_nodes);
++#endif
++		free(head);
++		head = cur;
++	}
++}
++
++static struct visited *insert_visited_function(struct visited *head, struct interesting_node *cur_node)
++{
++	struct visited *new_visited;
++
++	new_visited = (struct visited *)xmalloc(sizeof(*new_visited));
++	new_visited->fndecl = cur_node->fndecl;
++	new_visited->num = cur_node->num;
++	new_visited->first_stmt = cur_node->first_stmt;
++	new_visited->next = NULL;
++
++	if (!head)
++		return new_visited;
++
++	new_visited->next = head;
++	return new_visited;
++}
++
++/* Check whether the function was already visited. If the fndecl, the arg count of the fndecl and the first_stmt (call or return) are same then
++ * it is a visited function.
++ */
++static bool is_visited_function(struct visited *head, struct interesting_node *cur_node)
++{
++	struct visited *cur;
++
++	if (!head)
++		return false;
++
++	for (cur = head; cur; cur = cur->next) {
++		if (!operand_equal_p(cur_node->fndecl, cur->fndecl, 0))
++			continue;
++		if (cur_node->num != cur->num)
++			continue;
++		if (cur_node->first_stmt == cur->first_stmt)
++			return true;
 +	}
 +	return false;
 +}
 +
-+static void handle_function_arg(gimple stmt, tree fndecl, unsigned int argnum)
++static void free_next_cgraph_node(struct next_cgraph_node *head)
++{
++	struct next_cgraph_node *cur;
++
++	while (head) {
++		cur = head->next;
++		free(head);
++		head = cur;
++	}
++}
++
++static void remove_all_size_overflow_asm(void)
++{
++	basic_block bb;
++
++	FOR_ALL_BB(bb) {
++		gimple_stmt_iterator si;
++
++		for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
++			remove_size_overflow_asm(gsi_stmt(si));
++	}
++}
++
++/* Main recursive walk of the ipa pass: iterate over the collected interesting stmts in a function
++ * (they are interesting if they have an associated size_overflow asm stmt) and recursively walk
++ * the newly collected interesting functions (they are interesting if there is control flow between
++ * the interesting stmts and them).
++ */
++static struct visited *handle_function(struct cgraph_node *node, struct next_cgraph_node *next_node, struct visited *visited)
++{
++	struct interesting_node *head, *cur_node;
++	struct next_cgraph_node *cur_cnodes, *cnodes_head = NULL;
++
++#if BUILDING_GCC_VERSION <= 4007
++	set_current_function_decl(node->decl);
++#else
++	set_current_function_decl(node->symbol.decl);
++#endif
++	call_count = 0;
++
++	head = collect_interesting_stmts(next_node);
++	for (cur_node = head; cur_node; cur_node = cur_node->next) {
++		if (is_visited_function(visited, cur_node))
++			continue;
++		cnodes_head = handle_interesting_stmt(cnodes_head, cur_node, node);
++		visited = insert_visited_function(visited, cur_node);
++	}
++
++	free_interesting_node(head);
++	remove_all_size_overflow_asm();
++	unset_current_function_decl();
++
++	for (cur_cnodes = cnodes_head; cur_cnodes; cur_cnodes = cur_cnodes->next)
++		visited = handle_function(cur_cnodes->current_function, cur_cnodes, visited);
++
++	free_next_cgraph_node(cnodes_head);
++	return visited;
++}
++
++static void free_visited(struct visited *head)
++{
++	struct visited *cur;
++
++	while (head) {
++		cur = head->next;
++		free(head);
++		head = cur;
++	}
++}
++
++// erase the local flag
++static void set_plf_false(void)
++{
++	basic_block bb;
++
++	FOR_ALL_BB(bb) {
++		gimple_stmt_iterator si;
++
++		for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
++			gimple_set_plf(gsi_stmt(si), MY_STMT, false);
++		for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
++			gimple_set_plf(gsi_stmt(si), MY_STMT, false);
++	}
++}
++
++#if BUILDING_GCC_VERSION <= 4006
++static bool cgraph_function_with_gimple_body_p(struct cgraph_node *node)
++{
++	return node->analyzed && !node->thunk.thunk_p && !node->alias;
++}
++
++static struct cgraph_node *cgraph_first_function_with_gimple_body(void)
++{
++	struct cgraph_node *node;
++
++	for (node = cgraph_nodes; node; node = node->next) {
++		if (cgraph_function_with_gimple_body_p(node))
++			return node;
++	}
++	return NULL;
++}
++
++static inline struct cgraph_node *cgraph_next_function_with_gimple_body(struct cgraph_node *node)
++{
++	for (node = node->next; node; node = node->next) {
++		if (cgraph_function_with_gimple_body_p(node))
++			return node;
++	}
++	return NULL;
++}
++
++#define FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) \
++	for ((node) = cgraph_first_function_with_gimple_body (); (node); \
++		(node) = cgraph_next_function_with_gimple_body (node))
++
++#endif
++
++// Main entry point of the ipa pass: erases the plf flag of all stmts and iterates over all the functions
++static unsigned int search_function(void)
++{
++	struct cgraph_node *node;
++	struct visited *visited = NULL;
++
++	FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
++#if BUILDING_GCC_VERSION <= 4007
++		set_current_function_decl(node->decl);
++#else
++		set_current_function_decl(node->symbol.decl);
++#endif
++		set_plf_false();
++		unset_current_function_decl();
++	}
++
++	FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
++		gcc_assert(cgraph_function_flags_ready);
++#if BUILDING_GCC_VERSION <= 4007
++		gcc_assert(node->reachable);
++#endif
++
++		visited = handle_function(node, NULL, visited);
++	}
++
++	free_visited(visited);
++	return 0;
++}
++
++static struct ipa_opt_pass_d pass_ipa = {
++	.pass = {
++		.type			= SIMPLE_IPA_PASS,
++		.name			= "size_overflow",
++#if BUILDING_GCC_VERSION >= 4008
++		.optinfo_flags		= OPTGROUP_NONE,
++#endif
++		.gate			= NULL,
++		.execute		= search_function,
++		.sub			= NULL,
++		.next			= NULL,
++		.static_pass_number	= 0,
++		.tv_id			= TV_NONE,
++		.properties_required	= 0,
++		.properties_provided	= 0,
++		.properties_destroyed	= 0,
++		.todo_flags_start	= 0,
++		.todo_flags_finish	= TODO_verify_ssa | TODO_verify_stmts | TODO_remove_unused_locals | TODO_ggc_collect | TODO_verify_flow | TODO_dump_cgraph | TODO_dump_func | TODO_update_ssa_no_phi,
++	},
++	.generate_summary		= NULL,
++	.write_summary			= NULL,
++	.read_summary			= NULL,
++#if BUILDING_GCC_VERSION >= 4006
++	.write_optimization_summary	= NULL,
++	.read_optimization_summary	= NULL,
++#endif
++	.stmt_fixup			= NULL,
++	.function_transform_todo_flags_start		= 0,
++	.function_transform		= NULL,
++	.variable_transform		= NULL,
++};
++
++// data for the size_overflow asm stmt
++struct asm_data {
++	gimple def_stmt;
++	tree input;
++	tree output;
++};
++
++#if BUILDING_GCC_VERSION <= 4007
++static VEC(tree, gc) *create_asm_io_list(tree string, tree io)
++#else
++static vec<tree, va_gc> *create_asm_io_list(tree string, tree io)
++#endif
++{
++	tree list;
++#if BUILDING_GCC_VERSION <= 4007
++	VEC(tree, gc) *vec_list = NULL;
++#else
++	vec<tree, va_gc> *vec_list = NULL;
++#endif
++
++	list = build_tree_list(NULL_TREE, string);
++	list = chainon(NULL_TREE, build_tree_list(list, io));
++#if BUILDING_GCC_VERSION <= 4007
++	VEC_safe_push(tree, gc, vec_list, list);
++#else
++	vec_safe_push(vec_list, list);
++#endif
++	return vec_list;
++}
++
++static void create_asm_stmt(const char *str, tree str_input, tree str_output, struct asm_data *asm_data)
++{
++	gimple asm_stmt;
++	gimple_stmt_iterator gsi;
++#if BUILDING_GCC_VERSION <= 4007
++	VEC(tree, gc) *input, *output = NULL;
++#else
++	vec<tree, va_gc> *input, *output = NULL;
++#endif
++
++	input = create_asm_io_list(str_input, asm_data->input);
++
++	if (asm_data->output)
++		output = create_asm_io_list(str_output, asm_data->output);
++
++	asm_stmt = gimple_build_asm_vec(str, input, output, NULL, NULL);
++	gsi = gsi_for_stmt(asm_data->def_stmt);
++	gsi_insert_after(&gsi, asm_stmt, GSI_NEW_STMT);
++
++	if (asm_data->output)
++		SSA_NAME_DEF_STMT(asm_data->output) = asm_stmt;
++}
++
++static void replace_call_lhs(const struct asm_data *asm_data)
++{
++	gimple_set_lhs(asm_data->def_stmt, asm_data->input);
++	update_stmt(asm_data->def_stmt);
++	SSA_NAME_DEF_STMT(asm_data->input) = asm_data->def_stmt;
++}
++
++static enum mark search_intentional_phi(struct pointer_set_t *visited, const_tree result)
++{
++	enum mark cur_fndecl_attr;
++	gimple phi = get_def_stmt(result);
++	unsigned int i, n = gimple_phi_num_args(phi);
++
++	pointer_set_insert(visited, phi);
++	for (i = 0; i < n; i++) {
++		tree arg = gimple_phi_arg_def(phi, i);
++
++		cur_fndecl_attr = search_intentional(visited, arg);
++		if (cur_fndecl_attr != MARK_NO)
++			return cur_fndecl_attr;
++	}
++	return MARK_NO;
++}
++
++static enum mark search_intentional_binary(struct pointer_set_t *visited, const_tree lhs)
++{
++	enum mark cur_fndecl_attr;
++	const_tree rhs1, rhs2;
++	gimple def_stmt = get_def_stmt(lhs);
++
++	rhs1 = gimple_assign_rhs1(def_stmt);
++	rhs2 = gimple_assign_rhs2(def_stmt);
++
++	cur_fndecl_attr = search_intentional(visited, rhs1);
++	if (cur_fndecl_attr != MARK_NO)
++		return cur_fndecl_attr;
++	return search_intentional(visited, rhs2);
++}
++
++// Look up the intentional_overflow attribute on the caller and the callee functions.
++static enum mark search_intentional(struct pointer_set_t *visited, const_tree lhs)
++{
++	const_gimple def_stmt;
++
++	if (TREE_CODE(lhs) != SSA_NAME)
++		return get_intentional_attr_type(lhs);
++
++	def_stmt = get_def_stmt(lhs);
++	if (!def_stmt)
++		return MARK_NO;
++
++	if (pointer_set_contains(visited, def_stmt))
++		return MARK_NO;
++
++	switch (gimple_code(def_stmt)) {
++	case GIMPLE_NOP:
++		return search_intentional(visited, SSA_NAME_VAR(lhs));
++	case GIMPLE_ASM:
++	case GIMPLE_CALL:
++		return MARK_NO;
++	case GIMPLE_PHI:
++		return search_intentional_phi(visited, lhs);
++	case GIMPLE_ASSIGN:
++		switch (gimple_num_ops(def_stmt)) {
++		case 2:
++			return search_intentional(visited, gimple_assign_rhs1(def_stmt));
++		case 3:
++			return search_intentional_binary(visited, lhs);
++		}
++	case GIMPLE_RETURN:
++		return MARK_NO;
++	default:
++		debug_gimple_stmt((gimple)def_stmt);
++		error("%s: unknown gimple code", __func__);
++		gcc_unreachable();
++	}
++}
++
++// Check the intentional_overflow attribute and create the asm comment string for the size_overflow asm stmt.
++static const char *check_intentional_attribute_gimple(const_tree arg, const_gimple stmt, unsigned int argnum)
 +{
++	const_tree fndecl;
++	const char *asm_str;
 +	struct pointer_set_t *visited;
-+	tree arg, new_arg;
-+	bool match;
++	enum mark cur_fndecl_attr, decl_attr = MARK_NO;
 +
-+	if (argnum == 0)
++	fndecl = get_interesting_orig_fndecl(stmt, argnum);
++	if (is_end_intentional_intentional_attr(fndecl, argnum))
++		decl_attr = MARK_NOT_INTENTIONAL;
++	else if (is_yes_intentional_attr(fndecl, argnum))
++		decl_attr = MARK_YES;
++	else if (is_turn_off_intentional_attr(fndecl) || is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl))) {
++		return "# size_overflow MARK_TURN_OFF\n\t";
++	}
++
++	visited = pointer_set_create();
++	cur_fndecl_attr = search_intentional(visited, arg);
++	pointer_set_destroy(visited);
++
++	switch (cur_fndecl_attr) {
++	case MARK_NO:
++		asm_str = "# size_overflow\n\t";
++		break;
++	case MARK_TURN_OFF:
++		asm_str = "# size_overflow MARK_TURN_OFF\n\t";
++		break;
++	default:
++		asm_str = "# size_overflow MARK_YES\n\t";
++		print_missing_intentional(decl_attr, cur_fndecl_attr, fndecl, argnum);
++		break;
++	}
++
++	return asm_str;
++}
++
++static void check_missing_size_overflow_attribute(tree var)
++{
++	tree orig_fndecl;
++	unsigned int num;
++
++	if (is_a_return_check(var))
++		orig_fndecl = DECL_ORIGIN(var);
++	else
++		orig_fndecl = DECL_ORIGIN(current_function_decl);
++
++	num = get_function_num(var, orig_fndecl);
++	if (num == CANNOT_FIND_ARG)
 +		return;
 +
-+	argnum--;
++	is_missing_function(orig_fndecl, num);
++}
++
++static void search_size_overflow_attribute_phi(struct pointer_set_t *visited, const_tree result)
++{
++	gimple phi = get_def_stmt(result);
++	unsigned int i, n = gimple_phi_num_args(phi);
++
++	pointer_set_insert(visited, phi);
++	for (i = 0; i < n; i++) {
++		tree arg = gimple_phi_arg_def(phi, i);
++
++		search_size_overflow_attribute(visited, arg);
++	}
++}
++
++static void search_size_overflow_attribute_binary(struct pointer_set_t *visited, const_tree lhs)
++{
++	const_gimple def_stmt = get_def_stmt(lhs);
++	tree rhs1, rhs2;
++
++	rhs1 = gimple_assign_rhs1(def_stmt);
++	rhs2 = gimple_assign_rhs2(def_stmt);
++
++	search_size_overflow_attribute(visited, rhs1);
++	search_size_overflow_attribute(visited, rhs2);
++}
++
++static void search_size_overflow_attribute(struct pointer_set_t *visited, tree lhs)
++{
++	const_gimple def_stmt;
 +
-+	match = get_function_arg(&argnum, fndecl);
-+	if (!match)
++	if (TREE_CODE(lhs) == PARM_DECL) {
++		check_missing_size_overflow_attribute(lhs);
 +		return;
-+	gcc_assert(gimple_call_num_args(stmt) > argnum);
-+	arg = gimple_call_arg(stmt, argnum);
-+	if (arg == NULL_TREE)
++	}
++
++	def_stmt = get_def_stmt(lhs);
++	if (!def_stmt)
 +		return;
 +
-+	if (skip_types(arg))
++	if (pointer_set_insert(visited, def_stmt))
 +		return;
 +
-+	if (search_attributes(fndecl, arg, argnum, FROM_ARG))
++	switch (gimple_code(def_stmt)) {
++	case GIMPLE_NOP:
++		return search_size_overflow_attribute(visited, SSA_NAME_VAR(lhs));
++	case GIMPLE_ASM:
++		return;
++	case GIMPLE_CALL: {
++		tree fndecl = gimple_call_fndecl(def_stmt);
++
++		if (fndecl == NULL_TREE)
++			return;
++		check_missing_size_overflow_attribute(fndecl);
++		return;
++	}
++	case GIMPLE_PHI:
++		return search_size_overflow_attribute_phi(visited, lhs);
++	case GIMPLE_ASSIGN:
++		switch (gimple_num_ops(def_stmt)) {
++		case 2:
++			return search_size_overflow_attribute(visited, gimple_assign_rhs1(def_stmt));
++		case 3:
++			return search_size_overflow_attribute_binary(visited, lhs);
++		}
++	default:
++		debug_gimple_stmt((gimple)def_stmt);
++		error("%s: unknown gimple code", __func__);
++		gcc_unreachable();
++	}
++}
++
++// Search missing entries in the hash table (invoked from the gimple pass)
++static void search_missing_size_overflow_attribute_gimple(const_gimple stmt, unsigned int num)
++{
++	tree fndecl = NULL_TREE;
++	tree lhs;
++	struct pointer_set_t *visited;
++
++	if (is_turn_off_intentional_attr(DECL_ORIGIN(current_function_decl)))
++		return;
++
++	if (num == 0) {
++		gcc_assert(gimple_code(stmt) == GIMPLE_RETURN);
++		lhs = gimple_return_retval(stmt);
++	} else {
++		gcc_assert(is_gimple_call(stmt));
++		lhs = gimple_call_arg(stmt, num - 1);
++		fndecl = gimple_call_fndecl(stmt);
++	}
++
++	if (fndecl != NULL_TREE && is_turn_off_intentional_attr(DECL_ORIGIN(fndecl)))
 +		return;
 +
 +	visited = pointer_set_create();
-+	new_arg = expand(visited, arg);
++	search_size_overflow_attribute(visited, lhs);
 +	pointer_set_destroy(visited);
++}
++
++static void create_output_from_phi(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
++{
++	gimple_stmt_iterator gsi;
++	gimple assign;
 +
-+	if (new_arg == NULL_TREE)
++	assign = gimple_build_assign(asm_data->input, asm_data->output);
++	gsi = gsi_for_stmt(stmt);
++	gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
++	asm_data->def_stmt = assign;
++
++	asm_data->output = create_new_var(TREE_TYPE(asm_data->output));
++	asm_data->output = make_ssa_name(asm_data->output, stmt);
++	if (gimple_code(stmt) == GIMPLE_RETURN)
++		gimple_return_set_retval(stmt, asm_data->output);
++	else
++		gimple_call_set_arg(stmt, argnum - 1, asm_data->output);
++	update_stmt(stmt);
++}
++
++/* Create the input of the size_overflow asm stmt.
++ * When the arg of the callee function is a parm_decl it creates this kind of size_overflow asm stmt:
++ *   __asm__("# size_overflow MARK_YES" :  : "rm" size_1(D));
++ * The input field in asm_data will be empty if there is no need for further size_overflow asm stmt insertion.
++ * otherwise create the input (for a phi stmt the output too) of the asm stmt.
++ */
++static void create_asm_input(gimple stmt, unsigned int argnum, struct asm_data *asm_data)
++{
++	if (!asm_data->def_stmt) {
++		asm_data->input = NULL_TREE;
 +		return;
++	}
++
++	asm_data->input = create_new_var(TREE_TYPE(asm_data->output));
++	asm_data->input = make_ssa_name(asm_data->input, asm_data->def_stmt);
++
++	switch (gimple_code(asm_data->def_stmt)) {
++	case GIMPLE_ASSIGN:
++	case GIMPLE_CALL:
++		replace_call_lhs(asm_data);
++		break;
++	case GIMPLE_PHI:
++		create_output_from_phi(stmt, argnum, asm_data);
++		break;
++	case GIMPLE_NOP: {
++		const char *str = check_intentional_attribute_gimple(asm_data->output, stmt, argnum);
++
++		asm_data->input = asm_data->output;
++		asm_data->output = NULL;
++		asm_data->def_stmt = stmt;
++
++		create_asm_stmt(str, build_string(2, "rm"), NULL, asm_data);
++		asm_data->input = NULL_TREE;
++		break;
++	}
++	case GIMPLE_ASM:
++		if (is_size_overflow_asm(asm_data->def_stmt)) {
++			asm_data->input = NULL_TREE;
++			break;
++		}
++	default:
++		debug_gimple_stmt(asm_data->def_stmt);
++		gcc_unreachable();
++	}
++}
 +
-+	change_function_arg(stmt, arg, argnum, new_arg);
-+	check_size_overflow(stmt, TREE_TYPE(new_arg), new_arg, arg, BEFORE_STMT);
++/* This is the gimple part of searching for a missing size_overflow attribute. If the intentional_overflow attribute type
++ * is of the right kind create the appropriate size_overflow asm stmts:
++ *   __asm__("# size_overflow" : =rm" D.3344_8 : "0" cicus.4_16);
++ *   __asm__("# size_overflow MARK_YES" :  : "rm" size_1(D));
++ */
++static void create_size_overflow_asm(gimple stmt, tree output_node, unsigned int argnum)
++{
++	struct asm_data asm_data;
++	const char *str;
++
++	if (is_gimple_constant(output_node))
++		return;
++
++	search_missing_size_overflow_attribute_gimple(stmt, argnum);
++
++	asm_data.output = output_node;
++	asm_data.def_stmt = get_def_stmt(asm_data.output);
++	create_asm_input(stmt, argnum, &asm_data);
++	if (asm_data.input == NULL_TREE)
++		return;
++
++	str = check_intentional_attribute_gimple(asm_data.output, stmt, argnum);
++	create_asm_stmt(str, build_string(1, "0"), build_string(3, "=rm"), &asm_data);
 +}
 +
-+static void handle_function_by_attribute(gimple stmt, const_tree attr, tree fndecl)
++// Determine the return value and insert the asm stmt to mark the return stmt.
++static void insert_asm_ret(gimple stmt)
 +{
-+	tree p = TREE_VALUE(attr);
-+	do {
-+		handle_function_arg(stmt, fndecl, TREE_INT_CST_LOW(TREE_VALUE(p)));
-+		p = TREE_CHAIN(p);
-+	} while (p);
++	tree ret;
++
++	ret = gimple_return_retval(stmt);
++	create_size_overflow_asm(stmt, ret, 0);
++}
++
++// Determine the correct arg index and arg and insert the asm stmt to mark the stmt.
++static void insert_asm_arg(gimple stmt, unsigned int orig_argnum)
++{
++	tree arg;
++	unsigned int argnum;
++
++	argnum = get_correct_arg_count(orig_argnum, gimple_call_fndecl(stmt));
++	gcc_assert(argnum != 0);
++	if (argnum == CANNOT_FIND_ARG)
++		return;
++
++	arg = gimple_call_arg(stmt, argnum - 1);
++	gcc_assert(arg != NULL_TREE);
++	create_size_overflow_asm(stmt, arg, argnum);
++}
++
++// If a function arg or the return value is marked by the size_overflow attribute then set its index in the array.
++static void set_argnum_attribute(const_tree attr, bool *argnums)
++{
++	unsigned int argnum;
++	tree attr_value;
++
++	for (attr_value = TREE_VALUE(attr); attr_value; attr_value = TREE_CHAIN(attr_value)) {
++		argnum = TREE_INT_CST_LOW(TREE_VALUE(attr_value));
++		argnums[argnum] = true;
++	}
 +}
 +
-+static void handle_function_by_hash(gimple stmt, tree fndecl)
++// If a function arg or the return value is in the hash table then set its index in the array.
++static void set_argnum_hash(tree fndecl, bool *argnums)
 +{
 +	unsigned int num;
 +	const struct size_overflow_hash *hash;
 +
-+	hash = get_function_hash(fndecl);
++	hash = get_function_hash(DECL_ORIGIN(fndecl));
 +	if (!hash)
 +		return;
 +
-+	for (num = 0; num <= MAX_PARAM; num++)
-+		if (hash->param & (1U << num))
-+			handle_function_arg(stmt, fndecl, num);
++	for (num = 0; num <= MAX_PARAM; num++) {
++		if (!(hash->param & (1U << num)))
++			continue;
++
++		argnums[num] = true;
++	}
 +}
 +
-+static bool check_return_value(void)
++static bool is_all_the_argnums_empty(bool *argnums)
 +{
-+	const struct size_overflow_hash *hash;
-+
-+	hash = get_function_hash(current_function_decl);
-+	if (!hash || !(hash->param & 1U << 0))
-+		return false;
++	unsigned int i;
 +
++	for (i = 0; i <= MAX_PARAM; i++)
++		if (argnums[i])
++			return false;
 +	return true;
 +}
 +
-+static void handle_return_value(gimple ret_stmt)
++// Check whether the arguments or the return value of the function are in the hash table or are marked by the size_overflow attribute.
++static void search_interesting_args(tree fndecl, bool *argnums)
 +{
-+	struct pointer_set_t *visited;
-+	tree ret, new_ret;
++	const_tree attr;
 +
-+	if (gimple_code(ret_stmt) != GIMPLE_RETURN)
++	set_argnum_hash(fndecl, argnums);
++	if (!is_all_the_argnums_empty(argnums))
 +		return;
 +
-+	ret = gimple_return_retval(ret_stmt);
++	attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl));
++	if (attr && TREE_VALUE(attr))
++		set_argnum_attribute(attr, argnums);
++}
 +
-+	if (skip_types(ret))
-+		return;
++/*
++ * Look up the intentional_overflow attribute that turns off ipa based duplication
++ * on the callee function, if found insert an asm stmt with "MARK_TURN_OFF".
++ */
++static bool create_mark_turn_off_asm(gimple stmt)
++{
++	enum mark mark;
++	struct asm_data asm_data;
++	const_tree fndecl = gimple_call_fndecl(stmt);
 +
-+	if (search_attributes(current_function_decl, ret, 0, FROM_RET))
-+		return;
++	mark = get_intentional_attr_type(DECL_ORIGIN(fndecl));
++	if (mark != MARK_TURN_OFF)
++		return false;
 +
-+	visited = pointer_set_create();
-+	new_ret = expand(visited, ret);
-+	pointer_set_destroy(visited);
++	asm_data.input = gimple_call_lhs(stmt);
++	if (asm_data.input == NULL_TREE) {
++		asm_data.input = gimple_call_arg(stmt, 0);
++		if (is_gimple_constant(asm_data.input))
++			return false;
++	}
 +
-+	change_function_return(ret_stmt, ret, new_ret);
-+	check_size_overflow(ret_stmt, TREE_TYPE(new_ret), new_ret, ret, BEFORE_STMT);
++	asm_data.output = NULL;
++	asm_data.def_stmt = stmt;
++	create_asm_stmt("# size_overflow MARK_TURN_OFF\n\t", build_string(2, "rm"), NULL, &asm_data);
++	return true;
 +}
 +
-+static void set_plf_false(void)
++// If the argument(s) of the callee function is/are in the hash table or are marked by an attribute then mark the call stmt with an asm stmt
++static void handle_interesting_function(gimple stmt)
 +{
-+	basic_block bb;
++	unsigned int argnum;
++	tree fndecl;
++	bool orig_argnums[MAX_PARAM + 1] = {false};
 +
-+	FOR_ALL_BB(bb) {
-+		gimple_stmt_iterator si;
++	if (gimple_call_num_args(stmt) == 0)
++		return;
++	fndecl = gimple_call_fndecl(stmt);
++	if (fndecl == NULL_TREE)
++		return;
++	fndecl = DECL_ORIGIN(fndecl);
 +
-+		for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
-+			gimple_set_plf(gsi_stmt(si), MY_STMT, false);
-+		for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
-+			gimple_set_plf(gsi_stmt(si), MY_STMT, false);
-+	}
++	if (create_mark_turn_off_asm(stmt))
++		return;
++
++	search_interesting_args(fndecl, orig_argnums);
++
++	for (argnum = 1; argnum < MAX_PARAM; argnum++)
++		if (orig_argnums[argnum])
++			insert_asm_arg(stmt, argnum);
 +}
 +
-+static unsigned int handle_function(void)
++// If the return value of the caller function is in hash table (its index is 0) then mark the return stmt with an asm stmt
++static void handle_interesting_ret(gimple stmt)
 +{
-+	basic_block next, bb = ENTRY_BLOCK_PTR->next_bb;
-+	bool check_ret;
++	bool orig_argnums[MAX_PARAM + 1] = {false};
 +
-+	set_plf_false();
++	search_interesting_args(current_function_decl, orig_argnums);
 +
-+	check_ret = check_return_value();
++	if (orig_argnums[0])
++		insert_asm_ret(stmt);
++}
 +
-+	do {
++// Iterate over all the stmts and search for call and return stmts and mark them if they're in the hash table
++static unsigned int search_interesting_functions(void)
++{
++	basic_block bb;
++
++	FOR_ALL_BB(bb) {
 +		gimple_stmt_iterator gsi;
-+		next = bb->next_bb;
 +
 +		for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
-+			tree fndecl, attr;
 +			gimple stmt = gsi_stmt(gsi);
 +
-+			if (check_ret)
-+				handle_return_value(stmt);
-+
-+			if (!(is_gimple_call(stmt)))
-+				continue;
-+			fndecl = gimple_call_fndecl(stmt);
-+			if (fndecl == NULL_TREE)
-+				continue;
-+			if (gimple_call_num_args(stmt) == 0)
-+				continue;
-+			attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl));
-+			if (!attr || !TREE_VALUE(attr))
-+				handle_function_by_hash(stmt, fndecl);
-+			else
-+				handle_function_by_attribute(stmt, attr, fndecl);
-+			gsi = gsi_for_stmt(stmt);
-+			next = gimple_bb(stmt)->next_bb;
++			if (is_gimple_call(stmt))
++				handle_interesting_function(stmt);
++			else if (gimple_code(stmt) == GIMPLE_RETURN)
++				handle_interesting_ret(stmt);
 +		}
-+		bb = next;
-+	} while (bb);
++	}
 +	return 0;
 +}
 +
-+static struct gimple_opt_pass size_overflow_pass = {
++/*
++ * A lot of functions get inlined before the ipa passes so after the build_ssa gimple pass
++ * this pass inserts asm stmts to mark the interesting args
++ * that the ipa pass will detect and insert the size overflow checks for.
++ */
++static struct gimple_opt_pass insert_size_overflow_asm_pass = {
 +	.pass = {
 +		.type			= GIMPLE_PASS,
-+		.name			= "size_overflow",
++		.name			= "insert_size_overflow_asm",
 +#if BUILDING_GCC_VERSION >= 4008
 +		.optinfo_flags		= OPTGROUP_NONE,
 +#endif
 +		.gate			= NULL,
-+		.execute		= handle_function,
++		.execute		= search_interesting_functions,
 +		.sub			= NULL,
 +		.next			= NULL,
 +		.static_pass_number	= 0,
@@ -111056,6 +113774,7 @@ index 0000000..03d0c84
 +	}
 +};
 +
++// Create the noreturn report_size_overflow() function decl.
 +static void start_unit_callback(void __unused *gcc_data, void __unused *user_data)
 +{
 +	tree fntype;
@@ -111078,6 +113797,77 @@ index 0000000..03d0c84
 +	TREE_THIS_VOLATILE(report_size_overflow_decl) = 1;
 +}
 +
++static unsigned int dump_functions(void)
++{
++	struct cgraph_node *node;
++
++	FOR_EACH_FUNCTION_WITH_GIMPLE_BODY(node) {
++		basic_block bb;
++
++#if BUILDING_GCC_VERSION <= 4007
++		push_cfun(DECL_STRUCT_FUNCTION(node->decl));
++		current_function_decl = node->decl;
++#else
++		push_cfun(DECL_STRUCT_FUNCTION(node->symbol.decl));
++		current_function_decl = node->symbol.decl;
++#endif
++
++		fprintf(stderr, "-----------------------------------------\n%s\n-----------------------------------------\n", NAME(current_function_decl));
++
++		FOR_ALL_BB(bb) {
++			gimple_stmt_iterator si;
++
++			fprintf(stderr, "<bb %u>:\n", bb->index);
++			for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
++				debug_gimple_stmt(gsi_stmt(si));
++			for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
++				debug_gimple_stmt(gsi_stmt(si));
++			fprintf(stderr, "\n");
++		}
++
++		fprintf(stderr, "-------------------------------------------------------------------------\n");
++
++		pop_cfun();
++		current_function_decl = NULL_TREE;
++	}
++
++	fprintf(stderr, "###############################################################################\n");
++
++	return 0;
++}
++
++static struct ipa_opt_pass_d pass_dump = {
++	.pass = {
++		.type			= SIMPLE_IPA_PASS,
++		.name			= "dump",
++#if BUILDING_GCC_VERSION >= 4008
++		.optinfo_flags		= OPTGROUP_NONE,
++#endif
++		.gate			= NULL,
++		.execute		= dump_functions,
++		.sub			= NULL,
++		.next			= NULL,
++		.static_pass_number	= 0,
++		.tv_id			= TV_NONE,
++		.properties_required	= 0,
++		.properties_provided	= 0,
++		.properties_destroyed	= 0,
++		.todo_flags_start	= 0,
++		.todo_flags_finish	= 0,
++	},
++	.generate_summary		= NULL,
++	.write_summary			= NULL,
++	.read_summary			= NULL,
++#if BUILDING_GCC_VERSION >= 4006
++	.write_optimization_summary	= NULL,
++	.read_optimization_summary	= NULL,
++#endif
++	.stmt_fixup			= NULL,
++	.function_transform_todo_flags_start		= 0,
++	.function_transform		= NULL,
++	.variable_transform		= NULL,
++};
++
 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
 +{
 +	int i;
@@ -111086,13 +113876,34 @@ index 0000000..03d0c84
 +	const struct plugin_argument * const argv = plugin_info->argv;
 +	bool enable = true;
 +
-+	struct register_pass_info size_overflow_pass_info = {
-+		.pass				= &size_overflow_pass.pass,
++	struct register_pass_info insert_size_overflow_asm_pass_info = {
++		.pass				= &insert_size_overflow_asm_pass.pass,
 +		.reference_pass_name		= "ssa",
 +		.ref_pass_instance_number	= 1,
 +		.pos_op				= PASS_POS_INSERT_AFTER
 +	};
 +
++	struct register_pass_info __unused dump_before_pass_info = {
++		.pass				= &pass_dump.pass,
++		.reference_pass_name		= "increase_alignment",
++		.ref_pass_instance_number	= 1,
++		.pos_op				= PASS_POS_INSERT_BEFORE
++	};
++
++	struct register_pass_info ipa_pass_info = {
++		.pass				= &pass_ipa.pass,
++		.reference_pass_name		= "increase_alignment",
++		.ref_pass_instance_number	= 1,
++		.pos_op				= PASS_POS_INSERT_BEFORE
++	};
++
++	struct register_pass_info __unused dump_after_pass_info = {
++		.pass				= &pass_dump.pass,
++		.reference_pass_name		= "increase_alignment",
++		.ref_pass_instance_number	= 1,
++		.pos_op				= PASS_POS_INSERT_BEFORE
++	};
++
 +	if (!plugin_default_version_check(version, &gcc_version)) {
 +		error(G_("incompatible gcc/plugin versions"));
 +		return 1;
@@ -111109,7 +113920,10 @@ index 0000000..03d0c84
 +	register_callback(plugin_name, PLUGIN_INFO, NULL, &size_overflow_plugin_info);
 +	if (enable) {
 +		register_callback("start_unit", PLUGIN_START_UNIT, &start_unit_callback, NULL);
-+		register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &size_overflow_pass_info);
++		register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &insert_size_overflow_asm_pass_info);
++//		register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_before_pass_info);
++		register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &ipa_pass_info);
++//		register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &dump_after_pass_info);
 +	}
 +	register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
 +
@@ -111732,31 +114546,18 @@ index 0000000..4fae911
 +	return 0;
 +}
 diff --git a/tools/lib/lk/Makefile b/tools/lib/lk/Makefile
-index 926cbf3..b8403e0 100644
+index 3dba0a4..97175dc 100644
 --- a/tools/lib/lk/Makefile
 +++ b/tools/lib/lk/Makefile
-@@ -10,7 +10,7 @@ LIB_OBJS += $(OUTPUT)debugfs.o
+@@ -13,7 +13,7 @@ LIB_OBJS += $(OUTPUT)debugfs.o
  
  LIBFILE = liblk.a
  
 -CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
 +CFLAGS = -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) -fPIC
- EXTLIBS = -lpthread -lrt -lelf -lm
+ EXTLIBS = -lelf -lpthread -lrt -lm
  ALL_CFLAGS = $(CFLAGS) $(BASIC_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  ALL_LDFLAGS = $(LDFLAGS)
-diff --git a/tools/perf/Makefile b/tools/perf/Makefile
-index b0f164b..63c9f7d 100644
---- a/tools/perf/Makefile
-+++ b/tools/perf/Makefile
-@@ -188,7 +188,7 @@ endif
- 
- ifndef PERF_DEBUG
- 	ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -D_FORTIFY_SOURCE=2,-D_FORTIFY_SOURCE=2),y)
--		CFLAGS := $(CFLAGS) -D_FORTIFY_SOURCE=2
-+		CFLAGS := $(CFLAGS) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
- 	endif
- endif
- 
 diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
 index 6789d78..4afd019e 100644
 --- a/tools/perf/util/include/asm/alternative-asm.h
@@ -111787,7 +114588,7 @@ index 96b919d..c49bb74 100644
 +
  #endif
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 302681c..3bde377 100644
+index 1cf9ccb..b9236e2 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -75,12 +75,17 @@ LIST_HEAD(vm_list);
@@ -111810,7 +114611,7 @@ index 302681c..3bde377 100644
  
  struct dentry *kvm_debugfs_dir;
  
-@@ -766,7 +771,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
+@@ -749,7 +754,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
  	/* We can read the guest memory with __xxx_user() later on. */
  	if ((mem->slot < KVM_USER_MEM_SLOTS) &&
  	    ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
@@ -111819,7 +114620,7 @@ index 302681c..3bde377 100644
  			(void __user *)(unsigned long)mem->userspace_addr,
  			mem->memory_size)))
  		goto out;
-@@ -1878,7 +1883,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
+@@ -1867,7 +1872,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
  	return 0;
  }
  
@@ -111828,7 +114629,7 @@ index 302681c..3bde377 100644
  	.release        = kvm_vcpu_release,
  	.unlocked_ioctl = kvm_vcpu_ioctl,
  #ifdef CONFIG_COMPAT
-@@ -2561,7 +2566,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -2550,7 +2555,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)
  	return 0;
  }
  
@@ -111837,7 +114638,7 @@ index 302681c..3bde377 100644
  	.release        = kvm_vm_release,
  	.unlocked_ioctl = kvm_vm_ioctl,
  #ifdef CONFIG_COMPAT
-@@ -2662,7 +2667,7 @@ out:
+@@ -2651,7 +2656,7 @@ out:
  	return r;
  }
  
@@ -111846,7 +114647,7 @@ index 302681c..3bde377 100644
  	.unlocked_ioctl = kvm_dev_ioctl,
  	.compat_ioctl   = kvm_dev_ioctl,
  	.llseek		= noop_llseek,
-@@ -2688,7 +2693,7 @@ static void hardware_enable_nolock(void *junk)
+@@ -2677,7 +2682,7 @@ static void hardware_enable_nolock(void *junk)
  
  	if (r) {
  		cpumask_clear_cpu(cpu, cpus_hardware_enabled);
@@ -111855,7 +114656,7 @@ index 302681c..3bde377 100644
  		printk(KERN_INFO "kvm: enabling virtualization on "
  				 "CPU%d failed\n", cpu);
  	}
-@@ -2742,10 +2747,10 @@ static int hardware_enable_all(void)
+@@ -2731,10 +2736,10 @@ static int hardware_enable_all(void)
  
  	kvm_usage_count++;
  	if (kvm_usage_count == 1) {
@@ -111868,7 +114669,7 @@ index 302681c..3bde377 100644
  			hardware_disable_all_nolock();
  			r = -EBUSY;
  		}
-@@ -3099,7 +3104,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
+@@ -3168,7 +3173,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
  	kvm_arch_vcpu_put(vcpu);
  }
  
@@ -111877,7 +114678,7 @@ index 302681c..3bde377 100644
  		  struct module *module)
  {
  	int r;
-@@ -3146,7 +3151,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3215,7 +3220,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
  	if (!vcpu_align)
  		vcpu_align = __alignof__(struct kvm_vcpu);
  	kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
@@ -111886,7 +114687,7 @@ index 302681c..3bde377 100644
  	if (!kvm_vcpu_cache) {
  		r = -ENOMEM;
  		goto out_free_3;
-@@ -3156,9 +3161,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3225,9 +3230,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
  	if (r)
  		goto out_free;
  
@@ -111898,7 +114699,7 @@ index 302681c..3bde377 100644
  
  	r = misc_register(&kvm_dev);
  	if (r) {
-@@ -3168,9 +3175,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3237,9 +3244,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
  
  	register_syscore_ops(&kvm_syscore_ops);
  
diff --git a/main/linux-virt-grsec/kernelconfig.x86 b/main/linux-virt-grsec/kernelconfig.x86
index 77cb6c9862..7ba14a2fe6 100644
--- a/main/linux-virt-grsec/kernelconfig.x86
+++ b/main/linux-virt-grsec/kernelconfig.x86
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.10 Kernel Configuration
+# Linux/x86 3.12.0 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -28,6 +28,8 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 # CONFIG_ZONE_DMA32 is not set
 # CONFIG_AUDIT_ARCH is not set
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -35,7 +37,6 @@ CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_32_LAZY_GS=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
@@ -48,6 +49,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -55,11 +57,13 @@ CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -67,12 +71,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_FHANDLE is not set
 # CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
 
 #
 # IRQ subsystem
 #
-CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
@@ -145,8 +147,10 @@ CONFIG_BLK_CGROUP=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
 CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
@@ -157,12 +161,12 @@ CONFIG_RD_GZIP=y
 # CONFIG_RD_LZMA is not set
 CONFIG_RD_XZ=y
 # CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HOTPLUG=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_EXPERT=y
 CONFIG_UID16=y
@@ -196,6 +200,7 @@ CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
+CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
@@ -232,6 +237,7 @@ CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
@@ -258,12 +264,14 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_CMDLINE_PARSER is not set
 
 #
 # Partition Types
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
@@ -280,6 +288,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
 
 #
 # IO Schedulers
@@ -293,6 +302,7 @@ CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=m
+CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -309,7 +319,6 @@ CONFIG_SMP=y
 # CONFIG_X86_MPPARSE is not set
 CONFIG_X86_BIGSMP=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
-# CONFIG_X86_GOLDFISH is not set
 # CONFIG_X86_INTEL_LPSS is not set
 # CONFIG_X86_32_IRIS is not set
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
@@ -319,6 +328,7 @@ CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_SPINLOCKS=y
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 CONFIG_KVM_GUEST=y
+CONFIG_KVM_DEBUG_FS=y
 # CONFIG_LGUEST_GUEST is not set
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
@@ -386,8 +396,8 @@ CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_MICROCODE_INTEL_LIB=y
-CONFIG_MICROCODE_INTEL_EARLY=y
-CONFIG_MICROCODE_EARLY=y
+# CONFIG_MICROCODE_INTEL_EARLY is not set
+# CONFIG_MICROCODE_AMD_EARLY is not set
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
@@ -429,6 +439,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 # CONFIG_FRONTSWAP is not set
+# CONFIG_CMA is not set
+# CONFIG_ZBUD is not set
 # CONFIG_HIGHPTE is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
@@ -443,14 +455,12 @@ CONFIG_ARCH_RANDOM=y
 # CONFIG_X86_SMAP is not set
 # CONFIG_EFI is not set
 # CONFIG_SECCOMP is not set
-# CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
 # CONFIG_RELOCATABLE is not set
@@ -474,19 +484,18 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_RUNTIME is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_EC_DEBUGFS=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 is not set
-CONFIG_ACPI_I2C=m
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
@@ -513,6 +522,10 @@ CONFIG_ACPI_APEI_ERST_DEBUG=y
 # CPU Frequency scaling
 #
 # CONFIG_CPU_FREQ is not set
+
+#
+# CPU Idle
+#
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -534,14 +547,13 @@ CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_CNB20LE_QUIRK=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 # CONFIG_PCIEAER is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
@@ -553,6 +565,10 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
 CONFIG_SCx200=m
@@ -563,12 +579,15 @@ CONFIG_SCx200HR_TIMER=m
 # CONFIG_GEOS is not set
 CONFIG_AMD_NB=y
 # CONFIG_PCCARD is not set
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
 # CONFIG_HOTPLUG_PCI_COMPAQ is not set
 # CONFIG_HOTPLUG_PCI_IBM is not set
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_RAPIDIO is not set
+CONFIG_X86_SYSFB=y
 
 #
 # Executable file formats / Emulations
@@ -581,7 +600,6 @@ CONFIG_HAVE_AOUT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_HAVE_TEXT_POKE_SMP=y
 CONFIG_NET=y
 
 #
@@ -621,7 +639,6 @@ 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_NET_IPVTI=m
 CONFIG_INET_AH=m
@@ -730,7 +747,7 @@ CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
-CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
 #
@@ -880,6 +897,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -916,6 +934,7 @@ CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_NF_NAT_IPV6=m
@@ -964,7 +983,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 #
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
@@ -1038,6 +1056,7 @@ CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_CODEL=m
 CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
 CONFIG_NET_SCH_INGRESS=m
 # CONFIG_NET_SCH_PLUG is not set
 
@@ -1081,15 +1100,20 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
 CONFIG_VSOCKETS=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
+CONFIG_NET_FLOW_LIMIT=y
 
 #
 # Network testing
@@ -1134,7 +1158,6 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_CMA is not set
 
 #
 # Bus devices
@@ -1190,7 +1213,6 @@ CONFIG_BLK_DEV_RBD=m
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_PHANTOM is not set
-# CONFIG_INTEL_MID_PTI is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_ICS932S401 is not set
@@ -1302,6 +1324,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_ESAS2R is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
@@ -1392,6 +1415,7 @@ CONFIG_ATA_PIIX=y
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
 # CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_RCAR is not set
 # CONFIG_SATA_SIL is not set
 # CONFIG_SATA_SIS is not set
 # CONFIG_SATA_SVW is not set
@@ -1495,6 +1519,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_UEVENT is not set
 CONFIG_DM_FLAKEY=m
 # CONFIG_DM_VERITY is not set
+CONFIG_DM_SWITCH=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -1530,12 +1555,12 @@ CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
+CONFIG_MII=m
 CONFIG_NET_CORE=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_EQUALIZER=m
 # CONFIG_NET_FC is not set
-CONFIG_MII=m
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -1554,6 +1579,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
 # CONFIG_ARCNET is not set
 # CONFIG_ATM_DRIVERS is not set
 
@@ -1563,6 +1589,7 @@ CONFIG_VIRTIO_NET=m
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
 
 #
 # Distributed Switch Architecture drivers
@@ -1579,6 +1606,7 @@ CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_AMD=y
 # CONFIG_AMD8111_ETH is not set
 CONFIG_PCNET32=m
+# CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_ATHEROS is not set
 # CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
@@ -1611,6 +1639,7 @@ CONFIG_E1000=m
 # CONFIG_IXGB is not set
 # CONFIG_IXGBE is not set
 # CONFIG_IXGBEVF is not set
+# CONFIG_I40E is not set
 # CONFIG_NET_VENDOR_I825XX is not set
 # CONFIG_IP1000 is not set
 # CONFIG_JME is not set
@@ -1618,6 +1647,7 @@ CONFIG_E1000=m
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLX4_EN is not set
 # CONFIG_MLX4_CORE is not set
+# CONFIG_MLX5_CORE is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MYRI is not set
 # CONFIG_FEALNX is not set
@@ -1636,6 +1666,7 @@ CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
+# CONFIG_SH_ETH is not set
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
 # CONFIG_NET_VENDOR_SILAN is not set
@@ -1790,6 +1821,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_IMS_PCU is not set
 # CONFIG_INPUT_CMA3000 is not set
+# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
 
 #
 # Hardware I/O ports
@@ -1816,7 +1848,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
@@ -1860,6 +1892,8 @@ CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_SERIAL_PCH_UART=m
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_ST_ASC is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -1938,7 +1972,6 @@ CONFIG_I2C_PIIX4=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_INTEL_MID is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PXA_PCI is not set
@@ -1963,11 +1996,6 @@ CONFIG_I2C_PIIX4=m
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_SPI is not set
-
-#
-# Qualcomm MSM SSBI bus support
-#
-# CONFIG_SSBI is not set
 # CONFIG_HSI is not set
 
 #
@@ -1997,6 +2025,7 @@ CONFIG_GPIO_ACPI=y
 #
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
 # CONFIG_GPIO_TS5500 is not set
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_ICH is not set
@@ -2032,6 +2061,10 @@ CONFIG_GPIO_ACPI=y
 #
 
 #
+# LPC GPIO expanders:
+#
+
+#
 # MODULbus GPIO expanders:
 #
 
@@ -2054,8 +2087,8 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
 # CONFIG_POWER_RESET is not set
 # CONFIG_POWER_AVS is not set
 CONFIG_HWMON=m
@@ -2094,10 +2127,12 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_F75375S is not set
 # CONFIG_SENSORS_FSCHMD is not set
 # CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_G762 is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_GPIO_FAN is not set
 # CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_HTU21 is not set
 # CONFIG_SENSORS_CORETEMP is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
@@ -2188,6 +2223,10 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_INTEL_POWERCLAMP is not set
+
+#
+# Texas Instruments thermal drivers
+#
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -2232,6 +2271,7 @@ CONFIG_I6300ESB_WDT=m
 # CONFIG_W83977F_WDT is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
+# CONFIG_MEN_A21_WDT is not set
 
 #
 # PCI-based Watchdog Cards
@@ -2272,6 +2312,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
@@ -2332,6 +2373,7 @@ CONFIG_DRM_RADEON=m
 CONFIG_DRM_I810=m
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_KMS is not set
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
@@ -2427,6 +2469,9 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
 # CONFIG_BACKLIGHT_LM3630 is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
 
 #
 # Console display driver support
@@ -2437,9 +2482,6 @@ 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
@@ -2460,6 +2502,7 @@ CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
@@ -2541,6 +2584,7 @@ CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
 CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
@@ -2605,8 +2649,10 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
 # CONFIG_HID_ELECOM is not set
+# CONFIG_HID_ELO is not set
 # CONFIG_HID_EZKEY is not set
 # CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_HUION is not set
 # CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
 # CONFIG_HID_UCLOGIC is not set
@@ -2628,7 +2674,6 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_PS3REMOTE is not set
 # CONFIG_HID_ROCCAT is not set
 # CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
@@ -2645,6 +2690,7 @@ CONFIG_HID_HYPERV_MOUSE=m
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_WACOM is not set
 # CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
 # CONFIG_HID_SENSOR_HUB is not set
@@ -2666,9 +2712,7 @@ CONFIG_USB_MOUSE=m
 # I2C HID support
 #
 # CONFIG_I2C_HID is not set
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -2691,7 +2735,6 @@ CONFIG_USB_MON=m
 #
 # CONFIG_USB_C67X00_HCD is not set
 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
@@ -2701,16 +2744,17 @@ CONFIG_USB_EHCI_HCD_PLATFORM=m
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_FUSBH200_HCD is not set
+# CONFIG_USB_FOTG210_HCD is not set
 CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=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_OHCI_HCD_PLATFORM=m
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
 
 #
 # USB Device Class drivers
@@ -2778,12 +2822,24 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 # CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_YUREX is not set
 # CONFIG_USB_EZUSB_FX2 is not set
 # CONFIG_USB_HSIC_USB3503 is not set
 # CONFIG_USB_ATM is not set
+
+#
+# USB Physical Layer drivers
+#
 # CONFIG_USB_PHY is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_AM335X_PHY_USB is not set
+# CONFIG_SAMSUNG_USB2PHY is not set
+# CONFIG_SAMSUNG_USB3PHY is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_RCAR_PHY is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_UWB is not set
 # CONFIG_MMC is not set
@@ -2802,9 +2858,10 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA9633 is not set
+# CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_INTEL_SS4200 is not set
 # CONFIG_LEDS_LT3593 is not set
@@ -2848,6 +2905,7 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 # CONFIG_RTC_DRV_ISL12022 is not set
 CONFIG_RTC_DRV_X1205=m
+# CONFIG_RTC_DRV_PCF2127 is not set
 # CONFIG_RTC_DRV_PCF8523 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
@@ -2886,6 +2944,7 @@ CONFIG_RTC_DRV_V3020=m
 #
 # on-CPU RTC drivers
 #
+# CONFIG_RTC_DRV_MOXART is not set
 
 #
 # HID Sensor RTC drivers
@@ -2899,7 +2958,9 @@ CONFIG_DMADEVICES=y
 #
 # CONFIG_INTEL_MID_DMAC is not set
 CONFIG_INTEL_IOATDMA=m
+# CONFIG_DW_DMAC_CORE is not set
 # CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
 CONFIG_TIMB_DMA=m
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ENGINE=y
@@ -2940,7 +3001,6 @@ CONFIG_STAGING=y
 # CONFIG_USBIP_CORE is not set
 # CONFIG_ECHO is not set
 # CONFIG_COMEDI is not set
-# CONFIG_ASUS_OLED is not set
 # CONFIG_PANEL is not set
 # CONFIG_RTS5139 is not set
 # CONFIG_TRANZPORT is not set
@@ -2970,11 +3030,16 @@ CONFIG_STAGING=y
 # CONFIG_ANDROID is not set
 # CONFIG_USB_WPAN_HCD is not set
 # CONFIG_WIMAX_GDM72XX is not set
+# CONFIG_LTE_GDM724X is not set
 # CONFIG_NET_VENDOR_SILICOM is not set
 # CONFIG_CED1401 is not set
 # CONFIG_DGRP is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_USB_DWC2 is not set
+# CONFIG_LUSTRE_FS is not set
+# CONFIG_XILLYBUS is not set
+# CONFIG_DGNC is not set
+# CONFIG_DGAP is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set
 
 #
@@ -3003,10 +3068,12 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 # CONFIG_EXTCON is not set
 CONFIG_MEMORY=y
 # CONFIG_IIO is not set
+# CONFIG_NTB is not set
 # CONFIG_VME_BUS is not set
 # CONFIG_PWM is not set
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
+# CONFIG_FMC is not set
 
 #
 # Firmware Drivers
@@ -3074,6 +3141,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
 CONFIG_NILFS2_FS=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m
@@ -3147,6 +3215,7 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 CONFIG_EFS_FS=m
@@ -3182,6 +3251,7 @@ CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
+# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
@@ -3208,6 +3278,7 @@ CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
@@ -3226,6 +3297,7 @@ CONFIG_CIFS_SMB2=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
+# CONFIG_9P_FS_SECURITY is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -3284,63 +3356,90 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_DEBUG_SHIRQ=y
+
+#
+# Debug Lockups and Hangs
+#
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
-# CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
+CONFIG_DEBUG_LIST=y
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
 
 #
 # RCU Debugging
@@ -3350,17 +3449,12 @@ CONFIG_FRAME_POINTER=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_LKDTM is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_LATENCYTOP=y
 CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -3373,22 +3467,26 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
+
+#
+# Runtime Testing
+#
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
+# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_EARLY_PRINTK is not set
-CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_NX_TEST=m
 CONFIG_DOUBLEFAULT=y
@@ -3408,6 +3506,7 @@ CONFIG_DEBUG_BOOT_PARAMS=y
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_DEBUG_NMI_SELFTEST=y
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Security options
@@ -3470,7 +3569,7 @@ CONFIG_PAX_RANDMMAP=y
 # CONFIG_PAX_MEMORY_SANITIZE is not set
 # CONFIG_PAX_MEMORY_STACKLEAK is not set
 CONFIG_PAX_MEMORY_STRUCTLEAK=y
-# CONFIG_PAX_MEMORY_UDEREF is not set
+CONFIG_PAX_MEMORY_UDEREF=y
 CONFIG_PAX_REFCOUNT=y
 CONFIG_PAX_USERCOPY=y
 # CONFIG_PAX_USERCOPY_DEBUG is not set
@@ -3486,7 +3585,7 @@ CONFIG_GRKERNSEC_KMEM=y
 CONFIG_GRKERNSEC_PERF_HARDEN=y
 # CONFIG_GRKERNSEC_RAND_THREADSTACK is not set
 CONFIG_GRKERNSEC_PROC_MEMMAP=y
-# CONFIG_GRKERNSEC_BRUTE is not set
+CONFIG_GRKERNSEC_BRUTE=y
 # CONFIG_GRKERNSEC_MODHARDEN is not set
 # CONFIG_GRKERNSEC_HIDESYM is not set
 # CONFIG_GRKERNSEC_KERN_LOCKOUT is not set
@@ -3526,6 +3625,7 @@ CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
 CONFIG_GRKERNSEC_CHROOT_NICE=y
 CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
 CONFIG_GRKERNSEC_CHROOT_CAPS=y
+# CONFIG_GRKERNSEC_CHROOT_INITRD is not set
 
 #
 # Kernel Auditing
@@ -3550,6 +3650,7 @@ CONFIG_GRKERNSEC_PROC_IPADDR=y
 CONFIG_GRKERNSEC_HARDEN_PTRACE=y
 CONFIG_GRKERNSEC_PTRACE_READEXEC=y
 CONFIG_GRKERNSEC_SETXID=y
+CONFIG_GRKERNSEC_HARDEN_IPC=y
 # CONFIG_GRKERNSEC_TPE is not set
 
 #
@@ -3655,6 +3756,7 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32=m
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
+CONFIG_CRYPTO_CRCT10DIF=m
 CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -3702,6 +3804,8 @@ CONFIG_CRYPTO_TWOFISH_586=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 
 #
 # Random Number Generation
@@ -3744,6 +3848,7 @@ CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
@@ -3762,9 +3867,12 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=m
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -3798,3 +3906,7 @@ CONFIG_CORDIC=m
 CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
+CONFIG_FONT_SUPPORT=m
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
diff --git a/main/linux-virt-grsec/kernelconfig.x86_64 b/main/linux-virt-grsec/kernelconfig.x86_64
index a43ae25783..fe182f8ba2 100644
--- a/main/linux-virt-grsec/kernelconfig.x86_64
+++ b/main/linux-virt-grsec/kernelconfig.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.10 Kernel Configuration
+# Linux/x86 3.12.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -29,6 +29,8 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_ZONE_DMA32=y
 CONFIG_AUDIT_ARCH=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -48,6 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
@@ -55,11 +58,13 @@ CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -67,12 +72,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 # CONFIG_FHANDLE is not set
 # CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
 
 #
 # IRQ subsystem
 #
-CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
@@ -149,8 +152,10 @@ CONFIG_BLK_CGROUP=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
 CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
+CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
 CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
@@ -161,11 +166,11 @@ CONFIG_RD_GZIP=y
 # CONFIG_RD_LZMA is not set
 CONFIG_RD_XZ=y
 # CONFIG_RD_LZO is not set
+# CONFIG_RD_LZ4 is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HOTPLUG=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_EXPERT=y
 CONFIG_SYSCTL_SYSCALL=y
@@ -198,6 +203,7 @@ CONFIG_VM_EVENT_COUNTERS=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
 # CONFIG_SLOB is not set
+CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_PROFILING is not set
 CONFIG_HAVE_OPROFILE=y
 CONFIG_OPROFILE_NMI_TIMER=y
@@ -233,6 +239,7 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_RELA=y
 
 #
@@ -255,12 +262,14 @@ CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_THROTTLING is not set
+# CONFIG_BLK_CMDLINE_PARSER is not set
 
 #
 # Partition Types
 #
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ATARI_PARTITION is not set
@@ -277,6 +286,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
 
 #
 # IO Schedulers
@@ -290,6 +300,7 @@ CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=m
+CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -320,6 +331,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=500
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
 CONFIG_KVM_GUEST=y
+CONFIG_KVM_DEBUG_FS=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_PARAVIRT_CLOCK=y
 CONFIG_NO_BOOTMEM=y
@@ -364,8 +376,8 @@ CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_AMD=y
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_MICROCODE_INTEL_LIB=y
-CONFIG_MICROCODE_INTEL_EARLY=y
-CONFIG_MICROCODE_EARLY=y
+# CONFIG_MICROCODE_INTEL_EARLY is not set
+# CONFIG_MICROCODE_AMD_EARLY is not set
 CONFIG_X86_CPUID=m
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
@@ -408,6 +420,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CLEANCACHE=y
 # CONFIG_FRONTSWAP is not set
+# CONFIG_CMA is not set
+# CONFIG_ZBUD is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
 CONFIG_MTRR=y
@@ -427,7 +441,6 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
-# CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_PHYSICAL_START=0x1000000
 # CONFIG_RELOCATABLE is not set
@@ -453,19 +466,18 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_RUNTIME is not set
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_PROCFS_POWER=y
 CONFIG_ACPI_EC_DEBUGFS=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 is not set
-CONFIG_ACPI_I2C=m
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
@@ -492,6 +504,10 @@ CONFIG_ACPI_APEI_ERST_DEBUG=y
 # CPU Frequency scaling
 #
 # CONFIG_CPU_FREQ is not set
+
+#
+# CPU Idle
+#
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -514,14 +530,13 @@ CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_CNB20LE_QUIRK=y
 CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
 # CONFIG_PCIEAER is not set
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
-CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
@@ -534,13 +549,20 @@ CONFIG_PCI_PRI=y
 CONFIG_PCI_PASID=y
 CONFIG_PCI_IOAPIC=y
 CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 # CONFIG_PCCARD is not set
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+# CONFIG_HOTPLUG_PCI_ACPI_IBM is not set
 # CONFIG_HOTPLUG_PCI_CPCI is not set
 CONFIG_HOTPLUG_PCI_SHPC=m
 # CONFIG_RAPIDIO is not set
+CONFIG_X86_SYSFB=y
 
 #
 # Executable file formats / Emulations
@@ -553,7 +575,6 @@ CONFIG_BINFMT_SCRIPT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_COREDUMP=y
 # CONFIG_IA32_EMULATION is not set
-CONFIG_HAVE_TEXT_POKE_SMP=y
 CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_NET=y
 
@@ -594,7 +615,6 @@ 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_NET_IPVTI=m
 CONFIG_INET_AH=m
@@ -703,7 +723,7 @@ CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
 CONFIG_NF_NAT_TFTP=m
-CONFIG_NETFILTER_TPROXY=m
+CONFIG_NETFILTER_SYNPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
 #
@@ -853,6 +873,7 @@ CONFIG_IP_NF_MATCH_RPFILTER=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=m
 CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_NF_NAT_IPV4=m
 CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -889,6 +910,7 @@ CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
 CONFIG_IP6_NF_MANGLE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_NF_NAT_IPV6=m
@@ -937,7 +959,6 @@ CONFIG_IP_DCCP_TFRC_LIB=y
 #
 # CONFIG_IP_DCCP_DEBUG is not set
 CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
 # CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1 is not set
@@ -1011,6 +1032,7 @@ CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_CODEL=m
 CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
 CONFIG_NET_SCH_INGRESS=m
 # CONFIG_NET_SCH_PLUG is not set
 
@@ -1054,16 +1076,21 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
 CONFIG_VSOCKETS=m
 CONFIG_VMWARE_VMCI_VSOCKETS=m
 CONFIG_NETLINK_MMAP=y
 CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
 CONFIG_BPF_JIT=y
+CONFIG_NET_FLOW_LIMIT=y
 
 #
 # Network testing
@@ -1166,7 +1193,6 @@ CONFIG_BLK_DEV_RBD=m
 # CONFIG_DUMMY_IRQ is not set
 # CONFIG_IBM_ASM is not set
 # CONFIG_PHANTOM is not set
-# CONFIG_INTEL_MID_PTI is not set
 # CONFIG_SGI_IOC4 is not set
 # CONFIG_TIFM_CORE is not set
 # CONFIG_ICS932S401 is not set
@@ -1278,6 +1304,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_ADVANSYS is not set
 # CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_ESAS2R is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
@@ -1367,6 +1394,7 @@ CONFIG_ATA_PIIX=y
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
 # CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_RCAR is not set
 # CONFIG_SATA_SIL is not set
 # CONFIG_SATA_SIS is not set
 # CONFIG_SATA_SVW is not set
@@ -1469,6 +1497,7 @@ CONFIG_DM_DELAY=m
 # CONFIG_DM_UEVENT is not set
 CONFIG_DM_FLAKEY=m
 # CONFIG_DM_VERITY is not set
+CONFIG_DM_SWITCH=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -1505,12 +1534,12 @@ CONFIG_I2O_SCSI=m
 CONFIG_I2O_PROC=m
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
+CONFIG_MII=m
 CONFIG_NET_CORE=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_EQUALIZER=m
 # CONFIG_NET_FC is not set
-CONFIG_MII=m
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
@@ -1529,6 +1558,7 @@ CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=m
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
 # CONFIG_ARCNET is not set
 # CONFIG_ATM_DRIVERS is not set
 
@@ -1538,6 +1568,7 @@ CONFIG_VIRTIO_NET=m
 CONFIG_VHOST_NET=m
 CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
 
 #
 # Distributed Switch Architecture drivers
@@ -1554,6 +1585,7 @@ CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_AMD=y
 # CONFIG_AMD8111_ETH is not set
 CONFIG_PCNET32=m
+# CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_ATHEROS is not set
 # CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
@@ -1586,6 +1618,7 @@ CONFIG_E1000=m
 # CONFIG_IXGB is not set
 # CONFIG_IXGBE is not set
 # CONFIG_IXGBEVF is not set
+# CONFIG_I40E is not set
 # CONFIG_NET_VENDOR_I825XX is not set
 # CONFIG_IP1000 is not set
 # CONFIG_JME is not set
@@ -1593,6 +1626,7 @@ CONFIG_E1000=m
 CONFIG_NET_VENDOR_MELLANOX=y
 # CONFIG_MLX4_EN is not set
 # CONFIG_MLX4_CORE is not set
+# CONFIG_MLX5_CORE is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MYRI is not set
 # CONFIG_FEALNX is not set
@@ -1611,6 +1645,7 @@ CONFIG_8139TOO_PIO=y
 # CONFIG_8139TOO_8129 is not set
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
+# CONFIG_SH_ETH is not set
 # CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
 # CONFIG_NET_VENDOR_SILAN is not set
@@ -1767,6 +1802,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_IMS_PCU is not set
 # CONFIG_INPUT_CMA3000 is not set
 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
+# CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set
 
 #
 # Hardware I/O ports
@@ -1793,7 +1829,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
@@ -1837,6 +1873,8 @@ CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_SERIAL_PCH_UART=m
 # CONFIG_SERIAL_ARC is not set
 # CONFIG_SERIAL_RP2 is not set
+# CONFIG_SERIAL_FSL_LPUART is not set
+# CONFIG_SERIAL_ST_ASC is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -1913,7 +1951,6 @@ CONFIG_I2C_PIIX4=m
 # CONFIG_I2C_DESIGNWARE_PCI is not set
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_INTEL_MID is not set
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
 # CONFIG_I2C_PXA_PCI is not set
@@ -1937,11 +1974,6 @@ CONFIG_I2C_PIIX4=m
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_SPI is not set
-
-#
-# Qualcomm MSM SSBI bus support
-#
-# CONFIG_SSBI is not set
 # CONFIG_HSI is not set
 
 #
@@ -1971,6 +2003,7 @@ CONFIG_GPIO_ACPI=y
 #
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
 # CONFIG_GPIO_TS5500 is not set
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_ICH is not set
@@ -2006,6 +2039,10 @@ CONFIG_GPIO_ACPI=y
 #
 
 #
+# LPC GPIO expanders:
+#
+
+#
 # MODULbus GPIO expanders:
 #
 
@@ -2028,8 +2065,8 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_SMB347 is not set
-# CONFIG_BATTERY_GOLDFISH is not set
 # CONFIG_POWER_RESET is not set
 # CONFIG_POWER_AVS is not set
 CONFIG_HWMON=m
@@ -2068,10 +2105,12 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_F75375S is not set
 # CONFIG_SENSORS_FSCHMD is not set
 # CONFIG_SENSORS_G760A is not set
+# CONFIG_SENSORS_G762 is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_GPIO_FAN is not set
 # CONFIG_SENSORS_HIH6130 is not set
+# CONFIG_SENSORS_HTU21 is not set
 # CONFIG_SENSORS_CORETEMP is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_JC42 is not set
@@ -2162,6 +2201,10 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
 # CONFIG_THERMAL_GOV_USER_SPACE is not set
 # CONFIG_THERMAL_EMULATION is not set
 # CONFIG_INTEL_POWERCLAMP is not set
+
+#
+# Texas Instruments thermal drivers
+#
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_CORE=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -2204,6 +2247,7 @@ CONFIG_I6300ESB_WDT=m
 # CONFIG_W83977F_WDT is not set
 # CONFIG_MACHZ_WDT is not set
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
+# CONFIG_MEN_A21_WDT is not set
 # CONFIG_XEN_WDT is not set
 
 #
@@ -2245,6 +2289,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_VIPERBOARD is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
@@ -2299,6 +2344,7 @@ CONFIG_DRM_RADEON=m
 CONFIG_DRM_I810=m
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_KMS is not set
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
 CONFIG_DRM_MGA=m
 CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
@@ -2370,7 +2416,6 @@ CONFIG_FB_UVESA=m
 # CONFIG_FB_ARK is not set
 # CONFIG_FB_PM3 is not set
 # CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
 # CONFIG_FB_TMIO is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_UDL is not set
@@ -2394,6 +2439,9 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
 # CONFIG_BACKLIGHT_LM3630 is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
 
 #
 # Console display driver support
@@ -2404,9 +2452,6 @@ 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
@@ -2427,6 +2472,7 @@ CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
@@ -2508,6 +2554,7 @@ CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
 CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_I915=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y
@@ -2571,8 +2618,10 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
 # CONFIG_HID_ELECOM is not set
+# CONFIG_HID_ELO is not set
 # CONFIG_HID_EZKEY is not set
 # CONFIG_HID_HOLTEK is not set
+# CONFIG_HID_HUION is not set
 # CONFIG_HID_KEYTOUCH is not set
 # CONFIG_HID_KYE is not set
 # CONFIG_HID_UCLOGIC is not set
@@ -2594,7 +2643,6 @@ CONFIG_HID_GENERIC=m
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PICOLCD is not set
 # CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_PS3REMOTE is not set
 # CONFIG_HID_ROCCAT is not set
 # CONFIG_HID_SAITEK is not set
 # CONFIG_HID_SAMSUNG is not set
@@ -2611,6 +2659,7 @@ CONFIG_HID_HYPERV_MOUSE=m
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_WACOM is not set
 # CONFIG_HID_WIIMOTE is not set
+# CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 # CONFIG_HID_ZYDACRON is not set
 # CONFIG_HID_SENSOR_HUB is not set
@@ -2632,9 +2681,7 @@ CONFIG_USB_MOUSE=m
 # I2C HID support
 #
 # CONFIG_I2C_HID is not set
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB_ARCH_HAS_XHCI=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_COMMON=m
 CONFIG_USB_ARCH_HAS_HCD=y
@@ -2657,7 +2704,6 @@ CONFIG_USB_MON=m
 #
 # CONFIG_USB_C67X00_HCD is not set
 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
@@ -2667,16 +2713,17 @@ CONFIG_USB_EHCI_HCD_PLATFORM=m
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
 # CONFIG_USB_ISP1362_HCD is not set
+# CONFIG_USB_FUSBH200_HCD is not set
+# CONFIG_USB_FOTG210_HCD is not set
 CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
 CONFIG_USB_OHCI_HCD_SSB=y
-CONFIG_USB_OHCI_HCD_PLATFORM=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_OHCI_HCD_PLATFORM=m
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
 
 #
 # USB Device Class drivers
@@ -2744,12 +2791,24 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 # CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
 # CONFIG_USB_ISIGHTFW is not set
 # CONFIG_USB_YUREX is not set
 # CONFIG_USB_EZUSB_FX2 is not set
 # CONFIG_USB_HSIC_USB3503 is not set
 # CONFIG_USB_ATM is not set
+
+#
+# USB Physical Layer drivers
+#
 # CONFIG_USB_PHY is not set
+# CONFIG_NOP_USB_XCEIV is not set
+# CONFIG_AM335X_PHY_USB is not set
+# CONFIG_SAMSUNG_USB2PHY is not set
+# CONFIG_SAMSUNG_USB3PHY is not set
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_USB_ISP1301 is not set
+# CONFIG_USB_RCAR_PHY is not set
 # CONFIG_USB_GADGET is not set
 # CONFIG_UWB is not set
 # CONFIG_MMC is not set
@@ -2768,9 +2827,10 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_LP5562 is not set
+# CONFIG_LEDS_LP8501 is not set
 # CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_LEDS_PCA955X is not set
-# CONFIG_LEDS_PCA9633 is not set
+# CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_INTEL_SS4200 is not set
 # CONFIG_LEDS_LT3593 is not set
@@ -2814,6 +2874,7 @@ CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
 # CONFIG_RTC_DRV_ISL12022 is not set
 CONFIG_RTC_DRV_X1205=m
+# CONFIG_RTC_DRV_PCF2127 is not set
 # CONFIG_RTC_DRV_PCF8523 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
@@ -2852,6 +2913,7 @@ CONFIG_RTC_DRV_V3020=m
 #
 # on-CPU RTC drivers
 #
+# CONFIG_RTC_DRV_MOXART is not set
 
 #
 # HID Sensor RTC drivers
@@ -2865,7 +2927,9 @@ CONFIG_DMADEVICES=y
 #
 # CONFIG_INTEL_MID_DMAC is not set
 CONFIG_INTEL_IOATDMA=m
+# CONFIG_DW_DMAC_CORE is not set
 # CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
 CONFIG_TIMB_DMA=m
 CONFIG_PCH_DMA=m
 CONFIG_DMA_ENGINE=y
@@ -2927,7 +2991,6 @@ CONFIG_STAGING=y
 # CONFIG_USBIP_CORE is not set
 # CONFIG_ECHO is not set
 # CONFIG_COMEDI is not set
-# CONFIG_ASUS_OLED is not set
 # CONFIG_PANEL is not set
 # CONFIG_RTS5139 is not set
 # CONFIG_TRANZPORT is not set
@@ -2957,11 +3020,16 @@ CONFIG_STAGING=y
 # CONFIG_ANDROID is not set
 # CONFIG_USB_WPAN_HCD is not set
 # CONFIG_WIMAX_GDM72XX is not set
+# CONFIG_LTE_GDM724X is not set
 # CONFIG_NET_VENDOR_SILICOM is not set
 # CONFIG_CED1401 is not set
 # CONFIG_DGRP is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_USB_DWC2 is not set
+# CONFIG_LUSTRE_FS is not set
+# CONFIG_XILLYBUS is not set
+# CONFIG_DGNC is not set
+# CONFIG_DGAP is not set
 # CONFIG_X86_PLATFORM_DEVICES is not set
 
 #
@@ -2996,6 +3064,7 @@ CONFIG_MEMORY=y
 # CONFIG_PWM is not set
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
+# CONFIG_FMC is not set
 
 #
 # Firmware Drivers
@@ -3063,6 +3132,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
 # CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
 CONFIG_NILFS2_FS=m
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m
@@ -3136,6 +3206,7 @@ CONFIG_ECRYPT_FS=m
 # CONFIG_ECRYPT_FS_MESSAGING is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 CONFIG_EFS_FS=m
@@ -3171,6 +3242,7 @@ CONFIG_F2FS_FS=m
 CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
+# CONFIG_F2FS_FS_SECURITY is not set
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
@@ -3197,6 +3269,7 @@ CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_SUNRPC_DEBUG is not set
 CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
@@ -3215,6 +3288,7 @@ CONFIG_CIFS_SMB2=y
 CONFIG_9P_FS=m
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS_POSIX_ACL=y
+# CONFIG_9P_FS_SECURITY is not set
 CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=m
@@ -3273,62 +3347,89 @@ CONFIG_DLM=m
 # Kernel hacking
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
 CONFIG_PRINTK_TIME=y
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_DYNAMIC_DEBUG is not set
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_HAVE_ARCH_KMEMCHECK=y
 CONFIG_DEBUG_SHIRQ=y
+
+#
+# Debug Lockups and Hangs
+#
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_PANIC_ON_OOPS is not set
 CONFIG_PANIC_ON_OOPS_VALUE=0
-# CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_SCHED_DEBUG=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_STATS is not set
-CONFIG_HAVE_DEBUG_KMEMLEAK=y
-# CONFIG_DEBUG_KMEMLEAK is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
-# CONFIG_DEBUG_MEMORY_INIT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_TEST_LIST_SORT is not set
+CONFIG_DEBUG_LIST=y
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
 
 #
 # RCU Debugging
@@ -3338,17 +3439,12 @@ CONFIG_FRAME_POINTER=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_RCU_TRACE is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_LKDTM is not set
 # CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_LATENCYTOP=y
 CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-# CONFIG_DEBUG_PAGEALLOC is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_HAVE_FUNCTION_TRACER=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -3362,24 +3458,29 @@ CONFIG_HAVE_FENTRY=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
+
+#
+# Runtime Testing
+#
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
 # CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
+# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 # CONFIG_EARLY_PRINTK is not set
-CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_NX_TEST=m
+CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -3396,6 +3497,7 @@ CONFIG_DEBUG_BOOT_PARAMS=y
 # CONFIG_CPA_DEBUG is not set
 # CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_DEBUG_NMI_SELFTEST=y
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
 
 #
 # Security options
@@ -3511,6 +3613,7 @@ CONFIG_GRKERNSEC_CHROOT_FINDTASK=y
 CONFIG_GRKERNSEC_CHROOT_NICE=y
 CONFIG_GRKERNSEC_CHROOT_SYSCTL=y
 CONFIG_GRKERNSEC_CHROOT_CAPS=y
+# CONFIG_GRKERNSEC_CHROOT_INITRD is not set
 
 #
 # Kernel Auditing
@@ -3535,6 +3638,7 @@ CONFIG_GRKERNSEC_PROC_IPADDR=y
 CONFIG_GRKERNSEC_HARDEN_PTRACE=y
 CONFIG_GRKERNSEC_PTRACE_READEXEC=y
 CONFIG_GRKERNSEC_SETXID=y
+CONFIG_GRKERNSEC_HARDEN_IPC=y
 # CONFIG_GRKERNSEC_TPE is not set
 
 #
@@ -3640,6 +3744,8 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_CRC32=m
 # CONFIG_CRYPTO_CRC32_PCLMUL is not set
+CONFIG_CRYPTO_CRCT10DIF=m
+# CONFIG_CRYPTO_CRCT10DIF_PCLMUL is not set
 CONFIG_CRYPTO_GHASH=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
@@ -3701,6 +3807,8 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 
 #
 # Random Number Generation
@@ -3740,10 +3848,13 @@ CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_IO=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_CMPXCHG_LOCKREF=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
@@ -3758,9 +3869,12 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=m
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
 CONFIG_XZ_DEC_POWERPC=y
@@ -3794,3 +3908,7 @@ CONFIG_CORDIC=m
 CONFIG_DDR=y
 CONFIG_MPILIB=m
 CONFIG_OID_REGISTRY=m
+CONFIG_FONT_SUPPORT=m
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
diff --git a/main/linux-virt-grsec/sysctl_lxc.patch b/main/linux-virt-grsec/sysctl_lxc.patch
deleted file mode 100644
index 56279aa03f..0000000000
--- a/main/linux-virt-grsec/sysctl_lxc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-This patch allows guests to set /proc/sys/net/*/ip_forward without
-needing CAP_SYS_ADMIN.
-
-diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
-index 1e6dc7e..0a5638b 100644
---- a/fs/proc/proc_sysctl.c
-+++ b/fs/proc/proc_sysctl.c
-@@ -11,6 +11,7 @@
- #include <linux/namei.h>
- #include <linux/mm.h>
- #include <linux/module.h>
-+#include <linux/nsproxy.h>
- #include "internal.h"
- 
- extern int gr_handle_chroot_sysctl(const int op);
-@@ -521,8 +522,13 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
- 	dput(filp->f_path.dentry);
- 	if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
- 		goto out;
--	if (write && !capable(CAP_SYS_ADMIN))
--		goto out;
-+	if (write) {
-+		if (current->nsproxy->net_ns != table->extra2) {
-+			if (!capable(CAP_SYS_ADMIN))
-+				goto out;
-+		} else if (!nsown_capable(CAP_NET_ADMIN))
-+			goto out;
-+	}
- #endif
- 
- 	/* careful: calling conventions are nasty here */