Grsec/PaX: 3.1-{3.2.68,3.14.40,4.0.1}-20150504205320150504

16 files changed, 4833 insertions, 5847 deletions

diff --git a/3.14.40/0000_README b/3.14.40/0000_README
index 5a5e724..39720d8 100644
--- a/3.14.40/0000_README
+++ b/3.14.40/0000_README
@@ -6,7 +6,7 @@ Patch:	1039_linux-3.14.40.patch
 From:	http://www.kernel.org
 Desc:	Linux 3.14.40
 
-Patch:	4420_grsecurity-3.1-3.14.40-201505021012.patch
+Patch:	4420_grsecurity-3.1-3.14.40-201505042052.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.14.40/4420_grsecurity-3.1-3.14.40-201505021012.patch b/3.14.40/4420_grsecurity-3.1-3.14.40-201505042052.patch
index b34880f..e1edd45 100644
--- a/3.14.40/4420_grsecurity-3.1-3.14.40-201505021012.patch
+++ b/3.14.40/4420_grsecurity-3.1-3.14.40-201505042052.patch
@@ -41474,9 +41474,34 @@ index 768e666..68cf44d 100644
  	unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
  
 diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
-index 3c59584..500f2e9 100644
+index 3c59584..2708e91 100644
 --- a/drivers/gpu/drm/i915/i915_ioc32.c
 +++ b/drivers/gpu/drm/i915/i915_ioc32.c
+@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
+ 	    || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
+ 	    || __put_user(batchbuffer32.num_cliprects,
+ 			  &batchbuffer->num_cliprects)
+-	    || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
++	    || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
+ 			  &batchbuffer->cliprects))
+ 		return -EFAULT;
+ 
+@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
+ 
+ 	cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
+ 	if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
+-	    || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
++	    || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
+ 			  &cmdbuffer->buf)
+ 	    || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
+ 	    || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
+ 	    || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
+ 	    || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
+-	    || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
++	    || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
+ 			  &cmdbuffer->cliprects))
+ 		return -EFAULT;
+ 
 @@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
  			 (unsigned long)request);
  }
@@ -41486,7 +41511,7 @@ index 3c59584..500f2e9 100644
  	[DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
  	[DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
  	[DRM_I915_GETPARAM] = compat_i915_getparam,
-@@ -202,18 +202,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
+@@ -202,17 +202,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
  long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -41500,14 +41525,12 @@ index 3c59584..500f2e9 100644
 -		fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
 index 4050450..f67c5c1 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
@@ -41697,7 +41720,7 @@ index fe45321..836fdca 100644
  
  	unsigned int fb_cpp;
 diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
-index 86b4bb8..ae237ad 100644
+index 86b4bb8..d5ad960e2 100644
 --- a/drivers/gpu/drm/mga/mga_ioc32.c
 +++ b/drivers/gpu/drm/mga/mga_ioc32.c
 @@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
@@ -41709,7 +41732,7 @@ index 86b4bb8..ae237ad 100644
  	[DRM_MGA_INIT] = compat_mga_init,
  	[DRM_MGA_GETPARAM] = compat_mga_getparam,
  	[DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
-@@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
+@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
  long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -41723,14 +41746,12 @@ index 86b4bb8..ae237ad 100644
 -		fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
 index 1b071b8..de8601a 100644
 --- a/drivers/gpu/drm/mga/mga_irq.c
@@ -42132,7 +42153,7 @@ index 5bf3f5f..7000661 100644
  	u32 color_fmt;
  	unsigned int front_offset;
 diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
-index b0d0fd3..a6fbbe4 100644
+index b0d0fd3..7fe3706 100644
 --- a/drivers/gpu/drm/r128/r128_ioc32.c
 +++ b/drivers/gpu/drm/r128/r128_ioc32.c
 @@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
@@ -42144,7 +42165,7 @@ index b0d0fd3..a6fbbe4 100644
  	[DRM_R128_INIT] = compat_r128_init,
  	[DRM_R128_DEPTH] = compat_r128_depth,
  	[DRM_R128_STIPPLE] = compat_r128_stipple,
-@@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
+@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
  long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -42158,14 +42179,12 @@ index b0d0fd3..a6fbbe4 100644
 -		fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
 index c2ae496..30b5993 100644
 --- a/drivers/gpu/drm/r128/r128_irq.c
@@ -42253,7 +42272,7 @@ index dafd812..1bf20c7 100644
  	uint32_t irq_enable_reg;
  	uint32_t r500_disp_irq_reg;
 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
-index bdb0f93..5ff558f 100644
+index bdb0f93..b83eb47 100644
 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
 @@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
@@ -42274,7 +42293,7 @@ index bdb0f93..5ff558f 100644
  	[DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
  	[DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
  	[DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
-@@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
+@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
  long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -42288,14 +42307,12 @@ index bdb0f93..5ff558f 100644
 -		fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
 index 244b19b..c19226d 100644
 --- a/drivers/gpu/drm/radeon/radeon_irq.c
diff --git a/3.19.6/1005_linux-3.19.6.patch b/3.19.6/1005_linux-3.19.6.patch
deleted file mode 100644
index f55bc7e..0000000
--- a/3.19.6/1005_linux-3.19.6.patch
+++ /dev/null
@@ -1,1674 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 633b5f0..65c7c87 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- VERSION = 3
- PATCHLEVEL = 19
--SUBLEVEL = 5
-+SUBLEVEL = 6
- EXTRAVERSION =
- NAME = Diseased Newt
- 
-diff --git a/arch/arm/mm/hugetlbpage.c b/arch/arm/mm/hugetlbpage.c
-index 66781bf..c724124 100644
---- a/arch/arm/mm/hugetlbpage.c
-+++ b/arch/arm/mm/hugetlbpage.c
-@@ -36,12 +36,6 @@
-  * of type casting from pmd_t * to pte_t *.
-  */
- 
--struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,
--			      int write)
--{
--	return ERR_PTR(-EINVAL);
--}
--
- int pud_huge(pud_t pud)
- {
- 	return 0;
-diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
-index 023747b..2de9d2e 100644
---- a/arch/arm64/mm/hugetlbpage.c
-+++ b/arch/arm64/mm/hugetlbpage.c
-@@ -38,12 +38,6 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
- }
- #endif
- 
--struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,
--			      int write)
--{
--	return ERR_PTR(-EINVAL);
--}
--
- int pmd_huge(pmd_t pmd)
- {
- 	return !(pmd_val(pmd) & PMD_TABLE_BIT);
-diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
-index 76069c1..52b7604 100644
---- a/arch/ia64/mm/hugetlbpage.c
-+++ b/arch/ia64/mm/hugetlbpage.c
-@@ -114,12 +114,6 @@ int pud_huge(pud_t pud)
- 	return 0;
- }
- 
--struct page *
--follow_huge_pmd(struct mm_struct *mm, unsigned long address, pmd_t *pmd, int write)
--{
--	return NULL;
--}
--
- void hugetlb_free_pgd_range(struct mmu_gather *tlb,
- 			unsigned long addr, unsigned long end,
- 			unsigned long floor, unsigned long ceiling)
-diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
-index 3c32075..7ca80ac 100644
---- a/arch/metag/mm/hugetlbpage.c
-+++ b/arch/metag/mm/hugetlbpage.c
-@@ -94,12 +94,6 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
- 	return 0;
- }
- 
--struct page *follow_huge_addr(struct mm_struct *mm,
--			      unsigned long address, int write)
--{
--	return ERR_PTR(-EINVAL);
--}
--
- int pmd_huge(pmd_t pmd)
- {
- 	return pmd_page_shift(pmd) > PAGE_SHIFT;
-diff --git a/arch/mips/mm/hugetlbpage.c b/arch/mips/mm/hugetlbpage.c
-index 4ec8ee1..06e0f42 100644
---- a/arch/mips/mm/hugetlbpage.c
-+++ b/arch/mips/mm/hugetlbpage.c
-@@ -68,12 +68,6 @@ int is_aligned_hugepage_range(unsigned long addr, unsigned long len)
- 	return 0;
- }
- 
--struct page *
--follow_huge_addr(struct mm_struct *mm, unsigned long address, int write)
--{
--	return ERR_PTR(-EINVAL);
--}
--
- int pmd_huge(pmd_t pmd)
- {
- 	return (pmd_val(pmd) & _PAGE_HUGE) != 0;
-@@ -83,15 +77,3 @@ int pud_huge(pud_t pud)
- {
- 	return (pud_val(pud) & _PAGE_HUGE) != 0;
- }
--
--struct page *
--follow_huge_pmd(struct mm_struct *mm, unsigned long address,
--		pmd_t *pmd, int write)
--{
--	struct page *page;
--
--	page = pte_page(*(pte_t *)pmd);
--	if (page)
--		page += ((address & ~HPAGE_MASK) >> PAGE_SHIFT);
--	return page;
--}
-diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
-index 620d0ec..7e408bf 100644
---- a/arch/powerpc/mm/hugetlbpage.c
-+++ b/arch/powerpc/mm/hugetlbpage.c
-@@ -714,6 +714,14 @@ follow_huge_pmd(struct mm_struct *mm, unsigned long address,
- 	return NULL;
- }
- 
-+struct page *
-+follow_huge_pud(struct mm_struct *mm, unsigned long address,
-+		pud_t *pud, int write)
-+{
-+	BUG();
-+	return NULL;
-+}
-+
- static unsigned long hugepte_addr_end(unsigned long addr, unsigned long end,
- 				      unsigned long sz)
- {
-diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
-index 3c80d2e..210ffed 100644
---- a/arch/s390/mm/hugetlbpage.c
-+++ b/arch/s390/mm/hugetlbpage.c
-@@ -192,12 +192,6 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
- 	return 0;
- }
- 
--struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,
--			      int write)
--{
--	return ERR_PTR(-EINVAL);
--}
--
- int pmd_huge(pmd_t pmd)
- {
- 	if (!MACHINE_HAS_HPAGE)
-@@ -210,17 +204,3 @@ int pud_huge(pud_t pud)
- {
- 	return 0;
- }
--
--struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
--			     pmd_t *pmdp, int write)
--{
--	struct page *page;
--
--	if (!MACHINE_HAS_HPAGE)
--		return NULL;
--
--	page = pmd_page(*pmdp);
--	if (page)
--		page += ((address & ~HPAGE_MASK) >> PAGE_SHIFT);
--	return page;
--}
-diff --git a/arch/sh/mm/hugetlbpage.c b/arch/sh/mm/hugetlbpage.c
-index d776234..534bc97 100644
---- a/arch/sh/mm/hugetlbpage.c
-+++ b/arch/sh/mm/hugetlbpage.c
-@@ -67,12 +67,6 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
- 	return 0;
- }
- 
--struct page *follow_huge_addr(struct mm_struct *mm,
--			      unsigned long address, int write)
--{
--	return ERR_PTR(-EINVAL);
--}
--
- int pmd_huge(pmd_t pmd)
- {
- 	return 0;
-@@ -82,9 +76,3 @@ int pud_huge(pud_t pud)
- {
- 	return 0;
- }
--
--struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
--			     pmd_t *pmd, int write)
--{
--	return NULL;
--}
-diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
-index d329537..4242eab 100644
---- a/arch/sparc/mm/hugetlbpage.c
-+++ b/arch/sparc/mm/hugetlbpage.c
-@@ -215,12 +215,6 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
- 	return entry;
- }
- 
--struct page *follow_huge_addr(struct mm_struct *mm,
--			      unsigned long address, int write)
--{
--	return ERR_PTR(-EINVAL);
--}
--
- int pmd_huge(pmd_t pmd)
- {
- 	return 0;
-@@ -230,9 +224,3 @@ int pud_huge(pud_t pud)
- {
- 	return 0;
- }
--
--struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
--			     pmd_t *pmd, int write)
--{
--	return NULL;
--}
-diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
-index 3270e00..8416240 100644
---- a/arch/tile/mm/hugetlbpage.c
-+++ b/arch/tile/mm/hugetlbpage.c
-@@ -150,12 +150,6 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
- 	return NULL;
- }
- 
--struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,
--			      int write)
--{
--	return ERR_PTR(-EINVAL);
--}
--
- int pmd_huge(pmd_t pmd)
- {
- 	return !!(pmd_val(pmd) & _PAGE_HUGE_PAGE);
-@@ -166,28 +160,6 @@ int pud_huge(pud_t pud)
- 	return !!(pud_val(pud) & _PAGE_HUGE_PAGE);
- }
- 
--struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
--			     pmd_t *pmd, int write)
--{
--	struct page *page;
--
--	page = pte_page(*(pte_t *)pmd);
--	if (page)
--		page += ((address & ~PMD_MASK) >> PAGE_SHIFT);
--	return page;
--}
--
--struct page *follow_huge_pud(struct mm_struct *mm, unsigned long address,
--			     pud_t *pud, int write)
--{
--	struct page *page;
--
--	page = pte_page(*(pte_t *)pud);
--	if (page)
--		page += ((address & ~PUD_MASK) >> PAGE_SHIFT);
--	return page;
--}
--
- int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
- {
- 	return 0;
-diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index d4c58d8..3124464 100644
---- a/arch/x86/kvm/vmx.c
-+++ b/arch/x86/kvm/vmx.c
-@@ -2404,8 +2404,7 @@ static __init void nested_vmx_setup_ctls_msrs(void)
- 
- 	if (enable_ept) {
- 		/* nested EPT: emulate EPT also to L1 */
--		nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT |
--			SECONDARY_EXEC_UNRESTRICTED_GUEST;
-+		nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT;
- 		nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT |
- 			 VMX_EPTP_WB_BIT | VMX_EPT_2MB_PAGE_BIT |
- 			 VMX_EPT_INVEPT_BIT;
-@@ -2419,6 +2418,10 @@ static __init void nested_vmx_setup_ctls_msrs(void)
- 	} else
- 		nested_vmx_ept_caps = 0;
- 
-+	if (enable_unrestricted_guest)
-+		nested_vmx_secondary_ctls_high |=
-+			SECONDARY_EXEC_UNRESTRICTED_GUEST;
-+
- 	/* miscellaneous data */
- 	rdmsr(MSR_IA32_VMX_MISC, nested_vmx_misc_low, nested_vmx_misc_high);
- 	nested_vmx_misc_low &= VMX_MISC_SAVE_EFER_LMA;
-diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
-index 006cc91..9161f76 100644
---- a/arch/x86/mm/hugetlbpage.c
-+++ b/arch/x86/mm/hugetlbpage.c
-@@ -52,20 +52,8 @@ int pud_huge(pud_t pud)
- 	return 0;
- }
- 
--struct page *
--follow_huge_pmd(struct mm_struct *mm, unsigned long address,
--		pmd_t *pmd, int write)
--{
--	return NULL;
--}
- #else
- 
--struct page *
--follow_huge_addr(struct mm_struct *mm, unsigned long address, int write)
--{
--	return ERR_PTR(-EINVAL);
--}
--
- /*
-  * pmd_huge() returns 1 if @pmd is hugetlb related entry, that is normal
-  * hugetlb entry or non-present (migration or hwpoisoned) hugetlb entry.
-diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
-index 0dceba1..68ad39a 100644
---- a/drivers/net/bonding/bond_main.c
-+++ b/drivers/net/bonding/bond_main.c
-@@ -3797,7 +3797,8 @@ static inline int bond_slave_override(struct bonding *bond,
- 	/* Find out if any slaves have the same mapping as this skb. */
- 	bond_for_each_slave_rcu(bond, slave, iter) {
- 		if (slave->queue_id == skb->queue_mapping) {
--			if (bond_slave_can_tx(slave)) {
-+			if (bond_slave_is_up(slave) &&
-+			    slave->link == BOND_LINK_UP) {
- 				bond_dev_queue_xmit(bond, skb, slave->dev);
- 				return 0;
- 			}
-diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
-index c3a6072..2559206 100644
---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
-+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
-@@ -531,20 +531,8 @@ struct bnx2x_fastpath {
- 	struct napi_struct	napi;
- 
- #ifdef CONFIG_NET_RX_BUSY_POLL
--	unsigned int state;
--#define BNX2X_FP_STATE_IDLE		      0
--#define BNX2X_FP_STATE_NAPI		(1 << 0)    /* NAPI owns this FP */
--#define BNX2X_FP_STATE_POLL		(1 << 1)    /* poll owns this FP */
--#define BNX2X_FP_STATE_DISABLED		(1 << 2)
--#define BNX2X_FP_STATE_NAPI_YIELD	(1 << 3)    /* NAPI yielded this FP */
--#define BNX2X_FP_STATE_POLL_YIELD	(1 << 4)    /* poll yielded this FP */
--#define BNX2X_FP_OWNED	(BNX2X_FP_STATE_NAPI | BNX2X_FP_STATE_POLL)
--#define BNX2X_FP_YIELD	(BNX2X_FP_STATE_NAPI_YIELD | BNX2X_FP_STATE_POLL_YIELD)
--#define BNX2X_FP_LOCKED	(BNX2X_FP_OWNED | BNX2X_FP_STATE_DISABLED)
--#define BNX2X_FP_USER_PEND (BNX2X_FP_STATE_POLL | BNX2X_FP_STATE_POLL_YIELD)
--	/* protect state */
--	spinlock_t lock;
--#endif /* CONFIG_NET_RX_BUSY_POLL */
-+	unsigned long		busy_poll_state;
-+#endif
- 
- 	union host_hc_status_block	status_blk;
- 	/* chip independent shortcuts into sb structure */
-@@ -619,104 +607,83 @@ struct bnx2x_fastpath {
- #define bnx2x_fp_qstats(bp, fp)	(&((bp)->fp_stats[(fp)->index].eth_q_stats))
- 
- #ifdef CONFIG_NET_RX_BUSY_POLL
--static inline void bnx2x_fp_init_lock(struct bnx2x_fastpath *fp)
-+
-+enum bnx2x_fp_state {
-+	BNX2X_STATE_FP_NAPI	= BIT(0), /* NAPI handler owns the queue */
-+
-+	BNX2X_STATE_FP_NAPI_REQ_BIT = 1, /* NAPI would like to own the queue */
-+	BNX2X_STATE_FP_NAPI_REQ = BIT(1),
-+
-+	BNX2X_STATE_FP_POLL_BIT = 2,
-+	BNX2X_STATE_FP_POLL     = BIT(2), /* busy_poll owns the queue */
-+
-+	BNX2X_STATE_FP_DISABLE_BIT = 3, /* queue is dismantled */
-+};
-+
-+static inline void bnx2x_fp_busy_poll_init(struct bnx2x_fastpath *fp)
- {
--	spin_lock_init(&fp->lock);
--	fp->state = BNX2X_FP_STATE_IDLE;
-+	WRITE_ONCE(fp->busy_poll_state, 0);
- }
- 
- /* called from the device poll routine to get ownership of a FP */
- static inline bool bnx2x_fp_lock_napi(struct bnx2x_fastpath *fp)
- {
--	bool rc = true;
--
--	spin_lock_bh(&fp->lock);
--	if (fp->state & BNX2X_FP_LOCKED) {
--		WARN_ON(fp->state & BNX2X_FP_STATE_NAPI);
--		fp->state |= BNX2X_FP_STATE_NAPI_YIELD;
--		rc = false;
--	} else {
--		/* we don't care if someone yielded */
--		fp->state = BNX2X_FP_STATE_NAPI;
-+	unsigned long prev, old = READ_ONCE(fp->busy_poll_state);
-+
-+	while (1) {
-+		switch (old) {
-+		case BNX2X_STATE_FP_POLL:
-+			/* make sure bnx2x_fp_lock_poll() wont starve us */
-+			set_bit(BNX2X_STATE_FP_NAPI_REQ_BIT,
-+				&fp->busy_poll_state);
-+			/* fallthrough */
-+		case BNX2X_STATE_FP_POLL | BNX2X_STATE_FP_NAPI_REQ:
-+			return false;
-+		default:
-+			break;
-+		}
-+		prev = cmpxchg(&fp->busy_poll_state, old, BNX2X_STATE_FP_NAPI);
-+		if (unlikely(prev != old)) {
-+			old = prev;
-+			continue;
-+		}
-+		return true;
- 	}
--	spin_unlock_bh(&fp->lock);
--	return rc;
- }
- 
--/* returns true is someone tried to get the FP while napi had it */
--static inline bool bnx2x_fp_unlock_napi(struct bnx2x_fastpath *fp)
-+static inline void bnx2x_fp_unlock_napi(struct bnx2x_fastpath *fp)
- {
--	bool rc = false;
--
--	spin_lock_bh(&fp->lock);
--	WARN_ON(fp->state &
--		(BNX2X_FP_STATE_POLL | BNX2X_FP_STATE_NAPI_YIELD));
--
--	if (fp->state & BNX2X_FP_STATE_POLL_YIELD)
--		rc = true;
--
--	/* state ==> idle, unless currently disabled */
--	fp->state &= BNX2X_FP_STATE_DISABLED;
--	spin_unlock_bh(&fp->lock);
--	return rc;
-+	smp_wmb();
-+	fp->busy_poll_state = 0;
- }
- 
- /* called from bnx2x_low_latency_poll() */
- static inline bool bnx2x_fp_lock_poll(struct bnx2x_fastpath *fp)
- {
--	bool rc = true;
--
--	spin_lock_bh(&fp->lock);
--	if ((fp->state & BNX2X_FP_LOCKED)) {
--		fp->state |= BNX2X_FP_STATE_POLL_YIELD;
--		rc = false;
--	} else {
--		/* preserve yield marks */
--		fp->state |= BNX2X_FP_STATE_POLL;
--	}
--	spin_unlock_bh(&fp->lock);
--	return rc;
-+	return cmpxchg(&fp->busy_poll_state, 0, BNX2X_STATE_FP_POLL) == 0;
- }
- 
--/* returns true if someone tried to get the FP while it was locked */
--static inline bool bnx2x_fp_unlock_poll(struct bnx2x_fastpath *fp)
-+static inline void bnx2x_fp_unlock_poll(struct bnx2x_fastpath *fp)
- {
--	bool rc = false;
--
--	spin_lock_bh(&fp->lock);
--	WARN_ON(fp->state & BNX2X_FP_STATE_NAPI);
--
--	if (fp->state & BNX2X_FP_STATE_POLL_YIELD)
--		rc = true;
--
--	/* state ==> idle, unless currently disabled */
--	fp->state &= BNX2X_FP_STATE_DISABLED;
--	spin_unlock_bh(&fp->lock);
--	return rc;
-+	smp_mb__before_atomic();
-+	clear_bit(BNX2X_STATE_FP_POLL_BIT, &fp->busy_poll_state);
- }
- 
--/* true if a socket is polling, even if it did not get the lock */
-+/* true if a socket is polling */
- static inline bool bnx2x_fp_ll_polling(struct bnx2x_fastpath *fp)
- {
--	WARN_ON(!(fp->state & BNX2X_FP_OWNED));
--	return fp->state & BNX2X_FP_USER_PEND;
-+	return READ_ONCE(fp->busy_poll_state) & BNX2X_STATE_FP_POLL;
- }
- 
- /* false if fp is currently owned */
- static inline bool bnx2x_fp_ll_disable(struct bnx2x_fastpath *fp)
- {
--	int rc = true;
--
--	spin_lock_bh(&fp->lock);
--	if (fp->state & BNX2X_FP_OWNED)
--		rc = false;
--	fp->state |= BNX2X_FP_STATE_DISABLED;
--	spin_unlock_bh(&fp->lock);
-+	set_bit(BNX2X_STATE_FP_DISABLE_BIT, &fp->busy_poll_state);
-+	return !bnx2x_fp_ll_polling(fp);
- 
--	return rc;
- }
- #else
--static inline void bnx2x_fp_init_lock(struct bnx2x_fastpath *fp)
-+static inline void bnx2x_fp_busy_poll_init(struct bnx2x_fastpath *fp)
- {
- }
- 
-@@ -725,9 +692,8 @@ static inline bool bnx2x_fp_lock_napi(struct bnx2x_fastpath *fp)
- 	return true;
- }
- 
--static inline bool bnx2x_fp_unlock_napi(struct bnx2x_fastpath *fp)
-+static inline void bnx2x_fp_unlock_napi(struct bnx2x_fastpath *fp)
- {
--	return false;
- }
- 
- static inline bool bnx2x_fp_lock_poll(struct bnx2x_fastpath *fp)
-@@ -735,9 +701,8 @@ static inline bool bnx2x_fp_lock_poll(struct bnx2x_fastpath *fp)
- 	return false;
- }
- 
--static inline bool bnx2x_fp_unlock_poll(struct bnx2x_fastpath *fp)
-+static inline void bnx2x_fp_unlock_poll(struct bnx2x_fastpath *fp)
- {
--	return false;
- }
- 
- static inline bool bnx2x_fp_ll_polling(struct bnx2x_fastpath *fp)
-diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
-index e468ed3..2b8e8b2 100644
---- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
-+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
-@@ -1849,7 +1849,7 @@ static void bnx2x_napi_enable_cnic(struct bnx2x *bp)
- 	int i;
- 
- 	for_each_rx_queue_cnic(bp, i) {
--		bnx2x_fp_init_lock(&bp->fp[i]);
-+		bnx2x_fp_busy_poll_init(&bp->fp[i]);
- 		napi_enable(&bnx2x_fp(bp, i, napi));
- 	}
- }
-@@ -1859,7 +1859,7 @@ static void bnx2x_napi_enable(struct bnx2x *bp)
- 	int i;
- 
- 	for_each_eth_queue(bp, i) {
--		bnx2x_fp_init_lock(&bp->fp[i]);
-+		bnx2x_fp_busy_poll_init(&bp->fp[i]);
- 		napi_enable(&bnx2x_fp(bp, i, napi));
- 	}
- }
-@@ -3191,9 +3191,10 @@ static int bnx2x_poll(struct napi_struct *napi, int budget)
- 			}
- 		}
- 
-+		bnx2x_fp_unlock_napi(fp);
-+
- 		/* Fall out from the NAPI loop if needed */
--		if (!bnx2x_fp_unlock_napi(fp) &&
--		    !(bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) {
-+		if (!(bnx2x_has_rx_work(fp) || bnx2x_has_tx_work(fp))) {
- 
- 			/* No need to update SB for FCoE L2 ring as long as
- 			 * it's connected to the default SB and the SB
-diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
-index 96bf01b..05ae126 100644
---- a/drivers/net/ethernet/broadcom/tg3.c
-+++ b/drivers/net/ethernet/broadcom/tg3.c
-@@ -17868,8 +17868,10 @@ static int tg3_init_one(struct pci_dev *pdev,
- 	 */
- 	if ((tr32(HOSTCC_MODE) & HOSTCC_MODE_ENABLE) ||
- 	    (tr32(WDMAC_MODE) & WDMAC_MODE_ENABLE)) {
-+		tg3_full_lock(tp, 0);
- 		tw32(MEMARB_MODE, MEMARB_MODE_ENABLE);
- 		tg3_halt(tp, RESET_KIND_SHUTDOWN, 1);
-+		tg3_full_unlock(tp);
- 	}
- 
- 	err = tg3_test_dma(tp);
-diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
-index 5c93d14..9842bf9 100644
---- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
-+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
-@@ -585,7 +585,8 @@ static int mlx4_cmd_wait(struct mlx4_dev *dev, u64 in_param, u64 *out_param,
- 		 * on the host, we deprecate the error message for this
- 		 * specific command/input_mod/opcode_mod/fw-status to be debug.
- 		 */
--		if (op == MLX4_CMD_SET_PORT && in_modifier == 1 &&
-+		if (op == MLX4_CMD_SET_PORT &&
-+		    (in_modifier == 1 || in_modifier == 2) &&
- 		    op_modifier == 0 && context->fw_status == CMD_STAT_BAD_SIZE)
- 			mlx4_dbg(dev, "command 0x%x failed: fw status = 0x%x\n",
- 				 op, context->fw_status);
-diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
-index ac6a8f1..2617c9d 100644
---- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
-+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
-@@ -2627,13 +2627,6 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
- 	netif_carrier_off(dev);
- 	mlx4_en_set_default_moderation(priv);
- 
--	err = register_netdev(dev);
--	if (err) {
--		en_err(priv, "Netdev registration failed for port %d\n", port);
--		goto out;
--	}
--	priv->registered = 1;
--
- 	en_warn(priv, "Using %d TX rings\n", prof->tx_ring_num);
- 	en_warn(priv, "Using %d RX rings\n", prof->rx_ring_num);
- 
-@@ -2673,6 +2666,14 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
- 		queue_delayed_work(mdev->workqueue, &priv->service_task,
- 				   SERVICE_TASK_DELAY);
- 
-+	err = register_netdev(dev);
-+	if (err) {
-+		en_err(priv, "Netdev registration failed for port %d\n", port);
-+		goto out;
-+	}
-+
-+	priv->registered = 1;
-+
- 	return 0;
- 
- out:
-diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
-index 2f398fa..24c0284 100644
---- a/drivers/net/ethernet/rocker/rocker.c
-+++ b/drivers/net/ethernet/rocker/rocker.c
-@@ -4305,10 +4305,16 @@ static int rocker_port_master_changed(struct net_device *dev)
- 	struct net_device *master = netdev_master_upper_dev_get(dev);
- 	int err = 0;
- 
-+	/* There are currently three cases handled here:
-+	 * 1. Joining a bridge
-+	 * 2. Leaving a previously joined bridge
-+	 * 3. Other, e.g. being added to or removed from a bond or openvswitch,
-+	 *    in which case nothing is done
-+	 */
- 	if (master && master->rtnl_link_ops &&
- 	    !strcmp(master->rtnl_link_ops->kind, "bridge"))
- 		err = rocker_port_bridge_join(rocker_port, master);
--	else
-+	else if (rocker_port_is_bridged(rocker_port))
- 		err = rocker_port_bridge_leave(rocker_port);
- 
- 	return err;
-diff --git a/drivers/net/tun.c b/drivers/net/tun.c
-index 10f9e40..9a409a8 100644
---- a/drivers/net/tun.c
-+++ b/drivers/net/tun.c
-@@ -1368,7 +1368,7 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile,
- 	skb = __skb_recv_datagram(tfile->socket.sk, noblock ? MSG_DONTWAIT : 0,
- 				  &peeked, &off, &err);
- 	if (!skb)
--		return 0;
-+		return err;
- 
- 	ret = tun_put_user(tun, tfile, skb, to);
- 	if (unlikely(ret < 0))
-diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
-index 5c55f11..75d6f26 100644
---- a/drivers/net/usb/asix_common.c
-+++ b/drivers/net/usb/asix_common.c
-@@ -188,6 +188,8 @@ struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
- 		memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
- 		skb_put(skb, sizeof(padbytes));
- 	}
-+
-+	usbnet_set_skb_tx_stats(skb, 1, 0);
- 	return skb;
- }
- 
-diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
-index 80a844e..c3e4da9 100644
---- a/drivers/net/usb/cdc_ncm.c
-+++ b/drivers/net/usb/cdc_ncm.c
-@@ -1172,17 +1172,17 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign)
- 
- 	/* return skb */
- 	ctx->tx_curr_skb = NULL;
--	dev->net->stats.tx_packets += ctx->tx_curr_frame_num;
- 
- 	/* keep private stats: framing overhead and number of NTBs */
- 	ctx->tx_overhead += skb_out->len - ctx->tx_curr_frame_payload;
- 	ctx->tx_ntbs++;
- 
--	/* usbnet has already counted all the framing overhead.
-+	/* usbnet will count all the framing overhead by default.
- 	 * Adjust the stats so that the tx_bytes counter show real
- 	 * payload data instead.
- 	 */
--	dev->net->stats.tx_bytes -= skb_out->len - ctx->tx_curr_frame_payload;
-+	usbnet_set_skb_tx_stats(skb_out, n,
-+				ctx->tx_curr_frame_payload - skb_out->len);
- 
- 	return skb_out;
- 
-diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c
-index b94a0fb..953de13 100644
---- a/drivers/net/usb/sr9800.c
-+++ b/drivers/net/usb/sr9800.c
-@@ -144,6 +144,7 @@ static struct sk_buff *sr_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
- 		skb_put(skb, sizeof(padbytes));
- 	}
- 
-+	usbnet_set_skb_tx_stats(skb, 1, 0);
- 	return skb;
- }
- 
-diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
-index 3a6770a..e7ed251 100644
---- a/drivers/net/usb/usbnet.c
-+++ b/drivers/net/usb/usbnet.c
-@@ -1189,8 +1189,7 @@ static void tx_complete (struct urb *urb)
- 	struct usbnet		*dev = entry->dev;
- 
- 	if (urb->status == 0) {
--		if (!(dev->driver_info->flags & FLAG_MULTI_PACKET))
--			dev->net->stats.tx_packets++;
-+		dev->net->stats.tx_packets += entry->packets;
- 		dev->net->stats.tx_bytes += entry->length;
- 	} else {
- 		dev->net->stats.tx_errors++;
-@@ -1348,7 +1347,19 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
- 		} else
- 			urb->transfer_flags |= URB_ZERO_PACKET;
- 	}
--	entry->length = urb->transfer_buffer_length = length;
-+	urb->transfer_buffer_length = length;
-+
-+	if (info->flags & FLAG_MULTI_PACKET) {
-+		/* Driver has set number of packets and a length delta.
-+		 * Calculate the complete length and ensure that it's
-+		 * positive.
-+		 */
-+		entry->length += length;
-+		if (WARN_ON_ONCE(entry->length <= 0))
-+			entry->length = length;
-+	} else {
-+		usbnet_set_skb_tx_stats(skb, 1, length);
-+	}
- 
- 	spin_lock_irqsave(&dev->txq.lock, flags);
- 	retval = usb_autopm_get_interface_async(dev->intf);
-diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-index a8c755d..6c83846 100644
---- a/drivers/net/vxlan.c
-+++ b/drivers/net/vxlan.c
-@@ -1578,12 +1578,6 @@ static int vxlan6_xmit_skb(struct vxlan_sock *vs,
- 	int err;
- 	bool udp_sum = !udp_get_no_check6_tx(vs->sock->sk);
- 
--	skb = udp_tunnel_handle_offloads(skb, udp_sum);
--	if (IS_ERR(skb)) {
--		err = -EINVAL;
--		goto err;
--	}
--
- 	skb_scrub_packet(skb, xnet);
- 
- 	min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len
-@@ -1603,6 +1597,12 @@ static int vxlan6_xmit_skb(struct vxlan_sock *vs,
- 		goto err;
- 	}
- 
-+	skb = udp_tunnel_handle_offloads(skb, udp_sum);
-+	if (IS_ERR(skb)) {
-+		err = -EINVAL;
-+		goto err;
-+	}
-+
- 	vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
- 	vxh->vx_flags = htonl(VXLAN_FLAGS);
- 	vxh->vx_vni = vni;
-@@ -1628,10 +1628,6 @@ int vxlan_xmit_skb(struct vxlan_sock *vs,
- 	int err;
- 	bool udp_sum = !vs->sock->sk->sk_no_check_tx;
- 
--	skb = udp_tunnel_handle_offloads(skb, udp_sum);
--	if (IS_ERR(skb))
--		return PTR_ERR(skb);
--
- 	min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len
- 			+ VXLAN_HLEN + sizeof(struct iphdr)
- 			+ (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0);
-@@ -1647,6 +1643,10 @@ int vxlan_xmit_skb(struct vxlan_sock *vs,
- 	if (WARN_ON(!skb))
- 		return -ENOMEM;
- 
-+	skb = udp_tunnel_handle_offloads(skb, udp_sum);
-+	if (IS_ERR(skb))
-+		return PTR_ERR(skb);
-+
- 	vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
- 	vxh->vx_flags = htonl(VXLAN_FLAGS);
- 	vxh->vx_vni = vni;
-diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
-index a5186bb..8c45cf4 100644
---- a/drivers/net/wireless/rtlwifi/pci.c
-+++ b/drivers/net/wireless/rtlwifi/pci.c
-@@ -578,6 +578,13 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
- 		else
- 			entry = (u8 *)(&ring->desc[ring->idx]);
- 
-+		if (rtlpriv->cfg->ops->get_available_desc &&
-+		    rtlpriv->cfg->ops->get_available_desc(hw, prio) <= 1) {
-+			RT_TRACE(rtlpriv, (COMP_INTR | COMP_SEND), DBG_DMESG,
-+				 "no available desc!\n");
-+			return;
-+		}
-+
- 		if (!rtlpriv->cfg->ops->is_tx_desc_closed(hw, prio, ring->idx))
- 			return;
- 		ring->idx = (ring->idx + 1) % ring->entries;
-@@ -641,10 +648,9 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
- 
- 		ieee80211_tx_status_irqsafe(hw, skb);
- 
--		if ((ring->entries - skb_queue_len(&ring->queue))
--				== 2) {
-+		if ((ring->entries - skb_queue_len(&ring->queue)) <= 4) {
- 
--			RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-+			RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
- 				 "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%x\n",
- 				 prio, ring->idx,
- 				 skb_queue_len(&ring->queue));
-@@ -793,7 +799,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
- 			rx_remained_cnt =
- 				rtlpriv->cfg->ops->rx_desc_buff_remained_cnt(hw,
- 								      hw_queue);
--			if (rx_remained_cnt < 1)
-+			if (rx_remained_cnt == 0)
- 				return;
- 
- 		} else {	/* rx descriptor */
-@@ -845,18 +851,18 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
- 			else
- 				skb_reserve(skb, stats.rx_drvinfo_size +
- 					    stats.rx_bufshift);
--
- 		} else {
- 			RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
- 				 "skb->end - skb->tail = %d, len is %d\n",
- 				 skb->end - skb->tail, len);
--			break;
-+			dev_kfree_skb_any(skb);
-+			goto new_trx_end;
- 		}
- 		/* handle command packet here */
- 		if (rtlpriv->cfg->ops->rx_command_packet &&
- 		    rtlpriv->cfg->ops->rx_command_packet(hw, stats, skb)) {
- 				dev_kfree_skb_any(skb);
--				goto end;
-+				goto new_trx_end;
- 		}
- 
- 		/*
-@@ -906,6 +912,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
- 		} else {
- 			dev_kfree_skb_any(skb);
- 		}
-+new_trx_end:
- 		if (rtlpriv->use_new_trx_flow) {
- 			rtlpci->rx_ring[hw_queue].next_rx_rp += 1;
- 			rtlpci->rx_ring[hw_queue].next_rx_rp %=
-@@ -921,7 +928,6 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
- 			rtlpriv->enter_ps = false;
- 			schedule_work(&rtlpriv->works.lps_change_work);
- 		}
--end:
- 		skb = new_skb;
- no_new:
- 		if (rtlpriv->use_new_trx_flow) {
-@@ -1695,6 +1701,15 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
- 		}
- 	}
- 
-+	if (rtlpriv->cfg->ops->get_available_desc &&
-+	    rtlpriv->cfg->ops->get_available_desc(hw, hw_queue) == 0) {
-+			RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-+				 "get_available_desc fail\n");
-+			spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock,
-+					       flags);
-+			return skb->len;
-+	}
-+
- 	if (ieee80211_is_data_qos(fc)) {
- 		tid = rtl_get_tid(skb);
- 		if (sta) {
-diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c
-index 9b5a7d5..c31c6bf 100644
---- a/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c
-+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/sw.c
-@@ -113,8 +113,6 @@ int rtl92ee_init_sw_vars(struct ieee80211_hw *hw)
- 				  RCR_HTC_LOC_CTRL		|
- 				  RCR_AMF			|
- 				  RCR_ACF			|
--				  RCR_ADF			|
--				  RCR_AICV			|
- 				  RCR_ACRC32			|
- 				  RCR_AB			|
- 				  RCR_AM			|
-@@ -241,6 +239,7 @@ static struct rtl_hal_ops rtl8192ee_hal_ops = {
- 	.set_desc = rtl92ee_set_desc,
- 	.get_desc = rtl92ee_get_desc,
- 	.is_tx_desc_closed = rtl92ee_is_tx_desc_closed,
-+	.get_available_desc = rtl92ee_get_available_desc,
- 	.tx_polling = rtl92ee_tx_polling,
- 	.enable_hw_sec = rtl92ee_enable_hw_security_config,
- 	.set_key = rtl92ee_set_key,
-diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
-index 0069004..1f6d160 100644
---- a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
-+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.c
-@@ -707,7 +707,7 @@ static u16 get_desc_addr_fr_q_idx(u16 queue_index)
- 	return desc_address;
- }
- 
--void rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 q_idx)
-+u16 rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 q_idx)
- {
- 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
- 	struct rtl_priv *rtlpriv = rtl_priv(hw);
-@@ -721,11 +721,12 @@ void rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 q_idx)
- 	current_tx_write_point = (u16)((tmp_4byte) & 0x0fff);
- 
- 	point_diff = ((current_tx_read_point > current_tx_write_point) ?
--		      (current_tx_read_point - current_tx_write_point) :
--		      (TX_DESC_NUM_92E - current_tx_write_point +
-+		      (current_tx_read_point - current_tx_write_point - 1) :
-+		      (TX_DESC_NUM_92E - 1 - current_tx_write_point +
- 		       current_tx_read_point));
- 
- 	rtlpci->tx_ring[q_idx].avl_desc = point_diff;
-+	return point_diff;
- }
- 
- void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
-diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
-index 8effef9..b489dd9 100644
---- a/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
-+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/trx.h
-@@ -831,7 +831,7 @@ void rtl92ee_rx_check_dma_ok(struct ieee80211_hw *hw, u8 *header_desc,
- 			     u8 queue_index);
- u16	rtl92ee_rx_desc_buff_remained_cnt(struct ieee80211_hw *hw,
- 					  u8 queue_index);
--void rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 queue_index);
-+u16 rtl92ee_get_available_desc(struct ieee80211_hw *hw, u8 queue_index);
- void rtl92ee_pre_fill_tx_bd_desc(struct ieee80211_hw *hw,
- 				 u8 *tx_bd_desc, u8 *desc, u8 queue_index,
- 				 struct sk_buff *skb, dma_addr_t addr);
-diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
-index 6866dcf..27822fe 100644
---- a/drivers/net/wireless/rtlwifi/wifi.h
-+++ b/drivers/net/wireless/rtlwifi/wifi.h
-@@ -2161,6 +2161,7 @@ struct rtl_hal_ops {
- 	void (*add_wowlan_pattern)(struct ieee80211_hw *hw,
- 				   struct rtl_wow_pattern *rtl_pattern,
- 				   u8 index);
-+	u16 (*get_available_desc)(struct ieee80211_hw *hw, u8 q_idx);
- };
- 
- struct rtl_intf_ops {
-diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index d8c1076..76ce69c 100644
---- a/drivers/net/xen-netfront.c
-+++ b/drivers/net/xen-netfront.c
-@@ -1062,8 +1062,7 @@ err:
- 
- static int xennet_change_mtu(struct net_device *dev, int mtu)
- {
--	int max = xennet_can_sg(dev) ?
--		XEN_NETIF_MAX_TX_SIZE - MAX_TCP_HEADER : ETH_DATA_LEN;
-+	int max = xennet_can_sg(dev) ? XEN_NETIF_MAX_TX_SIZE : ETH_DATA_LEN;
- 
- 	if (mtu > max)
- 		return -EINVAL;
-@@ -1333,8 +1332,6 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev)
- 	netdev->ethtool_ops = &xennet_ethtool_ops;
- 	SET_NETDEV_DEV(netdev, &dev->dev);
- 
--	netif_set_gso_max_size(netdev, XEN_NETIF_MAX_TX_SIZE - MAX_TCP_HEADER);
--
- 	np->netdev = netdev;
- 
- 	netif_carrier_off(netdev);
-diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
-index d02df7d..57b7bc2 100644
---- a/drivers/staging/comedi/drivers/adv_pci1710.c
-+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
-@@ -455,7 +455,6 @@ static int pci171x_insn_read_ai(struct comedi_device *dev,
- 				struct comedi_insn *insn, unsigned int *data)
- {
- 	struct pci1710_private *devpriv = dev->private;
--	unsigned int chan = CR_CHAN(insn->chanspec);
- 	int ret = 0;
- 	int i;
- 
-@@ -477,7 +476,7 @@ static int pci171x_insn_read_ai(struct comedi_device *dev,
- 			break;
- 
- 		val = inw(dev->iobase + PCI171x_AD_DATA);
--		ret = pci171x_ai_dropout(dev, s, chan, val);
-+		ret = pci171x_ai_dropout(dev, s, 0, val);
- 		if (ret)
- 			break;
- 
-diff --git a/fs/exec.c b/fs/exec.c
-index ad8798e..4617a4e 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -1259,6 +1259,53 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
- 	spin_unlock(&p->fs->lock);
- }
- 
-+static void bprm_fill_uid(struct linux_binprm *bprm)
-+{
-+	struct inode *inode;
-+	unsigned int mode;
-+	kuid_t uid;
-+	kgid_t gid;
-+
-+	/* clear any previous set[ug]id data from a previous binary */
-+	bprm->cred->euid = current_euid();
-+	bprm->cred->egid = current_egid();
-+
-+	if (bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID)
-+		return;
-+
-+	if (task_no_new_privs(current))
-+		return;
-+
-+	inode = file_inode(bprm->file);
-+	mode = READ_ONCE(inode->i_mode);
-+	if (!(mode & (S_ISUID|S_ISGID)))
-+		return;
-+
-+	/* Be careful if suid/sgid is set */
-+	mutex_lock(&inode->i_mutex);
-+
-+	/* reload atomically mode/uid/gid now that lock held */
-+	mode = inode->i_mode;
-+	uid = inode->i_uid;
-+	gid = inode->i_gid;
-+	mutex_unlock(&inode->i_mutex);
-+
-+	/* We ignore suid/sgid if there are no mappings for them in the ns */
-+	if (!kuid_has_mapping(bprm->cred->user_ns, uid) ||
-+		 !kgid_has_mapping(bprm->cred->user_ns, gid))
-+		return;
-+
-+	if (mode & S_ISUID) {
-+		bprm->per_clear |= PER_CLEAR_ON_SETID;
-+		bprm->cred->euid = uid;
-+	}
-+
-+	if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
-+		bprm->per_clear |= PER_CLEAR_ON_SETID;
-+		bprm->cred->egid = gid;
-+	}
-+}
-+
- /*
-  * Fill the binprm structure from the inode.
-  * Check permissions, then read the first 128 (BINPRM_BUF_SIZE) bytes
-@@ -1267,36 +1314,9 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
-  */
- int prepare_binprm(struct linux_binprm *bprm)
- {
--	struct inode *inode = file_inode(bprm->file);
--	umode_t mode = inode->i_mode;
- 	int retval;
- 
--
--	/* clear any previous set[ug]id data from a previous binary */
--	bprm->cred->euid = current_euid();
--	bprm->cred->egid = current_egid();
--
--	if (!(bprm->file->f_path.mnt->mnt_flags & MNT_NOSUID) &&
--	    !task_no_new_privs(current) &&
--	    kuid_has_mapping(bprm->cred->user_ns, inode->i_uid) &&
--	    kgid_has_mapping(bprm->cred->user_ns, inode->i_gid)) {
--		/* Set-uid? */
--		if (mode & S_ISUID) {
--			bprm->per_clear |= PER_CLEAR_ON_SETID;
--			bprm->cred->euid = inode->i_uid;
--		}
--
--		/* Set-gid? */
--		/*
--		 * If setgid is set but no group execute bit then this
--		 * is a candidate for mandatory locking, not a setgid
--		 * executable.
--		 */
--		if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) {
--			bprm->per_clear |= PER_CLEAR_ON_SETID;
--			bprm->cred->egid = inode->i_gid;
--		}
--	}
-+	bprm_fill_uid(bprm);
- 
- 	/* fill in binprm security blob */
- 	retval = security_bprm_set_creds(bprm);
-diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
-index 431b7fc..e235ec5 100644
---- a/include/linux/hugetlb.h
-+++ b/include/linux/hugetlb.h
-@@ -99,9 +99,9 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep);
- struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,
- 			      int write);
- struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
--				pmd_t *pmd, int write);
-+				pmd_t *pmd, int flags);
- struct page *follow_huge_pud(struct mm_struct *mm, unsigned long address,
--				pud_t *pud, int write);
-+				pud_t *pud, int flags);
- int pmd_huge(pmd_t pmd);
- int pud_huge(pud_t pmd);
- unsigned long hugetlb_change_protection(struct vm_area_struct *vma,
-@@ -133,8 +133,8 @@ static inline void hugetlb_report_meminfo(struct seq_file *m)
- static inline void hugetlb_show_meminfo(void)
- {
- }
--#define follow_huge_pmd(mm, addr, pmd, write)	NULL
--#define follow_huge_pud(mm, addr, pud, write)	NULL
-+#define follow_huge_pmd(mm, addr, pmd, flags)	NULL
-+#define follow_huge_pud(mm, addr, pud, flags)	NULL
- #define prepare_hugepage_range(file, addr, len)	(-EINVAL)
- #define pmd_huge(x)	0
- #define pud_huge(x)	0
-diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 52fd8e8..840fb7f 100644
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -2159,6 +2159,12 @@ void netdev_freemem(struct net_device *dev);
- void synchronize_net(void);
- int init_dummy_netdev(struct net_device *dev);
- 
-+DECLARE_PER_CPU(int, xmit_recursion);
-+static inline int dev_recursion_level(void)
-+{
-+	return this_cpu_read(xmit_recursion);
-+}
-+
- struct net_device *dev_get_by_index(struct net *net, int ifindex);
- struct net_device *__dev_get_by_index(struct net *net, int ifindex);
- struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
-diff --git a/include/linux/swapops.h b/include/linux/swapops.h
-index 6adfb7b..e288d5c 100644
---- a/include/linux/swapops.h
-+++ b/include/linux/swapops.h
-@@ -137,6 +137,8 @@ static inline void make_migration_entry_read(swp_entry_t *entry)
- 	*entry = swp_entry(SWP_MIGRATION_READ, swp_offset(*entry));
- }
- 
-+extern void __migration_entry_wait(struct mm_struct *mm, pte_t *ptep,
-+					spinlock_t *ptl);
- extern void migration_entry_wait(struct mm_struct *mm, pmd_t *pmd,
- 					unsigned long address);
- extern void migration_entry_wait_huge(struct vm_area_struct *vma,
-@@ -150,6 +152,8 @@ static inline int is_migration_entry(swp_entry_t swp)
- }
- #define migration_entry_to_page(swp) NULL
- static inline void make_migration_entry_read(swp_entry_t *entryp) { }
-+static inline void __migration_entry_wait(struct mm_struct *mm, pte_t *ptep,
-+					spinlock_t *ptl) { }
- static inline void migration_entry_wait(struct mm_struct *mm, pmd_t *pmd,
- 					 unsigned long address) { }
- static inline void migration_entry_wait_huge(struct vm_area_struct *vma,
-diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
-index d9a4905..6e0ce8c 100644
---- a/include/linux/usb/usbnet.h
-+++ b/include/linux/usb/usbnet.h
-@@ -227,9 +227,23 @@ struct skb_data {	/* skb->cb is one of these */
- 	struct urb		*urb;
- 	struct usbnet		*dev;
- 	enum skb_state		state;
--	size_t			length;
-+	long			length;
-+	unsigned long		packets;
- };
- 
-+/* Drivers that set FLAG_MULTI_PACKET must call this in their
-+ * tx_fixup method before returning an skb.
-+ */
-+static inline void
-+usbnet_set_skb_tx_stats(struct sk_buff *skb,
-+			unsigned long packets, long bytes_delta)
-+{
-+	struct skb_data *entry = (struct skb_data *) skb->cb;
-+
-+	entry->packets = packets;
-+	entry->length = bytes_delta;
-+}
-+
- extern int usbnet_open(struct net_device *net);
- extern int usbnet_stop(struct net_device *net);
- extern netdev_tx_t usbnet_start_xmit(struct sk_buff *skb,
-diff --git a/include/net/ip.h b/include/net/ip.h
-index 09cf5ae..c0c26c3 100644
---- a/include/net/ip.h
-+++ b/include/net/ip.h
-@@ -453,22 +453,6 @@ static __inline__ void inet_reset_saddr(struct sock *sk)
- 
- #endif
- 
--static inline int sk_mc_loop(struct sock *sk)
--{
--	if (!sk)
--		return 1;
--	switch (sk->sk_family) {
--	case AF_INET:
--		return inet_sk(sk)->mc_loop;
--#if IS_ENABLED(CONFIG_IPV6)
--	case AF_INET6:
--		return inet6_sk(sk)->mc_loop;
--#endif
--	}
--	WARN_ON(1);
--	return 1;
--}
--
- bool ip_call_ra_chain(struct sk_buff *skb);
- 
- /*
-diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
-index 1d09b46..eda131d 100644
---- a/include/net/ip6_route.h
-+++ b/include/net/ip6_route.h
-@@ -174,7 +174,8 @@ int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));
- 
- static inline int ip6_skb_dst_mtu(struct sk_buff *skb)
- {
--	struct ipv6_pinfo *np = skb->sk ? inet6_sk(skb->sk) : NULL;
-+	struct ipv6_pinfo *np = skb->sk && !dev_recursion_level() ?
-+				inet6_sk(skb->sk) : NULL;
- 
- 	return (np && np->pmtudisc >= IPV6_PMTUDISC_PROBE) ?
- 	       skb_dst(skb)->dev->mtu : dst_mtu(skb_dst(skb));
-diff --git a/include/net/sock.h b/include/net/sock.h
-index 2210fec..45b54d3 100644
---- a/include/net/sock.h
-+++ b/include/net/sock.h
-@@ -1812,6 +1812,8 @@ struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie);
- 
- struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie);
- 
-+bool sk_mc_loop(struct sock *sk);
-+
- static inline bool sk_can_gso(const struct sock *sk)
- {
- 	return net_gso_ok(sk->sk_route_caps, sk->sk_gso_type);
-diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
-index a28e09c..36508e6 100644
---- a/kernel/bpf/verifier.c
-+++ b/kernel/bpf/verifier.c
-@@ -1380,7 +1380,8 @@ peek_stack:
- 			/* tell verifier to check for equivalent states
- 			 * after every call and jump
- 			 */
--			env->explored_states[t + 1] = STATE_LIST_MARK;
-+			if (t + 1 < insn_cnt)
-+				env->explored_states[t + 1] = STATE_LIST_MARK;
- 		} else {
- 			/* conditional jump with two edges */
- 			ret = push_insn(t, t + 1, FALLTHROUGH, env);
-diff --git a/mm/gup.c b/mm/gup.c
-index 9b2afbf..e29c374 100644
---- a/mm/gup.c
-+++ b/mm/gup.c
-@@ -167,10 +167,10 @@ struct page *follow_page_mask(struct vm_area_struct *vma,
- 	if (pud_none(*pud))
- 		return no_page_table(vma, flags);
- 	if (pud_huge(*pud) && vma->vm_flags & VM_HUGETLB) {
--		if (flags & FOLL_GET)
--			return NULL;
--		page = follow_huge_pud(mm, address, pud, flags & FOLL_WRITE);
--		return page;
-+		page = follow_huge_pud(mm, address, pud, flags);
-+		if (page)
-+			return page;
-+		return no_page_table(vma, flags);
- 	}
- 	if (unlikely(pud_bad(*pud)))
- 		return no_page_table(vma, flags);
-@@ -179,19 +179,10 @@ struct page *follow_page_mask(struct vm_area_struct *vma,
- 	if (pmd_none(*pmd))
- 		return no_page_table(vma, flags);
- 	if (pmd_huge(*pmd) && vma->vm_flags & VM_HUGETLB) {
--		page = follow_huge_pmd(mm, address, pmd, flags & FOLL_WRITE);
--		if (flags & FOLL_GET) {
--			/*
--			 * Refcount on tail pages are not well-defined and
--			 * shouldn't be taken. The caller should handle a NULL
--			 * return when trying to follow tail pages.
--			 */
--			if (PageHead(page))
--				get_page(page);
--			else
--				page = NULL;
--		}
--		return page;
-+		page = follow_huge_pmd(mm, address, pmd, flags);
-+		if (page)
-+			return page;
-+		return no_page_table(vma, flags);
- 	}
- 	if ((flags & FOLL_NUMA) && pmd_numa(*pmd))
- 		return no_page_table(vma, flags);
-diff --git a/mm/hugetlb.c b/mm/hugetlb.c
-index 267e419..a2bfd02 100644
---- a/mm/hugetlb.c
-+++ b/mm/hugetlb.c
-@@ -3700,44 +3700,64 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
- 	return (pte_t *) pmd;
- }
- 
--struct page *
--follow_huge_pmd(struct mm_struct *mm, unsigned long address,
--		pmd_t *pmd, int write)
--{
--	struct page *page;
-+#endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */
- 
--	if (!pmd_present(*pmd))
--		return NULL;
--	page = pte_page(*(pte_t *)pmd);
--	if (page)
--		page += ((address & ~PMD_MASK) >> PAGE_SHIFT);
--	return page;
-+/*
-+ * These functions are overwritable if your architecture needs its own
-+ * behavior.
-+ */
-+struct page * __weak
-+follow_huge_addr(struct mm_struct *mm, unsigned long address,
-+			      int write)
-+{
-+	return ERR_PTR(-EINVAL);
- }
- 
--struct page *
--follow_huge_pud(struct mm_struct *mm, unsigned long address,
--		pud_t *pud, int write)
-+struct page * __weak
-+follow_huge_pmd(struct mm_struct *mm, unsigned long address,
-+		pmd_t *pmd, int flags)
- {
--	struct page *page;
--
--	page = pte_page(*(pte_t *)pud);
--	if (page)
--		page += ((address & ~PUD_MASK) >> PAGE_SHIFT);
-+	struct page *page = NULL;
-+	spinlock_t *ptl;
-+retry:
-+	ptl = pmd_lockptr(mm, pmd);
-+	spin_lock(ptl);
-+	/*
-+	 * make sure that the address range covered by this pmd is not
-+	 * unmapped from other threads.
-+	 */
-+	if (!pmd_huge(*pmd))
-+		goto out;
-+	if (pmd_present(*pmd)) {
-+		page = pte_page(*(pte_t *)pmd) +
-+			((address & ~PMD_MASK) >> PAGE_SHIFT);
-+		if (flags & FOLL_GET)
-+			get_page(page);
-+	} else {
-+		if (is_hugetlb_entry_migration(huge_ptep_get((pte_t *)pmd))) {
-+			spin_unlock(ptl);
-+			__migration_entry_wait(mm, (pte_t *)pmd, ptl);
-+			goto retry;
-+		}
-+		/*
-+		 * hwpoisoned entry is treated as no_page_table in
-+		 * follow_page_mask().
-+		 */
-+	}
-+out:
-+	spin_unlock(ptl);
- 	return page;
- }
- 
--#else /* !CONFIG_ARCH_WANT_GENERAL_HUGETLB */
--
--/* Can be overriden by architectures */
- struct page * __weak
- follow_huge_pud(struct mm_struct *mm, unsigned long address,
--	       pud_t *pud, int write)
-+		pud_t *pud, int flags)
- {
--	BUG();
--	return NULL;
--}
-+	if (flags & FOLL_GET)
-+		return NULL;
- 
--#endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */
-+	return pte_page(*(pte_t *)pud) + ((address & ~PUD_MASK) >> PAGE_SHIFT);
-+}
- 
- #ifdef CONFIG_MEMORY_FAILURE
- 
-diff --git a/mm/migrate.c b/mm/migrate.c
-index 344cdf6..be6d1ed 100644
---- a/mm/migrate.c
-+++ b/mm/migrate.c
-@@ -229,7 +229,7 @@ static void remove_migration_ptes(struct page *old, struct page *new)
-  * get to the page and wait until migration is finished.
-  * When we return from this function the fault will be retried.
-  */
--static void __migration_entry_wait(struct mm_struct *mm, pte_t *ptep,
-+void __migration_entry_wait(struct mm_struct *mm, pte_t *ptep,
- 				spinlock_t *ptl)
- {
- 	pte_t pte;
-@@ -1268,7 +1268,8 @@ static int do_move_page_to_node_array(struct mm_struct *mm,
- 			goto put_and_set;
- 
- 		if (PageHuge(page)) {
--			isolate_huge_page(page, &pagelist);
-+			if (PageHead(page))
-+				isolate_huge_page(page, &pagelist);
- 			goto put_and_set;
- 		}
- 
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 4ff46f8..5dd905c 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -2821,7 +2821,9 @@ static void skb_update_prio(struct sk_buff *skb)
- #define skb_update_prio(skb)
- #endif
- 
--static DEFINE_PER_CPU(int, xmit_recursion);
-+DEFINE_PER_CPU(int, xmit_recursion);
-+EXPORT_SYMBOL(xmit_recursion);
-+
- #define RECURSION_LIMIT 10
- 
- /**
-diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 62c67be..39c444c 100644
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -4141,18 +4141,20 @@ EXPORT_SYMBOL(skb_try_coalesce);
-  */
- void skb_scrub_packet(struct sk_buff *skb, bool xnet)
- {
--	if (xnet)
--		skb_orphan(skb);
- 	skb->tstamp.tv64 = 0;
- 	skb->pkt_type = PACKET_HOST;
- 	skb->skb_iif = 0;
- 	skb->ignore_df = 0;
- 	skb_dst_drop(skb);
--	skb->mark = 0;
--	skb_init_secmark(skb);
- 	secpath_reset(skb);
- 	nf_reset(skb);
- 	nf_reset_trace(skb);
-+
-+	if (!xnet)
-+		return;
-+
-+	skb_orphan(skb);
-+	skb->mark = 0;
- }
- EXPORT_SYMBOL_GPL(skb_scrub_packet);
- 
-diff --git a/net/core/sock.c b/net/core/sock.c
-index 1c7a33d..a91f99f 100644
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -651,6 +651,25 @@ static inline void sock_valbool_flag(struct sock *sk, int bit, int valbool)
- 		sock_reset_flag(sk, bit);
- }
- 
-+bool sk_mc_loop(struct sock *sk)
-+{
-+	if (dev_recursion_level())
-+		return false;
-+	if (!sk)
-+		return true;
-+	switch (sk->sk_family) {
-+	case AF_INET:
-+		return inet_sk(sk)->mc_loop;
-+#if IS_ENABLED(CONFIG_IPV6)
-+	case AF_INET6:
-+		return inet6_sk(sk)->mc_loop;
-+#endif
-+	}
-+	WARN_ON(1);
-+	return true;
-+}
-+EXPORT_SYMBOL(sk_mc_loop);
-+
- /*
-  *	This is meant for all protocols to use and covers goings on
-  *	at the socket level. Everything here is generic.
-diff --git a/net/ipv4/geneve.c b/net/ipv4/geneve.c
-index 394a200..69711d8 100644
---- a/net/ipv4/geneve.c
-+++ b/net/ipv4/geneve.c
-@@ -121,10 +121,6 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,
- 	int min_headroom;
- 	int err;
- 
--	skb = udp_tunnel_handle_offloads(skb, !gs->sock->sk->sk_no_check_tx);
--	if (IS_ERR(skb))
--		return PTR_ERR(skb);
--
- 	min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len
- 			+ GENEVE_BASE_HLEN + opt_len + sizeof(struct iphdr)
- 			+ (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0);
-@@ -139,6 +135,10 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt,
- 	if (unlikely(!skb))
- 		return -ENOMEM;
- 
-+	skb = udp_tunnel_handle_offloads(skb, !gs->sock->sk->sk_no_check_tx);
-+	if (IS_ERR(skb))
-+		return PTR_ERR(skb);
-+
- 	gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) + opt_len);
- 	geneve_build_header(gnvh, tun_flags, vni, opt_len, opt);
- 
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index 075ab4d..08ccca6 100644
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -3104,10 +3104,11 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets,
- 			if (!first_ackt.v64)
- 				first_ackt = last_ackt;
- 
--			if (!(sacked & TCPCB_SACKED_ACKED))
-+			if (!(sacked & TCPCB_SACKED_ACKED)) {
- 				reord = min(pkts_acked, reord);
--			if (!after(scb->end_seq, tp->high_seq))
--				flag |= FLAG_ORIG_SACK_ACKED;
-+				if (!after(scb->end_seq, tp->high_seq))
-+					flag |= FLAG_ORIG_SACK_ACKED;
-+			}
- 		}
- 
- 		if (sacked & TCPCB_SACKED_ACKED)
-diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index d22f544..982347e 100644
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
-@@ -1516,7 +1516,7 @@ void tcp_v4_early_demux(struct sk_buff *skb)
- 		skb->sk = sk;
- 		skb->destructor = sock_edemux;
- 		if (sk->sk_state != TCP_TIME_WAIT) {
--			struct dst_entry *dst = sk->sk_rx_dst;
-+			struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst);
- 
- 			if (dst)
- 				dst = dst_check(dst, 0);
-diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
-index 9790f39..9f29453 100644
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -2931,6 +2931,8 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
- 	}
- #endif
- 
-+	/* Do not fool tcpdump (if any), clean our debris */
-+	skb->tstamp.tv64 = 0;
- 	return skb;
- }
- EXPORT_SYMBOL(tcp_make_synack);
-diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
-index 3f5aa99..0bf56e5 100644
---- a/net/ipv6/ip6_output.c
-+++ b/net/ipv6/ip6_output.c
-@@ -541,7 +541,8 @@ int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
- {
- 	struct sk_buff *frag;
- 	struct rt6_info *rt = (struct rt6_info *)skb_dst(skb);
--	struct ipv6_pinfo *np = skb->sk ? inet6_sk(skb->sk) : NULL;
-+	struct ipv6_pinfo *np = skb->sk && !dev_recursion_level() ?
-+				inet6_sk(skb->sk) : NULL;
- 	struct ipv6hdr *tmp_hdr;
- 	struct frag_hdr *fh;
- 	unsigned int mtu, hlen, left, len;
-diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
-index 6828667..d375ce6 100644
---- a/net/ipv6/ndisc.c
-+++ b/net/ipv6/ndisc.c
-@@ -1216,7 +1216,14 @@ static void ndisc_router_discovery(struct sk_buff *skb)
- 	if (rt)
- 		rt6_set_expires(rt, jiffies + (HZ * lifetime));
- 	if (ra_msg->icmph.icmp6_hop_limit) {
--		in6_dev->cnf.hop_limit = ra_msg->icmph.icmp6_hop_limit;
-+		/* Only set hop_limit on the interface if it is higher than
-+		 * the current hop_limit.
-+		 */
-+		if (in6_dev->cnf.hop_limit < ra_msg->icmph.icmp6_hop_limit) {
-+			in6_dev->cnf.hop_limit = ra_msg->icmph.icmp6_hop_limit;
-+		} else {
-+			ND_PRINTK(2, warn, "RA: Got route advertisement with lower hop_limit than current\n");
-+		}
- 		if (rt)
- 			dst_metric_set(&rt->dst, RTAX_HOPLIMIT,
- 				       ra_msg->icmph.icmp6_hop_limit);
-diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index 9c0b54e..b899793 100644
---- a/net/ipv6/tcp_ipv6.c
-+++ b/net/ipv6/tcp_ipv6.c
-@@ -1409,6 +1409,15 @@ static void tcp_v6_fill_cb(struct sk_buff *skb, const struct ipv6hdr *hdr,
- 	TCP_SKB_CB(skb)->sacked = 0;
- }
- 
-+static void tcp_v6_restore_cb(struct sk_buff *skb)
-+{
-+	/* We need to move header back to the beginning if xfrm6_policy_check()
-+	 * and tcp_v6_fill_cb() are going to be called again.
-+	 */
-+	memmove(IP6CB(skb), &TCP_SKB_CB(skb)->header.h6,
-+		sizeof(struct inet6_skb_parm));
-+}
-+
- static int tcp_v6_rcv(struct sk_buff *skb)
- {
- 	const struct tcphdr *th;
-@@ -1541,6 +1550,7 @@ do_time_wait:
- 			inet_twsk_deschedule(tw, &tcp_death_row);
- 			inet_twsk_put(tw);
- 			sk = sk2;
-+			tcp_v6_restore_cb(skb);
- 			goto process;
- 		}
- 		/* Fall through to ACK */
-@@ -1549,6 +1559,7 @@ do_time_wait:
- 		tcp_v6_timewait_ack(sk, skb);
- 		break;
- 	case TCP_TW_RST:
-+		tcp_v6_restore_cb(skb);
- 		goto no_tcp_socket;
- 	case TCP_TW_SUCCESS:
- 		;
-@@ -1583,7 +1594,7 @@ static void tcp_v6_early_demux(struct sk_buff *skb)
- 		skb->sk = sk;
- 		skb->destructor = sock_edemux;
- 		if (sk->sk_state != TCP_TIME_WAIT) {
--			struct dst_entry *dst = sk->sk_rx_dst;
-+			struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst);
- 
- 			if (dst)
- 				dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie);
-diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
-index 2034c6d..296cc24 100644
---- a/net/openvswitch/vport.c
-+++ b/net/openvswitch/vport.c
-@@ -274,10 +274,8 @@ void ovs_vport_del(struct vport *vport)
- 	ASSERT_OVSL();
- 
- 	hlist_del_rcu(&vport->hash_node);
--
--	vport->ops->destroy(vport);
--
- 	module_put(vport->ops->owner);
-+	vport->ops->destroy(vport);
- }
- 
- /**
diff --git a/3.2.68/0000_README b/3.2.68/0000_README
index fc115bd..6316628 100644
--- a/3.2.68/0000_README
+++ b/3.2.68/0000_README
@@ -190,7 +190,7 @@ Patch:	1067_linux-3.2.68.patch
 From:	http://www.kernel.org
 Desc:	Linux 3.2.68
 
-Patch:	4420_grsecurity-3.1-3.2.68-201505021011.patch
+Patch:	4420_grsecurity-3.1-3.2.68-201505042051.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.2.68/4420_grsecurity-3.1-3.2.68-201505021011.patch b/3.2.68/4420_grsecurity-3.1-3.2.68-201505042051.patch
index e21a5c6..a45a2c2 100644
--- a/3.2.68/4420_grsecurity-3.1-3.2.68-201505021011.patch
+++ b/3.2.68/4420_grsecurity-3.1-3.2.68-201505042051.patch
@@ -38986,9 +38986,34 @@ index a0b69ae0..98ea0f3 100644
  			     sizeof(*exec2_list) * args->buffer_count);
  	if (ret != 0) {
 diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
-index 13b0289..5fb9e24 100644
+index 13b0289..5c254c1 100644
 --- a/drivers/gpu/drm/i915/i915_ioc32.c
 +++ b/drivers/gpu/drm/i915/i915_ioc32.c
+@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
+ 	    || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
+ 	    || __put_user(batchbuffer32.num_cliprects,
+ 			  &batchbuffer->num_cliprects)
+-	    || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
++	    || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
+ 			  &batchbuffer->cliprects))
+ 		return -EFAULT;
+ 
+@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
+ 
+ 	cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
+ 	if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
+-	    || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
++	    || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
+ 			  &cmdbuffer->buf)
+ 	    || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
+ 	    || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
+ 	    || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
+ 	    || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
+-	    || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
++	    || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
+ 			  &cmdbuffer->cliprects))
+ 		return -EFAULT;
+ 
 @@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
  			 (unsigned long)request);
  }
@@ -38998,7 +39023,7 @@ index 13b0289..5fb9e24 100644
  	[DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
  	[DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
  	[DRM_I915_GETPARAM] = compat_i915_getparam,
-@@ -201,18 +201,15 @@ drm_ioctl_compat_t *i915_compat_ioctls[] = {
+@@ -201,17 +201,13 @@ drm_ioctl_compat_t *i915_compat_ioctls[] = {
  long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -39012,14 +39037,12 @@ index 13b0289..5fb9e24 100644
 -		fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
 index 93e74fb..4a1182d 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
@@ -39171,7 +39194,7 @@ index 54558a0..2d97005 100644
  
  	unsigned int fb_cpp;
 diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
-index c1f877b..0ae6960 100644
+index c1f877b..d5fc7ad 100644
 --- a/drivers/gpu/drm/mga/mga_ioc32.c
 +++ b/drivers/gpu/drm/mga/mga_ioc32.c
 @@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
@@ -39183,7 +39206,7 @@ index c1f877b..0ae6960 100644
  	[DRM_MGA_INIT] = compat_mga_init,
  	[DRM_MGA_GETPARAM] = compat_mga_getparam,
  	[DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
-@@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
+@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
  long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -39197,14 +39220,12 @@ index c1f877b..0ae6960 100644
 -		fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
 index 2581202..f230a8d9 100644
 --- a/drivers/gpu/drm/mga/mga_irq.c
@@ -39450,7 +39471,7 @@ index 930c71b..499aded 100644
  	u32 color_fmt;
  	unsigned int front_offset;
 diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
-index 51c99fc..8acd411 100644
+index 51c99fc..bae6026 100644
 --- a/drivers/gpu/drm/r128/r128_ioc32.c
 +++ b/drivers/gpu/drm/r128/r128_ioc32.c
 @@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
@@ -39462,7 +39483,7 @@ index 51c99fc..8acd411 100644
  	[DRM_R128_INIT] = compat_r128_init,
  	[DRM_R128_DEPTH] = compat_r128_depth,
  	[DRM_R128_STIPPLE] = compat_r128_stipple,
-@@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
+@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
  long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -39476,14 +39497,12 @@ index 51c99fc..8acd411 100644
 -		fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
 index 429d5a0..7e899ed 100644
 --- a/drivers/gpu/drm/r128/r128_irq.c
@@ -39753,7 +39772,7 @@ index 76ec0e9..6feb1a3 100644
  	INIT_LIST_HEAD(&rdev->fence_drv.emited);
  	INIT_LIST_HEAD(&rdev->fence_drv.signaled);
 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
-index 48b7cea..b10b216 100644
+index 48b7cea..17695c1 100644
 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
@@ -39774,7 +39793,7 @@ index 48b7cea..b10b216 100644
  	[DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
  	[DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
  	[DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
-@@ -394,18 +394,15 @@ drm_ioctl_compat_t *radeon_compat_ioctls[] = {
+@@ -394,17 +394,13 @@ drm_ioctl_compat_t *radeon_compat_ioctls[] = {
  long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -39788,14 +39807,12 @@ index 48b7cea..b10b216 100644
 -		fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
 index 00da384..32f972d 100644
 --- a/drivers/gpu/drm/radeon/radeon_irq.c
diff --git a/3.19.6/0000_README b/4.0.1/0000_README
index a40b535..9db745a 100644
--- a/3.19.6/0000_README
+++ b/4.0.1/0000_README
@@ -2,11 +2,7 @@ README
 -----------------------------------------------------------------------------
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	1005_linux-3.19.6.patch
-From:	http://www.kernel.org
-Desc:	Linux 3.19.6
-
-Patch:	4420_grsecurity-3.1-3.19.6-201505021013.patch
+Patch:	4420_grsecurity-3.1-4.0.1-201505042053.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
@@ -45,4 +41,4 @@ Desc:	Disables VDSO_COMPAT operation completely
 
 Patch: 4475_emutramp_default_on.patch
 From:  Anthony G. Basile <blueness@gentoo.org>
-Dnux-3.18.4.patchesc:  Set PAX_EMUTRAMP default on for libffi, bugs #329499 and #457194
+Desc:  Set PAX_EMUTRAMP default on for libffi, bugs #329499 and #457194
diff --git a/3.19.6/4420_grsecurity-3.1-3.19.6-201505021013.patch b/4.0.1/4420_grsecurity-3.1-4.0.1-201505042053.patch
index 7e681c9..505b676 100644
--- a/3.19.6/4420_grsecurity-3.1-3.19.6-201505021013.patch
+++ b/4.0.1/4420_grsecurity-3.1-4.0.1-201505042053.patch
@@ -235,7 +235,7 @@ index 9de9813..1462492 100644
 +zconf.lex.c
  zoffset.h
 diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
-index a311db8..415b28c 100644
+index 74b6c6d..eac0e77 100644
 --- a/Documentation/kbuild/makefiles.txt
 +++ b/Documentation/kbuild/makefiles.txt
 @@ -23,10 +23,11 @@ This document describes the Linux kernel Makefiles.
@@ -254,7 +254,7 @@ index a311db8..415b28c 100644
  
  	=== 5 Kbuild clean infrastructure
  
-@@ -642,7 +643,29 @@ Both possibilities are described in the following.
+@@ -643,7 +644,29 @@ Both possibilities are described in the following.
  	Finally, the two .o files are linked to the executable, lxdialog.
  	Note: The syntax <executable>-y is not permitted for host-programs.
  
@@ -285,7 +285,7 @@ index a311db8..415b28c 100644
  
  	kbuild offers support for host programs written in C++. This was
  	introduced solely to support kconfig, and is not recommended
-@@ -665,7 +688,7 @@ Both possibilities are described in the following.
+@@ -666,7 +689,7 @@ Both possibilities are described in the following.
  		qconf-cxxobjs := qconf.o
  		qconf-objs    := check.o
  
@@ -294,7 +294,7 @@ index a311db8..415b28c 100644
  
  	When compiling host programs, it is possible to set specific flags.
  	The programs will always be compiled utilising $(HOSTCC) passed
-@@ -693,7 +716,7 @@ Both possibilities are described in the following.
+@@ -694,7 +717,7 @@ Both possibilities are described in the following.
  	When linking qconf, it will be passed the extra option
  	"-L$(QTDIR)/lib".
  
@@ -303,7 +303,7 @@ index a311db8..415b28c 100644
  
  	Kbuild will only build host-programs when they are referenced
  	as a prerequisite.
-@@ -724,7 +747,7 @@ Both possibilities are described in the following.
+@@ -725,7 +748,7 @@ Both possibilities are described in the following.
  	This will tell kbuild to build lxdialog even if not referenced in
  	any rule.
  
@@ -313,10 +313,10 @@ index a311db8..415b28c 100644
  	A typical pattern in a Kbuild file looks like this:
  
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index 176d4fe..6eabd3c 100644
+index bfcb1a6..2dae09b 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -1191,6 +1191,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -1203,6 +1203,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
  			Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
  			Default: 1024
  
@@ -330,7 +330,7 @@ index 176d4fe..6eabd3c 100644
  	hashdist=	[KNL,NUMA] Large hashes allocated during boot
  			are distributed across NUMA nodes.  Defaults on
  			for 64-bit NUMA, off otherwise.
-@@ -2283,6 +2290,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -2300,6 +2307,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
  			noexec=on: enable non-executable mappings (default)
  			noexec=off: disable non-executable mappings
  
@@ -341,7 +341,7 @@ index 176d4fe..6eabd3c 100644
  	nosmap		[X86]
  			Disable SMAP (Supervisor Mode Access Prevention)
  			even if it is supported by processor.
-@@ -2584,6 +2595,30 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -2601,6 +2612,30 @@ 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.
  
@@ -373,7 +373,7 @@ index 176d4fe..6eabd3c 100644
  
  	pcd.		[PARIDE]
 diff --git a/Makefile b/Makefile
-index 65c7c87..abe7f93 100644
+index f499cd2..37a187f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -298,7 +298,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -480,7 +480,7 @@ index 65c7c87..abe7f93 100644
  endif
  ifdef CONFIG_DEBUG_INFO_DWARF4
  KBUILD_CFLAGS	+= $(call cc-option, -gdwarf-4,)
-@@ -879,7 +947,7 @@ export mod_sign_cmd
+@@ -884,7 +952,7 @@ export mod_sign_cmd
  
  
  ifeq ($(KBUILD_EXTMOD),)
@@ -489,7 +489,7 @@ index 65c7c87..abe7f93 100644
  
  vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
  		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-@@ -926,6 +994,8 @@ endif
+@@ -934,6 +1002,8 @@ endif
  
  # The actual objects are generated when descending,
  # make sure no implicit rule kicks in
@@ -498,7 +498,7 @@ index 65c7c87..abe7f93 100644
  $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
  
  # Handle descending into subdirectories listed in $(vmlinux-dirs)
-@@ -935,7 +1005,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
+@@ -943,7 +1013,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
  # Error messages still appears in the original language
  
  PHONY += $(vmlinux-dirs)
@@ -507,7 +507,7 @@ index 65c7c87..abe7f93 100644
  	$(Q)$(MAKE) $(build)=$@
  
  define filechk_kernel.release
-@@ -978,10 +1048,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
+@@ -986,10 +1056,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
  
  archprepare: archheaders archscripts prepare1 scripts_basic
  
@@ -521,7 +521,7 @@ index 65c7c87..abe7f93 100644
  prepare: prepare0
  
  # Generate some files
-@@ -1095,6 +1168,8 @@ all: modules
+@@ -1103,6 +1176,8 @@ all: modules
  # using awk while concatenating to the final file.
  
  PHONY += modules
@@ -530,7 +530,7 @@ index 65c7c87..abe7f93 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.';
-@@ -1110,7 +1185,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
+@@ -1118,7 +1193,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
  
  # Target to prepare building external modules
  PHONY += modules_prepare
@@ -539,19 +539,19 @@ index 65c7c87..abe7f93 100644
  
  # Target to install modules
  PHONY += modules_install
-@@ -1176,7 +1251,10 @@ MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
+@@ -1184,7 +1259,10 @@ MRPROPER_FILES += .config .config.old .version .old_version \
  		  Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
  		  signing_key.priv signing_key.x509 x509.genkey		\
  		  extra_certificates signing_key.x509.keyid		\
--		  signing_key.x509.signer
-+		  signing_key.x509.signer \
+-		  signing_key.x509.signer vmlinux-gdb.py
++		  signing_key.x509.signer vmlinux-gdb.py \
 +		  tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
 +		  tools/gcc/size_overflow_plugin/size_overflow_hash.h \
 +		  tools/gcc/randomize_layout_seed.h
  
  # clean - Delete most, but leave enough to build external modules
  #
-@@ -1215,7 +1293,7 @@ distclean: mrproper
+@@ -1223,7 +1301,7 @@ distclean: mrproper
  	@find $(srctree) $(RCS_FIND_IGNORE) \
  		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
  		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
@@ -560,7 +560,7 @@ index 65c7c87..abe7f93 100644
  		-type f -print | xargs rm -f
  
  
-@@ -1381,6 +1459,8 @@ PHONY += $(module-dirs) modules
+@@ -1389,6 +1467,8 @@ PHONY += $(module-dirs) modules
  $(module-dirs): crmodverdir $(objtree)/Module.symvers
  	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
  
@@ -569,7 +569,7 @@ index 65c7c87..abe7f93 100644
  modules: $(module-dirs)
  	@$(kecho) '  Building modules, stage 2.';
  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1521,17 +1601,21 @@ else
+@@ -1529,17 +1609,21 @@ else
          target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
  endif
  
@@ -595,7 +595,7 @@ index 65c7c87..abe7f93 100644
  	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
  %.symtypes: %.c prepare scripts FORCE
  	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-@@ -1543,11 +1627,15 @@ endif
+@@ -1551,11 +1635,15 @@ endif
  	$(build)=$(build-dir)
  # Make sure the latest headers are built for Documentation
  Documentation/: headers_install
@@ -694,10 +694,10 @@ index aab14a0..b4fa3e7 100644
  
  static inline void
 diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
-index d8f9b7e..f6222fa 100644
+index a9a1195..e9b8417 100644
 --- a/arch/alpha/include/asm/pgtable.h
 +++ b/arch/alpha/include/asm/pgtable.h
-@@ -102,6 +102,17 @@ struct vm_area_struct;
+@@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED	__pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
  #define PAGE_READONLY	__pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -944,10 +944,10 @@ index 9d0ac09..479a962 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 97d07ed..2931f2b 100644
+index cf4c0c9..a87ecf5 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1727,7 +1727,7 @@ config ALIGNMENT_TRAP
+@@ -1735,7 +1735,7 @@ config ALIGNMENT_TRAP
  
  config UACCESS_WITH_MEMCPY
  	bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
@@ -956,7 +956,7 @@ index 97d07ed..2931f2b 100644
  	default y if CPU_FEROCEON
  	help
  	  Implement faster copy_to_user and clear_user methods for CPU
-@@ -1991,6 +1991,7 @@ config XIP_PHYS_ADDR
+@@ -1999,6 +1999,7 @@ config XIP_PHYS_ADDR
  config KEXEC
  	bool "Kexec system call (EXPERIMENTAL)"
  	depends on (!SMP || PM_SLEEP_SMP)
@@ -1835,13 +1835,13 @@ index f98c7f3..e5c626d 100644
  	MT_MEMORY_DMA_READY,
  };
 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
-index 891a56b..48f337e 100644
+index 563b92f..689d58e 100644
 --- a/arch/arm/include/asm/outercache.h
 +++ b/arch/arm/include/asm/outercache.h
-@@ -36,7 +36,7 @@ struct outer_cache_fns {
- 
+@@ -39,7 +39,7 @@ struct outer_cache_fns {
  	/* This is an ARM L2C thing */
  	void (*write_sec)(unsigned long, unsigned);
+ 	void (*configure)(const struct l2x0_regs *);
 -};
 +} __no_const;
  
@@ -1950,10 +1950,10 @@ index 5e68278..1869bae 100644
  #define PTE_EXT_AP0		(_AT(pteval_t, 1) << 4)
  #define PTE_EXT_AP1		(_AT(pteval_t, 2) << 4)
 diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
-index f027941..f36ce30 100644
+index bfd662e..f6cbb02 100644
 --- a/arch/arm/include/asm/pgtable-2level.h
 +++ b/arch/arm/include/asm/pgtable-2level.h
-@@ -126,6 +126,9 @@
+@@ -127,6 +127,9 @@
  #define L_PTE_SHARED		(_AT(pteval_t, 1) << 10)	/* shared(v6), coherent(xsc3) */
  #define L_PTE_NONE		(_AT(pteval_t, 1) << 11)
  
@@ -1964,10 +1964,10 @@ index f027941..f36ce30 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.h b/arch/arm/include/asm/pgtable-3level.h
-index a31ecdad..95e98d4 100644
+index a745a2a..481350a 100644
 --- a/arch/arm/include/asm/pgtable-3level.h
 +++ b/arch/arm/include/asm/pgtable-3level.h
-@@ -81,6 +81,7 @@
+@@ -80,6 +80,7 @@
  #define L_PTE_USER		(_AT(pteval_t, 1) << 6)		/* AP[1] */
  #define L_PTE_SHARED		(_AT(pteval_t, 3) << 8)		/* SH[1:0], inner shareable */
  #define L_PTE_YOUNG		(_AT(pteval_t, 1) << 10)	/* AF */
@@ -1975,7 +1975,7 @@ index a31ecdad..95e98d4 100644
  #define L_PTE_XN		(_AT(pteval_t, 1) << 54)	/* XN */
  #define L_PTE_DIRTY		(_AT(pteval_t, 1) << 55)
  #define L_PTE_SPECIAL		(_AT(pteval_t, 1) << 56)
-@@ -92,10 +93,12 @@
+@@ -91,10 +92,12 @@
  #define L_PMD_SECT_SPLITTING	(_AT(pmdval_t, 1) << 56)
  #define L_PMD_SECT_NONE		(_AT(pmdval_t, 1) << 57)
  #define L_PMD_SECT_RDONLY	(_AT(pteval_t, 1) << 58)
@@ -1989,7 +1989,7 @@ index a31ecdad..95e98d4 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 d5cac54..906ea3e 100644
+index f403541..b10df68 100644
 --- a/arch/arm/include/asm/pgtable.h
 +++ b/arch/arm/include/asm/pgtable.h
 @@ -33,6 +33,9 @@
@@ -2108,10 +2108,10 @@ index 18f5a55..5072a40 100644
  struct of_cpu_method {
  	const char *method;
 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
-index d890e41..3921292 100644
+index 72812a1..335f4f3 100644
 --- a/arch/arm/include/asm/thread_info.h
 +++ b/arch/arm/include/asm/thread_info.h
-@@ -78,9 +78,9 @@ struct thread_info {
+@@ -77,9 +77,9 @@ struct thread_info {
  	.flags		= 0,						\
  	.preempt_count	= INIT_PREEMPT_COUNT,				\
  	.addr_limit	= KERNEL_DS,					\
@@ -2121,10 +2121,10 @@ index d890e41..3921292 100644
 +	.cpu_domain	= domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) |	\
 +			  domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) |	\
 +			  domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT),	\
- 	.restart_block	= {						\
- 		.fn	= do_no_restart_syscall,			\
- 	},								\
-@@ -159,7 +159,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+ }
+ 
+ #define init_thread_info	(init_thread_union.thread_info)
+@@ -155,7 +155,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 */
@@ -2137,7 +2137,7 @@ index d890e41..3921292 100644
  #define TIF_USING_IWMMXT	17
  #define TIF_MEMDIE		18	/* is terminating due to OOM killer */
  #define TIF_RESTORE_SIGMASK	20
-@@ -173,10 +177,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
+@@ -169,10 +173,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)
@@ -2173,7 +2173,7 @@ index 5f833f7..76e6644 100644
  		}
  
 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index 4767eb9..bf00668 100644
+index ce0786e..a80c264 100644
 --- a/arch/arm/include/asm/uaccess.h
 +++ b/arch/arm/include/asm/uaccess.h
 @@ -18,6 +18,7 @@
@@ -2192,7 +2192,7 @@ index 4767eb9..bf00668 100644
 +	modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
  }
  
- #define segment_eq(a,b)	((a) == (b))
+ #define segment_eq(a, b)	((a) == (b))
  
 +#define __HAVE_ARCH_PAX_OPEN_USERLAND
 +#define __HAVE_ARCH_PAX_CLOSE_USERLAND
@@ -2226,13 +2226,13 @@ index 4767eb9..bf00668 100644
  	__asm__("cmp %2, %0; movlo %0, #0" \
 @@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
  
- #define get_user(x,p)							\
+ #define get_user(x, p)							\
  	({								\
 +		int __e;						\
  		might_fault();						\
--		__get_user_check(x,p);					\
+-		__get_user_check(x, p);					\
 +		pax_open_userland();					\
-+		__e = __get_user_check(x,p);				\
++		__e = __get_user_check((x), (p));			\
 +		pax_close_userland();					\
 +		__e;							\
  	 })
@@ -2240,13 +2240,13 @@ index 4767eb9..bf00668 100644
  extern int __put_user_1(void *, unsigned int);
 @@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
  
- #define put_user(x,p)							\
+ #define put_user(x, p)							\
  	({								\
 +		int __e;						\
  		might_fault();						\
--		__put_user_check(x,p);					\
+-		__put_user_check(x, p);					\
 +		pax_open_userland();					\
-+		__e = __put_user_check(x,p);				\
++		__e = __put_user_check((x), (p));			\
 +		pax_close_userland();					\
 +		__e;							\
  	 })
@@ -2256,42 +2256,42 @@ index 4767eb9..bf00668 100644
  
  #endif /* CONFIG_MMU */
  
-+#define access_ok_noprefault(type,addr,size) access_ok((type),(addr),(size))
- #define access_ok(type,addr,size)	(__range_ok(addr,size) == 0)
++#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
+ #define access_ok(type, addr, size)	(__range_ok(addr, size) == 0)
  
  #define user_addr_max() \
 @@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
- #define __get_user(x,ptr)						\
+ #define __get_user(x, ptr)						\
  ({									\
  	long __gu_err = 0;						\
 +	pax_open_userland();						\
- 	__get_user_err((x),(ptr),__gu_err);				\
+ 	__get_user_err((x), (ptr), __gu_err);				\
 +	pax_close_userland();						\
  	__gu_err;							\
  })
  
- #define __get_user_error(x,ptr,err)					\
+ #define __get_user_error(x, ptr, err)					\
  ({									\
 +	pax_open_userland();						\
- 	__get_user_err((x),(ptr),err);					\
+ 	__get_user_err((x), (ptr), err);				\
 +	pax_close_userland();						\
  	(void) 0;							\
  })
  
 @@ -368,13 +409,17 @@ do {									\
- #define __put_user(x,ptr)						\
+ #define __put_user(x, ptr)						\
  ({									\
  	long __pu_err = 0;						\
 +	pax_open_userland();						\
- 	__put_user_err((x),(ptr),__pu_err);				\
+ 	__put_user_err((x), (ptr), __pu_err);				\
 +	pax_close_userland();						\
  	__pu_err;							\
  })
  
- #define __put_user_error(x,ptr,err)					\
+ #define __put_user_error(x, ptr, err)					\
  ({									\
 +	pax_open_userland();						\
- 	__put_user_err((x),(ptr),err);					\
+ 	__put_user_err((x), (ptr), err);				\
 +	pax_close_userland();						\
  	(void) 0;							\
  })
@@ -2342,8 +2342,8 @@ index 4767eb9..bf00668 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)
+ #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)
 @@ -487,6 +565,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)
@@ -2404,10 +2404,10 @@ index a88671c..1cc895e 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 2f5555d..d493c91 100644
+index 672b219..4aa120a 100644
 --- a/arch/arm/kernel/entry-armv.S
 +++ b/arch/arm/kernel/entry-armv.S
-@@ -47,6 +47,87 @@
+@@ -48,6 +48,87 @@
  9997:
  	.endm
  
@@ -2495,7 +2495,7 @@ index 2f5555d..d493c91 100644
  	.macro	pabt_helper
  	@ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
  #ifdef MULTI_PABORT
-@@ -89,11 +170,15 @@
+@@ -90,11 +171,15 @@
   * Invalid mode handlers
   */
  	.macro	inv_entry, reason
@@ -2511,7 +2511,7 @@ index 2f5555d..d493c91 100644
  	mov	r1, #\reason
  	.endm
  
-@@ -149,7 +234,11 @@ ENDPROC(__und_invalid)
+@@ -150,7 +235,11 @@ ENDPROC(__und_invalid)
  	.macro	svc_entry, stack_hole=0, trace=1
   UNWIND(.fnstart		)
   UNWIND(.save {r0 - pc}		)
@@ -2523,7 +2523,7 @@ index 2f5555d..d493c91 100644
  #ifdef CONFIG_THUMB2_KERNEL
   SPFIX(	str	r0, [sp]	)	@ temporarily saved
   SPFIX(	mov	r0, sp		)
-@@ -164,7 +253,12 @@ ENDPROC(__und_invalid)
+@@ -165,7 +254,12 @@ ENDPROC(__und_invalid)
  	ldmia	r0, {r3 - r5}
  	add	r7, sp, #S_SP - 4	@ here for interlock avoidance
  	mov	r6, #-1			@  ""  ""      ""       ""
@@ -2536,7 +2536,7 @@ index 2f5555d..d493c91 100644
   SPFIX(	addeq	r2, r2, #4	)
  	str	r3, [sp, #-4]!		@ save the "real" r0 copied
  					@ from the exception stack
-@@ -368,6 +462,9 @@ ENDPROC(__fiq_abt)
+@@ -369,6 +463,9 @@ ENDPROC(__fiq_abt)
  	.macro	usr_entry, trace=1
   UNWIND(.fnstart	)
   UNWIND(.cantunwind	)	@ don't unwind the user space
@@ -2546,7 +2546,7 @@ index 2f5555d..d493c91 100644
  	sub	sp, sp, #S_FRAME_SIZE
   ARM(	stmib	sp, {r1 - r12}	)
   THUMB(	stmia	sp, {r0 - r12}	)
-@@ -478,7 +575,9 @@ __und_usr:
+@@ -479,7 +576,9 @@ __und_usr:
  	tst	r3, #PSR_T_BIT			@ Thumb mode?
  	bne	__und_usr_thumb
  	sub	r4, r2, #4			@ ARM instr at LR - 4
@@ -2556,7 +2556,7 @@ index 2f5555d..d493c91 100644
   ARM_BE8(rev	r0, r0)				@ little endian instruction
  
  	@ r0 = 32-bit ARM instruction which caused the exception
-@@ -512,11 +611,15 @@ __und_usr_thumb:
+@@ -513,11 +612,15 @@ __und_usr_thumb:
   */
  	.arch	armv6t2
  #endif
@@ -2572,7 +2572,7 @@ index 2f5555d..d493c91 100644
  ARM_BE8(rev16	r0, r0)				@ little endian instruction
  	add	r2, r2, #2			@ r2 is PC + 2, make it PC + 4
  	str	r2, [sp, #S_PC]			@ it's a 2x16bit instr, update
-@@ -546,7 +649,8 @@ ENDPROC(__und_usr)
+@@ -547,7 +650,8 @@ ENDPROC(__und_usr)
   */
  	.pushsection .fixup, "ax"
  	.align	2
@@ -2582,7 +2582,7 @@ index 2f5555d..d493c91 100644
  	ret	r9
  	.popsection
  	.pushsection __ex_table,"a"
-@@ -766,7 +870,7 @@ ENTRY(__switch_to)
+@@ -767,7 +871,7 @@ ENTRY(__switch_to)
   THUMB(	str	lr, [ip], #4		   )
  	ldr	r4, [r2, #TI_TP_VALUE]
  	ldr	r5, [r2, #TI_TP_VALUE + 4]
@@ -2591,7 +2591,7 @@ index 2f5555d..d493c91 100644
  	ldr	r6, [r2, #TI_CPU_DOMAIN]
  #endif
  	switch_tls r1, r4, r5, r3, r7
-@@ -775,7 +879,7 @@ ENTRY(__switch_to)
+@@ -776,7 +880,7 @@ ENTRY(__switch_to)
  	ldr	r8, =__stack_chk_guard
  	ldr	r7, [r7, #TSK_STACK_CANARY]
  #endif
@@ -2768,10 +2768,10 @@ index 059c3da..8e45cfc 100644
  		flush_icache_range((unsigned long)base + offset, offset +
  				   length);
 diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
-index 664eee8..f470938 100644
+index 0196327..50ac8895 100644
 --- a/arch/arm/kernel/head.S
 +++ b/arch/arm/kernel/head.S
-@@ -437,7 +437,7 @@ __enable_mmu:
+@@ -444,7 +444,7 @@ __enable_mmu:
  	mov	r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
  		      domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
  		      domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
@@ -2781,7 +2781,7 @@ index 664eee8..f470938 100644
  	mcr	p15, 0, r4, c2, c0, 0		@ load page table pointer
  #endif
 diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
-index bea7db9..a210d10 100644
+index 2e11961..07f0704 100644
 --- a/arch/arm/kernel/module.c
 +++ b/arch/arm/kernel/module.c
 @@ -38,12 +38,39 @@
@@ -2794,8 +2794,8 @@ index bea7db9..a210d10 100644
 +	if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
 +		return NULL;
  	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
--				GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
-+				GFP_KERNEL, prot, NUMA_NO_NODE,
+-				GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
++				GFP_KERNEL, prot, 0, NUMA_NO_NODE,
  				__builtin_return_address(0));
  }
 +
@@ -2827,10 +2827,10 @@ index bea7db9..a210d10 100644
  
  int
 diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
-index 5038960..4aa71d8 100644
+index 69bda1a..755113a 100644
 --- a/arch/arm/kernel/patch.c
 +++ b/arch/arm/kernel/patch.c
-@@ -67,6 +67,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
+@@ -66,6 +66,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
  	else
  		__acquire(&patch_lock);
  
@@ -2838,7 +2838,7 @@ index 5038960..4aa71d8 100644
  	if (thumb2 && __opcode_is_thumb16(insn)) {
  		*(u16 *)waddr = __opcode_to_mem_thumb16(insn);
  		size = sizeof(u16);
-@@ -98,6 +99,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
+@@ -97,6 +98,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
  		*(u32 *)waddr = insn;
  		size = sizeof(u32);
  	}
@@ -3022,7 +3022,7 @@ index ef9119f..31995a3 100644
  #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
  	if (secure_computing() == -1)
 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index e55408e..14d9998 100644
+index 1d60beb..4aa25d5 100644
 --- a/arch/arm/kernel/setup.c
 +++ b/arch/arm/kernel/setup.c
 @@ -105,21 +105,23 @@ EXPORT_SYMBOL(elf_hwcap);
@@ -3054,9 +3054,9 @@ index e55408e..14d9998 100644
  EXPORT_SYMBOL(outer_cache);
  #endif
  
-@@ -253,9 +255,13 @@ static int __get_cpu_architecture(void)
- 		asm("mrc	p15, 0, %0, c0, c1, 4"
- 		    : "=r" (mmfr0));
+@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
+ 		 * Register 0 and check for VMSAv7 or PMSAv7 */
+ 		unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);
  		if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
 -		    (mmfr0 & 0x000000f0) >= 0x00000030)
 +		    (mmfr0 & 0x000000f0) >= 0x00000030) {
@@ -3071,7 +3071,7 @@ index e55408e..14d9998 100644
  			cpu_arch = CPU_ARCH_ARMv6;
  		else
 diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
-index 8aa6f1b..0899e08 100644
+index 023ac90..0a69950 100644
 --- a/arch/arm/kernel/signal.c
 +++ b/arch/arm/kernel/signal.c
 @@ -24,8 +24,6 @@
@@ -3240,7 +3240,7 @@ index b31aa73..cc4b7a1 100644
  # ifdef CONFIG_ARM_KERNMEM_PERMS
  	. = ALIGN(1<<SECTION_SHIFT);
 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
-index 0b0d58a..988cb45 100644
+index 5560f74..1cc00ea 100644
 --- a/arch/arm/kvm/arm.c
 +++ b/arch/arm/kvm/arm.c
 @@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
@@ -3252,7 +3252,7 @@ index 0b0d58a..988cb45 100644
  static u8 kvm_next_vmid;
  static DEFINE_SPINLOCK(kvm_vmid_lock);
  
-@@ -351,7 +351,7 @@ void force_vm_exit(const cpumask_t *mask)
+@@ -358,7 +358,7 @@ void force_vm_exit(const cpumask_t *mask)
   */
  static bool need_new_vmid_gen(struct kvm *kvm)
  {
@@ -3261,7 +3261,7 @@ index 0b0d58a..988cb45 100644
  }
  
  /**
-@@ -384,7 +384,7 @@ static void update_vttbr(struct kvm *kvm)
+@@ -391,7 +391,7 @@ static void update_vttbr(struct kvm *kvm)
  
  	/* First user of a new VMID generation? */
  	if (unlikely(kvm_next_vmid == 0)) {
@@ -3270,7 +3270,7 @@ index 0b0d58a..988cb45 100644
  		kvm_next_vmid = 1;
  
  		/*
-@@ -401,7 +401,7 @@ static void update_vttbr(struct kvm *kvm)
+@@ -408,7 +408,7 @@ static void update_vttbr(struct kvm *kvm)
  		kvm_call_hyp(__kvm_flush_vm_context);
  	}
  
@@ -3279,7 +3279,7 @@ index 0b0d58a..988cb45 100644
  	kvm->arch.vmid = kvm_next_vmid;
  	kvm_next_vmid++;
  
-@@ -1038,7 +1038,7 @@ static void check_kvm_target_cpu(void *ret)
+@@ -1088,7 +1088,7 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
  /**
   * Initialize Hyp-mode and memory mappings on all CPUs.
   */
@@ -3434,21 +3434,8 @@ index 3e58d71..029817c 100644
  {
  	/* See rational for this in __copy_to_user() above. */
  	if (n < 64)
-diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
-index ce25e85..3dd7850 100644
---- a/arch/arm/mach-at91/setup.c
-+++ b/arch/arm/mach-at91/setup.c
-@@ -57,7 +57,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
- 
- 	desc->pfn = __phys_to_pfn(base);
- 	desc->length = length;
--	desc->type = MT_MEMORY_RWX_NONCACHED;
-+	desc->type = MT_MEMORY_RW_NONCACHED;
- 
- 	pr_info("sram at 0x%lx of 0x%x mapped at 0x%lx\n",
- 		base, length, desc->virtual);
 diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
-index f8e7dcd..17ee921 100644
+index 318d127..9aab0d1 100644
 --- a/arch/arm/mach-exynos/suspend.c
 +++ b/arch/arm/mach-exynos/suspend.c
 @@ -18,6 +18,7 @@
@@ -3459,7 +3446,7 @@ index f8e7dcd..17ee921 100644
  #include <linux/irqchip/arm-gic.h>
  #include <linux/err.h>
  #include <linux/regulator/machine.h>
-@@ -558,8 +559,10 @@ void __init exynos_pm_init(void)
+@@ -632,8 +633,10 @@ void __init exynos_pm_init(void)
  	tmp |= pm_data->wake_disable_mask;
  	pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
  
@@ -3473,7 +3460,7 @@ index f8e7dcd..17ee921 100644
  	register_syscore_ops(&exynos_pm_syscore_ops);
  	suspend_set_ops(&exynos_suspend_ops);
 diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
-index 7f352de..6dc0929 100644
+index 0662087..004d163 100644
 --- a/arch/arm/mach-keystone/keystone.c
 +++ b/arch/arm/mach-keystone/keystone.c
 @@ -27,7 +27,7 @@
@@ -3486,10 +3473,10 @@ index 7f352de..6dc0929 100644
  
  static int keystone_platform_notifier(struct notifier_block *nb,
 diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
-index ccef880..5dfad80 100644
+index e46e9ea..9141c83 100644
 --- a/arch/arm/mach-mvebu/coherency.c
 +++ b/arch/arm/mach-mvebu/coherency.c
-@@ -164,7 +164,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
+@@ -117,7 +117,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
  
  /*
   * This ioremap hook is used on Armada 375/38x to ensure that PCIe
@@ -3498,7 +3485,7 @@ index ccef880..5dfad80 100644
   * is needed as a workaround for a deadlock issue between the PCIe
   * interface and the cache controller.
   */
-@@ -177,7 +177,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
+@@ -130,7 +130,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
  	mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
  
  	if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
@@ -3609,7 +3596,7 @@ index 78c02b3..c94109a 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 9025fff..3555702 100644
+index 355b089..2c9d7c3 100644
 --- a/arch/arm/mach-omap2/omap_hwmod.c
 +++ b/arch/arm/mach-omap2/omap_hwmod.c
 @@ -193,10 +193,10 @@ struct omap_hwmod_soc_ops {
@@ -3740,7 +3727,7 @@ index 52d768f..5f93180 100644
  #include "common.h"
  
 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
-index c43c714..4f8f7b9 100644
+index 9b4f29e..bbf3bfa 100644
 --- a/arch/arm/mm/Kconfig
 +++ b/arch/arm/mm/Kconfig
 @@ -446,6 +446,7 @@ config CPU_32v5
@@ -3843,12 +3830,12 @@ index 2c0c541..4585df9 100644
  			goto fault;				\
  	} while (0)
 diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
-index 5e65ca8..879e7b3 100644
+index 8f15f70..d599a2b 100644
 --- a/arch/arm/mm/cache-l2x0.c
 +++ b/arch/arm/mm/cache-l2x0.c
-@@ -42,7 +42,7 @@ struct l2c_init_data {
- 	void (*fixup)(void __iomem *, u32, struct outer_cache_fns *);
+@@ -43,7 +43,7 @@ struct l2c_init_data {
  	void (*save)(void __iomem *);
+ 	void (*configure)(void __iomem *);
  	struct outer_cache_fns outer_cache;
 -};
 +} __do_const;
@@ -3904,7 +3891,7 @@ index 845769e..4278fd7 100644
  		atomic64_set(&mm->context.id, asid);
  	}
 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
-index a982dc3..2d9f5f7 100644
+index 6333d9c..fd09b46 100644
 --- a/arch/arm/mm/fault.c
 +++ b/arch/arm/mm/fault.c
 @@ -25,6 +25,7 @@
@@ -4017,8 +4004,8 @@ index a982dc3..2d9f5f7 100644
 +die:
  	pr_alert("Unhandled fault: %s (0x%03x) at 0x%08lx\n",
  		inf->name, fsr, addr);
- 
-@@ -573,15 +646,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
+ 	show_pte(current->mm, addr);
+@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
  	ifsr_info[nr].name = name;
  }
  
@@ -4154,10 +4141,10 @@ 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 2495c8c..415b7fc 100644
+index 1609b02..def0785 100644
 --- a/arch/arm/mm/init.c
 +++ b/arch/arm/mm/init.c
-@@ -758,7 +758,46 @@ void free_tcmmem(void)
+@@ -755,7 +755,46 @@ void free_tcmmem(void)
  {
  #ifdef CONFIG_HAVE_TCM
  	extern char __tcm_start, __tcm_end;
@@ -4776,19 +4763,6 @@ index a5bc92d..0bb4730 100644
  		  omap_sram_size - omap_sram_skip);
 +	pax_close_kernel();
  }
-diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
-index ce6d763..cfea917 100644
---- a/arch/arm/plat-samsung/include/plat/dma-ops.h
-+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
-@@ -47,7 +47,7 @@ struct samsung_dma_ops {
- 	int (*started)(unsigned ch);
- 	int (*flush)(unsigned ch);
- 	int (*stop)(unsigned ch);
--};
-+} __no_const;
- 
- extern void *samsung_dmadev_get_ops(void);
- extern void *s3c_dma_get_ops(void);
 diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
 index 7047051..44e8675 100644
 --- a/arch/arm64/include/asm/atomic.h
@@ -4864,7 +4838,7 @@ index e20df38..027ede3 100644
  
  #if CONFIG_ARM64_PGTABLE_LEVELS > 3
 diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
-index 3bf8f4e..5dd5491 100644
+index 07e1ba44..ec8cbbb 100644
 --- a/arch/arm64/include/asm/uaccess.h
 +++ b/arch/arm64/include/asm/uaccess.h
 @@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
@@ -4876,7 +4850,7 @@ index 3bf8f4e..5dd5491 100644
  #define user_addr_max			get_fs
  
 diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
-index df34a70..5727a75 100644
+index ef7d112..08cd35f 100644
 --- a/arch/arm64/mm/dma-mapping.c
 +++ b/arch/arm64/mm/dma-mapping.c
 @@ -137,7 +137,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
@@ -4887,7 +4861,7 @@ index df34a70..5727a75 100644
 +		swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
  }
  
- static void *__dma_alloc_noncoherent(struct device *dev, size_t size,
+ static void *__dma_alloc(struct device *dev, size_t size,
 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
@@ -5262,7 +5236,7 @@ index 5767cdf..7462574 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 7935115..c0eca6a 100644
+index 7b6f880..ac8e008 100644
 --- a/arch/ia64/include/asm/pgtable.h
 +++ b/arch/ia64/include/asm/pgtable.h
 @@ -12,7 +12,7 @@
@@ -5274,7 +5248,7 @@ index 7935115..c0eca6a 100644
  #include <asm/mman.h>
  #include <asm/page.h>
  #include <asm/processor.h>
-@@ -142,6 +142,17 @@
+@@ -139,6 +139,17 @@
  #define PAGE_READONLY	__pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
  #define PAGE_COPY	__pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
  #define PAGE_COPY_EXEC	__pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
@@ -5306,7 +5280,7 @@ index 45698cd..e8e2dbc 100644
  
  static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
 diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
-index 103bedc..0210597 100644
+index 4f3fb6cc..254055e 100644
 --- a/arch/ia64/include/asm/uaccess.h
 +++ b/arch/ia64/include/asm/uaccess.h
 @@ -70,6 +70,7 @@
@@ -5317,7 +5291,7 @@ index 103bedc..0210597 100644
  #define access_ok(type, addr, size)	__access_ok((addr), (size), get_fs())
  
  /*
-@@ -240,12 +241,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
+@@ -241,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
  static inline unsigned long
  __copy_to_user (void __user *to, const void *from, unsigned long count)
  {
@@ -5342,7 +5316,7 @@ index 103bedc..0210597 100644
  	return __copy_user((__force void __user *) to, from, count);
  }
  
-@@ -255,10 +268,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
+@@ -256,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
  ({											\
  	void __user *__cu_to = (to);							\
  	const void *__cu_from = (from);							\
@@ -5358,7 +5332,7 @@ index 103bedc..0210597 100644
  	__cu_len;									\
  })
  
-@@ -266,11 +282,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
+@@ -267,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
  ({											\
  	void *__cu_to = (to);								\
  	const void __user *__cu_from = (from);						\
@@ -5722,10 +5696,10 @@ index 4efe96a..60e8699 100644
  #define SMP_CACHE_BYTES	L1_CACHE_BYTES
  
 diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 843713c..b6a87b9 100644
+index c7a1690..28c24b6 100644
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -2439,6 +2439,7 @@ source "kernel/Kconfig.preempt"
+@@ -2504,6 +2504,7 @@ source "kernel/Kconfig.preempt"
  
  config KEXEC
  	bool "Kexec system call"
@@ -5734,7 +5708,7 @@ index 843713c..b6a87b9 100644
  	  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/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
-index 3778655..1dff0a9 100644
+index 7d89878..57c55b7 100644
 --- a/arch/mips/cavium-octeon/dma-octeon.c
 +++ b/arch/mips/cavium-octeon/dma-octeon.c
 @@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
@@ -5747,7 +5721,7 @@ index 3778655..1dff0a9 100644
  
  static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
-index 857da84..0fee5e2 100644
+index 26d4363..3c9a82e 100644
 --- a/arch/mips/include/asm/atomic.h
 +++ b/arch/mips/include/asm/atomic.h
 @@ -22,15 +22,39 @@
@@ -5840,30 +5814,30 @@ index 857da84..0fee5e2 100644
  		"	beqzl	%0, 1b					\n"   \
 +		extable							      \
  		"	.set	mips0					\n"   \
- 		: "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter)	      \
+ 		: "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter)	      \
  		: "Ir" (i));						      \
  	} else if (kernel_uses_llsc) {					      \
  		int temp;						      \
  									      \
 -		do {							      \
 -			__asm__ __volatile__(				      \
--			"	.set	arch=r4000			\n"   \
+-			"	.set	"MIPS_ISA_LEVEL"		\n"   \
 -			"	ll	%0, %1		# atomic_" #op "\n"   \
 -			"	" #asm_op " %0, %2			\n"   \
 -			"	sc	%0, %1				\n"   \
 -			"	.set	mips0				\n"   \
--			: "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter)      \
+-			: "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter)      \
 -			: "Ir" (i));					      \
 -		} while (unlikely(!temp));				      \
 +		__asm__ __volatile__(					      \
-+		"	.set	mips3					\n"   \
++		"	.set	"MIPS_ISA_LEVEL"			\n"   \
 +		"1:	ll	%0, %1		# atomic_" #op #suffix "\n"   \
 +		"2:	" #asm_op " %0, %2				\n"   \
 +		"	sc	%0, %1					\n"   \
 +		"	beqz	%0, 1b					\n"   \
 +			extable						      \
 +		"	.set	mips0					\n"   \
-+		: "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter)	      \
++		: "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter)	      \
 +		: "Ir" (i));						      \
  	} else {							      \
  		unsigned long flags;					      \
@@ -5907,24 +5881,24 @@ index 857da84..0fee5e2 100644
 +		"5:							\n"   \
  		"	.set	mips0					\n"   \
  		: "=&r" (result), "=&r" (temp),				      \
- 		  "+" GCC_OFF12_ASM() (v->counter)			      \
+ 		  "+" GCC_OFF_SMALL_ASM() (v->counter)			      \
 @@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v)		      \
  	} else if (kernel_uses_llsc) {					      \
  		int temp;						      \
  									      \
 -		do {							      \
 -			__asm__ __volatile__(				      \
--			"	.set	arch=r4000			\n"   \
+-			"	.set	"MIPS_ISA_LEVEL"		\n"   \
 -			"	ll	%1, %2	# atomic_" #op "_return	\n"   \
 -			"	" #asm_op " %0, %1, %3			\n"   \
 -			"	sc	%0, %2				\n"   \
 -			"	.set	mips0				\n"   \
 -			: "=&r" (result), "=&r" (temp),			      \
--			  "+" GCC_OFF12_ASM() (v->counter)		      \
+-			  "+" GCC_OFF_SMALL_ASM() (v->counter)		      \
 -			: "Ir" (i));					      \
 -		} while (unlikely(!result));				      \
 +		__asm__ __volatile__(					      \
-+		"	.set	mips3					\n"   \
++		"	.set	"MIPS_ISA_LEVEL"			\n"   \
 +		"1:	ll	%1, %2	# atomic_" #op "_return" #suffix "\n" \
 +		"2:	" #asm_op " %0, %1, %3				\n"   \
 +		"	sc	%0, %2					\n"   \
@@ -5934,7 +5908,7 @@ index 857da84..0fee5e2 100644
 +		"5:							\n"   \
 +		"	.set	mips0					\n"   \
 +		: "=&r" (result), "=&r" (temp),				      \
-+		  "+" GCC_OFF12_ASM() (v->counter)			      \
++		  "+" GCC_OFF_SMALL_ASM() (v->counter)			      \
 +		: "Ir" (i));						      \
  									      \
  		result = temp; result c_op i;				      \
@@ -5951,7 +5925,7 @@ index 857da84..0fee5e2 100644
 +		"	sw	%0, %1					\n"   \
 +		"3:							\n"   \
 +		extable							      \
-+		: "=&r" (result), "+" GCC_OFF12_ASM() (v->counter) 	      \
++		: "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter)	      \
 +		: "Ir" (i));						      \
  		raw_local_irq_restore(flags);				      \
  	}								      \
@@ -5992,6 +5966,15 @@ index 857da84..0fee5e2 100644
  {
  	int result;
  
+@@ -159,7 +228,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
+ 		int temp;
+ 
+ 		__asm__ __volatile__(
+-		"	.set	arch=r4000				\n"
++		"	.set	"MIPS_ISA_LEVEL"			\n"
+ 		"1:	ll	%1, %2		# atomic_sub_if_positive\n"
+ 		"	subu	%0, %1, %3				\n"
+ 		"	bltz	%0, 1f					\n"
 @@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
  	return result;
  }
@@ -6108,37 +6091,37 @@ index 857da84..0fee5e2 100644
 -		"	.set	arch=r4000				\n"   \
 -		"1:	lld	%0, %1		# atomic64_" #op "	\n"   \
 -		"	" #asm_op " %0, %2				\n"   \
-+		"	.set	mips3					\n"   \
++		"	.set	"MIPS_ISA_LEVEL"			\n"   \
 +		"1:	lld	%0, %1		# atomic64_" #op #suffix "\n" \
 +		"2:	" #asm_op " %0, %2				\n"   \
  		"	scd	%0, %1					\n"   \
  		"	beqzl	%0, 1b					\n"   \
 +		extable							      \
  		"	.set	mips0					\n"   \
- 		: "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter)	      \
+ 		: "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter)	      \
  		: "Ir" (i));						      \
  	} else if (kernel_uses_llsc) {					      \
  		long temp;						      \
  									      \
 -		do {							      \
 -			__asm__ __volatile__(				      \
--			"	.set	arch=r4000			\n"   \
+-			"	.set	"MIPS_ISA_LEVEL"		\n"   \
 -			"	lld	%0, %1		# atomic64_" #op "\n" \
 -			"	" #asm_op " %0, %2			\n"   \
 -			"	scd	%0, %1				\n"   \
 -			"	.set	mips0				\n"   \
--			: "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter)      \
+-			: "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter)      \
 -			: "Ir" (i));					      \
 -		} while (unlikely(!temp));				      \
 +		__asm__ __volatile__(					      \
-+		"	.set	mips3					\n"   \
++		"	.set	"MIPS_ISA_LEVEL"			\n"   \
 +		"1:	lld	%0, %1		# atomic64_" #op #suffix "\n" \
 +		"2:	" #asm_op " %0, %2				\n"   \
 +		"	scd	%0, %1					\n"   \
 +		"	beqz	%0, 1b					\n"   \
 +			extable						      \
 +		"	.set	mips0					\n"   \
-+		: "=&r" (temp), "+" GCC_OFF12_ASM() (v->counter)	      \
++		: "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter)	      \
 +		: "Ir" (i));						      \
  	} else {							      \
  		unsigned long flags;					      \
@@ -6148,7 +6131,7 @@ index 857da84..0fee5e2 100644
 +		__asm__ __volatile__(					      \
 +		"2:	" #asm_op " %0, %1				\n"   \
 +		extable							      \
-+		: "+" GCC_OFF12_ASM() (v->counter) : "Ir" (i));		      \
++		: "+" GCC_OFF_SMALL_ASM() (v->counter) : "Ir" (i));	      \
  		raw_local_irq_restore(flags);				      \
  	}								      \
  }
@@ -6181,25 +6164,25 @@ index 857da84..0fee5e2 100644
 +		"5:							\n"   \
  		"	.set	mips0					\n"   \
  		: "=&r" (result), "=&r" (temp),				      \
- 		  "+" GCC_OFF12_ASM() (v->counter)			      \
+ 		  "+" GCC_OFF_SMALL_ASM() (v->counter)			      \
 @@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v)	      \
  	} else if (kernel_uses_llsc) {					      \
  		long temp;						      \
  									      \
 -		do {							      \
 -			__asm__ __volatile__(				      \
--			"	.set	arch=r4000			\n"   \
+-			"	.set	"MIPS_ISA_LEVEL"		\n"   \
 -			"	lld	%1, %2	# atomic64_" #op "_return\n"  \
 -			"	" #asm_op " %0, %1, %3			\n"   \
 -			"	scd	%0, %2				\n"   \
 -			"	.set	mips0				\n"   \
 -			: "=&r" (result), "=&r" (temp),			      \
--			  "=" GCC_OFF12_ASM() (v->counter)		      \
--			: "Ir" (i), GCC_OFF12_ASM() (v->counter)	      \
+-			  "=" GCC_OFF_SMALL_ASM() (v->counter)		      \
+-			: "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter)	      \
 -			: "memory");					      \
 -		} while (unlikely(!result));				      \
 +		__asm__ __volatile__(					      \
-+		"	.set	mips3					\n"   \
++		"	.set	"MIPS_ISA_LEVEL"			\n"   \
 +		"1:	lld	%1, %2	# atomic64_" #op "_return" #suffix "\n"\
 +		"2:	" #asm_op " %0, %1, %3				\n"   \
 +		"	scd	%0, %2					\n"   \
@@ -6210,8 +6193,8 @@ index 857da84..0fee5e2 100644
 +		"5:							\n"   \
 +		"	.set	mips0					\n"   \
 +		: "=&r" (result), "=&r" (temp),				      \
-+		  "=" GCC_OFF12_ASM() (v->counter)			      \
-+		: "Ir" (i), GCC_OFF12_ASM() (v->counter)		      \
++		  "=" GCC_OFF_SMALL_ASM() (v->counter)			      \
++		: "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter)		      \
 +		: "memory");						      \
  									      \
  		result = temp; result c_op i;				      \
@@ -6228,7 +6211,7 @@ index 857da84..0fee5e2 100644
 +		"	sd	%0, %1					\n"   \
 +		"3:							\n"   \
 +		extable							      \
-+		: "=&r" (result), "+" GCC_OFF12_ASM() (v->counter)	      \
++		: "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter)	      \
 +		: "Ir" (i));						      \
  		raw_local_irq_restore(flags);				      \
  	}								      \
@@ -6271,6 +6254,15 @@ index 857da84..0fee5e2 100644
  {
  	long result;
  
+@@ -440,7 +584,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
+ 		long temp;
+ 
+ 		__asm__ __volatile__(
+-		"	.set	arch=r4000				\n"
++		"	.set	"MIPS_ISA_LEVEL"			\n"
+ 		"1:	lld	%1, %2		# atomic64_sub_if_positive\n"
+ 		"	dsubu	%0, %1, %3				\n"
+ 		"	bltz	%0, 1f					\n"
 @@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
  	return result;
  }
@@ -6364,7 +6356,7 @@ index b4db69f..8f3b093 100644
  #define SMP_CACHE_SHIFT		L1_CACHE_SHIFT
  #define SMP_CACHE_BYTES		L1_CACHE_BYTES
 diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
-index eb4d95d..f2f7f93 100644
+index 535f196..2ab029e 100644
 --- a/arch/mips/include/asm/elf.h
 +++ b/arch/mips/include/asm/elf.h
 @@ -405,15 +405,18 @@ extern const char *__elf_platform;
@@ -6416,10 +6408,10 @@ index 9e8ef59..1139d6b 100644
  /*
   * interrupt-retrigger: NOP for now. This may not be appropriate for all
 diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
-index 46dfc3c..a16b13a 100644
+index 8feaed6..1bd8a64 100644
 --- a/arch/mips/include/asm/local.h
 +++ b/arch/mips/include/asm/local.h
-@@ -12,15 +12,25 @@ typedef struct
+@@ -13,15 +13,25 @@ typedef struct
  	atomic_long_t a;
  } local_t;
  
@@ -6445,7 +6437,7 @@ index 46dfc3c..a16b13a 100644
  
  /*
   * Same as above, but return the result value
-@@ -70,6 +80,51 @@ static __inline__ long local_add_return(long i, local_t * l)
+@@ -71,6 +81,51 @@ static __inline__ long local_add_return(long i, local_t * l)
  	return result;
  }
  
@@ -6497,7 +6489,7 @@ index 46dfc3c..a16b13a 100644
  static __inline__ long local_sub_return(long i, local_t * l)
  {
  	unsigned long result;
-@@ -117,6 +172,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
+@@ -118,6 +173,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
  
  #define local_cmpxchg(l, o, n) \
  	((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
@@ -6536,7 +6528,7 @@ index b336037..5b874cc 100644
  
  /*
 diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
-index 845016d..3303268 100644
+index bef782c..d99df93 100644
 --- a/arch/mips/include/asm/pgtable.h
 +++ b/arch/mips/include/asm/pgtable.h
 @@ -20,6 +20,9 @@
@@ -6550,10 +6542,10 @@ index 845016d..3303268 100644
  struct vm_area_struct;
  
 diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
-index e4440f9..8fb0005 100644
+index 55ed660..3dc9422 100644
 --- a/arch/mips/include/asm/thread_info.h
 +++ b/arch/mips/include/asm/thread_info.h
-@@ -106,6 +106,9 @@ static inline struct thread_info *current_thread_info(void)
+@@ -102,6 +102,9 @@ static inline struct thread_info *current_thread_info(void)
  #define TIF_SECCOMP		4	/* secure computing */
  #define TIF_NOTIFY_RESUME	5	/* callback before returning to user */
  #define TIF_RESTORE_SIGMASK	9	/* restore signal mask in do_signal() */
@@ -6563,7 +6555,7 @@ index e4440f9..8fb0005 100644
  #define TIF_USEDFPU		16	/* FPU was used by this task this quantum (SMP) */
  #define TIF_MEMDIE		18	/* is terminating due to OOM killer */
  #define TIF_NOHZ		19	/* in adaptive nohz mode */
-@@ -141,14 +144,16 @@ static inline struct thread_info *current_thread_info(void)
+@@ -137,14 +140,16 @@ static inline struct thread_info *current_thread_info(void)
  #define _TIF_USEDMSA		(1<<TIF_USEDMSA)
  #define _TIF_MSA_CTX_LIVE	(1<<TIF_MSA_CTX_LIVE)
  #define _TIF_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)
@@ -6582,7 +6574,7 @@ index e4440f9..8fb0005 100644
  
  /* work to do on interrupt/exception return */
  #define _TIF_WORK_MASK		\
-@@ -156,7 +161,7 @@ static inline struct thread_info *current_thread_info(void)
+@@ -152,7 +157,7 @@ static inline struct thread_info *current_thread_info(void)
  /* work to do on any return to u-space */
  #define _TIF_ALLWORK_MASK	(_TIF_NOHZ | _TIF_WORK_MASK |		\
  				 _TIF_WORK_SYSCALL_EXIT |		\
@@ -6723,10 +6715,10 @@ index 0614717..002fa43 100644
  
  	/* Run the generated entry code */
 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
-index 85bff5d..39bc202 100644
+index bf85cc1..b365c61 100644
 --- a/arch/mips/kernel/process.c
 +++ b/arch/mips/kernel/process.c
-@@ -534,18 +534,6 @@ out:
+@@ -535,18 +535,6 @@ out:
  	return pc;
  }
  
@@ -6874,10 +6866,10 @@ index 2242bdd..b284048 100644
  	}
  	/* Arrange for an interrupt in a short while */
 diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
-index c3b41e2..46c32e9 100644
+index 33984c0..666a96d 100644
 --- a/arch/mips/kernel/traps.c
 +++ b/arch/mips/kernel/traps.c
-@@ -688,7 +688,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
+@@ -689,7 +689,18 @@ asmlinkage void do_ov(struct pt_regs *regs)
  	siginfo_t info;
  
  	prev_state = exception_enter();
@@ -6898,10 +6890,10 @@ index c3b41e2..46c32e9 100644
  	info.si_code = FPE_INTOVF;
  	info.si_signo = SIGFPE;
 diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
-index 270bbd4..c01932a 100644
+index c9eccf5..3903621 100644
 --- a/arch/mips/kvm/mips.c
 +++ b/arch/mips/kvm/mips.c
-@@ -815,7 +815,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
+@@ -816,7 +816,7 @@ long kvm_arch_vm_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg)
  	return r;
  }
  
@@ -6911,12 +6903,12 @@ index 270bbd4..c01932a 100644
  	if (kvm_mips_callbacks) {
  		kvm_err("kvm: module already exists\n");
 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
-index 70ab5d6..62940fe 100644
+index 7ff8637..6004edb 100644
 --- a/arch/mips/mm/fault.c
 +++ b/arch/mips/mm/fault.c
-@@ -28,6 +28,23 @@
- #include <asm/highmem.h>		/* For VMALLOC_END */
- #include <linux/kdebug.h>
+@@ -31,6 +31,23 @@
+ 
+ int show_unhandled_signals = 1;
  
 +#ifdef CONFIG_PAX_PAGEEXEC
 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
@@ -6938,7 +6930,7 @@ index 70ab5d6..62940fe 100644
  /*
   * This routine handles page faults.  It determines the address,
   * and the problem, and then passes it off to one of the appropriate
-@@ -201,6 +218,14 @@ bad_area:
+@@ -206,6 +223,14 @@ bad_area:
  bad_area_nosemaphore:
  	/* User mode accesses just cause a SIGSEGV */
  	if (user_mode(regs)) {
@@ -6952,7 +6944,7 @@ index 70ab5d6..62940fe 100644
 +
  		tsk->thread.cp0_badvaddr = address;
  		tsk->thread.error_code = write;
- #if 0
+ 		if (show_unhandled_signals &&
 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
 index f1baadd..5472dca 100644
 --- a/arch/mips/mm/mmap.c
@@ -7058,58 +7050,6 @@ index f1baadd..5472dca 100644
  int __virt_addr_valid(const volatile void *kaddr)
  {
  	return pfn_valid(PFN_DOWN(virt_to_phys(kaddr)));
-diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
-index d07e041..bedb72b 100644
---- a/arch/mips/pci/pci-octeon.c
-+++ b/arch/mips/pci/pci-octeon.c
-@@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,
- 
- 
- static struct pci_ops octeon_pci_ops = {
--	octeon_read_config,
--	octeon_write_config,
-+	.read = octeon_read_config,
-+	.write = octeon_write_config,
- };
- 
- static struct resource octeon_pci_mem_resource = {
-diff --git a/arch/mips/pci/pcie-octeon.c b/arch/mips/pci/pcie-octeon.c
-index 5e36c33..eb4a17b 100644
---- a/arch/mips/pci/pcie-octeon.c
-+++ b/arch/mips/pci/pcie-octeon.c
-@@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
- }
- 
- static struct pci_ops octeon_pcie0_ops = {
--	octeon_pcie0_read_config,
--	octeon_pcie0_write_config,
-+	.read = octeon_pcie0_read_config,
-+	.write = octeon_pcie0_write_config,
- };
- 
- static struct resource octeon_pcie0_mem_resource = {
-@@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
- };
- 
- static struct pci_ops octeon_pcie1_ops = {
--	octeon_pcie1_read_config,
--	octeon_pcie1_write_config,
-+	.read = octeon_pcie1_read_config,
-+	.write = octeon_pcie1_write_config,
- };
- 
- static struct resource octeon_pcie1_mem_resource = {
-@@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
- };
- 
- static struct pci_ops octeon_dummy_ops = {
--	octeon_dummy_read_config,
--	octeon_dummy_write_config,
-+	.read = octeon_dummy_read_config,
-+	.write = octeon_dummy_write_config,
- };
- 
- static struct resource octeon_dummy_mem_resource = {
 diff --git a/arch/mips/sgi-ip27/ip27-nmi.c b/arch/mips/sgi-ip27/ip27-nmi.c
 index a2358b4..7cead4f 100644
 --- a/arch/mips/sgi-ip27/ip27-nmi.c
@@ -7311,7 +7251,7 @@ index 3391d06..c23a2cc 100644
     instruction set this CPU supports.  This could be done in user space,
     but it's not easy, and we've already done it here.  */
 diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
-index f213f5b..0af3e8e 100644
+index d174372..f27fe5c 100644
 --- a/arch/parisc/include/asm/pgalloc.h
 +++ b/arch/parisc/include/asm/pgalloc.h
 @@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
@@ -7326,7 +7266,7 @@ index f213f5b..0af3e8e 100644
  static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
  {
  	pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
-@@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
+@@ -96,6 +101,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
  #define pmd_alloc_one(mm, addr)		({ BUG(); ((pmd_t *)2); })
  #define pmd_free(mm, x)			do { } while (0)
  #define pgd_populate(mm, pmd, pte)	BUG()
@@ -7335,10 +7275,10 @@ index f213f5b..0af3e8e 100644
  #endif
  
 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
-index 22b89d1..ce34230 100644
+index 15207b9..3209e65 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);
+@@ -215,6 +215,17 @@ extern void purge_tlb_entries(struct mm_struct *, unsigned long);
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
  #define PAGE_RWX        __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
@@ -7357,7 +7297,7 @@ index 22b89d1..ce34230 100644
  #define PAGE_KERNEL_EXEC	__pgprot(_PAGE_KERNEL_EXEC)
  #define PAGE_KERNEL_RWX	__pgprot(_PAGE_KERNEL_RWX)
 diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
-index a5cb070..8604ddc 100644
+index 0abdd4c..1af92f0 100644
 --- a/arch/parisc/include/asm/uaccess.h
 +++ b/arch/parisc/include/asm/uaccess.h
 @@ -243,10 +243,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
@@ -7374,7 +7314,7 @@ index a5cb070..8604ddc 100644
          else
                  copy_from_user_overflow();
 diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
-index 5822e8e..bc5e638 100644
+index 3c63a82..b1d6ee9 100644
 --- a/arch/parisc/kernel/module.c
 +++ b/arch/parisc/kernel/module.c
 @@ -98,16 +98,38 @@
@@ -7737,10 +7677,10 @@ index e5120e6..8ddb5cc 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 a2a168e..e484682 100644
+index 22b0940..309f790 100644
 --- a/arch/powerpc/Kconfig
 +++ b/arch/powerpc/Kconfig
-@@ -408,6 +408,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
+@@ -409,6 +409,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE
  config KEXEC
  	bool "kexec system call"
  	depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP))
@@ -8530,7 +8470,7 @@ index 4b0be20..c15a27d 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 a8805fe..6d69617 100644
+index 9835ac4..900430f 100644
 --- a/arch/powerpc/include/asm/pgtable.h
 +++ b/arch/powerpc/include/asm/pgtable.h
 @@ -2,6 +2,7 @@
@@ -8542,11 +8482,11 @@ index a8805fe..6d69617 100644
  #include <linux/mmdebug.h>
  #include <linux/mmzone.h>
 diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
-index 4aad413..85d86bf 100644
+index 62cfb0c..50c6402 100644
 --- a/arch/powerpc/include/asm/pte-hash32.h
 +++ b/arch/powerpc/include/asm/pte-hash32.h
-@@ -21,6 +21,7 @@
- #define _PAGE_FILE	0x004	/* when !present: nonlinear file mapping */
+@@ -20,6 +20,7 @@
+ #define _PAGE_HASHPTE	0x002	/* hash_page has made an HPTE for this pte */
  #define _PAGE_USER	0x004	/* usermode access allowed */
  #define _PAGE_GUARDED	0x008	/* G: prohibit speculative access */
 +#define _PAGE_EXEC	_PAGE_GUARDED
@@ -8554,7 +8494,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 1c874fb..e8480a4 100644
+index af56b5c..f86f3f6 100644
 --- a/arch/powerpc/include/asm/reg.h
 +++ b/arch/powerpc/include/asm/reg.h
 @@ -253,6 +253,7 @@
@@ -8566,7 +8506,7 @@ index 1c874fb..e8480a4 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 5a6614a..d89995d1 100644
+index d607df5..08dc9ae 100644
 --- a/arch/powerpc/include/asm/smp.h
 +++ b/arch/powerpc/include/asm/smp.h
 @@ -51,7 +51,7 @@ struct smp_ops_t {
@@ -8646,10 +8586,10 @@ index 4dbe072..b803275 100644
  	: "r"(&rw->lock)
  	: "cr0", "xer", "memory");
 diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
-index 0be6c68..9c3c6ee 100644
+index 7248979..80b75de 100644
 --- a/arch/powerpc/include/asm/thread_info.h
 +++ b/arch/powerpc/include/asm/thread_info.h
-@@ -107,6 +107,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -103,6 +103,8 @@ static inline struct thread_info *current_thread_info(void)
  #if defined(CONFIG_PPC64)
  #define TIF_ELF2ABI		18	/* function descriptors must die! */
  #endif
@@ -8658,12 +8598,12 @@ index 0be6c68..9c3c6ee 100644
  
  /* as above, but as bit values */
  #define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)
-@@ -125,9 +127,10 @@ static inline struct thread_info *current_thread_info(void)
+@@ -121,9 +123,10 @@ static inline struct thread_info *current_thread_info(void)
  #define _TIF_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)
  #define _TIF_EMULATE_STACK_STORE	(1<<TIF_EMULATE_STACK_STORE)
  #define _TIF_NOHZ		(1<<TIF_NOHZ)
 +#define _TIF_GRSEC_SETXID	(1<<TIF_GRSEC_SETXID)
- #define _TIF_SYSCALL_T_OR_A	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
+ #define _TIF_SYSCALL_DOTRACE	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
  				 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
 -				 _TIF_NOHZ)
 +				 _TIF_NOHZ | _TIF_GRSEC_SETXID)
@@ -9103,7 +9043,7 @@ index f21897b..28c0428 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 b171001..4ac7ac5 100644
+index d3a831a..3a33123 100644
 --- a/arch/powerpc/kernel/signal_32.c
 +++ b/arch/powerpc/kernel/signal_32.c
 @@ -1011,7 +1011,7 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset,
@@ -9116,7 +9056,7 @@ index b171001..4ac7ac5 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 2cb0c94..c0c0bc9 100644
+index c7c24d2..1bf7039 100644
 --- a/arch/powerpc/kernel/signal_64.c
 +++ b/arch/powerpc/kernel/signal_64.c
 @@ -754,7 +754,7 @@ int handle_rt_signal64(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
@@ -9129,7 +9069,7 @@ index 2cb0c94..c0c0bc9 100644
  	} else {
  		err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
-index e6595b7..24bde6e 100644
+index 19e4744..28a8d7b 100644
 --- a/arch/powerpc/kernel/traps.c
 +++ b/arch/powerpc/kernel/traps.c
 @@ -36,6 +36,7 @@
@@ -9217,10 +9157,10 @@ index 305eb0d..accc5b40 100644
  		rc = vdso_base;
  		goto fail_mmapsem;
 diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
-index c45eaab..5f41b57 100644
+index 27c0fac..6ec4a32 100644
 --- a/arch/powerpc/kvm/powerpc.c
 +++ b/arch/powerpc/kvm/powerpc.c
-@@ -1403,7 +1403,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
+@@ -1402,7 +1402,7 @@ void kvmppc_init_lpid(unsigned long nr_lpids_param)
  }
  EXPORT_SYMBOL_GPL(kvmppc_init_lpid);
  
@@ -9265,7 +9205,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 6154b0a..4de2b19 100644
+index b396868..3eb6b9f 100644
 --- a/arch/powerpc/mm/fault.c
 +++ b/arch/powerpc/mm/fault.c
 @@ -33,6 +33,10 @@
@@ -9322,7 +9262,7 @@ index 6154b0a..4de2b19 100644
  	else
  		is_write = error_code & DSISR_ISSTORE;
  #else
-@@ -383,7 +414,7 @@ good_area:
+@@ -383,12 +414,16 @@ good_area:
           * "undefined".  Of those that can be set, this is the only
           * one which seems bad.
           */
@@ -9331,16 +9271,16 @@ index 6154b0a..4de2b19 100644
                  /* Guarded storage error. */
  		goto bad_area;
  #endif /* CONFIG_8xx */
-@@ -398,7 +429,7 @@ good_area:
- 		 * processors use the same I/D cache coherency mechanism
- 		 * as embedded.
- 		 */
--		if (error_code & DSISR_PROTFAULT)
-+		if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
- 			goto bad_area;
- #endif /* CONFIG_PPC_STD_MMU */
  
-@@ -490,6 +521,23 @@ bad_area:
+ 	if (is_exec) {
++#ifdef CONFIG_PPC_STD_MMU
++		if (error_code & DSISR_GUARDED)
++			goto bad_area;
++#endif
+ 		/*
+ 		 * Allow execution from readable areas if the MMU does not
+ 		 * provide separate controls over reading and executing.
+@@ -483,6 +518,23 @@ bad_area:
  bad_area_nosemaphore:
  	/* User mode accesses cause a SIGSEGV */
  	if (user_mode(regs)) {
@@ -9426,7 +9366,7 @@ index cb8bdbe..cde4bc7 100644
  	}
  }
 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
-index ded0ea1..f213a9b 100644
+index 0f432a7..abfe841 100644
 --- a/arch/powerpc/mm/slice.c
 +++ b/arch/powerpc/mm/slice.c
 @@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
@@ -9463,21 +9403,6 @@ index ded0ea1..f213a9b 100644
  	/* If hint, make sure it matches our alignment restrictions */
  	if (!fixed && addr) {
  		addr = _ALIGN_UP(addr, 1ul << pshift);
-diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
-index f223875..94170e4 100644
---- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
-+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
-@@ -399,8 +399,8 @@ static int scc_pciex_write_config(struct pci_bus *bus, unsigned int devfn,
- }
- 
- static struct pci_ops scc_pciex_pci_ops = {
--	scc_pciex_read_config,
--	scc_pciex_write_config,
-+	.read = scc_pciex_read_config,
-+	.write = scc_pciex_write_config,
- };
- 
- static void pciex_clear_intr_all(unsigned int __iomem *base)
 diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
 index d966bbe..372124a 100644
 --- a/arch/powerpc/platforms/cell/spufs/file.c
@@ -9543,15 +9468,15 @@ index 4d7ccac..d03d0ad 100644
  
  #define __read_mostly __attribute__((__section__(".data..read_mostly")))
 diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
-index f6e43d3..5f57681 100644
+index c9c875d..b4b0e4c 100644
 --- a/arch/s390/include/asm/elf.h
 +++ b/arch/s390/include/asm/elf.h
 @@ -163,8 +163,14 @@ extern unsigned int vdso_enabled;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
  
--extern unsigned long randomize_et_dyn(unsigned long base);
--#define ELF_ET_DYN_BASE		(randomize_et_dyn(STACK_TOP / 3 * 2))
+-extern unsigned long randomize_et_dyn(void);
+-#define ELF_ET_DYN_BASE		randomize_et_dyn()
 +#define ELF_ET_DYN_BASE		(STACK_TOP / 3 * 2)
 +
 +#ifdef CONFIG_PAX_ASLR
@@ -9563,7 +9488,7 @@ index f6e43d3..5f57681 100644
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports. */
-@@ -223,9 +229,6 @@ struct linux_binprm;
+@@ -225,9 +231,6 @@ struct linux_binprm;
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
  int arch_setup_additional_pages(struct linux_binprm *, int);
  
@@ -9626,7 +9551,7 @@ index cd4c68e..6764641 100644
  		return n;
  	}
 diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
-index 409d152..d90d368 100644
+index 2ca9586..55682a9 100644
 --- a/arch/s390/kernel/module.c
 +++ b/arch/s390/kernel/module.c
 @@ -165,11 +165,11 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
@@ -9701,10 +9626,10 @@ index 409d152..d90d368 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 aa7a839..6c2a916 100644
+index 13fc097..84d375f 100644
 --- a/arch/s390/kernel/process.c
 +++ b/arch/s390/kernel/process.c
-@@ -219,37 +219,3 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -227,27 +227,3 @@ unsigned long get_wchan(struct task_struct *p)
  	}
  	return 0;
  }
@@ -9732,21 +9657,11 @@ index aa7a839..6c2a916 100644
 -	ret = PAGE_ALIGN(mm->brk + brk_rnd());
 -	return (ret > mm->brk) ? ret : mm->brk;
 -}
--
--unsigned long randomize_et_dyn(unsigned long base)
--{
--	unsigned long ret;
--
--	if (!(current->flags & PF_RANDOMIZE))
--		return base;
--	ret = PAGE_ALIGN(base + brk_rnd());
--	return (ret > base) ? ret : base;
--}
 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
-index 9b436c2..54fbf0a 100644
+index 179a2c2..371e85c 100644
 --- a/arch/s390/mm/mmap.c
 +++ b/arch/s390/mm/mmap.c
-@@ -95,9 +95,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -204,9 +204,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = mmap_base_legacy();
@@ -9768,7 +9683,7 @@ index 9b436c2..54fbf0a 100644
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  	}
  }
-@@ -170,9 +182,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -279,9 +291,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = mmap_base_legacy();
@@ -10230,7 +10145,7 @@ index 59ba6f6..4518128 100644
 +
  #endif
 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
-index b9b91ae..950b91e 100644
+index f06b36a..bca3189 100644
 --- a/arch/sparc/include/asm/pgtable_32.h
 +++ b/arch/sparc/include/asm/pgtable_32.h
 @@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
@@ -10269,10 +10184,10 @@ index b9b91ae..950b91e 100644
  #define __S101	PAGE_READONLY
  #define __S110	PAGE_SHARED
 diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
-index 79da178..c2eede8 100644
+index ae51a11..eadfd03 100644
 --- a/arch/sparc/include/asm/pgtsrmmu.h
 +++ b/arch/sparc/include/asm/pgtsrmmu.h
-@@ -115,6 +115,11 @@
+@@ -111,6 +111,11 @@
  				    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
  				    SRMMU_EXEC | SRMMU_REF)
@@ -10401,23 +10316,22 @@ index 9689176..63c18ea 100644
  	unsigned long mask, tmp1, tmp2, result;
  
 diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
-index 025c984..a216504 100644
+index fd7bd0a..2e2fa7a 100644
 --- a/arch/sparc/include/asm/thread_info_32.h
 +++ b/arch/sparc/include/asm/thread_info_32.h
-@@ -49,6 +49,8 @@ struct thread_info {
+@@ -47,6 +47,7 @@ struct thread_info {
+ 	struct reg_window32	reg_window[NSWINS];	/* align for ldd! */
+ 	unsigned long		rwbuf_stkptrs[NSWINS];
  	unsigned long		w_saved;
- 
- 	struct restart_block	restart_block;
-+
 +	unsigned long		lowest_stack;
  };
  
  /*
 diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
-index 798f027..b009941 100644
+index ff45516..73001ab 100644
 --- a/arch/sparc/include/asm/thread_info_64.h
 +++ b/arch/sparc/include/asm/thread_info_64.h
-@@ -63,6 +63,8 @@ struct thread_info {
+@@ -61,6 +61,8 @@ struct thread_info {
  	struct pt_regs		*kern_una_regs;
  	unsigned int		kern_una_insn;
  
@@ -10426,7 +10340,7 @@ index 798f027..b009941 100644
  	unsigned long		fpregs[(7 * 256) / sizeof(unsigned long)]
  		__attribute__ ((aligned(64)));
  };
-@@ -190,12 +192,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
+@@ -184,12 +186,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
  #define TIF_NEED_RESCHED	3	/* rescheduling necessary */
  /* flag bit 4 is available */
  #define TIF_UNALIGNED		5	/* allowed to do unaligned accesses */
@@ -10441,7 +10355,7 @@ index 798f027..b009941 100644
  /* NOTE: Thread flags >= 12 should be ones we have no interest
   *       in using in assembly, else we can't use the mask as
   *       an immediate value in instructions such as andcc.
-@@ -215,12 +218,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
+@@ -209,12 +212,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
  #define _TIF_SYSCALL_AUDIT	(1<<TIF_SYSCALL_AUDIT)
  #define _TIF_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)
  #define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)
@@ -10471,18 +10385,18 @@ index bd56c28..4b63d83 100644
  #include <asm/uaccess_64.h>
  #else
 diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
-index 9634d08..020b2dc 100644
+index 64ee103..388aef0 100644
 --- a/arch/sparc/include/asm/uaccess_32.h
 +++ b/arch/sparc/include/asm/uaccess_32.h
 @@ -47,6 +47,7 @@
  #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
  #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
- #define __access_ok(addr,size) (__user_ok((addr) & get_fs().seg,(size)))
+ #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
 +#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
- #define access_ok(type, addr, size)					\
+ #define access_ok(type, addr, size) \
  	({ (void)(type); __access_ok((unsigned long)(addr), size); })
  
-@@ -250,27 +251,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
+@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -10534,7 +10448,7 @@ index 9634d08..020b2dc 100644
  }
  
 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
-index c990a5e..7384856 100644
+index a35194b..47dabc0d 100644
 --- a/arch/sparc/include/asm/uaccess_64.h
 +++ b/arch/sparc/include/asm/uaccess_64.h
 @@ -10,6 +10,7 @@
@@ -10557,7 +10471,7 @@ index c990a5e..7384856 100644
  static inline int access_ok(int type, const void __user * addr, unsigned long size)
  {
  	return 1;
-@@ -214,8 +220,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
+@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
  static inline unsigned long __must_check
  copy_from_user(void *to, const void __user *from, unsigned long size)
  {
@@ -10574,7 +10488,7 @@ index c990a5e..7384856 100644
  	if (unlikely(ret))
  		ret = copy_from_user_fixup(to, from, size);
  
-@@ -231,8 +244,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
+@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
  static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long size)
  {
@@ -10727,7 +10641,7 @@ index 9ddc492..27a5619 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 da6f1a7..e5dea8f 100644
+index 61139d9..c1a5f28 100644
 --- a/arch/sparc/kernel/smp_64.c
 +++ b/arch/sparc/kernel/smp_64.c
 @@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
@@ -11026,7 +10940,7 @@ index 6fd386c5..6907d81 100644
  }
  
 diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
-index 981a769..d906eda 100644
+index 0e69974..0c15a6e 100644
 --- a/arch/sparc/kernel/traps_64.c
 +++ b/arch/sparc/kernel/traps_64.c
 @@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
@@ -11203,10 +11117,10 @@ index 981a769..d906eda 100644
  			       (void *) rw->ins[7]);
  
  			rw = kernel_stack_up(rw);
-@@ -2427,8 +2440,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
- 		}
- 		user_instruction_dump ((unsigned int __user *) regs->tpc);
+@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
  	}
+ 	if (panic_on_oops)
+ 		panic("Fatal exception");
 -	if (regs->tstate & TSTATE_PRIV)
 +	if (regs->tstate & TSTATE_PRIV) {
 +		gr_handle_kernel_exploit();
@@ -12343,7 +12257,7 @@ index 4242eab..9ae6360 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 3ea267c..93f0659 100644
+index 4ca0d6b..e89bca1 100644
 --- a/arch/sparc/mm/init_64.c
 +++ b/arch/sparc/mm/init_64.c
 @@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
@@ -12432,10 +12346,10 @@ index 6160761..00cac88 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 b6cde32..c0cb736 100644
+index f41cb53..31d3ab4 100644
 --- a/arch/tile/include/asm/uaccess.h
 +++ b/arch/tile/include/asm/uaccess.h
-@@ -414,9 +414,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
+@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
  					  const void __user *from,
  					  unsigned long n)
  {
@@ -12529,7 +12443,7 @@ index 71c5d13..4c7b9f1 100644
  
  struct page;
 diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
-index 0032f92..cd151e0 100644
+index 2b4274e..754fe06 100644
 --- a/arch/um/include/asm/pgtable-3level.h
 +++ b/arch/um/include/asm/pgtable-3level.h
 @@ -58,6 +58,7 @@
@@ -12585,10 +12499,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 0dc9d01..98df103 100644
+index b7d31ca..9481ec5 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -130,7 +130,7 @@ config X86
+@@ -132,7 +132,7 @@ config X86
  	select RTC_LIB
  	select HAVE_DEBUG_STACKOVERFLOW
  	select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
@@ -12597,7 +12511,7 @@ index 0dc9d01..98df103 100644
  	select GENERIC_CPU_AUTOPROBE
  	select HAVE_ARCH_AUDITSYSCALL
  	select ARCH_SUPPORTS_ATOMIC_RMW
-@@ -263,7 +263,7 @@ config X86_HT
+@@ -266,7 +266,7 @@ config X86_HT
  
  config X86_32_LAZY_GS
  	def_bool y
@@ -12606,7 +12520,7 @@ index 0dc9d01..98df103 100644
  
  config ARCH_HWEIGHT_CFLAGS
  	string
-@@ -601,6 +601,7 @@ config SCHED_OMIT_FRAME_POINTER
+@@ -632,6 +632,7 @@ config SCHED_OMIT_FRAME_POINTER
  
  menuconfig HYPERVISOR_GUEST
  	bool "Linux guest support"
@@ -12614,7 +12528,7 @@ index 0dc9d01..98df103 100644
  	---help---
  	  Say Y here to enable options for running Linux under various hyper-
  	  visors. This option enables basic hypervisor detection and platform
-@@ -978,6 +979,7 @@ config VM86
+@@ -1013,6 +1014,7 @@ config VM86
  
  config X86_16BIT
  	bool "Enable support for 16-bit segments" if EXPERT
@@ -12622,7 +12536,7 @@ index 0dc9d01..98df103 100644
  	default y
  	---help---
  	  This option is required by programs like Wine to run 16-bit
-@@ -1151,6 +1153,7 @@ choice
+@@ -1186,6 +1188,7 @@ choice
  
  config NOHIGHMEM
  	bool "off"
@@ -12630,7 +12544,7 @@ index 0dc9d01..98df103 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
-@@ -1187,6 +1190,7 @@ config NOHIGHMEM
+@@ -1222,6 +1225,7 @@ config NOHIGHMEM
  
  config HIGHMEM4G
  	bool "4GB"
@@ -12638,7 +12552,7 @@ index 0dc9d01..98df103 100644
  	---help---
  	  Select this if you have a 32-bit processor and between 1 and 4
  	  gigabytes of physical RAM.
-@@ -1239,7 +1243,7 @@ config PAGE_OFFSET
+@@ -1274,7 +1278,7 @@ config PAGE_OFFSET
  	hex
  	default 0xB0000000 if VMSPLIT_3G_OPT
  	default 0x80000000 if VMSPLIT_2G
@@ -12647,7 +12561,7 @@ index 0dc9d01..98df103 100644
  	default 0x40000000 if VMSPLIT_1G
  	default 0xC0000000
  	depends on X86_32
-@@ -1680,6 +1684,7 @@ source kernel/Kconfig.hz
+@@ -1715,6 +1719,7 @@ source kernel/Kconfig.hz
  
  config KEXEC
  	bool "kexec system call"
@@ -12655,7 +12569,7 @@ index 0dc9d01..98df103 100644
  	---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
-@@ -1865,7 +1870,9 @@ config X86_NEED_RELOCS
+@@ -1900,7 +1905,9 @@ config X86_NEED_RELOCS
  
  config PHYSICAL_ALIGN
  	hex "Alignment value to which kernel should be aligned"
@@ -12666,7 +12580,7 @@ index 0dc9d01..98df103 100644
  	range 0x2000 0x1000000 if X86_32
  	range 0x200000 0x1000000 if X86_64
  	---help---
-@@ -1948,6 +1955,7 @@ config COMPAT_VDSO
+@@ -1983,6 +1990,7 @@ config COMPAT_VDSO
  	def_bool n
  	prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
  	depends on X86_32 || IA32_EMULATION
@@ -12706,7 +12620,7 @@ index 6983314..54ad7e8 100644
  config X86_MINIMUM_CPU_FAMILY
  	int
 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
-index 61bd2ad..50b625d 100644
+index 20028da..88d5946 100644
 --- a/arch/x86/Kconfig.debug
 +++ b/arch/x86/Kconfig.debug
 @@ -93,7 +93,7 @@ config EFI_PGT_DUMP
@@ -12728,7 +12642,7 @@ index 61bd2ad..50b625d 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 920e616..ac3d4df 100644
+index 5ba2d9c..41e5bb6 100644
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
 @@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
@@ -12751,7 +12665,7 @@ index 920e616..ac3d4df 100644
  # Make sure compiler does not have buggy stack-protector support.
  ifdef CONFIG_CC_STACKPROTECTOR
  	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
-@@ -180,6 +180,7 @@ archheaders:
+@@ -181,6 +181,7 @@ archheaders:
  	$(Q)$(MAKE) $(build)=arch/x86/syscalls all
  
  archprepare:
@@ -12759,7 +12673,7 @@ index 920e616..ac3d4df 100644
  ifeq ($(CONFIG_KEXEC_FILE),y)
  	$(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
  endif
-@@ -263,3 +264,9 @@ define archhelp
+@@ -264,3 +265,9 @@ define archhelp
    echo  '                  FDARGS="..."  arguments for the booted kernel'
    echo  '                  FDINITRD=file initrd for the booted kernel'
  endef
@@ -12770,10 +12684,10 @@ index 920e616..ac3d4df 100644
 +*** Please upgrade your binutils to 2.18 or newer
 +endef
 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
-index 3db07f3..9d81d0f 100644
+index 57bbf2f..b100fce 100644
 --- a/arch/x86/boot/Makefile
 +++ b/arch/x86/boot/Makefile
-@@ -56,6 +56,9 @@ clean-files += cpustr.h
+@@ -58,6 +58,9 @@ clean-files += cpustr.h
  # ---------------------------------------------------------------------------
  
  KBUILD_CFLAGS	:= $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
@@ -12819,10 +12733,10 @@ index bd49ec6..94c7f58 100644
  }
  
 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
-index 8bd44e8..6b111e9 100644
+index 0a291cd..9686efc 100644
 --- a/arch/x86/boot/compressed/Makefile
 +++ b/arch/x86/boot/compressed/Makefile
-@@ -28,6 +28,9 @@ KBUILD_CFLAGS += $(cflags-y)
+@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
  KBUILD_CFLAGS += -mno-mmx -mno-sse
  KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
  KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
@@ -13122,7 +13036,7 @@ index 9105655..41779c1 100644
  	movq	r1,r2;			\
  	movq	r3,r4;			\
 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
-index 477e9d7..c92c7d8 100644
+index 6bd2c6c..368c93e 100644
 --- a/arch/x86/crypto/aesni-intel_asm.S
 +++ b/arch/x86/crypto/aesni-intel_asm.S
 @@ -31,6 +31,7 @@
@@ -13131,9 +13045,9 @@ index 477e9d7..c92c7d8 100644
  #include <asm/inst.h>
 +#include <asm/alternative-asm.h>
  
- #ifdef __x86_64__
- .data
-@@ -205,7 +206,7 @@ enc:        .octa 0x2
+ /*
+  * The following macros are used to move an (un)aligned 16 byte value to/from
+@@ -217,7 +218,7 @@ enc:        .octa 0x2
  * num_initial_blocks = b mod 4
  * encrypt the initial num_initial_blocks blocks and apply ghash on
  * the ciphertext
@@ -13142,26 +13056,28 @@ index 477e9d7..c92c7d8 100644
  * are clobbered
  * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
  */
-@@ -214,8 +215,8 @@ enc:        .octa 0x2
- .macro INITIAL_BLOCKS_DEC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
+@@ -227,8 +228,8 @@ enc:        .octa 0x2
  XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
+         MOVADQ     SHUF_MASK(%rip), %xmm14
  	mov	   arg7, %r10           # %r10 = AAD
 -	mov	   arg8, %r12           # %r12 = aadLen
 -	mov	   %r12, %r11
 +	mov	   arg8, %r15           # %r15 = aadLen
 +	mov	   %r15, %r11
  	pxor	   %xmm\i, %xmm\i
+ 
  _get_AAD_loop\num_initial_blocks\operation:
- 	movd	   (%r10), \TMP1
-@@ -223,15 +224,15 @@ _get_AAD_loop\num_initial_blocks\operation:
+@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
  	psrldq	   $4, %xmm\i
  	pxor	   \TMP1, %xmm\i
  	add	   $4, %r10
 -	sub	   $4, %r12
 +	sub	   $4, %r15
  	jne	   _get_AAD_loop\num_initial_blocks\operation
+ 
  	cmp	   $16, %r11
  	je	   _get_AAD_loop2_done\num_initial_blocks\operation
+ 
 -	mov	   $16, %r12
 +	mov	   $16, %r15
  _get_AAD_loop2\num_initial_blocks\operation:
@@ -13171,9 +13087,9 @@ index 477e9d7..c92c7d8 100644
 +	sub	   $4, %r15
 +	cmp	   %r11, %r15
  	jne	   _get_AAD_loop2\num_initial_blocks\operation
+ 
  _get_AAD_loop2_done\num_initial_blocks\operation:
-         movdqa     SHUF_MASK(%rip), %xmm14
-@@ -443,7 +444,7 @@ _initial_blocks_done\num_initial_blocks\operation:
+@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
  * num_initial_blocks = b mod 4
  * encrypt the initial num_initial_blocks blocks and apply ghash on
  * the ciphertext
@@ -13183,8 +13099,8 @@ index 477e9d7..c92c7d8 100644
  * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
  */
 @@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
- .macro INITIAL_BLOCKS_ENC num_initial_blocks TMP1 TMP2 TMP3 TMP4 TMP5 XMM0 XMM1 \
  XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
+         MOVADQ     SHUF_MASK(%rip), %xmm14
  	mov	   arg7, %r10           # %r10 = AAD
 -	mov	   arg8, %r12           # %r12 = aadLen
 -	mov	   %r12, %r11
@@ -13212,8 +13128,8 @@ index 477e9d7..c92c7d8 100644
 +	cmp	   %r11, %r15
  	jne	   _get_AAD_loop2\num_initial_blocks\operation
  _get_AAD_loop2_done\num_initial_blocks\operation:
-         movdqa     SHUF_MASK(%rip), %xmm14
-@@ -1269,7 +1270,7 @@ TMP7 XMM1 XMM2 XMM3 XMM4 XMMDst
+ 	PSHUFB_XMM   %xmm14, %xmm\i # byte-reflect the AAD data
+@@ -1280,7 +1281,7 @@ _esb_loop_\@:
  *
  *****************************************************************************/
  ENTRY(aesni_gcm_dec)
@@ -13222,7 +13138,7 @@ index 477e9d7..c92c7d8 100644
  	push	%r13
  	push	%r14
  	mov	%rsp, %r14
-@@ -1279,8 +1280,8 @@ ENTRY(aesni_gcm_dec)
+@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
  */
  	sub	$VARIABLE_OFFSET, %rsp
  	and	$~63, %rsp                        # align rsp to 64 bytes
@@ -13233,7 +13149,7 @@ index 477e9d7..c92c7d8 100644
          movdqa  SHUF_MASK(%rip), %xmm2
  	PSHUFB_XMM %xmm2, %xmm13
  
-@@ -1308,10 +1309,10 @@ ENTRY(aesni_gcm_dec)
+@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
  	movdqa %xmm13, HashKey(%rsp)           # store HashKey<<1 (mod poly)
  	mov %arg4, %r13    # save the number of bytes of plaintext/ciphertext
  	and $-16, %r13                      # %r13 = %r13 - (%r13 mod 16)
@@ -13247,7 +13163,7 @@ index 477e9d7..c92c7d8 100644
  	jb _initial_num_blocks_is_1_decrypt
  	je _initial_num_blocks_is_2_decrypt
  _initial_num_blocks_is_3_decrypt:
-@@ -1361,16 +1362,16 @@ _zero_cipher_left_decrypt:
+@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
  	sub $16, %r11
  	add %r13, %r11
  	movdqu (%arg3,%r11,1), %xmm1   # receive the last <16 byte block
@@ -13268,7 +13184,7 @@ index 477e9d7..c92c7d8 100644
  	# get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
  	pand %xmm1, %xmm0            # mask out top 16-%r13 bytes of %xmm0
  	pand    %xmm1, %xmm2
-@@ -1399,9 +1400,9 @@ _less_than_8_bytes_left_decrypt:
+@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
  	sub	$1, %r13
  	jne	_less_than_8_bytes_left_decrypt
  _multiple_of_16_bytes_decrypt:
@@ -13281,7 +13197,7 @@ index 477e9d7..c92c7d8 100644
  	shl	$3, %arg4		  # len(C) in bits (*128)
  	MOVQ_R64_XMM	%arg4, %xmm1
  	pslldq	$8, %xmm15		  # %xmm15 = len(A)||0x0000000000000000
-@@ -1440,7 +1441,8 @@ _return_T_done_decrypt:
+@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
  	mov	%r14, %rsp
  	pop	%r14
  	pop	%r13
@@ -13291,7 +13207,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(aesni_gcm_dec)
  
-@@ -1529,7 +1531,7 @@ ENDPROC(aesni_gcm_dec)
+@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
  * poly = x^128 + x^127 + x^126 + x^121 + 1
  ***************************************************************************/
  ENTRY(aesni_gcm_enc)
@@ -13300,7 +13216,7 @@ index 477e9d7..c92c7d8 100644
  	push	%r13
  	push	%r14
  	mov	%rsp, %r14
-@@ -1539,8 +1541,8 @@ ENTRY(aesni_gcm_enc)
+@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
  #
  	sub	$VARIABLE_OFFSET, %rsp
  	and	$~63, %rsp
@@ -13311,7 +13227,7 @@ index 477e9d7..c92c7d8 100644
          movdqa  SHUF_MASK(%rip), %xmm2
  	PSHUFB_XMM %xmm2, %xmm13
  
-@@ -1564,13 +1566,13 @@ ENTRY(aesni_gcm_enc)
+@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
  	movdqa	%xmm13, HashKey(%rsp)
  	mov	%arg4, %r13            # %xmm13 holds HashKey<<1 (mod poly)
  	and	$-16, %r13
@@ -13328,7 +13244,7 @@ index 477e9d7..c92c7d8 100644
  	jb	_initial_num_blocks_is_1_encrypt
  	je	_initial_num_blocks_is_2_encrypt
  _initial_num_blocks_is_3_encrypt:
-@@ -1623,14 +1625,14 @@ _zero_cipher_left_encrypt:
+@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
  	sub $16, %r11
  	add %r13, %r11
  	movdqu (%arg3,%r11,1), %xmm1     # receive the last <16 byte blocks
@@ -13347,7 +13263,7 @@ index 477e9d7..c92c7d8 100644
  	# get the appropriate mask to mask out top 16-r13 bytes of xmm0
  	pand	%xmm1, %xmm0            # mask out top 16-r13 bytes of xmm0
          movdqa SHUF_MASK(%rip), %xmm10
-@@ -1663,9 +1665,9 @@ _less_than_8_bytes_left_encrypt:
+@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
  	sub $1, %r13
  	jne _less_than_8_bytes_left_encrypt
  _multiple_of_16_bytes_encrypt:
@@ -13360,7 +13276,7 @@ index 477e9d7..c92c7d8 100644
  	shl	$3, %arg4               # len(C) in bits (*128)
  	MOVQ_R64_XMM	%arg4, %xmm1
  	pslldq	$8, %xmm15          # %xmm15 = len(A)||0x0000000000000000
-@@ -1704,7 +1706,8 @@ _return_T_done_encrypt:
+@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
  	mov	%r14, %rsp
  	pop	%r14
  	pop	%r13
@@ -13370,7 +13286,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(aesni_gcm_enc)
  
-@@ -1722,6 +1725,7 @@ _key_expansion_256a:
+@@ -1733,6 +1736,7 @@ _key_expansion_256a:
  	pxor %xmm1, %xmm0
  	movaps %xmm0, (TKEYP)
  	add $0x10, TKEYP
@@ -13378,7 +13294,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(_key_expansion_128)
  ENDPROC(_key_expansion_256a)
-@@ -1748,6 +1752,7 @@ _key_expansion_192a:
+@@ -1759,6 +1763,7 @@ _key_expansion_192a:
  	shufps $0b01001110, %xmm2, %xmm1
  	movaps %xmm1, 0x10(TKEYP)
  	add $0x20, TKEYP
@@ -13386,7 +13302,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(_key_expansion_192a)
  
-@@ -1768,6 +1773,7 @@ _key_expansion_192b:
+@@ -1779,6 +1784,7 @@ _key_expansion_192b:
  
  	movaps %xmm0, (TKEYP)
  	add $0x10, TKEYP
@@ -13394,7 +13310,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(_key_expansion_192b)
  
-@@ -1781,6 +1787,7 @@ _key_expansion_256b:
+@@ -1792,6 +1798,7 @@ _key_expansion_256b:
  	pxor %xmm1, %xmm2
  	movaps %xmm2, (TKEYP)
  	add $0x10, TKEYP
@@ -13402,7 +13318,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(_key_expansion_256b)
  
-@@ -1894,6 +1901,7 @@ ENTRY(aesni_set_key)
+@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
  #ifndef __x86_64__
  	popl KEYP
  #endif
@@ -13410,7 +13326,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(aesni_set_key)
  
-@@ -1916,6 +1924,7 @@ ENTRY(aesni_enc)
+@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
  	popl KLEN
  	popl KEYP
  #endif
@@ -13418,7 +13334,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(aesni_enc)
  
-@@ -1974,6 +1983,7 @@ _aesni_enc1:
+@@ -1985,6 +1994,7 @@ _aesni_enc1:
  	AESENC KEY STATE
  	movaps 0x70(TKEYP), KEY
  	AESENCLAST KEY STATE
@@ -13426,7 +13342,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(_aesni_enc1)
  
-@@ -2083,6 +2093,7 @@ _aesni_enc4:
+@@ -2094,6 +2104,7 @@ _aesni_enc4:
  	AESENCLAST KEY STATE2
  	AESENCLAST KEY STATE3
  	AESENCLAST KEY STATE4
@@ -13434,7 +13350,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(_aesni_enc4)
  
-@@ -2106,6 +2117,7 @@ ENTRY(aesni_dec)
+@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
  	popl KLEN
  	popl KEYP
  #endif
@@ -13442,7 +13358,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(aesni_dec)
  
-@@ -2164,6 +2176,7 @@ _aesni_dec1:
+@@ -2175,6 +2187,7 @@ _aesni_dec1:
  	AESDEC KEY STATE
  	movaps 0x70(TKEYP), KEY
  	AESDECLAST KEY STATE
@@ -13450,7 +13366,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(_aesni_dec1)
  
-@@ -2273,6 +2286,7 @@ _aesni_dec4:
+@@ -2284,6 +2297,7 @@ _aesni_dec4:
  	AESDECLAST KEY STATE2
  	AESDECLAST KEY STATE3
  	AESDECLAST KEY STATE4
@@ -13458,7 +13374,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(_aesni_dec4)
  
-@@ -2331,6 +2345,7 @@ ENTRY(aesni_ecb_enc)
+@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
  	popl KEYP
  	popl LEN
  #endif
@@ -13466,7 +13382,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(aesni_ecb_enc)
  
-@@ -2390,6 +2405,7 @@ ENTRY(aesni_ecb_dec)
+@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
  	popl KEYP
  	popl LEN
  #endif
@@ -13474,7 +13390,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(aesni_ecb_dec)
  
-@@ -2432,6 +2448,7 @@ ENTRY(aesni_cbc_enc)
+@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
  	popl LEN
  	popl IVP
  #endif
@@ -13482,7 +13398,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(aesni_cbc_enc)
  
-@@ -2523,6 +2540,7 @@ ENTRY(aesni_cbc_dec)
+@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
  	popl LEN
  	popl IVP
  #endif
@@ -13490,7 +13406,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(aesni_cbc_dec)
  
-@@ -2550,6 +2568,7 @@ _aesni_inc_init:
+@@ -2561,6 +2579,7 @@ _aesni_inc_init:
  	mov $1, TCTR_LOW
  	MOVQ_R64_XMM TCTR_LOW INC
  	MOVQ_R64_XMM CTR TCTR_LOW
@@ -13498,7 +13414,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(_aesni_inc_init)
  
-@@ -2579,6 +2598,7 @@ _aesni_inc:
+@@ -2590,6 +2609,7 @@ _aesni_inc:
  .Linc_low:
  	movaps CTR, IV
  	PSHUFB_XMM BSWAP_MASK IV
@@ -13506,7 +13422,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(_aesni_inc)
  
-@@ -2640,6 +2660,7 @@ ENTRY(aesni_ctr_enc)
+@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
  .Lctr_enc_ret:
  	movups IV, (IVP)
  .Lctr_enc_just_ret:
@@ -13514,7 +13430,7 @@ index 477e9d7..c92c7d8 100644
  	ret
  ENDPROC(aesni_ctr_enc)
  
-@@ -2766,6 +2787,7 @@ ENTRY(aesni_xts_crypt8)
+@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
  	pxor INC, STATE4
  	movdqu STATE4, 0x70(OUTP)
  
@@ -14669,7 +14585,7 @@ index ae6aad1..719d6d9 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 f9e181a..300544c 100644
+index d0165c9..0d5639b 100644
 --- a/arch/x86/ia32/ia32_signal.c
 +++ b/arch/x86/ia32/ia32_signal.c
 @@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
@@ -14746,7 +14662,7 @@ index f9e181a..300544c 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 82e8a1d..4e998d5 100644
+index 156ebca..9591cf0 100644
 --- a/arch/x86/ia32/ia32entry.S
 +++ b/arch/x86/ia32/ia32entry.S
 @@ -15,8 +15,10 @@
@@ -14886,7 +14802,7 @@ index 82e8a1d..4e998d5 100644
  	CFI_REMEMBER_STATE
  	jnz  sysenter_tracesys
  	cmpq	$(IA32_NR_syscalls-1),%rax
-@@ -172,15 +218,18 @@ sysenter_do_call:
+@@ -172,14 +218,17 @@ sysenter_do_call:
  sysenter_dispatch:
  	call	*ia32_sys_call_table(,%rax,8)
  	movq	%rax,RAX-ARGOFFSET(%rsp)
@@ -14900,15 +14816,13 @@ index 82e8a1d..4e998d5 100644
 -	andl    $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
 +	pax_exit_kernel_user
 +	pax_erase_kstack
-+	andl    $~TS_COMPAT,TI_status(%r11)
++	andl	$~TS_COMPAT,TI_status(%r11)
  	/* clear IF, that popfq doesn't enable interrupts early */
--	andl  $~0x200,EFLAGS-R11(%rsp) 
--	movl	RIP-R11(%rsp),%edx		/* User %eip */
-+	andl  $~X86_EFLAGS_IF,EFLAGS(%rsp)
-+	movl	RIP(%rsp),%edx		/* User %eip */
+-	andl	$~0x200,EFLAGS-ARGOFFSET(%rsp)
++	andl	$~X86_EFLAGS_IF,EFLAGS-ARGOFFSET(%rsp)
+ 	movl	RIP-ARGOFFSET(%rsp),%edx		/* User %eip */
  	CFI_REGISTER rip,rdx
  	RESTORE_ARGS 0,24,0,0,0,0
- 	xorq	%r8,%r8
 @@ -205,6 +254,9 @@ sysexit_from_sys_call:
  	movl %ebx,%esi			/* 2nd arg: 1st syscall arg */
  	movl %eax,%edi			/* 1st arg: syscall number */
@@ -15198,7 +15112,7 @@ index 473bdbe..b1e3377 100644
  	ALTINSTR_REPLACEMENT(newinstr2, feature2, 2)			\
  	".popsection"
 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
-index 465b309..ab7e51f 100644
+index efc3b22..85c4f3a 100644
 --- a/arch/x86/include/asm/apic.h
 +++ b/arch/x86/include/asm/apic.h
 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
@@ -16223,15 +16137,14 @@ index 48f99f1..d78ebf9 100644
  #ifdef CONFIG_X86_VSMP
  #ifdef CONFIG_SMP
 diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
-index 76659b6..72b8439 100644
+index 1f1297b..72b8439 100644
 --- a/arch/x86/include/asm/calling.h
 +++ b/arch/x86/include/asm/calling.h
-@@ -82,107 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
+@@ -82,106 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
  #define RSP		152
  #define SS		160
  
 -#define ARGOFFSET	R11
--#define SWFRAME		ORIG_RAX
 +#define ARGOFFSET	R15
  
  	.macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
@@ -16516,10 +16429,10 @@ 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 aede2c3..40d7a8f 100644
+index 90a5485..43b6211 100644
 --- a/arch/x86/include/asm/cpufeature.h
 +++ b/arch/x86/include/asm/cpufeature.h
-@@ -212,7 +212,7 @@
+@@ -213,7 +213,7 @@
  #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
  #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
  #define X86_FEATURE_VMMCALL     ( 8*32+15) /* Prefer vmmcall to vmcall */
@@ -16528,7 +16441,7 @@ index aede2c3..40d7a8f 100644
  
  /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
  #define X86_FEATURE_FSGSBASE	( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
-@@ -220,7 +220,7 @@
+@@ -221,7 +221,7 @@
  #define X86_FEATURE_BMI1	( 9*32+ 3) /* 1st group bit manipulation extensions */
  #define X86_FEATURE_HLE		( 9*32+ 4) /* Hardware Lock Elision */
  #define X86_FEATURE_AVX2	( 9*32+ 5) /* AVX2 instructions */
@@ -16537,15 +16450,15 @@ index aede2c3..40d7a8f 100644
  #define X86_FEATURE_BMI2	( 9*32+ 8) /* 2nd group bit manipulation extensions */
  #define X86_FEATURE_ERMS	( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
  #define X86_FEATURE_INVPCID	( 9*32+10) /* Invalidate Processor Context ID */
-@@ -388,6 +388,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
- #define cpu_has_cx16		boot_cpu_has(X86_FEATURE_CX16)
+@@ -390,6 +390,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
  #define cpu_has_eager_fpu	boot_cpu_has(X86_FEATURE_EAGER_FPU)
  #define cpu_has_topoext		boot_cpu_has(X86_FEATURE_TOPOEXT)
+ #define cpu_has_bpext		boot_cpu_has(X86_FEATURE_BPEXT)
 +#define cpu_has_pcid		boot_cpu_has(X86_FEATURE_PCID)
  
  #if __GNUC__ >= 4
  extern void warn_pre_alternatives(void);
-@@ -439,7 +440,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
+@@ -441,7 +442,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
  
  #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
  	t_warn:
@@ -16555,7 +16468,7 @@ index aede2c3..40d7a8f 100644
  		return false;
  #endif
  
-@@ -459,7 +461,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
+@@ -461,7 +463,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"
@@ -16564,7 +16477,7 @@ index aede2c3..40d7a8f 100644
  			     "3: movb $1,%0\n"
  			     "4:\n"
  			     ".previous\n"
-@@ -496,7 +498,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
+@@ -498,7 +500,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"
@@ -16573,7 +16486,7 @@ index aede2c3..40d7a8f 100644
  			 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
  			 "4:\n"
  			 ".previous\n"
-@@ -529,7 +531,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
+@@ -531,7 +533,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"
@@ -16582,7 +16495,7 @@ index aede2c3..40d7a8f 100644
  			     "3: movb $0,%0\n"
  			     "4:\n"
  			     ".previous\n"
-@@ -543,7 +545,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
+@@ -545,7 +547,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"
@@ -16978,7 +16891,7 @@ index 1c7eefe..d0e4702 100644
  };
  
 diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
-index f895358..800c60d 100644
+index 72ba21a..79f3f66 100644
 --- a/arch/x86/include/asm/fpu-internal.h
 +++ b/arch/x86/include/asm/fpu-internal.h
 @@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
@@ -17002,7 +16915,7 @@ index f895358..800c60d 100644
  	err;								\
  })
  
-@@ -298,7 +302,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
+@@ -300,7 +304,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
  			"fnclex\n\t"
  			"emms\n\t"
  			"fildl %P[addr]"	/* set F?P to defined value */
@@ -17196,19 +17109,6 @@ index 4421b5d..8543006 100644
  
  #define flush_insn_slot(p)	do { } while (0)
  
-diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
-index d89c6b8..e711c69 100644
---- a/arch/x86/include/asm/kvm_host.h
-+++ b/arch/x86/include/asm/kvm_host.h
-@@ -51,7 +51,7 @@
- 			  | X86_CR0_NW | X86_CR0_CD | X86_CR0_PG))
- 
- #define CR3_L_MODE_RESERVED_BITS 0xFFFFFF0000000000ULL
--#define CR3_PCID_INVD		 (1UL << 63)
-+#define CR3_PCID_INVD		 (1ULL << 63)
- #define CR4_RESERVED_BITS                                               \
- 	(~(unsigned long)(X86_CR4_VME | X86_CR4_PVI | X86_CR4_TSD | X86_CR4_DE\
- 			  | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE     \
 diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
 index 4ad6560..75c7bdd 100644
 --- a/arch/x86/include/asm/local.h
@@ -17413,7 +17313,7 @@ index 0000000..2bfd3ba
 +
 +#endif /* X86_MMAN_H */
 diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
-index 876e74e..e20bfb1 100644
+index 09b9620..923aecd 100644
 --- a/arch/x86/include/asm/mmu.h
 +++ b/arch/x86/include/asm/mmu.h
 @@ -9,7 +9,7 @@
@@ -17443,14 +17343,14 @@ index 876e74e..e20bfb1 100644
 +
 +#endif
 +#endif
- } mm_context_t;
  
- #ifdef CONFIG_SMP
+ 	atomic_t perf_rdpmc_allowed;	/* nonzero if rdpmc is allowed */
+ } mm_context_t;
 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
-index 4b75d59..8ffacb6 100644
+index 883f6b93..6869d96 100644
 --- a/arch/x86/include/asm/mmu_context.h
 +++ b/arch/x86/include/asm/mmu_context.h
-@@ -27,6 +27,20 @@ void destroy_context(struct mm_struct *mm);
+@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
  {
@@ -17471,7 +17371,7 @@ index 4b75d59..8ffacb6 100644
  #ifdef CONFIG_SMP
  	if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
  		this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
-@@ -37,16 +51,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
  			     struct task_struct *tsk)
  {
  	unsigned cpu = smp_processor_id();
@@ -17531,7 +17431,7 @@ index 4b75d59..8ffacb6 100644
  		trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
  
  		/* Stop flush ipis for the previous mm */
-@@ -64,9 +121,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
  		 */
  		if (unlikely(prev->context.ldt != next->context.ldt))
  			load_LDT_nolock(&next->context);
@@ -17600,7 +17500,7 @@ index 4b75d59..8ffacb6 100644
  		this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
  		BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
  
-@@ -83,12 +198,29 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -103,13 +218,30 @@ 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.
  			 */
@@ -17610,6 +17510,7 @@ index 4b75d59..8ffacb6 100644
  			trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
 +#endif
 +
+ 			load_mm_cr4(next);
  			load_LDT_nolock(&next->context);
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
@@ -17774,7 +17675,7 @@ index b3bebf9..13ac22e 100644
  #define __phys_addr(x)		__phys_addr_nodebug(x)
  #define __phys_addr_symbol(x) \
 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index 32444ae..1a1624b 100644
+index 965c47d..ffe0af8 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)
@@ -18018,7 +17919,7 @@ index c4412e9..90e88c5 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 206a87f..1623b06 100644
+index fd74a11..35fd5af 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)
@@ -18032,7 +17933,7 @@ index 206a87f..1623b06 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 81bb91b..9392125 100644
+index cdaa58c..e61122b 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)
@@ -18053,7 +17954,7 @@ index 81bb91b..9392125 100644
  
  /*
 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index e8a5454..1539359 100644
+index a0c35bf..3647d79 100644
 --- a/arch/x86/include/asm/pgtable.h
 +++ b/arch/x86/include/asm/pgtable.h
 @@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
@@ -18118,7 +18019,7 @@ index e8a5454..1539359 100644
  static inline int pte_dirty(pte_t pte)
  {
  	return pte_flags(pte) & _PAGE_DIRTY;
-@@ -161,6 +203,11 @@ static inline unsigned long pud_pfn(pud_t pud)
+@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
  	return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
  }
  
@@ -18130,7 +18031,7 @@ index e8a5454..1539359 100644
  #define pte_page(pte)	pfn_to_page(pte_pfn(pte))
  
  static inline int pmd_large(pmd_t pte)
-@@ -214,9 +261,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
+@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
  	return pte_clear_flags(pte, _PAGE_RW);
  }
  
@@ -18161,7 +18062,7 @@ index e8a5454..1539359 100644
  }
  
  static inline pte_t pte_mkdirty(pte_t pte)
-@@ -446,6 +513,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
+@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
  #endif
  
  #ifndef __ASSEMBLY__
@@ -18178,7 +18079,7 @@ index e8a5454..1539359 100644
  #include <linux/mm_types.h>
  #include <linux/mmdebug.h>
  #include <linux/log2.h>
-@@ -592,7 +669,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
+@@ -571,7 +648,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:
   */
@@ -18187,7 +18088,7 @@ index e8a5454..1539359 100644
  
  /* Find an entry in the second-level page table.. */
  static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
-@@ -632,7 +709,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
+@@ -611,7 +688,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:
   */
@@ -18196,7 +18097,7 @@ index e8a5454..1539359 100644
  
  /* to find an entry in a page-table-directory. */
  static inline unsigned long pud_index(unsigned long address)
-@@ -647,7 +724,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
+@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
  
  static inline int pgd_bad(pgd_t pgd)
  {
@@ -18205,7 +18106,7 @@ index e8a5454..1539359 100644
  }
  
  static inline int pgd_none(pgd_t pgd)
-@@ -670,7 +747,12 @@ static inline int pgd_none(pgd_t pgd)
+@@ -649,7 +726,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;
   */
@@ -18219,7 +18120,7 @@ index e8a5454..1539359 100644
  /*
   * a shortcut which implies the use of the kernel's pgd, instead
   * of a process's
-@@ -681,6 +763,23 @@ static inline int pgd_none(pgd_t pgd)
+@@ -660,6 +742,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)
  
@@ -18243,7 +18144,7 @@ index e8a5454..1539359 100644
  #ifndef __ASSEMBLY__
  
  extern int direct_gbpages;
-@@ -847,11 +946,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
+@@ -826,11 +925,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.
   */
@@ -18349,7 +18250,7 @@ index 9fb2f2b..b04b4bf 100644
  #define MODULES_END	VMALLOC_END
  #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
 diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
-index 4572b2f..4430113 100644
+index 2ee7811..db41d8c 100644
 --- a/arch/x86/include/asm/pgtable_64.h
 +++ b/arch/x86/include/asm/pgtable_64.h
 @@ -16,11 +16,16 @@
@@ -18427,10 +18328,10 @@ index 602b602..acb53ed 100644
  
  #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
-index 25bcd4a..bf3f815 100644
+index 8c7c108..1c1b77f 100644
 --- a/arch/x86/include/asm/pgtable_types.h
 +++ b/arch/x86/include/asm/pgtable_types.h
-@@ -110,8 +110,10 @@
+@@ -85,8 +85,10 @@
  
  #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
  #define _PAGE_NX	(_AT(pteval_t, 1) << _PAGE_BIT_NX)
@@ -18441,8 +18342,8 @@ index 25bcd4a..bf3f815 100644
 +#define _PAGE_NX	(_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
  #endif
  
- #define _PAGE_FILE	(_AT(pteval_t, 1) << _PAGE_BIT_FILE)
-@@ -167,6 +169,9 @@ enum page_cache_mode {
+ #define _PAGE_PROTNONE	(_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
+@@ -141,6 +143,9 @@ enum page_cache_mode {
  #define PAGE_READONLY_EXEC	__pgprot(_PAGE_PRESENT | _PAGE_USER |	\
  					 _PAGE_ACCESSED)
  
@@ -18452,7 +18353,7 @@ index 25bcd4a..bf3f815 100644
  #define __PAGE_KERNEL_EXEC						\
  	(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
  #define __PAGE_KERNEL		(__PAGE_KERNEL_EXEC | _PAGE_NX)
-@@ -174,7 +179,7 @@ enum page_cache_mode {
+@@ -148,7 +153,7 @@ enum page_cache_mode {
  #define __PAGE_KERNEL_RO		(__PAGE_KERNEL & ~_PAGE_RW)
  #define __PAGE_KERNEL_RX		(__PAGE_KERNEL_EXEC & ~_PAGE_RW)
  #define __PAGE_KERNEL_NOCACHE		(__PAGE_KERNEL | _PAGE_NOCACHE)
@@ -18461,7 +18362,7 @@ index 25bcd4a..bf3f815 100644
  #define __PAGE_KERNEL_VVAR		(__PAGE_KERNEL_RO | _PAGE_USER)
  #define __PAGE_KERNEL_LARGE		(__PAGE_KERNEL | _PAGE_PSE)
  #define __PAGE_KERNEL_LARGE_EXEC	(__PAGE_KERNEL_EXEC | _PAGE_PSE)
-@@ -220,7 +225,7 @@ enum page_cache_mode {
+@@ -194,7 +199,7 @@ enum page_cache_mode {
  #ifdef CONFIG_X86_64
  #define __PAGE_KERNEL_IDENT_LARGE_EXEC	__PAGE_KERNEL_LARGE_EXEC
  #else
@@ -18470,7 +18371,7 @@ index 25bcd4a..bf3f815 100644
  #define PDE_IDENT_ATTR	 0x063		/* PRESENT+RW+DIRTY+ACCESSED */
  #define PGD_IDENT_ATTR	 0x001		/* PRESENT (no other attributes) */
  #endif
-@@ -259,7 +264,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
+@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
  {
  	return native_pgd_val(pgd) & PTE_FLAGS_MASK;
  }
@@ -18488,7 +18389,7 @@ index 25bcd4a..bf3f815 100644
  #if PAGETABLE_LEVELS > 3
  typedef struct { pudval_t pud; } pud_t;
  
-@@ -273,8 +288,6 @@ static inline pudval_t native_pud_val(pud_t pud)
+@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
  	return pud.pud;
  }
  #else
@@ -18497,7 +18398,7 @@ index 25bcd4a..bf3f815 100644
  static inline pudval_t native_pud_val(pud_t pud)
  {
  	return native_pgd_val(pud.pgd);
-@@ -294,8 +307,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
+@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
  	return pmd.pmd;
  }
  #else
@@ -18506,7 +18407,7 @@ index 25bcd4a..bf3f815 100644
  static inline pmdval_t native_pmd_val(pmd_t pmd)
  {
  	return native_pgd_val(pmd.pud.pgd);
-@@ -402,7 +413,6 @@ typedef struct page *pgtable_t;
+@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
  
  extern pteval_t __supported_pte_mask;
  extern void set_nx(void);
@@ -18528,7 +18429,7 @@ index 8f327184..368fb29 100644
  
  /*
 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index a092a0c..8e9640b 100644
+index ec1c935..5cc6023 100644
 --- a/arch/x86/include/asm/processor.h
 +++ b/arch/x86/include/asm/processor.h
 @@ -127,7 +127,7 @@ struct cpuinfo_x86 {
@@ -18580,39 +18481,7 @@ index a092a0c..8e9640b 100644
  #endif
  #ifdef CONFIG_X86_32
  	unsigned long		ip;
-@@ -588,29 +601,8 @@ static inline void load_sp0(struct tss_struct *tss,
- extern unsigned long mmu_cr4_features;
- extern u32 *trampoline_cr4_features;
- 
--static inline void set_in_cr4(unsigned long mask)
--{
--	unsigned long cr4;
--
--	mmu_cr4_features |= mask;
--	if (trampoline_cr4_features)
--		*trampoline_cr4_features = mmu_cr4_features;
--	cr4 = read_cr4();
--	cr4 |= mask;
--	write_cr4(cr4);
--}
--
--static inline void clear_in_cr4(unsigned long mask)
--{
--	unsigned long cr4;
--
--	mmu_cr4_features &= ~mask;
--	if (trampoline_cr4_features)
--		*trampoline_cr4_features = mmu_cr4_features;
--	cr4 = read_cr4();
--	cr4 &= ~mask;
--	write_cr4(cr4);
--}
-+extern void set_in_cr4(unsigned long mask);
-+extern void clear_in_cr4(unsigned long mask);
- 
- typedef struct {
- 	unsigned long		seg;
-@@ -838,11 +830,18 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -805,11 +818,18 @@ static inline void spin_lock_prefetch(const void *x)
   */
  #define TASK_SIZE		PAGE_OFFSET
  #define TASK_SIZE_MAX		TASK_SIZE
@@ -18633,7 +18502,7 @@ index a092a0c..8e9640b 100644
  	.vm86_info		= NULL,					  \
  	.sysenter_cs		= __KERNEL_CS,				  \
  	.io_bitmap_ptr		= NULL,					  \
-@@ -856,7 +855,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -823,7 +843,7 @@ static inline void spin_lock_prefetch(const void *x)
   */
  #define INIT_TSS  {							  \
  	.x86_tss = {							  \
@@ -18642,7 +18511,7 @@ index a092a0c..8e9640b 100644
  		.ss0		= __KERNEL_DS,				  \
  		.ss1		= __KERNEL_CS,				  \
  		.io_bitmap_base	= INVALID_IO_BITMAP_OFFSET,		  \
-@@ -867,11 +866,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -834,11 +854,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))
@@ -18655,7 +18524,7 @@ index a092a0c..8e9640b 100644
  
  /*
   * The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -886,7 +881,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -853,7 +869,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
  #define task_pt_regs(task)                                             \
  ({                                                                     \
         struct pt_regs *__regs__;                                       \
@@ -18664,7 +18533,7 @@ index a092a0c..8e9640b 100644
         __regs__ - 1;                                                   \
  })
  
-@@ -902,13 +897,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -869,13 +885,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
   * particular problem by preventing anything from being mapped
   * at the maximum canonical address.
   */
@@ -18680,7 +18549,7 @@ index a092a0c..8e9640b 100644
  
  #define TASK_SIZE		(test_thread_flag(TIF_ADDR32) ? \
  					IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -919,11 +914,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -886,11 +902,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
  #define STACK_TOP_MAX		TASK_SIZE_MAX
  
  #define INIT_THREAD  { \
@@ -18694,7 +18563,7 @@ index a092a0c..8e9640b 100644
  }
  
  /*
-@@ -951,6 +946,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
+@@ -918,6 +934,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
   */
  #define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
  
@@ -18705,7 +18574,7 @@ index a092a0c..8e9640b 100644
  #define KSTK_EIP(task)		(task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-@@ -995,7 +994,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
+@@ -962,7 +982,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
  	return 0;
  }
  
@@ -18714,7 +18583,7 @@ index a092a0c..8e9640b 100644
  extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
  
  void default_idle(void);
-@@ -1005,6 +1004,6 @@ bool xen_set_default_idle(void);
+@@ -972,6 +992,6 @@ bool xen_set_default_idle(void);
  #define xen_set_default_idle 0
  #endif
  
@@ -19416,7 +19285,7 @@ index 751bf4b..a1278b5 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 547e344..6be1175 100644
+index 1d4e4f2..506db18 100644
 --- a/arch/x86/include/asm/thread_info.h
 +++ b/arch/x86/include/asm/thread_info.h
 @@ -24,7 +24,6 @@ struct exec_domain;
@@ -19427,9 +19296,9 @@ index 547e344..6be1175 100644
  	struct exec_domain	*exec_domain;	/* execution domain */
  	__u32			flags;		/* low level flags */
  	__u32			status;		/* thread synchronous flags */
-@@ -33,13 +32,13 @@ struct thread_info {
+@@ -32,13 +31,13 @@ struct thread_info {
+ 	int			saved_preempt_count;
  	mm_segment_t		addr_limit;
- 	struct restart_block    restart_block;
  	void __user		*sysenter_return;
 +	unsigned long		lowest_stack;
  	unsigned int		sig_on_uaccess_error:1;
@@ -19443,8 +19312,8 @@ index 547e344..6be1175 100644
  	.exec_domain	= &default_exec_domain,	\
  	.flags		= 0,			\
  	.cpu		= 0,			\
-@@ -50,7 +49,7 @@ struct thread_info {
- 	},					\
+@@ -46,7 +45,7 @@ struct thread_info {
+ 	.addr_limit	= KERNEL_DS,		\
  }
  
 -#define init_thread_info	(init_thread_union.thread_info)
@@ -19452,7 +19321,7 @@ index 547e344..6be1175 100644
  #define init_stack		(init_thread_union.stack)
  
  #else /* !__ASSEMBLY__ */
-@@ -91,6 +90,7 @@ struct thread_info {
+@@ -86,6 +85,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 */
@@ -19460,7 +19329,7 @@ index 547e344..6be1175 100644
  
  #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
  #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
-@@ -115,17 +115,18 @@ struct thread_info {
+@@ -109,17 +109,18 @@ struct thread_info {
  #define _TIF_SYSCALL_TRACEPOINT	(1 << TIF_SYSCALL_TRACEPOINT)
  #define _TIF_ADDR32		(1 << TIF_ADDR32)
  #define _TIF_X32		(1 << TIF_X32)
@@ -19481,7 +19350,7 @@ index 547e344..6be1175 100644
  
  /* work to do on interrupt/exception return */
  #define _TIF_WORK_MASK							\
-@@ -136,7 +137,7 @@ struct thread_info {
+@@ -130,7 +131,7 @@ struct thread_info {
  /* work to do on any return to user space */
  #define _TIF_ALLWORK_MASK						\
  	((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT |	\
@@ -19490,7 +19359,7 @@ index 547e344..6be1175 100644
  
  /* Only used for 64 bit */
  #define _TIF_DO_NOTIFY_MASK						\
-@@ -151,7 +152,6 @@ struct thread_info {
+@@ -145,7 +146,6 @@ struct thread_info {
  #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
  
  #define STACK_WARN		(THREAD_SIZE/8)
@@ -19498,7 +19367,7 @@ index 547e344..6be1175 100644
  
  /*
   * macros/functions for gaining access to the thread information structure
-@@ -162,26 +162,18 @@ struct thread_info {
+@@ -156,12 +156,11 @@ struct thread_info {
  
  DECLARE_PER_CPU(unsigned long, kernel_stack);
  
@@ -19513,7 +19382,8 @@ index 547e344..6be1175 100644
 +	return this_cpu_read_stable(current_tinfo);
  }
  
- #else /* !__ASSEMBLY__ */
+ static inline unsigned long current_stack_pointer(void)
+@@ -179,14 +178,7 @@ static inline unsigned long current_stack_pointer(void)
  
  /* how to get the thread information struct from ASM */
  #define GET_THREAD_INFO(reg) \
@@ -19529,7 +19399,7 @@ index 547e344..6be1175 100644
  
  #endif
  
-@@ -237,5 +229,12 @@ static inline bool is_ia32_task(void)
+@@ -242,5 +234,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);
@@ -19543,10 +19413,10 @@ index 547e344..6be1175 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 04905bf..1178cdf 100644
+index cd79194..e7a9491 100644
 --- a/arch/x86/include/asm/tlbflush.h
 +++ b/arch/x86/include/asm/tlbflush.h
-@@ -17,18 +17,44 @@
+@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
  
  static inline void __native_flush_tlb(void)
  {
@@ -19578,7 +19448,7 @@ index 04905bf..1178cdf 100644
 +	if (static_cpu_has(X86_FEATURE_INVPCID)) {
 +		u64 descriptor[2];
  
--	cr4 = native_read_cr4();
+-	cr4 = this_cpu_read(cpu_tlbstate.cr4);
 -	/* clear PGE */
 -	native_write_cr4(cr4 & ~X86_CR4_PGE);
 -	/* write old PGE again and flush TLBs */
@@ -19588,7 +19458,7 @@ index 04905bf..1178cdf 100644
 +	} else {
 +		unsigned long cr4;
 +
-+		cr4 = native_read_cr4();
++		cr4 = this_cpu_read(cpu_tlbstate.cr4);
 +		/* clear PGE */
 +		native_write_cr4(cr4 & ~X86_CR4_PGE);
 +		/* write old PGE again and flush TLBs */
@@ -19597,7 +19467,7 @@ index 04905bf..1178cdf 100644
  }
  
  static inline void __native_flush_tlb_global(void)
-@@ -49,6 +75,41 @@ static inline void __native_flush_tlb_global(void)
+@@ -118,6 +144,41 @@ static inline void __native_flush_tlb_global(void)
  
  static inline void __native_flush_tlb_single(unsigned long addr)
  {
@@ -19640,7 +19510,7 @@ index 04905bf..1178cdf 100644
  }
  
 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
-index 0d592e0..cbc90a3 100644
+index ace9dec..3f9e253 100644
 --- a/arch/x86/include/asm/uaccess.h
 +++ b/arch/x86/include/asm/uaccess.h
 @@ -7,6 +7,7 @@
@@ -19728,7 +19598,7 @@ index 0d592e0..cbc90a3 100644
  	asm volatile("call __get_user_%P3"				\
  		     : "=a" (__ret_gu), "=r" (__val_gu)			\
  		     : "0" (ptr), "i" (sizeof(*(ptr))));		\
- 	(x) = (__typeof__(*(ptr))) __val_gu;				\
+ 	(x) = (__force __typeof__(*(ptr))) __val_gu;			\
 +	pax_close_userland();						\
  	__ret_gu;							\
  })
@@ -20191,7 +20061,7 @@ index 3c03a5d..edb68ae 100644
  
  #endif /* _ASM_X86_UACCESS_32_H */
 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
-index 12a26b9..c36fff5 100644
+index f2f9b39..2ae1bf8 100644
 --- a/arch/x86/include/asm/uaccess_64.h
 +++ b/arch/x86/include/asm/uaccess_64.h
 @@ -10,6 +10,9 @@
@@ -20513,8 +20383,8 @@ index 12a26b9..c36fff5 100644
  }
  
  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) __size_overflow(3);
+-copy_user_handle_tail(char *to, char *from, unsigned len);
++copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
  
  #endif /* _ASM_X86_UACCESS_64_H */
 diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
@@ -20580,10 +20450,10 @@ index f58a9c7..dc378042a 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 5eea099..ff7ef8d 100644
+index 358dcd3..23c0bf1 100644
 --- a/arch/x86/include/asm/xen/page.h
 +++ b/arch/x86/include/asm/xen/page.h
-@@ -83,7 +83,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
+@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
   * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
   *   cases needing an extended handling.
   */
@@ -20663,10 +20533,10 @@ index 7b0a55a..ad115bf 100644
  
  /* top of stack page */
 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
-index 5d4502c..a567e09 100644
+index cdb1b70..426434c 100644
 --- a/arch/x86/kernel/Makefile
 +++ b/arch/x86/kernel/Makefile
-@@ -24,7 +24,7 @@ obj-y			+= time.o ioport.o ldt.o dumpstack.o nmi.o
+@@ -28,7 +28,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
@@ -20676,10 +20546,10 @@ index 5d4502c..a567e09 100644
  obj-$(CONFIG_X86_64)	+= mcount_64.o
  obj-y			+= syscall_$(BITS).o vsyscall_gtod.o
 diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
-index b5ddc96..490b4e4 100644
+index 803b684..68c64f1 100644
 --- a/arch/x86/kernel/acpi/boot.c
 +++ b/arch/x86/kernel/acpi/boot.c
-@@ -1351,7 +1351,7 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
+@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
   * If your system is blacklisted here, but you find that acpi=force
   * works for you, please contact linux-acpi@vger.kernel.org
   */
@@ -20688,7 +20558,7 @@ index b5ddc96..490b4e4 100644
  	/*
  	 * Boxes that need ACPI disabled
  	 */
-@@ -1426,7 +1426,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
+@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
  };
  
  /* second table for DMI checks that should run after early-quirks */
@@ -20698,7 +20568,7 @@ index b5ddc96..490b4e4 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 3136820..e2c6577 100644
+index d1daead..acd77e2 100644
 --- a/arch/x86/kernel/acpi/sleep.c
 +++ b/arch/x86/kernel/acpi/sleep.c
 @@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
@@ -20902,10 +20772,10 @@ index 703130f..27a155d 100644
  	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 29b5b18..3bdfc29 100644
+index ad3639a..bd4253c 100644
 --- a/arch/x86/kernel/apic/apic.c
 +++ b/arch/x86/kernel/apic/apic.c
-@@ -201,7 +201,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
+@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
  /*
   * Debug level, exported for io_apic.c
   */
@@ -20914,7 +20784,7 @@ index 29b5b18..3bdfc29 100644
  
  int pic_mode;
  
-@@ -1991,7 +1991,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
+@@ -1918,7 +1918,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
  		apic_write(APIC_ESR, 0);
  	v = apic_read(APIC_ESR);
  	ack_APIC_irq();
@@ -20972,10 +20842,10 @@ index c4a8d63..fe893ac 100644
  	.name				= "bigsmp",
  	.probe				= probe_bigsmp,
 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 3f5f604..07a35cf 100644
+index f4dc246..fbab133 100644
 --- a/arch/x86/kernel/apic/io_apic.c
 +++ b/arch/x86/kernel/apic/io_apic.c
-@@ -1859,7 +1859,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
+@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
  	return ret;
  }
  
@@ -20984,7 +20854,7 @@ index 3f5f604..07a35cf 100644
  
  #ifdef CONFIG_GENERIC_PENDING_IRQ
  static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
-@@ -2000,7 +2000,7 @@ static void ack_ioapic_level(struct irq_data *data)
+@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
  	 * at the cpu.
  	 */
  	if (!(v & (1 << (i & 0x1f)))) {
@@ -20993,7 +20863,7 @@ index 3f5f604..07a35cf 100644
  
  		eoi_ioapic_irq(irq, cfg);
  	}
-@@ -2008,7 +2008,7 @@ static void ack_ioapic_level(struct irq_data *data)
+@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
  	ioapic_irqd_unmask(data, cfg, masked);
  }
  
@@ -21002,7 +20872,7 @@ index 3f5f604..07a35cf 100644
  	.name			= "IO-APIC",
  	.irq_startup		= startup_ioapic_irq,
  	.irq_mask		= mask_ioapic_irq,
-@@ -2067,7 +2067,7 @@ static void ack_lapic_irq(struct irq_data *data)
+@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
  	ack_APIC_irq();
  }
  
@@ -21246,7 +21116,7 @@ index 80091ae..0c5184f 100644
  obj-y			+= common.o
  obj-y			+= rdrand.o
 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index 15c5df9..d9a604a 100644
+index a220239..607fc38 100644
 --- a/arch/x86/kernel/cpu/amd.c
 +++ b/arch/x86/kernel/cpu/amd.c
 @@ -717,7 +717,7 @@ static void init_amd(struct cpuinfo_x86 *c)
@@ -21259,10 +21129,10 @@ index 15c5df9..d9a604a 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 c604965..1558f4a 100644
+index 2346c95..c061472 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
-@@ -90,60 +90,6 @@ static const struct cpu_dev default_cpu = {
+@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
  
  static const struct cpu_dev *this_cpu = &default_cpu;
  
@@ -21323,7 +21193,7 @@ index c604965..1558f4a 100644
  static int __init x86_xsave_setup(char *s)
  {
  	if (strlen(s))
-@@ -305,6 +251,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
+@@ -306,6 +252,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
  	}
  }
  
@@ -21361,7 +21231,7 @@ index c604965..1558f4a 100644
 +	}
 +
 +	printk("PAX: PCID detected\n");
-+	set_in_cr4(X86_CR4_PCIDE);
++	cr4_set_bits(X86_CR4_PCIDE);
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	pax_open_kernel();
@@ -21383,7 +21253,7 @@ index c604965..1558f4a 100644
  /*
   * Some CPU features depend on higher CPUID levels, which may not always
   * be available due to CPUID level capping or broken virtualization
-@@ -405,7 +404,7 @@ void switch_to_new_gdt(int cpu)
+@@ -406,7 +405,7 @@ void switch_to_new_gdt(int cpu)
  {
  	struct desc_ptr gdt_descr;
  
@@ -21392,7 +21262,7 @@ index c604965..1558f4a 100644
  	gdt_descr.size = GDT_SIZE - 1;
  	load_gdt(&gdt_descr);
  	/* Reload the per-cpu base */
-@@ -895,6 +894,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
+@@ -897,6 +896,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
  	setup_smep(c);
  	setup_smap(c);
  
@@ -21413,7 +21283,7 @@ index c604965..1558f4a 100644
  	/*
  	 * The vendor-specific functions might have changed features.
  	 * Now we do "generic changes."
-@@ -977,7 +990,7 @@ static void syscall32_cpu_init(void)
+@@ -979,7 +992,7 @@ static void syscall32_cpu_init(void)
  void enable_sep_cpu(void)
  {
  	int cpu = get_cpu();
@@ -21422,7 +21292,7 @@ index c604965..1558f4a 100644
  
  	if (!boot_cpu_has(X86_FEATURE_SEP)) {
  		put_cpu();
-@@ -1115,14 +1128,16 @@ static __init int setup_disablecpuid(char *arg)
+@@ -1117,14 +1130,16 @@ static __init int setup_disablecpuid(char *arg)
  }
  __setup("clearcpuid=", setup_disablecpuid);
  
@@ -21443,7 +21313,7 @@ index c604965..1558f4a 100644
  
  DEFINE_PER_CPU_FIRST(union irq_stack_union,
  		     irq_stack_union) __aligned(PAGE_SIZE) __visible;
-@@ -1299,7 +1314,7 @@ void cpu_init(void)
+@@ -1307,7 +1322,7 @@ void cpu_init(void)
  	 */
  	load_ucode_ap();
  
@@ -21452,15 +21322,15 @@ index c604965..1558f4a 100644
  	oist = &per_cpu(orig_ist, cpu);
  
  #ifdef CONFIG_NUMA
-@@ -1331,7 +1346,6 @@ void cpu_init(void)
+@@ -1339,7 +1354,6 @@ void cpu_init(void)
  	wrmsrl(MSR_KERNEL_GS_BASE, 0);
  	barrier();
  
 -	x86_configure_nx();
- 	enable_x2apic();
+ 	x2apic_setup();
  
  	/*
-@@ -1383,7 +1397,7 @@ void cpu_init(void)
+@@ -1391,7 +1405,7 @@ void cpu_init(void)
  {
  	int cpu = smp_processor_id();
  	struct task_struct *curr = current;
@@ -21470,10 +21340,10 @@ index c604965..1558f4a 100644
  
  	wait_for_master_cpu(cpu);
 diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
-index c703507..28535e3 100644
+index 6596433..1ad6eaf 100644
 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
 +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
-@@ -1026,6 +1026,22 @@ static struct attribute *default_attrs[] = {
+@@ -1024,6 +1024,22 @@ static struct attribute *default_attrs[] = {
  };
  
  #ifdef CONFIG_AMD_NB
@@ -21496,7 +21366,7 @@ index c703507..28535e3 100644
  static struct attribute **amd_l3_attrs(void)
  {
  	static struct attribute **attrs;
-@@ -1036,18 +1052,7 @@ static struct attribute **amd_l3_attrs(void)
+@@ -1034,18 +1050,7 @@ static struct attribute **amd_l3_attrs(void)
  
  	n = ARRAY_SIZE(default_attrs);
  
@@ -21516,7 +21386,7 @@ index c703507..28535e3 100644
  
  	if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
  		attrs[n++] = &cache_disable_0.attr;
-@@ -1098,6 +1103,13 @@ static struct kobj_type ktype_cache = {
+@@ -1096,6 +1101,13 @@ static struct kobj_type ktype_cache = {
  	.default_attrs	= default_attrs,
  };
  
@@ -21530,7 +21400,7 @@ index c703507..28535e3 100644
  static struct kobj_type ktype_percpu_entry = {
  	.sysfs_ops	= &sysfs_ops,
  };
-@@ -1163,20 +1175,26 @@ static int cache_add_dev(struct device *dev)
+@@ -1161,20 +1173,26 @@ static int cache_add_dev(struct device *dev)
  		return retval;
  	}
  
@@ -21561,18 +21431,18 @@ index c703507..28535e3 100644
  					      "index%1lu", i);
  		if (unlikely(retval)) {
 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index d2c6116..62fd7aa 100644
+index 3c036cb..3b5677d 100644
 --- a/arch/x86/kernel/cpu/mcheck/mce.c
 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
-@@ -45,6 +45,7 @@
- #include <asm/processor.h>
+@@ -47,6 +47,7 @@
+ #include <asm/tlbflush.h>
  #include <asm/mce.h>
  #include <asm/msr.h>
 +#include <asm/local.h>
  
  #include "mce-internal.h"
  
-@@ -259,7 +260,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);
  
@@ -21581,7 +21451,7 @@ index d2c6116..62fd7aa 100644
  			print_symbol("{%s}", m->ip);
  		pr_cont("\n");
  	}
-@@ -292,10 +293,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 */
  
@@ -21594,7 +21464,7 @@ index d2c6116..62fd7aa 100644
  
  /* Panic in progress. Enable interrupts and wait for final IPI */
  static void wait_for_panic(void)
-@@ -319,7 +320,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -318,7 +319,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
  		/*
  		 * Make sure only one CPU runs in machine check panic
  		 */
@@ -21603,7 +21473,7 @@ index d2c6116..62fd7aa 100644
  			wait_for_panic();
  		barrier();
  
-@@ -327,7 +328,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -326,7 +327,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
  		console_verbose();
  	} else {
  		/* Don't log too much for fake panic */
@@ -21612,7 +21482,7 @@ index d2c6116..62fd7aa 100644
  			return;
  	}
  	/* First print corrected ones that are still unlogged */
-@@ -366,7 +367,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -365,7 +366,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
  	if (!fake_panic) {
  		if (panic_timeout == 0)
  			panic_timeout = mca_cfg.panic_timeout;
@@ -21621,7 +21491,7 @@ index d2c6116..62fd7aa 100644
  	} else
  		pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
  }
-@@ -744,7 +745,7 @@ static int mce_timed_out(u64 *t)
+@@ -743,7 +744,7 @@ static int mce_timed_out(u64 *t, const char *msg)
  	 * might have been modified by someone else.
  	 */
  	rmb();
@@ -21630,7 +21500,7 @@ index d2c6116..62fd7aa 100644
  		wait_for_panic();
  	if (!mca_cfg.monarch_timeout)
  		goto out;
-@@ -1722,7 +1723,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
+@@ -1669,7 +1670,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
  }
  
  /* Call the installed machine check handler for this CPU setup. */
@@ -21639,7 +21509,7 @@ index d2c6116..62fd7aa 100644
  						unexpected_machine_check;
  
  /*
-@@ -1745,7 +1746,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1692,7 +1693,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
  		return;
  	}
  
@@ -21649,7 +21519,7 @@ index d2c6116..62fd7aa 100644
  
  	__mcheck_cpu_init_generic();
  	__mcheck_cpu_init_vendor(c);
-@@ -1759,7 +1762,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1706,7 +1709,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
   */
  
  static DEFINE_SPINLOCK(mce_chrdev_state_lock);
@@ -21658,7 +21528,7 @@ index d2c6116..62fd7aa 100644
  static int mce_chrdev_open_exclu;	/* already open exclusive? */
  
  static int mce_chrdev_open(struct inode *inode, struct file *file)
-@@ -1767,7 +1770,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1714,7 +1717,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
  	spin_lock(&mce_chrdev_state_lock);
  
  	if (mce_chrdev_open_exclu ||
@@ -21667,7 +21537,7 @@ index d2c6116..62fd7aa 100644
  		spin_unlock(&mce_chrdev_state_lock);
  
  		return -EBUSY;
-@@ -1775,7 +1778,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
+@@ -1722,7 +1725,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
  
  	if (file->f_flags & O_EXCL)
  		mce_chrdev_open_exclu = 1;
@@ -21676,7 +21546,7 @@ index d2c6116..62fd7aa 100644
  
  	spin_unlock(&mce_chrdev_state_lock);
  
-@@ -1786,7 +1789,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
+@@ -1733,7 +1736,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
  {
  	spin_lock(&mce_chrdev_state_lock);
  
@@ -21685,7 +21555,7 @@ index d2c6116..62fd7aa 100644
  	mce_chrdev_open_exclu = 0;
  
  	spin_unlock(&mce_chrdev_state_lock);
-@@ -2461,7 +2464,7 @@ static __init void mce_init_banks(void)
+@@ -2408,7 +2411,7 @@ static __init void mce_init_banks(void)
  
  	for (i = 0; i < mca_cfg.banks; i++) {
  		struct mce_bank *b = &mce_banks[i];
@@ -21694,7 +21564,7 @@ index d2c6116..62fd7aa 100644
  
  		sysfs_attr_init(&a->attr);
  		a->attr.name	= b->attrname;
-@@ -2568,7 +2571,7 @@ struct dentry *mce_get_debugfs_dir(void)
+@@ -2515,7 +2518,7 @@ struct dentry *mce_get_debugfs_dir(void)
  static void mce_reset(void)
  {
  	cpu_missing = 0;
@@ -21704,18 +21574,18 @@ index d2c6116..62fd7aa 100644
  	atomic_set(&mce_callin, 0);
  	atomic_set(&global_nwo, 0);
 diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
-index a304298..49b6d06 100644
+index 737b0ad..09ec66e 100644
 --- a/arch/x86/kernel/cpu/mcheck/p5.c
 +++ b/arch/x86/kernel/cpu/mcheck/p5.c
-@@ -10,6 +10,7 @@
- #include <asm/processor.h>
+@@ -12,6 +12,7 @@
+ #include <asm/tlbflush.h>
  #include <asm/mce.h>
  #include <asm/msr.h>
 +#include <asm/pgtable.h>
  
  /* By default disabled */
  int mce_p5_enabled __read_mostly;
-@@ -48,7 +49,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
+@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
  	if (!cpu_has(c, X86_FEATURE_MCE))
  		return;
  
@@ -21726,18 +21596,18 @@ index a304298..49b6d06 100644
  	wmb();
  
 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
-index 7dc5564..1273569 100644
+index 44f1382..315b292 100644
 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
 +++ b/arch/x86/kernel/cpu/mcheck/winchip.c
-@@ -9,6 +9,7 @@
- #include <asm/processor.h>
+@@ -11,6 +11,7 @@
+ #include <asm/tlbflush.h>
  #include <asm/mce.h>
  #include <asm/msr.h>
 +#include <asm/pgtable.h>
  
  /* Machine check handler for WinChip C6: */
  static void winchip_machine_check(struct pt_regs *regs, long error_code)
-@@ -22,7 +23,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
+@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
  {
  	u32 lo, hi;
  
@@ -21761,22 +21631,10 @@ index 36a8361..e7058c2 100644
  };
  
 diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
-index c6826d1..8dc677e 100644
+index 746e7fd..8dc677e 100644
 --- a/arch/x86/kernel/cpu/microcode/intel.c
 +++ b/arch/x86/kernel/cpu/microcode/intel.c
-@@ -196,6 +196,11 @@ static enum ucode_state generic_load_microcode(int cpu, void *data, size_t size,
- 		struct microcode_header_intel mc_header;
- 		unsigned int mc_size;
- 
-+		if (leftover < sizeof(mc_header)) {
-+			pr_err("error! Truncated header in microcode data file\n");
-+			break;
-+		}
-+
- 		if (get_ucode_data(&mc_header, ucode_ptr, sizeof(mc_header)))
- 			break;
- 
-@@ -293,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
+@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
  
  static int get_ucode_user(void *to, const void *from, size_t n)
  {
@@ -21792,23 +21650,6 @@ index c6826d1..8dc677e 100644
  }
  
  static void microcode_fini_cpu(int cpu)
-diff --git a/arch/x86/kernel/cpu/microcode/intel_early.c b/arch/x86/kernel/cpu/microcode/intel_early.c
-index ec9df6f..420eb93 100644
---- a/arch/x86/kernel/cpu/microcode/intel_early.c
-+++ b/arch/x86/kernel/cpu/microcode/intel_early.c
-@@ -321,7 +321,11 @@ get_matching_model_microcode(int cpu, unsigned long start,
- 	unsigned int mc_saved_count = mc_saved_data->mc_saved_count;
- 	int i;
- 
--	while (leftover) {
-+	while (leftover && mc_saved_count < ARRAY_SIZE(mc_saved_tmp)) {
-+
-+		if (leftover < sizeof(mc_header))
-+			break;
-+
- 		mc_header = (struct microcode_header_intel *)ucode_ptr;
- 
- 		mc_size = get_totalsize(mc_header);
 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
 index ea5f363..cb0e905 100644
 --- a/arch/x86/kernel/cpu/mtrr/main.c
@@ -21836,10 +21677,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 143e5f5..5825081 100644
+index b71a7f8..534af0e 100644
 --- a/arch/x86/kernel/cpu/perf_event.c
 +++ b/arch/x86/kernel/cpu/perf_event.c
-@@ -1374,7 +1374,7 @@ static void __init pmu_check_apic(void)
+@@ -1376,7 +1376,7 @@ static void __init pmu_check_apic(void)
  
  }
  
@@ -21848,7 +21689,7 @@ index 143e5f5..5825081 100644
  	.name = "format",
  	.attrs = NULL,
  };
-@@ -1473,7 +1473,7 @@ static struct attribute *events_attr[] = {
+@@ -1475,7 +1475,7 @@ static struct attribute *events_attr[] = {
  	NULL,
  };
  
@@ -21857,7 +21698,7 @@ index 143e5f5..5825081 100644
  	.name = "events",
  	.attrs = events_attr,
  };
-@@ -1997,7 +1997,7 @@ static unsigned long get_segment_base(unsigned int segment)
+@@ -2037,7 +2037,7 @@ static unsigned long get_segment_base(unsigned int segment)
  		if (idx > GDT_ENTRIES)
  			return 0;
  
@@ -21866,7 +21707,7 @@ index 143e5f5..5825081 100644
  	}
  
  	return get_desc_base(desc + idx);
-@@ -2087,7 +2087,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
+@@ -2127,7 +2127,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
  			break;
  
  		perf_callchain_store(entry, frame.return_address);
@@ -21889,7 +21730,7 @@ index 97242a9..cf9c30e 100644
  
  	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 498b6d9..4126515 100644
+index 2589906..1ca1000 100644
 --- a/arch/x86/kernel/cpu/perf_event_intel.c
 +++ b/arch/x86/kernel/cpu/perf_event_intel.c
 @@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
@@ -22020,7 +21861,7 @@ index f6dfd93..892ade4 100644
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
-index b74ebc7..2c95874 100644
+index cf3df1d..b637d9a 100644
 --- a/arch/x86/kernel/dumpstack.c
 +++ b/arch/x86/kernel/dumpstack.c
 @@ -2,6 +2,9 @@
@@ -22163,7 +22004,7 @@ index b74ebc7..2c95874 100644
  }
  NOKPROBE_SYMBOL(oops_end);
  
-@@ -275,7 +279,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
+@@ -278,7 +282,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
  	print_modules();
  	show_regs(regs);
  #ifdef CONFIG_X86_32
@@ -22172,7 +22013,7 @@ index b74ebc7..2c95874 100644
  		sp = regs->sp;
  		ss = regs->ss & 0xffff;
  	} else {
-@@ -304,7 +308,7 @@ void die(const char *str, struct pt_regs *regs, long err)
+@@ -307,7 +311,7 @@ void die(const char *str, struct pt_regs *regs, long err)
  	unsigned long flags = oops_begin();
  	int sig = SIGSEGV;
  
@@ -22391,10 +22232,10 @@ index ff86f19..73eabf4 100644
 +EXPORT_SYMBOL(pax_check_alloca);
 +#endif
 diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
-index dd2f07a..845dc05 100644
+index 46201de..ebffabf 100644
 --- a/arch/x86/kernel/e820.c
 +++ b/arch/x86/kernel/e820.c
-@@ -802,8 +802,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
+@@ -794,8 +794,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
  
  static void early_panic(char *msg)
  {
@@ -22406,7 +22247,7 @@ index dd2f07a..845dc05 100644
  
  static int userdef __initdata;
 diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
-index 01d1c18..8073693 100644
+index a62536a..8444df4 100644
 --- a/arch/x86/kernel/early_printk.c
 +++ b/arch/x86/kernel/early_printk.c
 @@ -7,6 +7,7 @@
@@ -22418,7 +22259,7 @@ index 01d1c18..8073693 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 000d419..8f66802 100644
+index 31e2d5b..b31c76d 100644
 --- a/arch/x86/kernel/entry_32.S
 +++ b/arch/x86/kernel/entry_32.S
 @@ -177,13 +177,154 @@
@@ -23074,7 +22915,7 @@ index 000d419..8f66802 100644
  
  #ifdef CONFIG_XEN
  /* Xen doesn't set %esp to be precisely what the normal sysenter
-@@ -1054,7 +1294,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
+@@ -1057,7 +1297,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
  
  ENTRY(mcount)
  	ret
@@ -23083,7 +22924,7 @@ index 000d419..8f66802 100644
  
  ENTRY(ftrace_caller)
  	pushl %eax
-@@ -1084,7 +1324,7 @@ ftrace_graph_call:
+@@ -1087,7 +1327,7 @@ ftrace_graph_call:
  .globl ftrace_stub
  ftrace_stub:
  	ret
@@ -23092,7 +22933,7 @@ index 000d419..8f66802 100644
  
  ENTRY(ftrace_regs_caller)
  	pushf	/* push flags before compare (in cs location) */
-@@ -1182,7 +1422,7 @@ trace:
+@@ -1185,7 +1425,7 @@ trace:
  	popl %ecx
  	popl %eax
  	jmp ftrace_stub
@@ -23101,7 +22942,7 @@ index 000d419..8f66802 100644
  #endif /* CONFIG_DYNAMIC_FTRACE */
  #endif /* CONFIG_FUNCTION_TRACER */
  
-@@ -1200,7 +1440,7 @@ ENTRY(ftrace_graph_caller)
+@@ -1203,7 +1443,7 @@ ENTRY(ftrace_graph_caller)
  	popl %ecx
  	popl %eax
  	ret
@@ -23110,7 +22951,7 @@ index 000d419..8f66802 100644
  
  .globl return_to_handler
  return_to_handler:
-@@ -1261,15 +1501,18 @@ error_code:
+@@ -1264,15 +1504,18 @@ error_code:
  	movl $-1, PT_ORIG_EAX(%esp)	# no syscall to restart
  	REG_TO_PTGS %ecx
  	SET_KERNEL_GS %ecx
@@ -23131,7 +22972,7 @@ index 000d419..8f66802 100644
  
  /*
   * Debug traps and NMI can happen at the one SYSENTER instruction
-@@ -1312,7 +1555,7 @@ debug_stack_correct:
+@@ -1315,7 +1558,7 @@ debug_stack_correct:
  	call do_debug
  	jmp ret_from_exception
  	CFI_ENDPROC
@@ -23140,7 +22981,7 @@ index 000d419..8f66802 100644
  
  /*
   * NMI is doubly nasty. It can happen _while_ we're handling
-@@ -1352,6 +1595,9 @@ nmi_stack_correct:
+@@ -1355,6 +1598,9 @@ nmi_stack_correct:
  	xorl %edx,%edx		# zero error code
  	movl %esp,%eax		# pt_regs pointer
  	call do_nmi
@@ -23150,7 +22991,7 @@ index 000d419..8f66802 100644
  	jmp restore_all_notrace
  	CFI_ENDPROC
  
-@@ -1389,13 +1635,16 @@ nmi_espfix_stack:
+@@ -1392,13 +1638,16 @@ nmi_espfix_stack:
  	FIXUP_ESPFIX_STACK		# %eax == %esp
  	xorl %edx,%edx			# zero error code
  	call do_nmi
@@ -23168,7 +23009,7 @@ index 000d419..8f66802 100644
  
  ENTRY(int3)
  	RING0_INT_FRAME
-@@ -1408,14 +1657,14 @@ ENTRY(int3)
+@@ -1411,14 +1660,14 @@ ENTRY(int3)
  	call do_int3
  	jmp ret_from_exception
  	CFI_ENDPROC
@@ -23185,7 +23026,7 @@ index 000d419..8f66802 100644
  
  #ifdef CONFIG_KVM_GUEST
  ENTRY(async_page_fault)
-@@ -1424,6 +1673,6 @@ ENTRY(async_page_fault)
+@@ -1427,6 +1676,6 @@ ENTRY(async_page_fault)
  	pushl_cfi $do_async_page_fault
  	jmp error_code
  	CFI_ENDPROC
@@ -23194,7 +23035,7 @@ index 000d419..8f66802 100644
  #endif
  
 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
-index 4ee9a23..c786610 100644
+index f0095a7..ec77893 100644
 --- a/arch/x86/kernel/entry_64.S
 +++ b/arch/x86/kernel/entry_64.S
 @@ -59,6 +59,8 @@
@@ -23647,94 +23488,7 @@ index 4ee9a23..c786610 100644
  	jnc  1f
  	TRACE_IRQS_ON_DEBUG
  1:
-@@ -155,27 +582,6 @@ ENDPROC(native_usergs_sysret64)
- 	movq \tmp,R11+\offset(%rsp)
- 	.endm
- 
--	.macro FAKE_STACK_FRAME child_rip
--	/* push in order ss, rsp, eflags, cs, rip */
--	xorl %eax, %eax
--	pushq_cfi $__KERNEL_DS /* ss */
--	/*CFI_REL_OFFSET	ss,0*/
--	pushq_cfi %rax /* rsp */
--	CFI_REL_OFFSET	rsp,0
--	pushq_cfi $(X86_EFLAGS_IF|X86_EFLAGS_FIXED) /* eflags - interrupts on */
--	/*CFI_REL_OFFSET	rflags,0*/
--	pushq_cfi $__KERNEL_CS /* cs */
--	/*CFI_REL_OFFSET	cs,0*/
--	pushq_cfi \child_rip /* rip */
--	CFI_REL_OFFSET	rip,0
--	pushq_cfi %rax /* orig rax */
--	.endm
--
--	.macro UNFAKE_STACK_FRAME
--	addq $8*6, %rsp
--	CFI_ADJUST_CFA_OFFSET	-(6*8)
--	.endm
--
- /*
-  * initial frame state for interrupts (and exceptions without error code)
-  */
-@@ -241,25 +647,26 @@ ENDPROC(native_usergs_sysret64)
- /* save partial stack frame */
- 	.macro SAVE_ARGS_IRQ
- 	cld
--	/* start from rbp in pt_regs and jump over */
--	movq_cfi rdi, (RDI-RBP)
--	movq_cfi rsi, (RSI-RBP)
--	movq_cfi rdx, (RDX-RBP)
--	movq_cfi rcx, (RCX-RBP)
--	movq_cfi rax, (RAX-RBP)
--	movq_cfi  r8,  (R8-RBP)
--	movq_cfi  r9,  (R9-RBP)
--	movq_cfi r10, (R10-RBP)
--	movq_cfi r11, (R11-RBP)
-+	/* start from r15 in pt_regs and jump over */
-+	movq_cfi rdi, RDI
-+	movq_cfi rsi, RSI
-+	movq_cfi rdx, RDX
-+	movq_cfi rcx, RCX
-+	movq_cfi rax, RAX
-+	movq_cfi  r8,  R8
-+	movq_cfi  r9,  R9
-+	movq_cfi r10, R10
-+	movq_cfi r11, R11
-+	movq_cfi r12, R12
- 
- 	/* Save rbp so that we can unwind from get_irq_regs() */
--	movq_cfi rbp, 0
-+	movq_cfi rbp, RBP
- 
- 	/* Save previous stack value */
- 	movq %rsp, %rsi
- 
--	leaq -RBP(%rsp),%rdi	/* arg1 for handler */
--	testl $3, CS-RBP(%rsi)
-+	movq %rsp,%rdi	/* arg1 for handler */
-+	testb $3, CS(%rsi)
- 	je 1f
- 	SWAPGS
- 	/*
-@@ -279,6 +686,18 @@ ENDPROC(native_usergs_sysret64)
- 			0x06 /* DW_OP_deref */, \
- 			0x08 /* DW_OP_const1u */, SS+8-RBP, \
- 			0x22 /* DW_OP_plus */
-+
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+	testb $3, CS(%rdi)
-+	jnz 1f
-+	pax_enter_kernel
-+	jmp 2f
-+1:	pax_enter_kernel_user
-+2:
-+#else
-+	pax_enter_kernel
-+#endif
-+
- 	/* We entered an interrupt context - irqs are off: */
- 	TRACE_IRQS_OFF
- 	.endm
-@@ -308,9 +727,52 @@ ENTRY(save_paranoid)
+@@ -243,9 +670,52 @@ ENTRY(save_paranoid)
  	js 1f	/* negative -> in kernel */
  	SWAPGS
  	xorl %ebx,%ebx
@@ -23789,7 +23543,7 @@ index 4ee9a23..c786610 100644
  
  /*
   * A newly forked process directly context switches into this address.
-@@ -331,7 +793,7 @@ ENTRY(ret_from_fork)
+@@ -266,7 +736,7 @@ ENTRY(ret_from_fork)
  
  	RESTORE_REST
  
@@ -23798,7 +23552,7 @@ index 4ee9a23..c786610 100644
  	jz   1f
  
  	/*
-@@ -344,15 +806,13 @@ ENTRY(ret_from_fork)
+@@ -279,15 +749,13 @@ ENTRY(ret_from_fork)
  	jmp  int_ret_from_sys_call
  
  1:
@@ -23815,7 +23569,7 @@ index 4ee9a23..c786610 100644
  
  /*
   * System call entry. Up to 6 arguments in registers are supported.
-@@ -389,7 +849,7 @@ END(ret_from_fork)
+@@ -324,7 +792,7 @@ END(ret_from_fork)
  ENTRY(system_call)
  	CFI_STARTPROC	simple
  	CFI_SIGNAL_FRAME
@@ -23824,7 +23578,7 @@ index 4ee9a23..c786610 100644
  	CFI_REGISTER	rip,rcx
  	/*CFI_REGISTER	rflags,r11*/
  	SWAPGS_UNSAFE_STACK
-@@ -402,16 +862,23 @@ GLOBAL(system_call_after_swapgs)
+@@ -337,16 +805,23 @@ GLOBAL(system_call_after_swapgs)
  
  	movq	%rsp,PER_CPU_VAR(old_rsp)
  	movq	PER_CPU_VAR(kernel_stack),%rsp
@@ -23850,22 +23604,22 @@ index 4ee9a23..c786610 100644
  	jnz tracesys
  system_call_fastpath:
  #if __SYSCALL_MASK == ~0
-@@ -435,10 +902,13 @@ sysret_check:
- 	LOCKDEP_SYS_EXIT
- 	DISABLE_INTERRUPTS(CLBR_NONE)
- 	TRACE_IRQS_OFF
--	movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
+@@ -376,10 +851,13 @@ ret_from_sys_call:
+ 	 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
+ 	 * very bad.
+ 	 */
+-	testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
 +	GET_THREAD_INFO(%rcx)
-+	movl TI_flags(%rcx),%edx
- 	andl %edi,%edx
- 	jnz  sysret_careful
++	testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
+ 	jnz int_ret_from_sys_call_fixup	/* Go the the slow path */
+ 
  	CFI_REMEMBER_STATE
 +	pax_exit_kernel_user
 +	pax_erase_kstack
  	/*
  	 * sysretq will re-enable interrupts:
  	 */
-@@ -497,12 +967,15 @@ sysret_audit:
+@@ -399,12 +877,15 @@ int_ret_from_sys_call_fixup:
  
  	/* Do syscall tracing */
  tracesys:
@@ -23883,7 +23637,7 @@ index 4ee9a23..c786610 100644
  	jmp system_call_fastpath	/*      and return to the fast path */
  
  tracesys_phase2:
-@@ -513,12 +986,14 @@ tracesys_phase2:
+@@ -415,12 +896,14 @@ tracesys_phase2:
  	movq %rax,%rdx
  	call syscall_trace_enter_phase2
  
@@ -23899,7 +23653,7 @@ index 4ee9a23..c786610 100644
  	RESTORE_REST
  #if __SYSCALL_MASK == ~0
  	cmpq $__NR_syscall_max,%rax
-@@ -548,7 +1023,9 @@ GLOBAL(int_with_check)
+@@ -451,7 +934,9 @@ GLOBAL(int_with_check)
  	andl %edi,%edx
  	jnz   int_careful
  	andl    $~TS_COMPAT,TI_status(%rcx)
@@ -23910,7 +23664,7 @@ index 4ee9a23..c786610 100644
  
  	/* Either reschedule or signal or syscall exit tracking needed. */
  	/* First do a reschedule test. */
-@@ -594,7 +1071,7 @@ int_restore_rest:
+@@ -497,7 +982,7 @@ int_restore_rest:
  	TRACE_IRQS_OFF
  	jmp int_with_check
  	CFI_ENDPROC
@@ -23919,7 +23673,7 @@ index 4ee9a23..c786610 100644
  
  	.macro FORK_LIKE func
  ENTRY(stub_\func)
-@@ -607,9 +1084,10 @@ ENTRY(stub_\func)
+@@ -510,9 +995,10 @@ ENTRY(stub_\func)
  	DEFAULT_FRAME 0 8		/* offset 8: return address */
  	call sys_\func
  	RESTORE_TOP_OF_STACK %r11, 8
@@ -23932,7 +23686,7 @@ index 4ee9a23..c786610 100644
  	.endm
  
  	.macro FIXED_FRAME label,func
-@@ -619,9 +1097,10 @@ ENTRY(\label)
+@@ -522,9 +1008,10 @@ ENTRY(\label)
  	FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
  	call \func
  	RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
@@ -23944,27 +23698,7 @@ index 4ee9a23..c786610 100644
  	.endm
  
  	FORK_LIKE  clone
-@@ -629,19 +1108,6 @@ END(\label)
- 	FORK_LIKE  vfork
- 	FIXED_FRAME stub_iopl, sys_iopl
- 
--ENTRY(ptregscall_common)
--	DEFAULT_FRAME 1 8	/* offset 8: return address */
--	RESTORE_TOP_OF_STACK %r11, 8
--	movq_cfi_restore R15+8, r15
--	movq_cfi_restore R14+8, r14
--	movq_cfi_restore R13+8, r13
--	movq_cfi_restore R12+8, r12
--	movq_cfi_restore RBP+8, rbp
--	movq_cfi_restore RBX+8, rbx
--	ret $REST_SKIP		/* pop extended registers */
--	CFI_ENDPROC
--END(ptregscall_common)
--
- ENTRY(stub_execve)
- 	CFI_STARTPROC
- 	addq $8, %rsp
-@@ -653,7 +1119,7 @@ ENTRY(stub_execve)
+@@ -543,7 +1030,7 @@ ENTRY(stub_execve)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -23973,7 +23707,7 @@ index 4ee9a23..c786610 100644
  
  ENTRY(stub_execveat)
  	CFI_STARTPROC
-@@ -667,7 +1133,7 @@ ENTRY(stub_execveat)
+@@ -557,7 +1044,7 @@ ENTRY(stub_execveat)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -23982,7 +23716,7 @@ index 4ee9a23..c786610 100644
  
  /*
   * sigreturn is special because it needs to restore all registers on return.
-@@ -684,7 +1150,7 @@ ENTRY(stub_rt_sigreturn)
+@@ -574,7 +1061,7 @@ ENTRY(stub_rt_sigreturn)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -23991,7 +23725,7 @@ index 4ee9a23..c786610 100644
  
  #ifdef CONFIG_X86_X32_ABI
  ENTRY(stub_x32_rt_sigreturn)
-@@ -698,7 +1164,7 @@ ENTRY(stub_x32_rt_sigreturn)
+@@ -588,7 +1075,7 @@ ENTRY(stub_x32_rt_sigreturn)
  	RESTORE_REST
  	jmp int_ret_from_sys_call
  	CFI_ENDPROC
@@ -24000,7 +23734,25 @@ index 4ee9a23..c786610 100644
  
  ENTRY(stub_x32_execve)
  	CFI_STARTPROC
-@@ -763,7 +1229,7 @@ vector=vector+1
+@@ -602,7 +1089,7 @@ ENTRY(stub_x32_execve)
+ 	RESTORE_REST
+ 	jmp int_ret_from_sys_call
+ 	CFI_ENDPROC
+-END(stub_x32_execve)
++ENDPROC(stub_x32_execve)
+ 
+ ENTRY(stub_x32_execveat)
+ 	CFI_STARTPROC
+@@ -616,7 +1103,7 @@ ENTRY(stub_x32_execveat)
+ 	RESTORE_REST
+ 	jmp int_ret_from_sys_call
+ 	CFI_ENDPROC
+-END(stub_x32_execveat)
++ENDPROC(stub_x32_execveat)
+ 
+ #endif
+ 
+@@ -653,7 +1140,7 @@ vector=vector+1
  2:	jmp common_interrupt
  .endr
  	CFI_ENDPROC
@@ -24009,7 +23761,7 @@ index 4ee9a23..c786610 100644
  
  .previous
  END(interrupt)
-@@ -780,8 +1246,8 @@ END(interrupt)
+@@ -670,28 +1157,29 @@ END(interrupt)
  /* 0(%rsp): ~(interrupt number) */
  	.macro interrupt func
  	/* reserve pt_regs for scratch regs and rbp */
@@ -24017,10 +23769,63 @@ index 4ee9a23..c786610 100644
 -	CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
 +	subq $ORIG_RAX, %rsp
 +	CFI_ADJUST_CFA_OFFSET ORIG_RAX
- 	SAVE_ARGS_IRQ
- 	call \func
- 	.endm
-@@ -804,14 +1270,14 @@ ret_from_intr:
+ 	cld
+-	/* start from rbp in pt_regs and jump over */
+-	movq_cfi rdi, (RDI-RBP)
+-	movq_cfi rsi, (RSI-RBP)
+-	movq_cfi rdx, (RDX-RBP)
+-	movq_cfi rcx, (RCX-RBP)
+-	movq_cfi rax, (RAX-RBP)
+-	movq_cfi  r8,  (R8-RBP)
+-	movq_cfi  r9,  (R9-RBP)
+-	movq_cfi r10, (R10-RBP)
+-	movq_cfi r11, (R11-RBP)
++	/* start from r15 in pt_regs and jump over */
++	movq_cfi rdi, RDI
++	movq_cfi rsi, RSI
++	movq_cfi rdx, RDX
++	movq_cfi rcx, RCX
++	movq_cfi rax, RAX
++	movq_cfi  r8,  R8
++	movq_cfi  r9,  R9
++	movq_cfi r10, R10
++	movq_cfi r11, R11
++	movq_cfi r12, R12
+ 
+ 	/* Save rbp so that we can unwind from get_irq_regs() */
+-	movq_cfi rbp, 0
++	movq_cfi rbp, RBP
+ 
+ 	/* Save previous stack value */
+ 	movq %rsp, %rsi
+ 
+-	leaq -RBP(%rsp),%rdi	/* arg1 for handler */
+-	testl $3, CS-RBP(%rsi)
++	movq %rsp,%rdi	/* arg1 for handler */
++	testb $3, CS(%rsi)
+ 	je 1f
+ 	SWAPGS
+ 	/*
+@@ -711,6 +1199,18 @@ END(interrupt)
+ 			0x06 /* DW_OP_deref */, \
+ 			0x08 /* DW_OP_const1u */, SS+8-RBP, \
+ 			0x22 /* DW_OP_plus */
++
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++	testb $3, CS(%rdi)
++	jnz 1f
++	pax_enter_kernel
++	jmp 2f
++1:	pax_enter_kernel_user
++2:
++#else
++	pax_enter_kernel
++#endif
++
+ 	/* We entered an interrupt context - irqs are off: */
+ 	TRACE_IRQS_OFF
+ 
+@@ -735,14 +1235,14 @@ ret_from_intr:
  
  	/* Restore saved previous stack */
  	popq %rsi
@@ -24039,15 +23844,35 @@ index 4ee9a23..c786610 100644
  	je retint_kernel
  
  	/* Interrupt came from user space */
-@@ -833,12 +1299,35 @@ retint_swapgs:		/* return to user-space */
+@@ -764,14 +1264,16 @@ retint_swapgs:		/* return to user-space */
  	 * The iretq could re-enable interrupts:
  	 */
  	DISABLE_INTERRUPTS(CLBR_ANY)
 +	pax_exit_kernel_user
 +retint_swapgs_pax:
  	TRACE_IRQS_IRETQ
- 	SWAPGS
- 	jmp restore_args
+ 
+ 	/*
+ 	 * Try to use SYSRET instead of IRET if we're returning to
+ 	 * a completely clean 64-bit userspace context.
+ 	 */
+-	movq (RCX-R11)(%rsp), %rcx
+-	cmpq %rcx,(RIP-R11)(%rsp)		/* RCX == RIP */
++	movq (RCX-ARGOFFSET)(%rsp), %rcx
++	cmpq %rcx,(RIP-ARGOFFSET)(%rsp)		/* RCX == RIP */
+ 	jne opportunistic_sysret_failed
+ 
+ 	/*
+@@ -792,7 +1294,7 @@ retint_swapgs:		/* return to user-space */
+ 	shr $__VIRTUAL_MASK_SHIFT, %rcx
+ 	jnz opportunistic_sysret_failed
+ 
+-	cmpq $__USER_CS,(CS-R11)(%rsp)		/* CS must match SYSRET */
++	cmpq $__USER_CS,(CS-ARGOFFSET)(%rsp)	/* CS must match SYSRET */
+ 	jne opportunistic_sysret_failed
+ 
+ 	movq (R11-ARGOFFSET)(%rsp), %r11
+@@ -838,6 +1340,27 @@ opportunistic_sysret_failed:
  
  retint_restore_args:	/* return to kernel space */
  	DISABLE_INTERRUPTS(CLBR_ANY)
@@ -24075,7 +23900,7 @@ index 4ee9a23..c786610 100644
  	/*
  	 * The iretq could re-enable interrupts:
  	 */
-@@ -876,15 +1365,15 @@ native_irq_return_ldt:
+@@ -875,15 +1398,15 @@ native_irq_return_ldt:
  	SWAPGS
  	movq PER_CPU_VAR(espfix_waddr),%rdi
  	movq %rax,(0*8)(%rdi)	/* RAX */
@@ -24096,7 +23921,7 @@ index 4ee9a23..c786610 100644
  	movq %rax,(4*8)(%rdi)
  	andl $0xffff0000,%eax
  	popq_cfi %rdi
-@@ -938,7 +1427,7 @@ ENTRY(retint_kernel)
+@@ -937,7 +1460,7 @@ ENTRY(retint_kernel)
  	jmp exit_intr
  #endif
  	CFI_ENDPROC
@@ -24105,7 +23930,7 @@ index 4ee9a23..c786610 100644
  
  /*
   * APIC interrupts.
-@@ -952,7 +1441,7 @@ ENTRY(\sym)
+@@ -951,7 +1474,7 @@ ENTRY(\sym)
  	interrupt \do_sym
  	jmp ret_from_intr
  	CFI_ENDPROC
@@ -24114,7 +23939,7 @@ index 4ee9a23..c786610 100644
  .endm
  
  #ifdef CONFIG_TRACING
-@@ -1025,7 +1514,7 @@ apicinterrupt IRQ_WORK_VECTOR \
+@@ -1024,7 +1547,7 @@ apicinterrupt IRQ_WORK_VECTOR \
  /*
   * Exception entry points.
   */
@@ -24123,7 +23948,7 @@ index 4ee9a23..c786610 100644
  
  .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
  ENTRY(\sym)
-@@ -1076,6 +1565,12 @@ ENTRY(\sym)
+@@ -1080,6 +1603,12 @@ ENTRY(\sym)
  	.endif
  
  	.if \shift_ist != -1
@@ -24136,7 +23961,7 @@ index 4ee9a23..c786610 100644
  	subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
  	.endif
  
-@@ -1092,7 +1587,7 @@ ENTRY(\sym)
+@@ -1126,7 +1655,7 @@ ENTRY(\sym)
  	.endif
  
  	CFI_ENDPROC
@@ -24145,7 +23970,7 @@ index 4ee9a23..c786610 100644
  .endm
  
  #ifdef CONFIG_TRACING
-@@ -1133,9 +1628,10 @@ gs_change:
+@@ -1167,9 +1696,10 @@ gs_change:
  2:	mfence		/* workaround */
  	SWAPGS
  	popfq_cfi
@@ -24157,7 +23982,7 @@ index 4ee9a23..c786610 100644
  
  	_ASM_EXTABLE(gs_change,bad_gs)
  	.section .fixup,"ax"
-@@ -1163,9 +1659,10 @@ ENTRY(do_softirq_own_stack)
+@@ -1197,9 +1727,10 @@ ENTRY(do_softirq_own_stack)
  	CFI_DEF_CFA_REGISTER	rsp
  	CFI_ADJUST_CFA_OFFSET   -8
  	decl PER_CPU_VAR(irq_count)
@@ -24169,8 +23994,8 @@ index 4ee9a23..c786610 100644
  
  #ifdef CONFIG_XEN
  idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
-@@ -1203,7 +1700,7 @@ ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
- 	decl PER_CPU_VAR(irq_count)
+@@ -1240,7 +1771,7 @@ ENTRY(xen_do_hypervisor_callback)   # do_hypervisor_callback(struct *pt_regs)
+ #endif
  	jmp  error_exit
  	CFI_ENDPROC
 -END(xen_do_hypervisor_callback)
@@ -24178,7 +24003,7 @@ index 4ee9a23..c786610 100644
  
  /*
   * Hypervisor uses this for application faults while it executes.
-@@ -1262,7 +1759,7 @@ ENTRY(xen_failsafe_callback)
+@@ -1299,7 +1830,7 @@ ENTRY(xen_failsafe_callback)
  	SAVE_ALL
  	jmp error_exit
  	CFI_ENDPROC
@@ -24187,25 +24012,13 @@ index 4ee9a23..c786610 100644
  
  apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
  	xen_hvm_callback_vector xen_evtchn_do_upcall
-@@ -1309,18 +1806,33 @@ ENTRY(paranoid_exit)
+@@ -1344,18 +1875,25 @@ ENTRY(paranoid_exit)
  	DEFAULT_FRAME
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	TRACE_IRQS_OFF_DEBUG
 -	testl %ebx,%ebx				/* swapgs needed? */
 +	testl $1,%ebx				/* swapgs needed? */
  	jnz paranoid_restore
--	testl $3,CS(%rsp)
-+	testb $3,CS(%rsp)
- 	jnz   paranoid_userspace
-+#ifdef CONFIG_PAX_MEMORY_UDEREF
-+	pax_exit_kernel
-+	TRACE_IRQS_IRETQ 0
-+	SWAPGS_UNSAFE_STACK
-+	RESTORE_ALL 8
-+	pax_force_retaddr_bts
-+	jmp irq_return
-+#endif
- paranoid_swapgs:
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	pax_exit_kernel_user
 +#else
@@ -24214,25 +24027,20 @@ index 4ee9a23..c786610 100644
  	TRACE_IRQS_IRETQ 0
  	SWAPGS_UNSAFE_STACK
  	RESTORE_ALL 8
- 	jmp irq_return
+ 	INTERRUPT_RETURN
  paranoid_restore:
 +	pax_exit_kernel
  	TRACE_IRQS_IRETQ_DEBUG 0
  	RESTORE_ALL 8
 +	pax_force_retaddr_bts
- 	jmp irq_return
- paranoid_userspace:
- 	GET_THREAD_INFO(%rcx)
-@@ -1349,7 +1861,7 @@ paranoid_schedule:
- 	TRACE_IRQS_OFF
- 	jmp paranoid_userspace
+ 	INTERRUPT_RETURN
  	CFI_ENDPROC
 -END(paranoid_exit)
 +ENDPROC(paranoid_exit)
  
  /*
   * Exception entry point. This expects an error code/orig_rax on the stack.
-@@ -1376,12 +1888,23 @@ ENTRY(error_entry)
+@@ -1382,12 +1920,23 @@ ENTRY(error_entry)
  	movq %r14, R14+8(%rsp)
  	movq %r15, R15+8(%rsp)
  	xorl %ebx,%ebx
@@ -24257,7 +24065,7 @@ index 4ee9a23..c786610 100644
  	ret
  
  /*
-@@ -1416,7 +1939,7 @@ error_bad_iret:
+@@ -1422,7 +1971,7 @@ error_bad_iret:
  	decl %ebx	/* Return to usergs */
  	jmp error_sti
  	CFI_ENDPROC
@@ -24266,7 +24074,7 @@ index 4ee9a23..c786610 100644
  
  
  /* ebx:	no swapgs flag (1: don't need swapgs, 0: need it) */
-@@ -1427,7 +1950,7 @@ ENTRY(error_exit)
+@@ -1433,7 +1982,7 @@ ENTRY(error_exit)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	TRACE_IRQS_OFF
  	GET_THREAD_INFO(%rcx)
@@ -24275,7 +24083,7 @@ index 4ee9a23..c786610 100644
  	jne retint_kernel
  	LOCKDEP_SYS_EXIT_IRQ
  	movl TI_flags(%rcx),%edx
-@@ -1436,7 +1959,7 @@ ENTRY(error_exit)
+@@ -1442,7 +1991,7 @@ ENTRY(error_exit)
  	jnz retint_careful
  	jmp retint_swapgs
  	CFI_ENDPROC
@@ -24284,7 +24092,7 @@ index 4ee9a23..c786610 100644
  
  /*
   * Test if a given stack is an NMI stack or not.
-@@ -1494,9 +2017,11 @@ ENTRY(nmi)
+@@ -1500,9 +2049,11 @@ ENTRY(nmi)
  	 * If %cs was not the kernel segment, then the NMI triggered in user
  	 * space, which means it is definitely not nested.
  	 */
@@ -24297,7 +24105,7 @@ index 4ee9a23..c786610 100644
  	/*
  	 * Check the special variable on the stack to see if NMIs are
  	 * executing.
-@@ -1530,8 +2055,7 @@ nested_nmi:
+@@ -1536,8 +2087,7 @@ nested_nmi:
  
  1:
  	/* Set up the interrupted NMIs stack to jump to repeat_nmi */
@@ -24307,7 +24115,7 @@ index 4ee9a23..c786610 100644
  	CFI_ADJUST_CFA_OFFSET 1*8
  	leaq -10*8(%rsp), %rdx
  	pushq_cfi $__KERNEL_DS
-@@ -1549,6 +2073,7 @@ nested_nmi_out:
+@@ -1555,6 +2105,7 @@ nested_nmi_out:
  	CFI_RESTORE rdx
  
  	/* No need to check faults here */
@@ -24315,7 +24123,7 @@ index 4ee9a23..c786610 100644
  	INTERRUPT_RETURN
  
  	CFI_RESTORE_STATE
-@@ -1645,13 +2170,13 @@ end_repeat_nmi:
+@@ -1651,13 +2202,13 @@ end_repeat_nmi:
  	subq $ORIG_RAX-R15, %rsp
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	/*
@@ -24331,7 +24139,7 @@ index 4ee9a23..c786610 100644
  	DEFAULT_FRAME 0
  
  	/*
-@@ -1661,9 +2186,9 @@ end_repeat_nmi:
+@@ -1667,9 +2218,9 @@ end_repeat_nmi:
  	 * NMI itself takes a page fault, the page fault that was preempted
  	 * will read the information from the NMI page fault and not the
  	 * origin fault. Save it off and restore it if it changes.
@@ -24343,7 +24151,7 @@ index 4ee9a23..c786610 100644
  
  	/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
  	movq %rsp,%rdi
-@@ -1672,29 +2197,34 @@ end_repeat_nmi:
+@@ -1678,29 +2229,34 @@ end_repeat_nmi:
  
  	/* Did the NMI take a page fault? Restore cr2 if it did */
  	movq %cr2, %rcx
@@ -24466,10 +24274,10 @@ index 8b7b0a5..2395f29 100644
  
  	/* Make sure it is what we expect it to be */
 diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
-index eda1a86..8f6df48 100644
+index c4f8d46..2d63ae2 100644
 --- a/arch/x86/kernel/head64.c
 +++ b/arch/x86/kernel/head64.c
-@@ -67,12 +67,12 @@ again:
+@@ -68,12 +68,12 @@ again:
  	pgd = *pgd_p;
  
  	/*
@@ -24485,7 +24293,7 @@ index eda1a86..8f6df48 100644
  	else {
  		if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
  			reset_early_page_tables();
-@@ -82,13 +82,13 @@ again:
+@@ -83,13 +83,13 @@ again:
  		pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
  		for (i = 0; i < PTRS_PER_PUD; i++)
  			pud_p[i] = 0;
@@ -24501,7 +24309,7 @@ index eda1a86..8f6df48 100644
  	else {
  		if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
  			reset_early_page_tables();
-@@ -98,7 +98,7 @@ again:
+@@ -99,7 +99,7 @@ again:
  		pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
  		for (i = 0; i < PTRS_PER_PMD; i++)
  			pmd_p[i] = 0;
@@ -24510,7 +24318,7 @@ index eda1a86..8f6df48 100644
  	}
  	pmd = (physaddr & PMD_MASK) + early_pmd_flags;
  	pmd_p[pmd_index(address)] = pmd;
-@@ -175,7 +175,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
+@@ -180,7 +180,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
  	if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
  		early_printk("Kernel alive\n");
  
@@ -24942,7 +24750,7 @@ index f36bd42..0ab4474 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 a468c0a..8b5a879 100644
+index 6fd514d9..c4221b8 100644
 --- a/arch/x86/kernel/head_64.S
 +++ b/arch/x86/kernel/head_64.S
 @@ -20,6 +20,8 @@
@@ -25136,7 +24944,7 @@ index a468c0a..8b5a879 100644
  NEXT_PAGE(level2_kernel_pgt)
  	/*
  	 * 512 MB kernel mapping. We spend a full page on this pagetable
-@@ -494,28 +553,64 @@ NEXT_PAGE(level2_kernel_pgt)
+@@ -494,21 +553,57 @@ NEXT_PAGE(level2_kernel_pgt)
  NEXT_PAGE(level2_fixmap_pgt)
  	.fill	506,8,0
  	.quad	level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
@@ -25198,7 +25006,8 @@ index a468c0a..8b5a879 100644
  
  ENTRY(phys_base)
  	/* This must match the first entry in level2_kernel_pgt */
- 	.quad   0x0000000000000000
+@@ -532,8 +627,8 @@ NEXT_PAGE(kasan_zero_pud)
+ 
  
  #include "../../x86/xen/xen-head.S"
 -	
@@ -25207,6 +25016,7 @@ index a468c0a..8b5a879 100644
 +	.section .rodata,"a",@progbits
  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 05fd74f..c3548b1 100644
 --- a/arch/x86/kernel/i386_ksyms_32.c
@@ -25237,10 +25047,10 @@ index 05fd74f..c3548b1 100644
 +EXPORT_SYMBOL(cpu_pgd);
 +#endif
 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
-index a9a4229..6f4d476 100644
+index d5651fc..29c740d 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)
+@@ -68,7 +68,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
  static inline bool interrupted_user_mode(void)
  {
  	struct pt_regs *regs = get_irq_regs();
@@ -25351,7 +25161,7 @@ index 4ddaf66..49d5c18 100644
  	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 705ef8d..8672c9d 100644
+index 67b1cbe..6ad4cbc 100644
 --- a/arch/x86/kernel/irq.c
 +++ b/arch/x86/kernel/irq.c
 @@ -22,7 +22,7 @@
@@ -25385,7 +25195,7 @@ index 705ef8d..8672c9d 100644
  }
  
 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
-index 63ce838..2ea3e06 100644
+index 28d28f5..e6cc9ae 100644
 --- a/arch/x86/kernel/irq_32.c
 +++ b/arch/x86/kernel/irq_32.c
 @@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
@@ -25413,7 +25223,7 @@ index 63ce838..2ea3e06 100644
  	if (sysctl_panic_on_stackoverflow)
  		panic("low stack detected by irq handler - check messages\n");
  }
-@@ -84,10 +87,9 @@ static inline void *current_stack(void)
+@@ -77,10 +80,9 @@ static inline void *current_stack(void)
  static inline int
  execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
  {
@@ -25425,7 +25235,7 @@ index 63ce838..2ea3e06 100644
  	irqstk = __this_cpu_read(hardirq_stack);
  
  	/*
-@@ -96,15 +98,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
  	 * handler) we can't do that and just have to keep using the
  	 * current stack (which is the irq stack already after all)
  	 */
@@ -25438,7 +25248,7 @@ index 63ce838..2ea3e06 100644
  
  	/* Save the next esp at the bottom of the stack */
  	prev_esp = (u32 *)irqstk;
- 	*prev_esp = current_stack_pointer;
+ 	*prev_esp = current_stack_pointer();
  
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	__set_fs(MAKE_MM_SEG(0));
@@ -25447,7 +25257,7 @@ index 63ce838..2ea3e06 100644
  	if (unlikely(overflow))
  		call_on_stack(print_stack_overflow, isp);
  
-@@ -115,6 +121,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
  		     :  "0" (irq),   "1" (desc),  "2" (isp),
  			"D" (desc->handle_irq)
  		     : "memory", "cc", "ecx");
@@ -25459,7 +25269,7 @@ index 63ce838..2ea3e06 100644
  	return 1;
  }
  
-@@ -123,32 +134,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
   */
  void irq_ctx_init(int cpu)
  {
@@ -25494,9 +25304,9 @@ index 63ce838..2ea3e06 100644
  	irqstk = __this_cpu_read(softirq_stack);
  
  	/* build the stack frame on the softirq stack */
-@@ -158,7 +155,16 @@ void do_softirq_own_stack(void)
+@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
  	prev_esp = (u32 *)irqstk;
- 	*prev_esp = current_stack_pointer;
+ 	*prev_esp = current_stack_pointer();
  
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
 +	__set_fs(MAKE_MM_SEG(0));
@@ -25511,7 +25321,7 @@ index 63ce838..2ea3e06 100644
  }
  
  bool handle_irq(unsigned irq, struct pt_regs *regs)
-@@ -172,7 +178,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
+@@ -165,7 +171,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
  	if (unlikely(!desc))
  		return false;
  
@@ -25590,7 +25400,7 @@ index 26d5a55..a01160a 100644
  		}
  		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 7ec1d5f..5a7d130 100644
+index 25ecd56..e12482f 100644
 --- a/arch/x86/kernel/kgdb.c
 +++ b/arch/x86/kernel/kgdb.c
 @@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
@@ -25683,7 +25493,7 @@ index 7ec1d5f..5a7d130 100644
  }
  
 diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
-index 98f654d..ac04352 100644
+index 4e3d5a9..03fffd8 100644
 --- a/arch/x86/kernel/kprobes/core.c
 +++ b/arch/x86/kernel/kprobes/core.c
 @@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
@@ -25709,19 +25519,22 @@ index 98f654d..ac04352 100644
  		return 0;	/* Page fault may occur on this address. */
  
  retry:
-@@ -242,9 +245,9 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
- 	 *  for the first byte, we can recover the original instruction
- 	 *  from it and kp->opcode.
+@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
+ 	 * Fortunately, we know that the original code is the ideal 5-byte
+ 	 * long NOP.
  	 */
--	memcpy(buf, kp->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
-+	memcpy(buf, ktla_ktva(kp->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
- 	buf[0] = kp->opcode;
+-	memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
++	memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
+ 	if (faddr)
+ 		memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
+ 	else
+ 		buf[0] = kp->opcode;
 -	return (unsigned long)buf;
 +	return ktva_ktla((unsigned long)buf);
  }
  
  /*
-@@ -338,7 +341,9 @@ int __copy_instruction(u8 *dest, u8 *src)
+@@ -364,7 +367,9 @@ int __copy_instruction(u8 *dest, u8 *src)
  	/* Another subsystem puts a breakpoint, failed to recover */
  	if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
  		return 0;
@@ -25731,7 +25544,7 @@ index 98f654d..ac04352 100644
  
  #ifdef CONFIG_X86_64
  	if (insn_rip_relative(&insn)) {
-@@ -365,7 +370,9 @@ int __copy_instruction(u8 *dest, u8 *src)
+@@ -391,7 +396,9 @@ int __copy_instruction(u8 *dest, u8 *src)
  			return 0;
  		}
  		disp = (u8 *) dest + insn_offset_displacement(&insn);
@@ -25741,7 +25554,7 @@ index 98f654d..ac04352 100644
  	}
  #endif
  	return insn.length;
-@@ -507,7 +514,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
+@@ -533,7 +540,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
  		 * nor set current_kprobe, because it doesn't use single
  		 * stepping.
  		 */
@@ -25750,7 +25563,7 @@ index 98f654d..ac04352 100644
  		preempt_enable_no_resched();
  		return;
  	}
-@@ -524,9 +531,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
+@@ -550,9 +557,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
  	regs->flags &= ~X86_EFLAGS_IF;
  	/* single step inline if the instruction is an int3 */
  	if (p->opcode == BREAKPOINT_INSTRUCTION)
@@ -25762,7 +25575,7 @@ index 98f654d..ac04352 100644
  }
  NOKPROBE_SYMBOL(setup_singlestep);
  
-@@ -576,7 +583,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
+@@ -602,7 +609,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
  	struct kprobe *p;
  	struct kprobe_ctlblk *kcb;
  
@@ -25771,7 +25584,7 @@ index 98f654d..ac04352 100644
  		return 0;
  
  	addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
-@@ -611,7 +618,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
+@@ -637,7 +644,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
  				setup_singlestep(p, regs, kcb, 0);
  			return 1;
  		}
@@ -25780,7 +25593,7 @@ index 98f654d..ac04352 100644
  		/*
  		 * The breakpoint instruction was removed right
  		 * after we hit it.  Another cpu has removed
-@@ -658,6 +665,9 @@ static void __used kretprobe_trampoline_holder(void)
+@@ -684,6 +691,9 @@ static void __used kretprobe_trampoline_holder(void)
  			"	movq %rax, 152(%rsp)\n"
  			RESTORE_REGS_STRING
  			"	popfq\n"
@@ -25790,7 +25603,7 @@ index 98f654d..ac04352 100644
  #else
  			"	pushf\n"
  			SAVE_REGS_STRING
-@@ -798,7 +808,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
+@@ -824,7 +834,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
  			     struct kprobe_ctlblk *kcb)
  {
  	unsigned long *tos = stack_addr(regs);
@@ -25799,7 +25612,7 @@ index 98f654d..ac04352 100644
  	unsigned long orig_ip = (unsigned long)p->addr;
  	kprobe_opcode_t *insn = p->ainsn.insn;
  
-@@ -981,7 +991,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
+@@ -1007,7 +1017,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
  	struct die_args *args = data;
  	int ret = NOTIFY_DONE;
  
@@ -25809,7 +25622,7 @@ index 98f654d..ac04352 100644
  
  	if (val == DIE_GPF) {
 diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
-index 7c523bb..01b051b 100644
+index 7b3b9d1..e2478b91 100644
 --- a/arch/x86/kernel/kprobes/opt.c
 +++ b/arch/x86/kernel/kprobes/opt.c
 @@ -79,6 +79,7 @@ found:
@@ -25828,7 +25641,7 @@ index 7c523bb..01b051b 100644
  }
  
  asm (
-@@ -339,7 +341,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
  	 * Verify if the address gap is in 2GB range, because this uses
  	 * a relative jump.
  	 */
@@ -25837,7 +25650,7 @@ index 7c523bb..01b051b 100644
  	if (abs(rel) > 0x7fffffff) {
  		__arch_remove_optimized_kprobe(op, 0);
  		return -ERANGE;
-@@ -356,16 +358,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
  	op->optinsn.size = ret;
  
  	/* Copy arch-dep-instance from template */
@@ -25859,7 +25672,7 @@ index 7c523bb..01b051b 100644
  			   (u8 *)op->kp.addr + op->optinsn.size);
  
  	flush_icache_range((unsigned long) buf,
-@@ -390,7 +394,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
+@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
  		WARN_ON(kprobe_disabled(&op->kp));
  
  		/* Backup instructions which will be replaced by jump address */
@@ -25868,7 +25681,7 @@ index 7c523bb..01b051b 100644
  		       RELATIVE_ADDR_SIZE);
  
  		insn_buf[0] = RELATIVEJUMP_OPCODE;
-@@ -438,7 +442,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
+@@ -441,7 +445,7 @@ int 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 */
@@ -25958,6 +25771,39 @@ index c37886d..d851d32 100644
  	if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
  		error = -EINVAL;
  		goto out_unlock;
+diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
+index ff3c3101d..d7c0cd8 100644
+--- a/arch/x86/kernel/livepatch.c
++++ b/arch/x86/kernel/livepatch.c
+@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
+ 	int ret, numpages, size = 4;
+ 	bool readonly;
+ 	unsigned long val;
+-	unsigned long core = (unsigned long)mod->module_core;
+-	unsigned long core_ro_size = mod->core_ro_size;
+-	unsigned long core_size = mod->core_size;
++	unsigned long core_rx = (unsigned long)mod->module_core_rx;
++	unsigned long core_rw = (unsigned long)mod->module_core_rw;
++	unsigned long core_size_rx = mod->core_size_rx;
++	unsigned long core_size_rw = mod->core_size_rw;
+ 
+ 	switch (type) {
+ 	case R_X86_64_NONE:
+@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
+ 		return -EINVAL;
+ 	}
+ 
+-	if (loc < core || loc >= core + core_size)
++	if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
++	    (loc < core_rw || loc >= core_rw + core_size_rw))
+ 		/* loc does not point to any symbol inside the module */
+ 		return -EINVAL;
+ 
+-	if (loc < core + core_ro_size)
++	if (loc < core_rx + core_size_rx)
+ 		readonly = true;
+ 	else
+ 		readonly = false;
 diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
 index 469b23d..5449cfe 100644
 --- a/arch/x86/kernel/machine_kexec_32.c
@@ -26075,26 +25921,33 @@ index 94ea120..4154cea 100644
 +ENDPROC(return_to_handler)
  #endif
 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
-index e69f988..72902b7 100644
+index d1ac80b..f593701 100644
 --- a/arch/x86/kernel/module.c
 +++ b/arch/x86/kernel/module.c
-@@ -81,17 +81,62 @@ static unsigned long int get_module_load_offset(void)
+@@ -82,17 +82,17 @@ static unsigned long int get_module_load_offset(void)
  }
  #endif
  
 -void *module_alloc(unsigned long size)
 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
  {
+ 	void *p;
+ 
 -	if (PAGE_ALIGN(size) > MODULES_LEN)
 +	if (!size || PAGE_ALIGN(size) > MODULES_LEN)
  		return NULL;
- 	return __vmalloc_node_range(size, 1,
+ 
+ 	p = __vmalloc_node_range(size, MODULE_ALIGN,
  				    MODULES_VADDR + get_module_load_offset(),
 -				    MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
--				    PAGE_KERNEL_EXEC, NUMA_NO_NODE,
+-				    PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
 +				    MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
-+				    prot, NUMA_NO_NODE,
++				    prot, 0, NUMA_NO_NODE,
  				    __builtin_return_address(0));
+ 	if (p && (kasan_module_alloc(p, size) < 0)) {
+ 		vfree(p);
+@@ -102,6 +102,51 @@ void *module_alloc(unsigned long size)
+ 	return p;
  }
  
 +void *module_alloc(unsigned long size)
@@ -26145,7 +25998,7 @@ index e69f988..72902b7 100644
  #ifdef CONFIG_X86_32
  int apply_relocate(Elf32_Shdr *sechdrs,
  		   const char *strtab,
-@@ -102,14 +147,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -112,14 +157,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
  	unsigned int i;
  	Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
  	Elf32_Sym *sym;
@@ -26165,7 +26018,7 @@ index e69f988..72902b7 100644
  		/* This is the symbol it is referring to.  Note that all
  		   undefined symbols have been resolved.  */
  		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-@@ -118,11 +165,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -128,11 +175,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
  		switch (ELF32_R_TYPE(rel[i].r_info)) {
  		case R_386_32:
  			/* We add the value into the location given */
@@ -26183,7 +26036,7 @@ index e69f988..72902b7 100644
  			break;
  		default:
  			pr_err("%s: Unknown relocation: %u\n",
-@@ -167,21 +218,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
+@@ -177,21 +228,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
  		case R_X86_64_NONE:
  			break;
  		case R_X86_64_64:
@@ -26595,10 +26448,10 @@ index 77dd0ad..9ec4723 100644
  		dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
  }
 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index e127dda..94e384d 100644
+index 046e2d6..2cc8ad2 100644
 --- a/arch/x86/kernel/process.c
 +++ b/arch/x86/kernel/process.c
-@@ -36,7 +36,8 @@
+@@ -37,7 +37,8 @@
   * section. Since TSS's are completely CPU-local, we want them
   * on exact cacheline boundaries, to eliminate cacheline ping-pong.
   */
@@ -26608,7 +26461,7 @@ index e127dda..94e384d 100644
  
  #ifdef CONFIG_X86_64
  static DEFINE_PER_CPU(unsigned char, is_idle);
-@@ -94,7 +95,7 @@ void arch_task_cache_init(void)
+@@ -95,7 +96,7 @@ void arch_task_cache_init(void)
          task_xstate_cachep =
          	kmem_cache_create("task_xstate", xstate_size,
  				  __alignof__(union thread_xstate),
@@ -26617,7 +26470,7 @@ index e127dda..94e384d 100644
  	setup_xstate_comp();
  }
  
-@@ -108,7 +109,7 @@ void exit_thread(void)
+@@ -109,7 +110,7 @@ void exit_thread(void)
  	unsigned long *bp = t->io_bitmap_ptr;
  
  	if (bp) {
@@ -26626,7 +26479,7 @@ index e127dda..94e384d 100644
  
  		t->io_bitmap_ptr = NULL;
  		clear_thread_flag(TIF_IO_BITMAP);
-@@ -128,6 +129,9 @@ void flush_thread(void)
+@@ -129,6 +130,9 @@ void flush_thread(void)
  {
  	struct task_struct *tsk = current;
  
@@ -26636,7 +26489,7 @@ index e127dda..94e384d 100644
  	flush_ptrace_hw_breakpoint(tsk);
  	memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
  	drop_init_fpu(tsk);
-@@ -274,7 +278,7 @@ static void __exit_idle(void)
+@@ -275,7 +279,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
  	/* idle loop has pid 0 */
@@ -26645,7 +26498,7 @@ index e127dda..94e384d 100644
  		return;
  	__exit_idle();
  }
-@@ -327,7 +331,7 @@ bool xen_set_default_idle(void)
+@@ -328,7 +332,7 @@ bool xen_set_default_idle(void)
  	return ret;
  }
  #endif
@@ -26654,7 +26507,7 @@ index e127dda..94e384d 100644
  {
  	local_irq_disable();
  	/*
-@@ -456,16 +460,37 @@ static int __init idle_setup(char *str)
+@@ -457,16 +461,37 @@ static int __init idle_setup(char *str)
  }
  early_param("idle", idle_setup);
  
@@ -26703,7 +26556,7 @@ index e127dda..94e384d 100644
 +}
 +#endif
 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 8f3ebfe..cbc731b 100644
+index 603c4f9..3a105d7 100644
 --- a/arch/x86/kernel/process_32.c
 +++ b/arch/x86/kernel/process_32.c
 @@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
@@ -26812,7 +26665,7 @@ index 8f3ebfe..cbc731b 100644
  }
 -
 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
-index 5a2c029..ec8611d 100644
+index 67fcc43..0d2c630 100644
 --- a/arch/x86/kernel/process_64.c
 +++ b/arch/x86/kernel/process_64.c
 @@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
@@ -27206,10 +27059,10 @@ index 3fd2c69..a444264 100644
  identity_mapped:
  	/* set return address to 0 if not preserving context */
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index ab4734e..c4ca0eb 100644
+index 0a2421c..11f3f36 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -110,6 +110,7 @@
+@@ -111,6 +111,7 @@
  #include <asm/mce.h>
  #include <asm/alternative.h>
  #include <asm/prom.h>
@@ -27217,7 +27070,7 @@ index ab4734e..c4ca0eb 100644
  
  /*
   * max_low_pfn_mapped: highest direct mapped pfn under 4GB
-@@ -205,12 +206,50 @@ EXPORT_SYMBOL(boot_cpu_data);
+@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
  #endif
  
  
@@ -27232,46 +27085,8 @@ index ab4734e..c4ca0eb 100644
 +__visible unsigned long mmu_cr4_features __read_only;
  #endif
  
-+void set_in_cr4(unsigned long mask)
-+{
-+	unsigned long cr4 = read_cr4();
-+
-+	if ((cr4 & mask) == mask && cr4 == mmu_cr4_features)
-+		return;
-+
-+	pax_open_kernel();
-+	mmu_cr4_features |= mask;
-+	pax_close_kernel();
-+
-+	if (trampoline_cr4_features)
-+		*trampoline_cr4_features = mmu_cr4_features;
-+	cr4 |= mask;
-+	write_cr4(cr4);
-+}
-+EXPORT_SYMBOL(set_in_cr4);
-+
-+void clear_in_cr4(unsigned long mask)
-+{
-+	unsigned long cr4 = read_cr4();
-+
-+	if (!(cr4 & mask) && cr4 == mmu_cr4_features)
-+		return;
-+
-+	pax_open_kernel();
-+	mmu_cr4_features &= ~mask;
-+	pax_close_kernel();
-+
-+	if (trampoline_cr4_features)
-+		*trampoline_cr4_features = mmu_cr4_features;
-+	cr4 &= ~mask;
-+	write_cr4(cr4);
-+}
-+EXPORT_SYMBOL(clear_in_cr4);
-+
  /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
- int bootloader_type, bootloader_version;
- 
-@@ -772,7 +811,7 @@ static void __init trim_bios_range(void)
+@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
  	 * area (640->1Mb) as ram even though it is not.
  	 * take them out.
  	 */
@@ -27280,7 +27095,7 @@ index ab4734e..c4ca0eb 100644
  
  	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
  }
-@@ -780,7 +819,7 @@ static void __init trim_bios_range(void)
+@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
  /* called before trim_bios_range() to spare extra sanitize */
  static void __init e820_add_kernel_range(void)
  {
@@ -27289,7 +27104,7 @@ index ab4734e..c4ca0eb 100644
  	u64 size = __pa_symbol(_end) - start;
  
  	/*
-@@ -856,8 +895,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
+@@ -855,8 +858,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
  
  void __init setup_arch(char **cmdline_p)
  {
@@ -27302,7 +27117,7 @@ index ab4734e..c4ca0eb 100644
  
  	early_reserve_initrd();
  
-@@ -955,16 +998,16 @@ void __init setup_arch(char **cmdline_p)
+@@ -954,16 +961,16 @@ void __init setup_arch(char **cmdline_p)
  
  	if (!boot_params.hdr.root_flags)
  		root_mountflags &= ~MS_RDONLY;
@@ -27401,7 +27216,7 @@ index e4fcb87..9c06c55 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 ed37a76..39f936e 100644
+index e504246..ba10432 100644
 --- a/arch/x86/kernel/signal.c
 +++ b/arch/x86/kernel/signal.c
 @@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
@@ -27494,10 +27309,10 @@ index be8e1bd..a3d93fa 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 6d7022c..4feb6be 100644
+index febc6aa..37d8edf 100644
 --- a/arch/x86/kernel/smpboot.c
 +++ b/arch/x86/kernel/smpboot.c
-@@ -194,14 +194,17 @@ static void notrace start_secondary(void *unused)
+@@ -229,14 +229,17 @@ static void notrace start_secondary(void *unused)
  
  	enable_start_cpu0 = 0;
  
@@ -27519,7 +27334,7 @@ index 6d7022c..4feb6be 100644
  	/*
  	 * Check TSC synchronization with the BP:
  	 */
-@@ -765,8 +768,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
+@@ -800,8 +803,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
  	alternatives_enable_smp();
  
  	idle->thread.sp = (unsigned long) (((struct pt_regs *)
@@ -27530,7 +27345,7 @@ index 6d7022c..4feb6be 100644
  
  #ifdef CONFIG_X86_32
  	/* Stack for startup_32 can be just as for start_secondary onwards */
-@@ -775,10 +779,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
+@@ -810,10 +814,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
  	clear_tsk_thread_flag(idle, TIF_FORK);
  	initial_gs = per_cpu_offset(cpu);
  #endif
@@ -27544,7 +27359,7 @@ index 6d7022c..4feb6be 100644
  	initial_code = (unsigned long)start_secondary;
  	stack_start  = idle->thread.sp;
  
-@@ -918,6 +922,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
+@@ -953,6 +957,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);
  
@@ -28016,7 +27831,7 @@ index 1c113db..287b42e 100644
  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 89f4e64..aa4149d 100644
+index 4ff5d16..736e3e1 100644
 --- a/arch/x86/kernel/traps.c
 +++ b/arch/x86/kernel/traps.c
 @@ -68,7 +68,7 @@
@@ -28037,7 +27852,43 @@ index 89f4e64..aa4149d 100644
  
  DECLARE_BITMAP(used_vectors, NR_VECTORS);
  EXPORT_SYMBOL_GPL(used_vectors);
-@@ -109,11 +109,11 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
+@@ -112,7 +112,7 @@ enum ctx_state ist_enter(struct pt_regs *regs)
+ {
+ 	enum ctx_state prev_state;
+ 
+-	if (user_mode_vm(regs)) {
++	if (user_mode(regs)) {
+ 		/* Other than that, we're just an exception. */
+ 		prev_state = exception_enter();
+ 	} else {
+@@ -146,7 +146,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
+ 	/* Must be before exception_exit. */
+ 	preempt_count_sub(HARDIRQ_OFFSET);
+ 
+-	if (user_mode_vm(regs))
++	if (user_mode(regs))
+ 		return exception_exit(prev_state);
+ 	else
+ 		rcu_nmi_exit();
+@@ -158,7 +158,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
+  *
+  * IST exception handlers normally cannot schedule.  As a special
+  * exception, if the exception interrupted userspace code (i.e.
+- * user_mode_vm(regs) would return true) and the exception was not
++ * user_mode(regs) would return true) and the exception was not
+  * a double fault, it can be safe to schedule.  ist_begin_non_atomic()
+  * begins a non-atomic section within an ist_enter()/ist_exit() region.
+  * Callers are responsible for enabling interrupts themselves inside
+@@ -167,7 +167,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
+  */
+ void ist_begin_non_atomic(struct pt_regs *regs)
+ {
+-	BUG_ON(!user_mode_vm(regs));
++	BUG_ON(!user_mode(regs));
+ 
+ 	/*
+ 	 * Sanity check: we need to be on the normal thread stack.  This
+@@ -191,11 +191,11 @@ void ist_end_non_atomic(void)
  }
  
  static nokprobe_inline int
@@ -28051,7 +27902,7 @@ index 89f4e64..aa4149d 100644
  		/*
  		 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
  		 * On nmi (interrupt 2), do_trap should not be called.
-@@ -126,12 +126,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
+@@ -208,12 +208,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
  		return -1;
  	}
  #endif
@@ -28077,7 +27928,7 @@ index 89f4e64..aa4149d 100644
  		return 0;
  	}
  
-@@ -170,7 +182,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
+@@ -252,7 +264,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
  }
  
  static void
@@ -28086,7 +27937,7 @@ index 89f4e64..aa4149d 100644
  	long error_code, siginfo_t *info)
  {
  	struct task_struct *tsk = current;
-@@ -194,7 +206,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
+@@ -276,7 +288,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",
@@ -28095,7 +27946,7 @@ index 89f4e64..aa4149d 100644
  			regs->ip, regs->sp, error_code);
  		print_vma_addr(" in ", regs->ip);
  		pr_cont("\n");
-@@ -274,6 +286,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
+@@ -358,6 +370,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_nr = X86_TRAP_DF;
  
@@ -28107,7 +27958,7 @@ index 89f4e64..aa4149d 100644
  #ifdef CONFIG_DOUBLEFAULT
  	df_debug(regs, error_code);
  #endif
-@@ -300,7 +317,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)
+@@ -384,7 +401,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)
  		goto exit;
  	conditional_sti(regs);
  
@@ -28116,7 +27967,7 @@ index 89f4e64..aa4149d 100644
  		die("bounds", regs, error_code);
  
  	if (!cpu_feature_enabled(X86_FEATURE_MPX)) {
-@@ -379,7 +396,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -463,7 +480,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
  	conditional_sti(regs);
  
  #ifdef CONFIG_X86_32
@@ -28125,7 +27976,7 @@ index 89f4e64..aa4149d 100644
  		local_irq_enable();
  		handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
  		goto exit;
-@@ -387,18 +404,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -471,18 +488,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
  #endif
  
  	tsk = current;
@@ -28170,7 +28021,7 @@ index 89f4e64..aa4149d 100644
  	tsk->thread.error_code = error_code;
  	tsk->thread.trap_nr = X86_TRAP_GP;
  
-@@ -510,13 +551,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
+@@ -581,13 +622,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
  		container_of(task_pt_regs(current),
  			     struct bad_iret_stack, regs);
  
@@ -28188,7 +28039,7 @@ index 89f4e64..aa4149d 100644
  	return new_stack;
  }
  NOKPROBE_SYMBOL(fixup_bad_iret);
-@@ -566,7 +610,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
+@@ -637,7 +681,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
  	 * then it's very likely the result of an icebp/int01 trap.
  	 * User wants a sigtrap for that.
  	 */
@@ -28197,7 +28048,7 @@ index 89f4e64..aa4149d 100644
  		user_icebp = 1;
  
  	/* Catch kmemcheck conditions first of all! */
-@@ -602,7 +646,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
+@@ -673,7 +717,7 @@ dotraplinkage void 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);
  
@@ -28206,7 +28057,7 @@ index 89f4e64..aa4149d 100644
  		handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
  					X86_TRAP_DB);
  		preempt_conditional_cli(regs);
-@@ -617,7 +661,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
+@@ -688,7 +732,7 @@ dotraplinkage void 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.
  	 */
@@ -28215,7 +28066,7 @@ index 89f4e64..aa4149d 100644
  		tsk->thread.debugreg6 &= ~DR_STEP;
  		set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
  		regs->flags &= ~X86_EFLAGS_TF;
-@@ -650,7 +694,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
+@@ -721,7 +765,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
  		return;
  	conditional_sti(regs);
  
@@ -28238,10 +28089,10 @@ index 5054497..139f8f8 100644
  
  /*
 diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
-index 8b96a94..792b410 100644
+index 81f8adb0..fff670e 100644
 --- a/arch/x86/kernel/uprobes.c
 +++ b/arch/x86/kernel/uprobes.c
-@@ -845,7 +845,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
+@@ -912,7 +912,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
  	int ret = NOTIFY_DONE;
  
  	/* We are only interested in userspace traps */
@@ -28250,7 +28101,7 @@ index 8b96a94..792b410 100644
  		return NOTIFY_DONE;
  
  	switch (val) {
-@@ -919,7 +919,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
+@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
  
  	if (nleft != rasize) {
  		pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
@@ -28658,7 +28509,7 @@ index 2dcc6ff..082dc7a 100644
  	BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
  		     (unsigned long)VSYSCALL_ADDR);
 diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
-index 04068192..4d75aa6 100644
+index 37d8fa4..66e319a 100644
 --- a/arch/x86/kernel/x8664_ksyms_64.c
 +++ b/arch/x86/kernel/x8664_ksyms_64.c
 @@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
@@ -28670,7 +28521,7 @@ index 04068192..4d75aa6 100644
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-@@ -73,3 +71,7 @@ EXPORT_SYMBOL(___preempt_schedule);
+@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
  EXPORT_SYMBOL(___preempt_schedule_context);
  #endif
  #endif
@@ -28710,10 +28561,10 @@ index 234b072..b7ab191 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 8be1e17..07dd990 100644
+index cdc6cf9..e04f495 100644
 --- a/arch/x86/kernel/xsave.c
 +++ b/arch/x86/kernel/xsave.c
-@@ -167,18 +167,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
+@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
  
  	/* Setup the bytes not touched by the [f]xsave and reserved for SW. */
  	sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
@@ -28735,7 +28586,7 @@ index 8be1e17..07dd990 100644
  
  	/*
  	 * For legacy compatible, we always set FP/SSE bits in the bit
-@@ -193,7 +193,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
+@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
  	 */
  	xstate_bv |= XSTATE_FPSSE;
  
@@ -28744,7 +28595,7 @@ index 8be1e17..07dd990 100644
  
  	return err;
  }
-@@ -202,6 +202,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
+@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
  {
  	int err;
  
@@ -28752,7 +28603,7 @@ index 8be1e17..07dd990 100644
  	if (use_xsave())
  		err = xsave_user(buf);
  	else if (use_fxsr())
-@@ -312,6 +313,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
+@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
   */
  static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
  {
@@ -28812,10 +28663,10 @@ index 8a80737..bac4961 100644
  
  out:
 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
-index b24c2d8..e1e4e259 100644
+index 106c015..2db7161 100644
 --- a/arch/x86/kvm/emulate.c
 +++ b/arch/x86/kvm/emulate.c
-@@ -3503,7 +3503,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
+@@ -3572,7 +3572,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
  	int cr = ctxt->modrm_reg;
  	u64 efer = 0;
  
@@ -28825,10 +28676,10 @@ index b24c2d8..e1e4e259 100644
  		0, 0, 0, /* CR3 checked later */
  		CR4_RESERVED_BITS,
 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
-index d52dcf0..cec7e84 100644
+index 4ee827d..a14eff9 100644
 --- a/arch/x86/kvm/lapic.c
 +++ b/arch/x86/kvm/lapic.c
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
  /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
@@ -28851,7 +28702,7 @@ index fd49c86..77e1aa0 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 41dd038..de331cf 100644
+index cc618c8..3f72f76 100644
 --- a/arch/x86/kvm/svm.c
 +++ b/arch/x86/kvm/svm.c
 @@ -3568,7 +3568,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
@@ -28866,7 +28717,7 @@ index 41dd038..de331cf 100644
  	load_TR_desc();
  }
  
-@@ -3969,6 +3973,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -3964,6 +3968,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
  #endif
  #endif
  
@@ -28878,10 +28729,10 @@ index 41dd038..de331cf 100644
  
  	local_irq_disable();
 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index 3124464..2e42ec3 100644
+index ae4f6d3..7f5f59b 100644
 --- a/arch/x86/kvm/vmx.c
 +++ b/arch/x86/kvm/vmx.c
-@@ -1380,12 +1380,12 @@ static void vmcs_write64(unsigned long field, u64 value)
+@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
  #endif
  }
  
@@ -28896,7 +28747,7 @@ index 3124464..2e42ec3 100644
  {
  	vmcs_writel(field, vmcs_readl(field) | mask);
  }
-@@ -1645,7 +1645,11 @@ static void reload_tss(void)
+@@ -1705,7 +1705,11 @@ static void reload_tss(void)
  	struct desc_struct *descs;
  
  	descs = (void *)gdt->address;
@@ -28908,7 +28759,7 @@ index 3124464..2e42ec3 100644
  	load_TR_desc();
  }
  
-@@ -1881,6 +1885,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
+@@ -1941,6 +1945,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 */
  
@@ -28919,7 +28770,7 @@ index 3124464..2e42ec3 100644
  		rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
  		vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
  		vmx->loaded_vmcs->cpu = cpu;
-@@ -2170,7 +2178,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
+@@ -2233,7 +2241,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
   */
@@ -28928,7 +28779,7 @@ index 3124464..2e42ec3 100644
  {
  	u64 host_tsc, tsc_offset;
  
-@@ -4255,7 +4263,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
+@@ -4458,7 +4466,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
  	unsigned long cr4;
  
  	vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS);  /* 22.2.3 */
@@ -28938,8 +28789,8 @@ index 3124464..2e42ec3 100644
 +#endif
  
  	/* Save the most likely value for this task's CR4 in the VMCS. */
- 	cr4 = read_cr4();
-@@ -4282,7 +4293,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
+ 	cr4 = cr4_read_shadow();
+@@ -4485,7 +4496,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;
  
@@ -28948,15 +28799,17 @@ index 3124464..2e42ec3 100644
  
  	rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
  	vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
-@@ -5879,11 +5890,16 @@ static __init int hardware_setup(void)
- 		 * page upon invalidation.  No need to do anything if the
- 		 * processor does not have the APIC_ACCESS_ADDR VMCS field.
- 		 */
+@@ -6096,11 +6107,17 @@ static __init int hardware_setup(void)
+ 	 * page upon invalidation.  No need to do anything if not
+ 	 * using the APIC_ACCESS_ADDR VMCS field.
+ 	 */
+-	if (!flexpriority_enabled)
 -		kvm_x86_ops->set_apic_access_page_addr = NULL;
++	if (!flexpriority_enabled) {
 +		pax_open_kernel();
 +		*(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
 +		pax_close_kernel();
- 	}
++	}
  
 -	if (!cpu_has_vmx_tpr_shadow())
 -		kvm_x86_ops->update_cr8_intercept = NULL;
@@ -28968,7 +28821,7 @@ index 3124464..2e42ec3 100644
  
  	if (enable_ept && !cpu_has_vmx_ept_2m_page())
  		kvm_disable_largepages();
-@@ -5894,13 +5910,15 @@ static __init int hardware_setup(void)
+@@ -6111,14 +6128,16 @@ static __init int hardware_setup(void)
  	if (!cpu_has_vmx_apicv())
  		enable_apicv = 0;
  
@@ -28978,17 +28831,36 @@ index 3124464..2e42ec3 100644
 +		*(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
  	else {
 -		kvm_x86_ops->hwapic_irr_update = NULL;
+-		kvm_x86_ops->hwapic_isr_update = NULL;
 -		kvm_x86_ops->deliver_posted_interrupt = NULL;
 -		kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
 +		*(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
++		*(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
 +		*(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
 +		*(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
  	}
 +	pax_close_kernel();
  
- 	if (nested)
- 		nested_vmx_setup_ctls_msrs();
-@@ -7849,6 +7867,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+ 	vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
+ 	vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
+@@ -6171,10 +6190,12 @@ static __init int hardware_setup(void)
+ 		enable_pml = 0;
+ 
+ 	if (!enable_pml) {
+-		kvm_x86_ops->slot_enable_log_dirty = NULL;
+-		kvm_x86_ops->slot_disable_log_dirty = NULL;
+-		kvm_x86_ops->flush_log_dirty = NULL;
+-		kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
++		pax_open_kernel();
++		*(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
++		*(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
++		*(void **)&kvm_x86_ops->flush_log_dirty = NULL;
++		*(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
++		pax_close_kernel();
+ 	}
+ 
+ 	return alloc_kvm_area();
+@@ -8219,6 +8240,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
  		"jmp 2f \n\t"
  		"1: " __ex(ASM_VMX_VMRESUME) "\n\t"
  		"2: "
@@ -29001,7 +28873,7 @@ index 3124464..2e42ec3 100644
  		/* Save guest registers, load host registers, keep flags */
  		"mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
  		"pop %0 \n\t"
-@@ -7901,6 +7925,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -8271,6 +8298,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))
@@ -29013,7 +28885,7 @@ index 3124464..2e42ec3 100644
  	      : "cc", "memory"
  #ifdef CONFIG_X86_64
  		, "rax", "rbx", "rdi", "rsi"
-@@ -7914,7 +7943,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -8284,7 +8316,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
  	if (debugctlmsr)
  		update_debugctlmsr(debugctlmsr);
  
@@ -29022,7 +28894,7 @@ index 3124464..2e42ec3 100644
  	/*
  	 * The sysexit path does not restore ds/es, so we must set them to
  	 * a reasonable value ourselves.
-@@ -7923,8 +7952,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -8293,8 +8325,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.
  	 */
@@ -29044,10 +28916,10 @@ index 3124464..2e42ec3 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 64d76c1..e20a4c1 100644
+index 32bf19e..c8de1b5 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -1882,8 +1882,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
+@@ -1897,8 +1897,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
  {
  	struct kvm *kvm = vcpu->kvm;
  	int lm = is_long_mode(vcpu);
@@ -29058,7 +28930,7 @@ index 64d76c1..e20a4c1 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;
-@@ -2809,6 +2809,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
+@@ -2835,6 +2835,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
  		if (n < msr_list.nmsrs)
  			goto out;
  		r = -EFAULT;
@@ -29067,7 +28939,7 @@ index 64d76c1..e20a4c1 100644
  		if (copy_to_user(user_msr_list->indices, &msrs_to_save,
  				 num_msrs_to_save * sizeof(u32)))
  			goto out;
-@@ -5745,7 +5747,7 @@ static struct notifier_block pvclock_gtod_notifier = {
+@@ -5739,7 +5741,7 @@ static struct notifier_block pvclock_gtod_notifier = {
  };
  #endif
  
@@ -29077,10 +28949,10 @@ index 64d76c1..e20a4c1 100644
  	int r;
  	struct kvm_x86_ops *ops = opaque;
 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
-index c1c1544..f90c9d5 100644
+index ac4453d..1f43bf3 100644
 --- a/arch/x86/lguest/boot.c
 +++ b/arch/x86/lguest/boot.c
-@@ -1206,9 +1206,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
+@@ -1340,9 +1340,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.
   */
@@ -30466,7 +30338,7 @@ index 05a95e7..326f2fa 100644
  	CFI_ENDPROC
  ENDPROC(__iowrite32_copy)
 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
-index 56313a3..0db417e 100644
+index 89b53c9..97357ca 100644
 --- a/arch/x86/lib/memcpy_64.S
 +++ b/arch/x86/lib/memcpy_64.S
 @@ -24,7 +24,7 @@
@@ -30500,7 +30372,7 @@ index 56313a3..0db417e 100644
  	ret
  .Lmemcpy_e_e:
  	.previous
-@@ -136,6 +138,7 @@ ENTRY(memcpy)
+@@ -138,6 +140,7 @@ ENTRY(memcpy)
  	movq %r9,	1*8(%rdi)
  	movq %r10,	-2*8(%rdi, %rdx)
  	movq %r11,	-1*8(%rdi, %rdx)
@@ -30508,7 +30380,7 @@ index 56313a3..0db417e 100644
  	retq
  	.p2align 4
  .Lless_16bytes:
-@@ -148,6 +151,7 @@ ENTRY(memcpy)
+@@ -150,6 +153,7 @@ ENTRY(memcpy)
  	movq -1*8(%rsi, %rdx),	%r9
  	movq %r8,	0*8(%rdi)
  	movq %r9,	-1*8(%rdi, %rdx)
@@ -30516,7 +30388,7 @@ index 56313a3..0db417e 100644
  	retq
  	.p2align 4
  .Lless_8bytes:
-@@ -161,6 +165,7 @@ ENTRY(memcpy)
+@@ -163,6 +167,7 @@ ENTRY(memcpy)
  	movl -4(%rsi, %rdx), %r8d
  	movl %ecx, (%rdi)
  	movl %r8d, -4(%rdi, %rdx)
@@ -30524,7 +30396,7 @@ index 56313a3..0db417e 100644
  	retq
  	.p2align 4
  .Lless_3bytes:
-@@ -179,6 +184,7 @@ ENTRY(memcpy)
+@@ -181,6 +186,7 @@ ENTRY(memcpy)
  	movb %cl, (%rdi)
  
  .Lend:
@@ -30533,10 +30405,10 @@ index 56313a3..0db417e 100644
  	CFI_ENDPROC
  ENDPROC(memcpy)
 diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
-index 65268a6..dd1de11 100644
+index 9c4b530..830b77a 100644
 --- a/arch/x86/lib/memmove_64.S
 +++ b/arch/x86/lib/memmove_64.S
-@@ -202,14 +202,16 @@ ENTRY(memmove)
+@@ -205,14 +205,16 @@ ENTRY(__memmove)
  	movb (%rsi), %r11b
  	movb %r11b, (%rdi)
  13:
@@ -30555,7 +30427,7 @@ index 65268a6..dd1de11 100644
  .Lmemmove_end_forward_efs:
  	.previous
 diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
-index 2dcb380..2eb79fe 100644
+index 6f44935..fbf5f6d 100644
 --- a/arch/x86/lib/memset_64.S
 +++ b/arch/x86/lib/memset_64.S
 @@ -16,7 +16,7 @@
@@ -30591,7 +30463,7 @@ index 2dcb380..2eb79fe 100644
  	ret
  .Lmemset_e_e:
  	.previous
-@@ -118,6 +120,7 @@ ENTRY(__memset)
+@@ -120,6 +122,7 @@ ENTRY(__memset)
  
  .Lende:
  	movq	%r10,%rax
@@ -31747,7 +31619,7 @@ index e2f5e21..4b22130 100644
 +EXPORT_SYMBOL(set_fs);
 +#endif
 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
-index c905e89..01ab928 100644
+index 1f33b3d..83c151d 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)
@@ -31787,33 +31659,31 @@ index c905e89..01ab928 100644
  }
  EXPORT_SYMBOL(copy_in_user);
  
-@@ -69,11 +70,13 @@ EXPORT_SYMBOL(copy_in_user);
+@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
   * it is not necessary to optimize tail handling.
   */
  __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)
+-copy_user_handle_tail(char *to, char *from, unsigned len)
++copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
  {
- 	char c;
- 	unsigned zero_len;
- 
 +	clac();
 +	pax_close_userland();
  	for (; len; --len, to++) {
- 		if (__get_user_nocheck(c, from++, sizeof(char)))
- 			break;
-@@ -84,6 +87,5 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
- 	for (c = 0, zero_len = len; zerorest && zero_len; --zero_len)
- 		if (__put_user_nocheck(c, to++, sizeof(char)))
+ 		char c;
+ 
+@@ -79,7 +82,6 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
+ 		if (__put_user_nocheck(c, to, sizeof(char)))
  			break;
+ 	}
 -	clac();
- 	return len;
- }
+ 
+ 	/* If the destination is a kernel buffer, we always clear the end */
+ 	if ((unsigned long)to >= TASK_SIZE_MAX)
 diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
-index ecfdc46..55b9309 100644
+index c4cc740..60a7362 100644
 --- a/arch/x86/mm/Makefile
 +++ b/arch/x86/mm/Makefile
-@@ -32,3 +32,7 @@ obj-$(CONFIG_NUMA_EMU)		+= numa_emulation.o
+@@ -35,3 +35,7 @@ obj-$(CONFIG_NUMA_EMU)		+= numa_emulation.o
  obj-$(CONFIG_MEMTEST)		+= memtest.o
  
  obj-$(CONFIG_X86_INTEL_MPX)	+= mpx.o
@@ -31876,7 +31746,7 @@ index 903ec1e..c4166b2 100644
  }
  
 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index e3ff27a..f38f7c0 100644
+index ede025f..380466b 100644
 --- a/arch/x86/mm/fault.c
 +++ b/arch/x86/mm/fault.c
 @@ -13,12 +13,19 @@
@@ -32089,7 +31959,7 @@ index e3ff27a..f38f7c0 100644
 +			printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
  		if (pte && pte_present(*pte) && pte_exec(*pte) &&
  				(pgd_flags(*pgd) & _PAGE_USER) &&
- 				(read_cr4() & X86_CR4_SMEP))
+ 				(__read_cr4() & X86_CR4_SMEP))
 -			printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
 +			printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
  	}
@@ -32634,7 +32504,7 @@ index e3ff27a..f38f7c0 100644
 +	return ret ? -EFAULT : 0;
 +}
 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
-index 224b142..c2c9423 100644
+index 81bf3d2..7ef25c2 100644
 --- a/arch/x86/mm/gup.c
 +++ b/arch/x86/mm/gup.c
 @@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
@@ -32674,7 +32544,7 @@ index 4500142..53a363c 100644
  
  	return (void *)vaddr;
 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
-index 9161f76..cbc5124 100644
+index 42982b2..7168fc3 100644
 --- a/arch/x86/mm/hugetlbpage.c
 +++ b/arch/x86/mm/hugetlbpage.c
 @@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
@@ -32776,7 +32646,7 @@ index 9161f76..cbc5124 100644
  #endif /* CONFIG_HUGETLB_PAGE */
  
 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index 079c3b6..7069023 100644
+index a110efc..a31a18f 100644
 --- a/arch/x86/mm/init.c
 +++ b/arch/x86/mm/init.c
 @@ -4,6 +4,7 @@
@@ -32796,7 +32666,7 @@ index 079c3b6..7069023 100644
  
  /*
   * We need to define the tracepoints somewhere, and tlb.c
-@@ -596,7 +599,18 @@ void __init init_mem_mapping(void)
+@@ -620,7 +623,18 @@ void __init init_mem_mapping(void)
  	early_ioremap_page_table_range_init();
  #endif
  
@@ -32815,7 +32685,7 @@ index 079c3b6..7069023 100644
  	__flush_tlb_all();
  
  	early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
-@@ -612,10 +626,40 @@ void __init init_mem_mapping(void)
+@@ -636,10 +650,40 @@ void __init init_mem_mapping(void)
   * Access has to be given to non-kernel-ram areas as well, these contain the PCI
   * mmio resources as well as potential bios/acpi data regions.
   */
@@ -32857,7 +32727,7 @@ index 079c3b6..7069023 100644
  	if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
  		return 0;
  	if (!page_is_ram(pagenr))
-@@ -661,8 +705,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
+@@ -685,8 +729,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
  #endif
  }
  
@@ -33595,7 +33465,7 @@ index 0057a7a..95c7edd 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 1a88370..3f598b5 100644
+index cd4785b..25188b6 100644
 --- a/arch/x86/mm/numa.c
 +++ b/arch/x86/mm/numa.c
 @@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
@@ -33840,10 +33710,10 @@ 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 6fb6927..634b0f7 100644
+index 7b22ada..b11e66f 100644
 --- a/arch/x86/mm/pgtable.c
 +++ b/arch/x86/mm/pgtable.c
-@@ -97,10 +97,71 @@ static inline void pgd_list_del(pgd_t *pgd)
+@@ -97,10 +97,75 @@ static inline void pgd_list_del(pgd_t *pgd)
  	list_del(&page->lru);
  }
  
@@ -33898,6 +33768,8 @@ index 6fb6927..634b0f7 100644
 +#define pyd_populate(mm, pgd, pud)	pgd_populate((mm), (pgd), (pud))
 +#define pyd_offset(mm, address)		pgd_offset((mm), (address))
 +#define PYD_SIZE			PGDIR_SIZE
++#define mm_inc_nr_pxds(mm)		do {} while (0)
++#define mm_dec_nr_pxds(mm)		do {} while (0)
 +#else
 +#define pxd_t				pmd_t
 +#define pyd_t				pud_t
@@ -33908,6 +33780,8 @@ index 6fb6927..634b0f7 100644
 +#define pyd_populate(mm, pgd, pud)	pud_populate((mm), (pgd), (pud))
 +#define pyd_offset(mm, address)		pud_offset((mm), (address))
 +#define PYD_SIZE			PUD_SIZE
++#define mm_inc_nr_pxds(mm)		mm_inc_nr_pmds(mm)
++#define mm_dec_nr_pxds(mm)		mm_dec_nr_pmds(mm)
 +#endif
 +
 +#ifdef CONFIG_PAX_PER_CPU_PGD
@@ -33917,7 +33791,7 @@ index 6fb6927..634b0f7 100644
  static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
  {
  	BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
-@@ -141,6 +202,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -141,6 +206,7 @@ static void pgd_dtor(pgd_t *pgd)
  	pgd_list_del(pgd);
  	spin_unlock(&pgd_lock);
  }
@@ -33925,7 +33799,7 @@ index 6fb6927..634b0f7 100644
  
  /*
   * List of all pgd's needed for non-PAE so it can invalidate entries
-@@ -153,7 +215,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -153,7 +219,7 @@ static void pgd_dtor(pgd_t *pgd)
   * -- nyc
   */
  
@@ -33934,7 +33808,7 @@ index 6fb6927..634b0f7 100644
  /*
   * In PAE mode, we need to do a cr3 reload (=tlb flush) when
   * updating the top-level pagetable entries to guarantee the
-@@ -165,7 +227,7 @@ static void pgd_dtor(pgd_t *pgd)
+@@ -165,7 +231,7 @@ static void pgd_dtor(pgd_t *pgd)
   * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
   * and initialize the kernel pmds here.
   */
@@ -33943,7 +33817,7 @@ index 6fb6927..634b0f7 100644
  
  void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
  {
-@@ -183,43 +245,45 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
+@@ -183,46 +249,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
  	 */
  	flush_tlb_mm(mm);
  }
@@ -33957,8 +33831,8 @@ index 6fb6927..634b0f7 100644
  
  #endif	/* CONFIG_X86_PAE */
  
--static void free_pmds(pmd_t *pmds[])
-+static void free_pxds(pxd_t *pxds[])
+-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
++static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
  {
  	int i;
  
@@ -33966,15 +33840,17 @@ index 6fb6927..634b0f7 100644
 -		if (pmds[i]) {
 -			pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
 -			free_page((unsigned long)pmds[i]);
+-			mm_dec_nr_pmds(mm);
 +	for(i = 0; i < PREALLOCATED_PXDS; i++)
 +		if (pxds[i]) {
 +			pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
 +			free_page((unsigned long)pxds[i]);
++			mm_dec_nr_pxds(mm);
  		}
  }
  
--static int preallocate_pmds(pmd_t *pmds[])
-+static int preallocate_pxds(pxd_t *pxds[])
+-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
++static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
  {
  	int i;
  	bool failed = false;
@@ -33994,17 +33870,21 @@ index 6fb6927..634b0f7 100644
 +			pxd = NULL;
  			failed = true;
  		}
+-		if (pmd)
+-			mm_inc_nr_pmds(mm);
 -		pmds[i] = pmd;
++		if (pxd)
++			mm_inc_nr_pxds(mm);
 +		pxds[i] = pxd;
  	}
  
  	if (failed) {
--		free_pmds(pmds);
-+		free_pxds(pxds);
+-		free_pmds(mm, pmds);
++		free_pxds(mm, pxds);
  		return -ENOMEM;
  	}
  
-@@ -232,49 +296,52 @@ static int preallocate_pmds(pmd_t *pmds[])
+@@ -235,50 +303,54 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
   * preallocate which never got a corresponding vma will need to be
   * freed manually.
   */
@@ -34026,8 +33906,10 @@ index 6fb6927..634b0f7 100644
  
 -			paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
 -			pmd_free(mm, pmd);
+-			mm_dec_nr_pmds(mm);
 +			paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
 +			pxd_free(mm, pxd);
++			mm_dec_nr_pxds(mm);
  		}
  	}
  }
@@ -34044,17 +33926,17 @@ index 6fb6927..634b0f7 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 (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
+-		pmd_t *pmd = pmds[i];
 +	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);
@@ -34074,12 +33956,12 @@ index 6fb6927..634b0f7 100644
  
  	pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
  
-@@ -283,11 +350,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -287,11 +359,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  
  	mm->pgd = pgd;
  
--	if (preallocate_pmds(pmds) != 0)
-+	if (preallocate_pxds(pxds) != 0)
+-	if (preallocate_pmds(mm, pmds) != 0)
++	if (preallocate_pxds(mm, pxds) != 0)
  		goto out_free_pgd;
  
  	if (paravirt_pgd_alloc(mm) != 0)
@@ -34088,7 +33970,7 @@ index 6fb6927..634b0f7 100644
  
  	/*
  	 * Make sure that pre-populating the pmds is atomic with
-@@ -297,14 +364,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+@@ -301,14 +373,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
  	spin_lock(&pgd_lock);
  
  	pgd_ctor(mm, pgd);
@@ -34100,13 +33982,13 @@ index 6fb6927..634b0f7 100644
  	return pgd;
  
 -out_free_pmds:
--	free_pmds(pmds);
+-	free_pmds(mm, pmds);
 +out_free_pxds:
-+	free_pxds(pxds);
++	free_pxds(mm, pxds);
  out_free_pgd:
  	free_page((unsigned long)pgd);
  out:
-@@ -313,7 +380,7 @@ out:
+@@ -317,7 +389,7 @@ out:
  
  void pgd_free(struct mm_struct *mm, pgd_t *pgd)
  {
@@ -34189,10 +34071,10 @@ index 90555bf..f5f1828 100644
  }
  
 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index ee61c36..e6fedeb 100644
+index 3250f23..7a97ba2 100644
 --- a/arch/x86/mm/tlb.c
 +++ b/arch/x86/mm/tlb.c
-@@ -48,7 +48,11 @@ void leave_mm(int cpu)
+@@ -45,7 +45,11 @@ void leave_mm(int cpu)
  		BUG();
  	if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
  		cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
@@ -34515,7 +34397,7 @@ index 71e8a67..6a313bb 100644
  struct op_counter_config;
  
 diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
-index 44b9271..4c5a988 100644
+index 852aa4c..71613f2 100644
 --- a/arch/x86/pci/intel_mid_pci.c
 +++ b/arch/x86/pci/intel_mid_pci.c
 @@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
@@ -35124,9 +35006,18 @@ index 86d0f9e..6d499f4 100644
  ENDPROC(efi_call)
  
 diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
-index 1bbedc4..eb795b5 100644
+index 3005f0c..d06aeb0 100644
 --- a/arch/x86/platform/intel-mid/intel-mid.c
 +++ b/arch/x86/platform/intel-mid/intel-mid.c
+@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
+ /* intel_mid_ops to store sub arch ops */
+ struct intel_mid_ops *intel_mid_ops;
+ /* getter function for sub arch ops*/
+-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
++static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
+ enum intel_mid_cpu_type __intel_mid_cpu_chip;
+ EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
+ 
 @@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
  {
  };
@@ -35185,6 +35076,19 @@ index aaca917..66eadbc 100644
  {
  	return &tangier_ops;
  }
+diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
+index c9a0838..fae0977 100644
+--- a/arch/x86/platform/intel-quark/imr_selftest.c
++++ b/arch/x86/platform/intel-quark/imr_selftest.c
+@@ -54,7 +54,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
+  */
+ static void __init imr_self_test(void)
+ {
+-	phys_addr_t base  = virt_to_phys(&_text);
++	phys_addr_t base  = virt_to_phys(ktla_ktva(_text));
+ 	size_t size = virt_to_phys(&__end_rodata) - base;
+ 	const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
+ 	int ret;
 diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
 index d6ee929..3637cb5 100644
 --- a/arch/x86/platform/olpc/olpc_dt.c
@@ -35199,10 +35103,10 @@ 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 6ec7910..ecdbb11 100644
+index 3e32ed5..cc0adc5 100644
 --- a/arch/x86/power/cpu.c
 +++ b/arch/x86/power/cpu.c
-@@ -137,11 +137,8 @@ static void do_fpu_end(void)
+@@ -134,11 +134,8 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
  	int cpu = smp_processor_id();
@@ -35216,7 +35120,7 @@ index 6ec7910..ecdbb11 100644
  	set_tss_desc(cpu, t);	/*
  				 * This just modifies memory; should not be
  				 * necessary. But... This is necessary, because
-@@ -150,10 +147,6 @@ static void fix_processor_context(void)
+@@ -147,10 +144,6 @@ static void fix_processor_context(void)
  				 */
  
  #ifdef CONFIG_X86_64
@@ -35228,7 +35132,7 @@ index 6ec7910..ecdbb11 100644
  #endif
  	load_TR_desc();				/* This does ltr */
 diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
-index bad628a..a102610 100644
+index 0b7a63d..0d0f2c2 100644
 --- a/arch/x86/realmode/init.c
 +++ b/arch/x86/realmode/init.c
 @@ -68,7 +68,13 @@ void __init setup_real_mode(void)
@@ -35247,7 +35151,7 @@ index bad628a..a102610 100644
  	trampoline_header->gdt_base = __pa_symbol(boot_gdt);
  #else
 @@ -84,7 +90,7 @@ void __init setup_real_mode(void)
- 	*trampoline_cr4_features = read_cr4();
+ 	*trampoline_cr4_features = __read_cr4();
  
  	trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
 -	trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
@@ -35256,10 +35160,10 @@ index bad628a..a102610 100644
  #endif
  }
 diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
-index 7c0d7be..d24dc88 100644
+index 2730d77..2e4cd19 100644
 --- a/arch/x86/realmode/rm/Makefile
 +++ b/arch/x86/realmode/rm/Makefile
-@@ -67,5 +67,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
+@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
  
  KBUILD_CFLAGS	:= $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
  		   -I$(srctree)/arch/x86/boot
@@ -35621,10 +35525,10 @@ index 80ffa5b..a33bd15 100644
  
  	return 0;
 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
-index 5a4affe..9e2d522 100644
+index 7b9be98..39bb57f 100644
 --- a/arch/x86/vdso/Makefile
 +++ b/arch/x86/vdso/Makefile
-@@ -174,7 +174,7 @@ quiet_cmd_vdso = VDSO    $@
+@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO    $@
  		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
  		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
  
@@ -35784,7 +35688,7 @@ index e88fda8..76ce7ce 100644
  	  This is the Linux Xen port.  Enabling this will allow the
  	  kernel to boot in a paravirtualized environment under the
 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 78a881b..9994bbb 100644
+index 5240f56..0c12163 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
 @@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
@@ -35834,7 +35738,7 @@ index 78a881b..9994bbb 100644
  {
  	apic->read = xen_apic_read;
  	apic->write = xen_apic_write;
-@@ -1291,30 +1287,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
+@@ -1308,30 +1304,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
  #endif
  };
  
@@ -35872,7 +35776,7 @@ index 78a881b..9994bbb 100644
  {
  	if (pm_power_off)
  		pm_power_off();
-@@ -1467,8 +1463,11 @@ static void __ref xen_setup_gdt(int cpu)
+@@ -1484,8 +1480,11 @@ static void __ref xen_setup_gdt(int cpu)
  	pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
  	pv_cpu_ops.load_gdt = xen_load_gdt_boot;
  
@@ -35886,7 +35790,7 @@ index 78a881b..9994bbb 100644
  
  	pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
  	pv_cpu_ops.load_gdt = xen_load_gdt;
-@@ -1583,7 +1582,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
+@@ -1600,7 +1599,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
  	__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
  
  	/* Work out if we support NX */
@@ -35905,7 +35809,7 @@ index 78a881b..9994bbb 100644
  
  	/* Get mfn list */
  	xen_build_dynamic_phys_to_machine();
-@@ -1611,13 +1620,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
+@@ -1628,13 +1637,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
  
  	machine_ops = xen_machine_ops;
  
@@ -35920,7 +35824,7 @@ index 78a881b..9994bbb 100644
  
  #ifdef CONFIG_ACPI_NUMA
 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index 5c1f9ac..0e15f5c 100644
+index adca9e2..35d6a98 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)
@@ -35932,7 +35836,7 @@ index 5c1f9ac..0e15f5c 100644
  {
  	if (val & _PAGE_PRESENT) {
  		unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
-@@ -1836,7 +1836,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
+@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
  		 * L3_k[511] -> level2_fixmap_pgt */
  		convert_pfn_mfn(level3_kernel_pgt);
  
@@ -35944,7 +35848,7 @@ index 5c1f9ac..0e15f5c 100644
  		convert_pfn_mfn(level2_fixmap_pgt);
  	}
  	/* We get [511][511] and have Xen's version of level2_kernel_pgt */
-@@ -1861,11 +1865,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
+@@ -1860,11 +1864,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
  		set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
  		set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
  		set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
@@ -35961,7 +35865,7 @@ index 5c1f9ac..0e15f5c 100644
  
  		/* Pin down new L4 */
  		pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
-@@ -2049,6 +2058,7 @@ static void __init xen_post_allocator_init(void)
+@@ -2048,6 +2057,7 @@ static void __init xen_post_allocator_init(void)
  	pv_mmu_ops.set_pud = xen_set_pud;
  #if PAGETABLE_LEVELS == 4
  	pv_mmu_ops.set_pgd = xen_set_pgd;
@@ -35969,7 +35873,7 @@ index 5c1f9ac..0e15f5c 100644
  #endif
  
  	/* This will work as long as patching hasn't happened yet
-@@ -2127,6 +2137,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
+@@ -2126,6 +2136,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
  	.pud_val = PV_CALLEE_SAVE(xen_pud_val),
  	.make_pud = PV_CALLEE_SAVE(xen_make_pud),
  	.set_pgd = xen_set_pgd_hyper,
@@ -35978,7 +35882,7 @@ index 5c1f9ac..0e15f5c 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 4c071ae..00e7049 100644
+index 08e8489..b1e182f 100644
 --- a/arch/x86/xen/smp.c
 +++ b/arch/x86/xen/smp.c
 @@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
@@ -36083,12 +35987,12 @@ index 674b2225..f1f5dc1 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 5686bd9..0c8b6ee 100644
+index 9e195c6..523ed36 100644
 --- a/arch/x86/xen/xen-ops.h
 +++ b/arch/x86/xen/xen-ops.h
-@@ -10,8 +10,6 @@
- extern const char xen_hypervisor_callback[];
- extern const char xen_failsafe_callback[];
+@@ -16,8 +16,6 @@ void xen_syscall_target(void);
+ void xen_syscall32_target(void);
+ #endif
  
 -extern void *xen_initial_gdt;
 -
@@ -36134,10 +36038,10 @@ index 2f33760..835e50a 100644
  #define XCHAL_ICACHE_SIZE		8192	/* I-cache size in bytes or 0 */
  #define XCHAL_DCACHE_SIZE		8192	/* D-cache size in bytes or 0 */
 diff --git a/block/bio.c b/block/bio.c
-index 471d738..bd3da0d 100644
+index f66a4ea..73ddf55 100644
 --- a/block/bio.c
 +++ b/block/bio.c
-@@ -1169,7 +1169,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
+@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
  		/*
  		 * Overflow, abort
  		 */
@@ -36146,7 +36050,7 @@ index 471d738..bd3da0d 100644
  			return ERR_PTR(-EINVAL);
  
  		nr_pages += end - start;
-@@ -1303,7 +1303,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
+@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
  		/*
  		 * Overflow, abort
  		 */
@@ -36155,15 +36059,6 @@ index 471d738..bd3da0d 100644
  			return ERR_PTR(-EINVAL);
  
  		nr_pages += end - start;
-@@ -1565,7 +1565,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
- 	const int read = bio_data_dir(bio) == READ;
- 	struct bio_map_data *bmd = bio->bi_private;
- 	int i;
--	char *p = bmd->sgvecs[0].iov_base;
-+	char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
- 
- 	bio_for_each_segment_all(bvec, bio, i) {
- 		char *addr = page_address(bvec->bv_page);
 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
 index 0736729..2ec3b48 100644
 --- a/block/blk-iopoll.c
@@ -36178,10 +36073,10 @@ index 0736729..2ec3b48 100644
  	struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
  	int rearm = 0, budget = blk_iopoll_budget;
 diff --git a/block/blk-map.c b/block/blk-map.c
-index f890d43..97b0482 100644
+index b8d2725..08c52b0 100644
 --- a/block/blk-map.c
 +++ b/block/blk-map.c
-@@ -300,7 +300,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
+@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
  	if (!len || !kbuf)
  		return -EINVAL;
  
@@ -36190,28 +36085,6 @@ index f890d43..97b0482 100644
  	if (do_copy)
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
-diff --git a/block/blk-mq.c b/block/blk-mq.c
-index 447f533..da01de2 100644
---- a/block/blk-mq.c
-+++ b/block/blk-mq.c
-@@ -1456,7 +1456,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,
- 
- 		do {
- 			page = alloc_pages_node(set->numa_node,
--				GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY,
-+				GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY | __GFP_ZERO,
- 				this_order);
- 			if (page)
- 				break;
-@@ -1478,8 +1478,6 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set,
- 		left -= to_do * rq_size;
- 		for (j = 0; j < to_do; j++) {
- 			tags->rqs[i] = p;
--			tags->rqs[i]->atomic_flags = 0;
--			tags->rqs[i]->cmd_flags = 0;
- 			if (set->ops->init_request) {
- 				if (set->ops->init_request(set->driver_data,
- 						tags->rqs[i], hctx_idx, i,
 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
 index 53b1737..08177d2e 100644
 --- a/block/blk-softirq.c
@@ -36226,10 +36099,10 @@ index 53b1737..08177d2e 100644
  	struct list_head *cpu_list, local_list;
  
 diff --git a/block/bsg.c b/block/bsg.c
-index 276e869..6fe4c61 100644
+index d214e92..9649863 100644
 --- a/block/bsg.c
 +++ b/block/bsg.c
-@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
+@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
  				struct sg_io_v4 *hdr, struct bsg_device *bd,
  				fmode_t has_write_perm)
  {
@@ -36311,7 +36184,7 @@ index 0a536dc..b8f7aca 100644
  
  EXPORT_SYMBOL(blk_unregister_region);
 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
-index 56d08fd..2e07090 100644
+index 26cb624..a49c3a5 100644
 --- a/block/partitions/efi.c
 +++ b/block/partitions/efi.c
 @@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
@@ -36336,7 +36209,7 @@ index 56d08fd..2e07090 100644
  			(u8 *) pte, count) < count) {
  		kfree(pte);
 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
-index 28163fa..07190a06 100644
+index e1f71c3..02d295a 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)
@@ -36370,7 +36243,7 @@ index 28163fa..07190a06 100644
  	if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
  		return -EPERM;
  
-@@ -431,6 +443,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
+@@ -422,6 +434,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
  	int err;
  	unsigned int in_len, out_len, bytes, opcode, cmdlen;
  	char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
@@ -36379,7 +36252,7 @@ index 28163fa..07190a06 100644
  
  	if (!sic)
  		return -EINVAL;
-@@ -469,9 +483,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
+@@ -460,9 +474,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
  	 */
  	err = -EFAULT;
  	rq->cmd_len = cmdlen;
@@ -36452,7 +36325,7 @@ index 0eefa9d..0fa3d29 100644
  
  	workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
 diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
-index 6921c7f..78e1af7 100644
+index 3b37676..898edfa 100644
 --- a/drivers/acpi/acpica/hwxfsleep.c
 +++ b/drivers/acpi/acpica/hwxfsleep.c
 @@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
@@ -36585,7 +36458,7 @@ index c68e724..e863008 100644
  		/* parse the table header to get the table length */
  		if (count <= sizeof(struct acpi_table_header))
 diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
-index c0d44d3..5ad8f9a 100644
+index 735db11..91e07ff 100644
 --- a/drivers/acpi/device_pm.c
 +++ b/drivers/acpi/device_pm.c
 @@ -1025,6 +1025,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
@@ -36596,16 +36469,16 @@ index c0d44d3..5ad8f9a 100644
 +
  static struct dev_pm_domain acpi_general_pm_domain = {
  	.ops = {
- #ifdef CONFIG_PM
-@@ -1043,6 +1045,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
- #endif
+ 		.runtime_suspend = acpi_subsys_runtime_suspend,
+@@ -1041,6 +1043,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
+ 		.restore_early = acpi_subsys_resume_early,
  #endif
  	},
 +	.detach = acpi_dev_pm_detach
  };
  
  /**
-@@ -1112,7 +1115,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
+@@ -1110,7 +1113,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
  		acpi_device_wakeup(adev, ACPI_STATE_S0, false);
  	}
  
@@ -36614,10 +36487,10 @@ index c0d44d3..5ad8f9a 100644
  }
  EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
 diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
-index 1b5853f..ab1808c 100644
+index a8dd2f7..e15950e 100644
 --- a/drivers/acpi/ec.c
 +++ b/drivers/acpi/ec.c
-@@ -1045,7 +1045,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
+@@ -1242,7 +1242,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
  	return 0;
  }
  
@@ -36653,10 +36526,10 @@ index d9f7158..168e742 100644
  };
  
 diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
-index b27ab7a..275b1b6 100644
+index f98db0b..8309c83 100644
 --- a/drivers/acpi/processor_idle.c
 +++ b/drivers/acpi/processor_idle.c
-@@ -952,7 +952,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
+@@ -912,7 +912,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
  {
  	int i, count = CPUIDLE_DRIVER_STATE_START;
  	struct acpi_processor_cx *cx;
@@ -36679,7 +36552,7 @@ index e5dd808..1eceed1 100644
  	set_no_mwait, "Extensa 5220", {
  	DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
 diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
-index 8aa9254..aeff570 100644
+index 7f251dd..47b262c 100644
 --- a/drivers/acpi/sleep.c
 +++ b/drivers/acpi/sleep.c
 @@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
@@ -36723,7 +36596,7 @@ index d24fa19..782f1e6 100644
  	 * Award BIOS on this AOpen makes thermal control almost worthless.
  	 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
-index 3647ce7..e733107 100644
+index 26eb70c..4d66ddf 100644
 --- a/drivers/acpi/video.c
 +++ b/drivers/acpi/video.c
 @@ -418,7 +418,7 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
@@ -36749,7 +36622,7 @@ index 61a9c07..ea98fa1 100644
  				unsigned long timeout_msec)
  {
 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 00f2f74..efd8b7d 100644
+index 23dac3b..89ada44 100644
 --- a/drivers/ata/libata-core.c
 +++ b/drivers/ata/libata-core.c
 @@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
@@ -36761,7 +36634,7 @@ index 00f2f74..efd8b7d 100644
  
  struct ata_force_param {
  	const char	*name;
-@@ -4842,7 +4842,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
+@@ -4780,7 +4780,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
  	struct ata_port *ap;
  	unsigned int tag;
  
@@ -36770,7 +36643,7 @@ index 00f2f74..efd8b7d 100644
  	ap = qc->ap;
  
  	qc->flags = 0;
-@@ -4858,7 +4858,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
+@@ -4797,7 +4797,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
  	struct ata_port *ap;
  	struct ata_link *link;
  
@@ -36779,7 +36652,7 @@ index 00f2f74..efd8b7d 100644
  	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
  	ap = qc->ap;
  	link = qc->dev->link;
-@@ -5962,6 +5962,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5901,6 +5901,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
  		return;
  
  	spin_lock(&lock);
@@ -36787,7 +36660,7 @@ index 00f2f74..efd8b7d 100644
  
  	for (cur = ops->inherits; cur; cur = cur->inherits) {
  		void **inherit = (void **)cur;
-@@ -5975,8 +5976,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5914,8 +5915,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
  		if (IS_ERR(*pp))
  			*pp = NULL;
  
@@ -36798,7 +36671,7 @@ index 00f2f74..efd8b7d 100644
  	spin_unlock(&lock);
  }
  
-@@ -6172,7 +6174,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
+@@ -6111,7 +6113,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++) {
@@ -36808,10 +36681,10 @@ index 00f2f74..efd8b7d 100644
  	}
  
 diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
-index 6abd17a..9961bf7 100644
+index b061ba2..fdcd85f 100644
 --- a/drivers/ata/libata-scsi.c
 +++ b/drivers/ata/libata-scsi.c
-@@ -4169,7 +4169,7 @@ int ata_sas_port_init(struct ata_port *ap)
+@@ -4172,7 +4172,7 @@ int ata_sas_port_init(struct ata_port *ap)
  
  	if (rc)
  		return rc;
@@ -36821,7 +36694,7 @@ index 6abd17a..9961bf7 100644
  }
  EXPORT_SYMBOL_GPL(ata_sas_port_init);
 diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
-index 5f4e0cc..ff2c347 100644
+index f840ca1..edd6ef3 100644
 --- a/drivers/ata/libata.h
 +++ b/drivers/ata/libata.h
 @@ -53,7 +53,7 @@ enum {
@@ -36955,7 +36828,7 @@ index 480fa6f..947067c 100644
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
 diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
-index c7fab3e..68d0965 100644
+index 6339efd..2b441d5 100644
 --- a/drivers/atm/eni.c
 +++ b/drivers/atm/eni.c
 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
@@ -36995,7 +36868,7 @@ index c7fab3e..68d0965 100644
  	wake_up(&eni_dev->rx_wait);
  }
 @@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
- 		    PCI_DMA_TODEVICE);
+ 				 DMA_TO_DEVICE);
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb_irq(skb);
 -		atomic_inc(&vcc->stats->tx);
@@ -37041,10 +36914,10 @@ index 82f2ae0..f205c02 100644
  		default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
  			printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 
 diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
-index d5d9eaf..65c0d53 100644
+index 75dde90..4309ead 100644
 --- a/drivers/atm/fore200e.c
 +++ b/drivers/atm/fore200e.c
-@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
+@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
  #endif
  		/* check error condition */
  		if (*entry->status & STATUS_ERROR)
@@ -37056,7 +36929,7 @@ index d5d9eaf..65c0d53 100644
  	    }
  	}
  
-@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
+@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
      if (skb == NULL) {
  	DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
  
@@ -37065,7 +36938,7 @@ index d5d9eaf..65c0d53 100644
  	return -ENOMEM;
      } 
  
-@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
+@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
  
  	dev_kfree_skb_any(skb);
  
@@ -37082,7 +36955,7 @@ index d5d9eaf..65c0d53 100644
  
      ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
  
-@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
+@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
  		DPRINTK(2, "damaged PDU on %d.%d.%d\n",
  			fore200e->atm_dev->number,
  			entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
@@ -37091,7 +36964,7 @@ index d5d9eaf..65c0d53 100644
  	    }
  	}
  
-@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
  		goto retry_here;
  	    }
  
@@ -37101,10 +36974,10 @@ index d5d9eaf..65c0d53 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 c39702b..785b73b 100644
+index 93dca2e..c5daa69 100644
 --- a/drivers/atm/he.c
 +++ b/drivers/atm/he.c
-@@ -1689,7 +1689,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1692,7 +1692,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);
@@ -37113,7 +36986,7 @@ index c39702b..785b73b 100644
  			goto return_host_buffers;
  		}
  
-@@ -1716,7 +1716,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
  				RBRQ_LEN_ERR(he_dev->rbrq_head)
  							? "LEN_ERR" : "",
  							vcc->vpi, vcc->vci);
@@ -37122,7 +36995,7 @@ index c39702b..785b73b 100644
  			goto return_host_buffers;
  		}
  
-@@ -1768,7 +1768,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
  		vcc->push(vcc, skb);
  		spin_lock(&he_dev->global_lock);
  
@@ -37131,16 +37004,16 @@ index c39702b..785b73b 100644
  
  return_host_buffers:
  		++pdus_assembled;
-@@ -2094,7 +2094,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
+@@ -2097,7 +2097,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);
 -				atomic_inc(&tpd->vcc->stats->tx_err);
 +				atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
  			}
- 			pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
+ 			dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
  			return;
-@@ -2506,7 +2506,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -37149,7 +37022,7 @@ index c39702b..785b73b 100644
  		return -EINVAL;
  	}
  
-@@ -2517,7 +2517,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -37158,7 +37031,7 @@ index c39702b..785b73b 100644
  		return -EINVAL;
  	}
  #endif
-@@ -2529,7 +2529,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -37167,7 +37040,7 @@ index c39702b..785b73b 100644
  		spin_unlock_irqrestore(&he_dev->global_lock, flags);
  		return -ENOMEM;
  	}
-@@ -2571,7 +2571,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
  					vcc->pop(vcc, skb);
  				else
  					dev_kfree_skb_any(skb);
@@ -37176,7 +37049,7 @@ index c39702b..785b73b 100644
  				spin_unlock_irqrestore(&he_dev->global_lock, flags);
  				return -ENOMEM;
  			}
-@@ -2602,7 +2602,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2605,7 +2605,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);
  
@@ -37186,10 +37059,10 @@ index c39702b..785b73b 100644
  	return 0;
  }
 diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
-index 1dc0519..1aadaf7 100644
+index 527bbd5..96570c8 100644
 --- a/drivers/atm/horizon.c
 +++ b/drivers/atm/horizon.c
-@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
+@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
  	{
  	  struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
  	  // VC layer stats
@@ -37198,7 +37071,7 @@ index 1dc0519..1aadaf7 100644
  	  __net_timestamp(skb);
  	  // end of our responsibility
  	  vcc->push (vcc, skb);
-@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
+@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
  	dev->tx_iovec = NULL;
  	
  	// VC layer stats
@@ -37208,10 +37081,10 @@ index 1dc0519..1aadaf7 100644
  	// free the skb
  	hrz_kfree_skb (skb);
 diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
-index 2b24ed0..b3d6acc 100644
+index 074616b..d6b3d5f 100644
 --- a/drivers/atm/idt77252.c
 +++ b/drivers/atm/idt77252.c
-@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
+@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
  		else
  			dev_kfree_skb(skb);
  
@@ -37220,7 +37093,7 @@ index 2b24ed0..b3d6acc 100644
  	}
  
  	atomic_dec(&scq->used);
-@@ -1072,13 +1072,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  			if ((sb = dev_alloc_skb(64)) == NULL) {
  				printk("%s: Can't allocate buffers for aal0.\n",
  				       card->name);
@@ -37236,7 +37109,7 @@ index 2b24ed0..b3d6acc 100644
  				dev_kfree_skb(sb);
  				break;
  			}
-@@ -1095,7 +1095,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  			ATM_SKB(sb)->vcc = vcc;
  			__net_timestamp(sb);
  			vcc->push(vcc, sb);
@@ -37245,7 +37118,7 @@ index 2b24ed0..b3d6acc 100644
  
  			cell += ATM_CELL_PAYLOAD;
  		}
-@@ -1132,13 +1132,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  			         "(CDC: %08x)\n",
  			         card->name, len, rpp->len, readl(SAR_REG_CDC));
  			recycle_rx_pool_skb(card, rpp);
@@ -37261,7 +37134,7 @@ index 2b24ed0..b3d6acc 100644
  			return;
  		}
  		if (skb_queue_len(&rpp->queue) > 1) {
-@@ -1149,7 +1149,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  				RXPRINTK("%s: Can't alloc RX skb.\n",
  					 card->name);
  				recycle_rx_pool_skb(card, rpp);
@@ -37270,7 +37143,7 @@ index 2b24ed0..b3d6acc 100644
  				return;
  			}
  			if (!atm_charge(vcc, skb->truesize)) {
-@@ -1168,7 +1168,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  			__net_timestamp(skb);
  
  			vcc->push(vcc, skb);
@@ -37279,7 +37152,7 @@ index 2b24ed0..b3d6acc 100644
  
  			return;
  		}
-@@ -1190,7 +1190,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
  		__net_timestamp(skb);
  
  		vcc->push(vcc, skb);
@@ -37288,7 +37161,7 @@ index 2b24ed0..b3d6acc 100644
  
  		if (skb->truesize > SAR_FB_SIZE_3)
  			add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
-@@ -1301,14 +1301,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
+@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
  		if (vcc->qos.aal != ATM_AAL0) {
  			RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
  				card->name, vpi, vci);
@@ -37305,7 +37178,7 @@ index 2b24ed0..b3d6acc 100644
  			goto drop;
  		}
  
-@@ -1327,7 +1327,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
+@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
  		ATM_SKB(sb)->vcc = vcc;
  		__net_timestamp(sb);
  		vcc->push(vcc, sb);
@@ -37314,7 +37187,7 @@ index 2b24ed0..b3d6acc 100644
  
  drop:
  		skb_pull(queue, 64);
-@@ -1952,13 +1952,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
+@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
  
  	if (vc == NULL) {
  		printk("%s: NULL connection in send().\n", card->name);
@@ -37330,7 +37203,7 @@ index 2b24ed0..b3d6acc 100644
  		dev_kfree_skb(skb);
  		return -EINVAL;
  	}
-@@ -1970,14 +1970,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
+@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
  		break;
  	default:
  		printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
@@ -37347,7 +37220,7 @@ index 2b24ed0..b3d6acc 100644
  		dev_kfree_skb(skb);
  		return -EINVAL;
  	}
-@@ -1985,7 +1985,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
+@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
  
  	err = queue_skb(card, vc, skb, oam);
  	if (err) {
@@ -37356,7 +37229,7 @@ index 2b24ed0..b3d6acc 100644
  		dev_kfree_skb(skb);
  		return err;
  	}
-@@ -2008,7 +2008,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
+@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
  	skb = dev_alloc_skb(64);
  	if (!skb) {
  		printk("%s: Out of memory in send_oam().\n", card->name);
@@ -37366,7 +37239,7 @@ index 2b24ed0..b3d6acc 100644
  	}
  	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
 diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
-index 4217f29..88f547a 100644
+index 924f8e2..3375a3e 100644
 --- a/drivers/atm/iphase.c
 +++ b/drivers/atm/iphase.c
 @@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
@@ -37414,7 +37287,7 @@ index 4217f29..88f547a 100644
            iadev->rx_pkt_cnt++;
        }  
  INCR_DLE:
-@@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
+@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
           {
               struct k_sonet_stats *stats;
               stats = &PRIV(_ia_dev[board])->sonet_stats;
@@ -37439,7 +37312,7 @@ index 4217f29..88f547a 100644
           }
              ia_cmds.status = 0;
              break;
-@@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
+@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
  	if ((desc == 0) || (desc > iadev->num_tx_desc))  
  	{  
  		IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);) 
@@ -37448,7 +37321,7 @@ index 4217f29..88f547a 100644
  		if (vcc->pop)   
  		    vcc->pop(vcc, skb);   
  		else  
-@@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
+@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
          ATM_DESC(skb) = vcc->vci;
          skb_queue_tail(&iadev->tx_dma_q, skb);
  
@@ -37466,10 +37339,10 @@ index 4217f29..88f547a 100644
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
 diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
-index 93eaf8d..b4ca7da 100644
+index ce43ae3..969de38 100644
 --- a/drivers/atm/lanai.c
 +++ b/drivers/atm/lanai.c
-@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
+@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
  	vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
  	lanai_endtx(lanai, lvcc);
  	lanai_free_skb(lvcc->tx.atmvcc, skb);
@@ -37478,7 +37351,7 @@ index 93eaf8d..b4ca7da 100644
  }
  
  /* Try to fill the buffer - don't call unless there is backlog */
-@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
+@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
  	ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
  	__net_timestamp(skb);
  	lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
@@ -37487,7 +37360,7 @@ index 93eaf8d..b4ca7da 100644
      out:
  	lvcc->rx.buf.ptr = end;
  	cardvcc_write(lvcc, endptr, vcc_rxreadptr);
-@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
+@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
  		DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
  		    "vcc %d\n", lanai->number, (unsigned int) s, vci);
  		lanai->stats.service_rxnotaal5++;
@@ -37496,7 +37369,7 @@ index 93eaf8d..b4ca7da 100644
  		return 0;
  	}
  	if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
-@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
+@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
  		int bytes;
  		read_unlock(&vcc_sklist_lock);
  		DPRINTK("got trashed rx pdu on vci %d\n", vci);
@@ -37505,7 +37378,7 @@ index 93eaf8d..b4ca7da 100644
  		lvcc->stats.x.aal5.service_trash++;
  		bytes = (SERVICE_GET_END(s) * 16) -
  		    (((unsigned long) lvcc->rx.buf.ptr) -
-@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
+@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
  	}
  	if (s & SERVICE_STREAM) {
  		read_unlock(&vcc_sklist_lock);
@@ -37514,7 +37387,7 @@ index 93eaf8d..b4ca7da 100644
  		lvcc->stats.x.aal5.service_stream++;
  		printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
  		    "PDU on VCI %d!\n", lanai->number, vci);
-@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
+@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
  		return 0;
  	}
  	DPRINTK("got rx crc error on vci %d\n", vci);
@@ -37524,7 +37397,7 @@ index 93eaf8d..b4ca7da 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 9988ac9..7c52585 100644
+index b7e1cc0..eb336bfe 100644
 --- a/drivers/atm/nicstar.c
 +++ b/drivers/atm/nicstar.c
 @@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
@@ -37729,7 +37602,7 @@ index 9988ac9..7c52585 100644
  		}
  
 diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
-index 21b0bc6..b5f40ba 100644
+index 74e18b0..f16afa0 100644
 --- a/drivers/atm/solos-pci.c
 +++ b/drivers/atm/solos-pci.c
 @@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
@@ -37814,7 +37687,7 @@ index 5120a96..e2572bd 100644
  }
  
 diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
-index 969c3c2..9b72956 100644
+index cecfb94..87009ec 100644
 --- a/drivers/atm/zatm.c
 +++ b/drivers/atm/zatm.c
 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
@@ -37895,10 +37768,10 @@ index 25798db..15f130e 100644
  	while (1) {
  		spin_lock(&req_lock);
 diff --git a/drivers/base/node.c b/drivers/base/node.c
-index a3b82e9..f90a8ce 100644
+index 36fabe43..8cfc112 100644
 --- a/drivers/base/node.c
 +++ b/drivers/base/node.c
-@@ -614,7 +614,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
+@@ -615,7 +615,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
  struct node_attr {
  	struct device_attribute attr;
  	enum node_states state;
@@ -37908,10 +37781,10 @@ index a3b82e9..f90a8ce 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 0d8780c..0b5df3f 100644
+index 45937f8..b9a342e 100644
 --- a/drivers/base/power/domain.c
 +++ b/drivers/base/power/domain.c
-@@ -1725,7 +1725,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
+@@ -1698,7 +1698,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
  {
  	struct cpuidle_driver *cpuidle_drv;
  	struct gpd_cpuidle_data *cpuidle_data;
@@ -37920,7 +37793,7 @@ index 0d8780c..0b5df3f 100644
  	int ret = 0;
  
  	if (IS_ERR_OR_NULL(genpd) || state < 0)
-@@ -1793,7 +1793,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
+@@ -1766,7 +1766,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
  int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
  {
  	struct gpd_cpuidle_data *cpuidle_data;
@@ -37929,7 +37802,7 @@ index 0d8780c..0b5df3f 100644
  	int ret = 0;
  
  	if (IS_ERR_OR_NULL(genpd))
-@@ -2222,7 +2222,10 @@ int genpd_dev_pm_attach(struct device *dev)
+@@ -2195,7 +2195,10 @@ int genpd_dev_pm_attach(struct device *dev)
  		return ret;
  	}
  
@@ -37955,7 +37828,7 @@ index d2be3f9..0a3167a 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 c2744b3..08fac19 100644
+index aab7158..b172db2 100644
 --- a/drivers/base/power/wakeup.c
 +++ b/drivers/base/power/wakeup.c
 @@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
@@ -38433,7 +38306,7 @@ index 74df8cf..e41fc24 100644
  	if (!msg)
  		goto failed;
 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
-index d169b4a..481463f 100644
+index cee2035..22f66bd 100644
 --- a/drivers/block/drbd/drbd_receiver.c
 +++ b/drivers/block/drbd/drbd_receiver.c
 @@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
@@ -38619,10 +38492,10 @@ index d0fae55..4469096 100644
  	device->rs_last_events =
  		(int)part_stat_read(&disk->part0, sectors[0]) +
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 6cb1beb..bf490f7 100644
+index d1f168b..8f8cc52 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
-@@ -232,7 +232,7 @@ static int __do_lo_send_write(struct file *file,
+@@ -234,7 +234,7 @@ static int __do_lo_send_write(struct file *file,
  
  	file_start_write(file);
  	set_fs(get_ds());
@@ -38631,26 +38504,6 @@ index 6cb1beb..bf490f7 100644
  	set_fs(old_fs);
  	file_end_write(file);
  	if (likely(bw == len))
-diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
-index d826bf3..8eb406c 100644
---- a/drivers/block/nvme-core.c
-+++ b/drivers/block/nvme-core.c
-@@ -76,7 +76,6 @@ static LIST_HEAD(dev_list);
- static struct task_struct *nvme_thread;
- static struct workqueue_struct *nvme_workq;
- static wait_queue_head_t nvme_kthread_wait;
--static struct notifier_block nvme_nb;
- 
- static void nvme_reset_failed_dev(struct work_struct *ws);
- static int nvme_process_cq(struct nvme_queue *nvmeq);
-@@ -2955,7 +2954,6 @@ static int __init nvme_init(void)
- static void __exit nvme_exit(void)
- {
- 	pci_unregister_driver(&nvme_driver);
--	unregister_hotcpu_notifier(&nvme_nb);
- 	unregister_blkdev(nvme_major, "nvme");
- 	destroy_workqueue(nvme_workq);
- 	BUG_ON(nvme_thread && !IS_ERR(nvme_thread));
 diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
 index 09e628da..7607aaa 100644
 --- a/drivers/block/pktcdvd.c
@@ -38674,10 +38527,10 @@ index 09e628da..7607aaa 100644
  	if (ti.nwa_v) {
  		pd->nwa = be32_to_cpu(ti.next_writable);
 diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
-index 8a86b62..f54c87e 100644
+index b40af32..5fa825d 100644
 --- a/drivers/block/rbd.c
 +++ b/drivers/block/rbd.c
-@@ -63,7 +63,7 @@
+@@ -64,7 +64,7 @@
   * If the counter is already at its maximum value returns
   * -EINVAL without updating it.
   */
@@ -38834,10 +38687,10 @@ index 584bc31..e64a12c 100644
  
  static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index efefd12..4f1d494 100644
+index a4af822..ed58cd1 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
-@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
+@@ -17,7 +17,8 @@ config DEVMEM
  
  config DEVKMEM
  	bool "/dev/kmem virtual device support"
@@ -38847,7 +38700,7 @@ index efefd12..4f1d494 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
-@@ -577,6 +578,7 @@ config DEVPORT
+@@ -586,6 +587,7 @@ config DEVPORT
  	bool
  	depends on !M68K
  	depends on ISA || PCI
@@ -38903,7 +38756,7 @@ index 4f94375..413694e 100644
  	 	    return -EINVAL;
  	    else
 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
-index d5d4cd8..22d561d 100644
+index 5c0baa9..44011b1 100644
 --- a/drivers/char/hpet.c
 +++ b/drivers/char/hpet.c
 @@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
@@ -38916,10 +38769,10 @@ index d5d4cd8..22d561d 100644
  {
  	struct hpet_timer __iomem *timer;
 diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
-index e34a019..842a568 100644
+index 24cc4ed..f9807cf 100644
 --- a/drivers/char/i8k.c
 +++ b/drivers/char/i8k.c
-@@ -684,7 +684,7 @@ static const struct i8k_config_data i8k_config_data[] = {
+@@ -788,7 +788,7 @@ static const struct i8k_config_data i8k_config_data[] = {
  	},
  };
  
@@ -38929,7 +38782,7 @@ index e34a019..842a568 100644
  		.ident = "Dell Inspiron",
  		.matches = {
 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index 6b65fa4..8ebbc99 100644
+index 9bb5928..57a7801 100644
 --- a/drivers/char/ipmi/ipmi_msghandler.c
 +++ b/drivers/char/ipmi/ipmi_msghandler.c
 @@ -436,7 +436,7 @@ struct ipmi_smi {
@@ -38953,7 +38806,7 @@ index 6b65fa4..8ebbc99 100644
  
  static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
  				   "ACPI", "SMBIOS", "PCI",
-@@ -2837,7 +2837,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
+@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
  	INIT_LIST_HEAD(&intf->cmd_rcvrs);
  	init_waitqueue_head(&intf->waitq);
  	for (i = 0; i < IPMI_NUM_STATS; i++)
@@ -38963,10 +38816,10 @@ index 6b65fa4..8ebbc99 100644
  	intf->proc_dir = NULL;
  
 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
-index 967b73a..946e94c 100644
+index 518585c..6c985cef 100644
 --- a/drivers/char/ipmi/ipmi_si_intf.c
 +++ b/drivers/char/ipmi/ipmi_si_intf.c
-@@ -284,7 +284,7 @@ struct smi_info {
+@@ -289,7 +289,7 @@ struct smi_info {
  	unsigned char slave_addr;
  
  	/* Counters and things for the proc filesystem. */
@@ -38975,7 +38828,7 @@ index 967b73a..946e94c 100644
  
  	struct task_struct *thread;
  
-@@ -293,9 +293,9 @@ struct smi_info {
+@@ -298,9 +298,9 @@ struct smi_info {
  };
  
  #define smi_inc_stat(smi, stat) \
@@ -38987,7 +38840,7 @@ index 967b73a..946e94c 100644
  
  #define SI_MAX_PARMS 4
  
-@@ -3412,7 +3412,7 @@ static int try_smi_init(struct smi_info *new_smi)
+@@ -3498,7 +3498,7 @@ static int try_smi_init(struct smi_info *new_smi)
  	atomic_set(&new_smi->req_events, 0);
  	new_smi->run_to_completion = false;
  	for (i = 0; i < SI_NUM_STATS; i++)
@@ -38997,7 +38850,7 @@ index 967b73a..946e94c 100644
  	new_smi->interrupt_disabled = true;
  	atomic_set(&new_smi->need_watch, 0);
 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 4c58333..d5cca27 100644
+index 297110c..3f69b43 100644
 --- a/drivers/char/mem.c
 +++ b/drivers/char/mem.c
 @@ -18,6 +18,7 @@
@@ -39081,7 +38934,7 @@ index 4c58333..d5cca27 100644
  		unxlate_dev_mem_ptr(p, ptr);
  		if (remaining)
  			return -EFAULT;
-@@ -372,9 +404,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
  			 size_t count, loff_t *ppos)
  {
  	unsigned long p = *ppos;
@@ -39092,7 +38945,7 @@ index 4c58333..d5cca27 100644
  
  	read = 0;
  	if (p < (unsigned long) high_memory) {
-@@ -396,6 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
  		}
  #endif
  		while (low_count > 0) {
@@ -39101,7 +38954,7 @@ index 4c58333..d5cca27 100644
  			sz = size_inside_page(p, low_count);
  
  			/*
-@@ -405,7 +438,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
  			 */
  			kbuf = xlate_dev_kmem_ptr((void *)p);
  
@@ -39126,17 +38979,17 @@ index 4c58333..d5cca27 100644
  				return -EFAULT;
  			buf += sz;
  			p += sz;
-@@ -800,6 +849,9 @@ static const struct memdev {
+@@ -804,6 +853,9 @@ static const struct memdev {
  #ifdef CONFIG_PRINTK
- 	[11] = { "kmsg", 0644, &kmsg_fops, NULL },
+ 	[11] = { "kmsg", 0644, &kmsg_fops, 0 },
  #endif
 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
-+	[13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
++	[13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
 +#endif
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-@@ -871,7 +923,7 @@ static int __init chr_dev_init(void)
+@@ -865,7 +917,7 @@ static int __init chr_dev_init(void)
  			continue;
  
  		device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
@@ -39395,7 +39248,7 @@ index 3a56a13..f8cbd25 100644
  	return 0;
  }
 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
-index c3aac4c..88de09f9 100644
+index 72d7028..1586601 100644
 --- a/drivers/char/virtio_console.c
 +++ b/drivers/char/virtio_console.c
 @@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
@@ -39417,10 +39270,10 @@ index c3aac4c..88de09f9 100644
  
  static int wait_port_writable(struct port *port, bool nonblock)
 diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
-index 4386697..754ceca 100644
+index 956b7e5..b655045 100644
 --- a/drivers/clk/clk-composite.c
 +++ b/drivers/clk/clk-composite.c
-@@ -192,7 +192,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
+@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
  	struct clk *clk;
  	struct clk_init_data init;
  	struct clk_composite *composite;
@@ -39540,10 +39393,10 @@ index b0c18ed..1713a80 100644
  		cpu_notifier_register_begin();
  
 diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
-index fde97d6..3631eca 100644
+index bab67db..91af7e3 100644
 --- a/drivers/cpufreq/cpufreq-dt.c
 +++ b/drivers/cpufreq/cpufreq-dt.c
-@@ -393,7 +393,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
+@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
  	if (!IS_ERR(cpu_reg))
  		regulator_put(cpu_reg);
  
@@ -39555,10 +39408,10 @@ index fde97d6..3631eca 100644
  	ret = cpufreq_register_driver(&dt_cpufreq_driver);
  	if (ret)
 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
-index 24736bb..aae33f4 100644
+index 8ae655c..3141442 100644
 --- a/drivers/cpufreq/cpufreq.c
 +++ b/drivers/cpufreq/cpufreq.c
-@@ -2138,7 +2138,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
+@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
  	}
  
  	mutex_lock(&cpufreq_governor_mutex);
@@ -39567,7 +39420,7 @@ index 24736bb..aae33f4 100644
  	mutex_unlock(&cpufreq_governor_mutex);
  	return;
  }
-@@ -2354,7 +2354,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
+@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
  	return NOTIFY_OK;
  }
  
@@ -39576,7 +39429,7 @@ index 24736bb..aae33f4 100644
  	.notifier_call = cpufreq_cpu_callback,
  };
  
-@@ -2394,13 +2394,17 @@ int cpufreq_boost_trigger_state(int state)
+@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
  		return 0;
  
  	write_lock_irqsave(&cpufreq_driver_lock, flags);
@@ -39596,9 +39449,9 @@ index 24736bb..aae33f4 100644
  		write_unlock_irqrestore(&cpufreq_driver_lock, flags);
  
  		pr_err("%s: Cannot %s BOOST\n",
-@@ -2457,8 +2461,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
- 
- 	pr_debug("trying to register driver %s\n", driver_data->name);
+@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
+ 	cpufreq_driver = driver_data;
+ 	write_unlock_irqrestore(&cpufreq_driver_lock, flags);
  
 -	if (driver_data->setpolicy)
 -		driver_data->flags |= CPUFREQ_CONST_LOOPS;
@@ -39608,9 +39461,8 @@ index 24736bb..aae33f4 100644
 +		pax_close_kernel();
 +	}
  
- 	write_lock_irqsave(&cpufreq_driver_lock, flags);
- 	if (cpufreq_driver) {
-@@ -2473,8 +2480,11 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
+ 	if (cpufreq_boost_supported()) {
+ 		/*
  		 * Check if driver provides function to enable boost -
  		 * if not, use cpufreq_boost_set_sw as default
  		 */
@@ -39712,7 +39564,7 @@ index ad3f38f..8f086cd 100644
  }
  EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
 diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index 742eefb..e2fcfc8 100644
+index 872c577..5fb3c20 100644
 --- a/drivers/cpufreq/intel_pstate.c
 +++ b/drivers/cpufreq/intel_pstate.c
 @@ -133,10 +133,10 @@ struct pstate_funcs {
@@ -39728,7 +39580,7 @@ index 742eefb..e2fcfc8 100644
  static int hwp_active;
  
  struct perf_limits {
-@@ -653,18 +653,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
+@@ -690,18 +690,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
  
  	cpu->pstate.current_pstate = pstate;
  
@@ -39754,7 +39606,7 @@ index 742eefb..e2fcfc8 100644
  	intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
  }
  
-@@ -988,9 +988,9 @@ static int intel_pstate_msrs_not_valid(void)
+@@ -1030,9 +1030,9 @@ static int intel_pstate_msrs_not_valid(void)
  	rdmsrl(MSR_IA32_APERF, aperf);
  	rdmsrl(MSR_IA32_MPERF, mperf);
  
@@ -39767,7 +39619,7 @@ index 742eefb..e2fcfc8 100644
  		return -ENODEV;
  
  	rdmsrl(MSR_IA32_APERF, tmp);
-@@ -1004,7 +1004,7 @@ static int intel_pstate_msrs_not_valid(void)
+@@ -1046,7 +1046,7 @@ static int intel_pstate_msrs_not_valid(void)
  	return 0;
  }
  
@@ -39776,7 +39628,7 @@ index 742eefb..e2fcfc8 100644
  {
  	pid_params.sample_rate_ms = policy->sample_rate_ms;
  	pid_params.p_gain_pct = policy->p_gain_pct;
-@@ -1016,12 +1016,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
+@@ -1058,12 +1058,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
  
  static void copy_cpu_funcs(struct pstate_funcs *funcs)
  {
@@ -40034,7 +39886,7 @@ index 30b538d8..1610d75 100644
  	mutex_unlock(&devfreq_list_lock);
  
 diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
-index 3a2adb1..b3be9a3 100644
+index 8ee383d..736b5de 100644
 --- a/drivers/dma/sh/shdma-base.c
 +++ b/drivers/dma/sh/shdma-base.c
 @@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
@@ -40049,7 +39901,7 @@ index 3a2adb1..b3be9a3 100644
  		ret = -ENOMEM;
  		goto edescalloc;
 diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
-index aec8a84..7b45a1f 100644
+index 9f1d4c7..fceff78 100644
 --- a/drivers/dma/sh/shdmac.c
 +++ b/drivers/dma/sh/shdmac.c
 @@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
@@ -40078,7 +39930,7 @@ index 592af5f..bb1d583 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 670d282..6675f4d 100644
+index c84eecb..4d7381d 100644
 --- a/drivers/edac/edac_mc_sysfs.c
 +++ b/drivers/edac/edac_mc_sysfs.c
 @@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
@@ -40089,8 +39941,8 @@ index 670d282..6675f4d 100644
 +} __do_const;
  
  #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
- 	struct dev_ch_attribute dev_attr_legacy_##_name = \
-@@ -1011,14 +1011,16 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
+ 	static struct dev_ch_attribute dev_attr_legacy_##_name = \
+@@ -1009,15 +1009,17 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
  	}
  
  	if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
@@ -40101,6 +39953,7 @@ index 670d282..6675f4d 100644
 +			*(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
 +			*(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
  		}
+ 
  		if (mci->set_sdram_scrub_rate) {
 -			dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
 -			dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
@@ -40108,8 +39961,8 @@ index 670d282..6675f4d 100644
 +			*(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
  		}
 +		pax_close_kernel();
- 		err = device_create_file(&mci->dev,
- 					 &dev_attr_sdram_scrub_rate);
+ 
+ 		err = device_create_file(&mci->dev, &dev_attr_sdram_scrub_rate);
  		if (err) {
 diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
 index 2cf44b4d..6dd2dc7 100644
@@ -40281,7 +40134,7 @@ index f9e3aee..269dbdb 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 eb6935c..3cc2bfa 100644
+index d6a09b9..18e90dd 100644
 --- a/drivers/firewire/core-transaction.c
 +++ b/drivers/firewire/core-transaction.c
 @@ -38,6 +38,7 @@
@@ -40305,10 +40158,10 @@ index e1480ff6..1a429bd 100644
  void fw_card_initialize(struct fw_card *card,
  		const struct fw_card_driver *driver, struct device *device);
 diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
-index aff9018..fc87ded 100644
+index f51d376..b118e40 100644
 --- a/drivers/firewire/ohci.c
 +++ b/drivers/firewire/ohci.c
-@@ -2054,10 +2054,12 @@ static void bus_reset_work(struct work_struct *work)
+@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
  			  be32_to_cpu(ohci->next_header));
  	}
  
@@ -40321,7 +40174,7 @@ index aff9018..fc87ded 100644
  
  	spin_unlock_irq(&ohci->lock);
  
-@@ -2589,8 +2591,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
+@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
  	unsigned long flags;
  	int n, ret = 0;
  
@@ -40380,10 +40233,10 @@ index 4fd9961..52d60ce 100644
  EXPORT_SYMBOL_GPL(cper_next_record_id);
  
 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index 9035c1b..aff45f8 100644
+index 3061bb8..92b5fcc 100644
 --- a/drivers/firmware/efi/efi.c
 +++ b/drivers/firmware/efi/efi.c
-@@ -151,14 +151,16 @@ static struct attribute_group efi_subsys_attr_group = {
+@@ -160,14 +160,16 @@ static struct attribute_group efi_subsys_attr_group = {
  };
  
  static struct efivars generic_efivars;
@@ -40406,7 +40259,7 @@ index 9035c1b..aff45f8 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 f256ecd..387dcb1 100644
+index 7b2e049..a253334 100644
 --- a/drivers/firmware/efi/efivars.c
 +++ b/drivers/firmware/efi/efivars.c
 @@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
@@ -40522,10 +40375,10 @@ index f476ae2..05e1bdd 100644
  
  	match = of_match_device(of_match_ptr(omap_gpio_match), dev);
 diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
-index 584484e..e26ebd6 100644
+index c49522e..9a7ee54 100644
 --- a/drivers/gpio/gpio-rcar.c
 +++ b/drivers/gpio/gpio-rcar.c
-@@ -366,7 +366,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
+@@ -348,7 +348,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
  	struct gpio_rcar_priv *p;
  	struct resource *io, *irq;
  	struct gpio_chip *gpio_chip;
@@ -40548,7 +40401,7 @@ index c1caa45..f0f97d2 100644
  	return -EINVAL;
  }
 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index 568aa2b..d1204d8 100644
+index 1ca9295..9f3d481 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
 @@ -554,8 +554,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
@@ -40578,11 +40431,37 @@ index 568aa2b..d1204d8 100644
  
  	/*
  	 * Prepare the mapping since the irqchip shall be orthogonal to
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
+index 488f51d..301d462 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
+@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
+ 					   enum cache_policy alternate_policy,
+ 					   void __user *alternate_aperture_base,
+ 					   uint64_t alternate_aperture_size);
+-};
++} __no_const;
+ 
+ /**
+  * struct device_queue_manager
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
+index 5940531..a75b0e5 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
+@@ -62,7 +62,7 @@ struct kernel_queue_ops {
+ 
+ 	void	(*submit_packet)(struct kernel_queue *kq);
+ 	void	(*rollback_packet)(struct kernel_queue *kq);
+-};
++} __no_const;
+ 
+ struct kernel_queue {
+ 	struct kernel_queue_ops ops;
 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
-index 27a37e5..b6c6c71 100644
+index b6f076b..2918de2 100644
 --- a/drivers/gpu/drm/drm_crtc.c
 +++ b/drivers/gpu/drm/drm_crtc.c
-@@ -3953,7 +3953,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
+@@ -4118,7 +4118,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
  					goto done;
  				}
  
@@ -40592,10 +40471,10 @@ index 27a37e5..b6c6c71 100644
  					ret = -EFAULT;
  					goto done;
 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index 4f41377..ee33f40 100644
+index d512134..046f258 100644
 --- a/drivers/gpu/drm/drm_drv.c
 +++ b/drivers/gpu/drm/drm_drv.c
-@@ -444,7 +444,7 @@ void drm_unplug_dev(struct drm_device *dev)
+@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
  
  	drm_device_set_unplugged(dev);
  
@@ -40605,7 +40484,7 @@ index 4f41377..ee33f40 100644
  	}
  	mutex_unlock(&drm_global_mutex);
 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index 0b9514b..6acd174 100644
+index 076dd60..e4a4ba7 100644
 --- a/drivers/gpu/drm/drm_fops.c
 +++ b/drivers/gpu/drm/drm_fops.c
 @@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
@@ -40719,7 +40598,7 @@ index 3d2e91c..d31c4c9 100644
  		item->object = NULL;
  	}
 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
-index 51efebd..2b70935 100644
+index f1b32f9..394f791 100644
 --- a/drivers/gpu/drm/drm_info.c
 +++ b/drivers/gpu/drm/drm_info.c
 @@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
@@ -40802,10 +40681,10 @@ index 2f4c4343..dd12cd2 100644
  		ret = drm_ioctl(filp, cmd, arg);
  
 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
-index 00587a1..57a65ca 100644
+index 3785d66..1c489ef 100644
 --- a/drivers/gpu/drm/drm_ioctl.c
 +++ b/drivers/gpu/drm/drm_ioctl.c
-@@ -642,7 +642,7 @@ long drm_ioctl(struct file *filp,
+@@ -655,7 +655,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;
@@ -40814,6 +40693,29 @@ index 00587a1..57a65ca 100644
  	unsigned int nr = DRM_IOCTL_NR(cmd);
  	int retcode = -EINVAL;
  	char stack_kdata[128];
+diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
+index d4813e0..6c1ab4d 100644
+--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
++++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
+@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
+ 	u32 pipeconf_reg = PIPEACONF;
+ 	u32 dspcntr_reg = DSPACNTR;
+ 
+-	u32 pipeconf = dev_priv->pipeconf[pipe];
+-	u32 dspcntr = dev_priv->dspcntr[pipe];
++	u32 pipeconf;
++	u32 dspcntr;
+ 	u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
+ 
++	if (pipe == -1)
++		return;
++
++	pipeconf = dev_priv->pipeconf[pipe];
++	dspcntr = dev_priv->dspcntr[pipe];
++
+ 	if (pipe) {
+ 		pipeconf_reg = PIPECCONF;
+ 		dspcntr_reg = DSPCCNTR;
 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
 index 93ec5dc..82acbaf 100644
 --- a/drivers/gpu/drm/i810/i810_drv.h
@@ -40830,10 +40732,10 @@ index 93ec5dc..82acbaf 100644
  	int front_offset;
  } drm_i810_private_t;
 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index ecee3bc..ad5ae67 100644
+index 1a46787..0ff2ff4 100644
 --- a/drivers/gpu/drm/i915/i915_dma.c
 +++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -356,7 +356,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
+@@ -362,7 +362,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
  	 * locking inversion with the driver load path. And the access here is
  	 * completely racy anyway. So don't bother with locking for now.
  	 */
@@ -40843,10 +40745,10 @@ index ecee3bc..ad5ae67 100644
  
  static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index 1173831..7dfb389 100644
+index 38a7425..5322b16 100644
 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -863,12 +863,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
+@@ -872,12 +872,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
  static int
  validate_exec_list(struct drm_device *dev,
  		   struct drm_i915_gem_exec_object2 *exec,
@@ -40862,9 +40764,34 @@ index 1173831..7dfb389 100644
  	invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
  	if (USES_FULL_PPGTT(dev))
 diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
-index 176de63..1ef9ac7 100644
+index 176de63..b50b66a 100644
 --- a/drivers/gpu/drm/i915/i915_ioc32.c
 +++ b/drivers/gpu/drm/i915/i915_ioc32.c
+@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
+ 	    || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
+ 	    || __put_user(batchbuffer32.num_cliprects,
+ 			  &batchbuffer->num_cliprects)
+-	    || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
++	    || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
+ 			  &batchbuffer->cliprects))
+ 		return -EFAULT;
+ 
+@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
+ 
+ 	cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
+ 	if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
+-	    || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
++	    || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
+ 			  &cmdbuffer->buf)
+ 	    || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
+ 	    || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
+ 	    || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
+ 	    || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
+-	    || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
++	    || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
+ 			  &cmdbuffer->cliprects))
+ 		return -EFAULT;
+ 
 @@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
  			 (unsigned long)request);
  }
@@ -40874,7 +40801,7 @@ index 176de63..1ef9ac7 100644
  	[DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
  	[DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
  	[DRM_I915_GETPARAM] = compat_i915_getparam,
-@@ -201,18 +201,15 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
+@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
  long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -40888,19 +40815,17 @@ index 176de63..1ef9ac7 100644
 -		fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 791b00e..4d10235 100644
+index f75173c..f283e45 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -12939,13 +12939,13 @@ struct intel_quirk {
+@@ -13056,13 +13056,13 @@ struct intel_quirk {
  	int subsystem_vendor;
  	int subsystem_device;
  	void (*hook)(struct drm_device *dev);
@@ -40916,7 +40841,7 @@ index 791b00e..4d10235 100644
  
  static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
  {
-@@ -12953,18 +12953,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
+@@ -13070,18 +13070,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
  	return 1;
  }
  
@@ -40948,10 +40873,10 @@ index 791b00e..4d10235 100644
  	},
  };
 diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
-index b250130..98df2a4 100644
+index a002f53..0d60514 100644
 --- a/drivers/gpu/drm/imx/imx-drm-core.c
 +++ b/drivers/gpu/drm/imx/imx-drm-core.c
-@@ -356,7 +356,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
+@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
  	if (imxdrm->pipes >= MAX_CRTC)
  		return -EINVAL;
  
@@ -40977,7 +40902,7 @@ index b4a20149..219ab78 100644
  
  	unsigned int fb_cpp;
 diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
-index 729bfd5..ead8823 100644
+index 729bfd5..14bae78 100644
 --- a/drivers/gpu/drm/mga/mga_ioc32.c
 +++ b/drivers/gpu/drm/mga/mga_ioc32.c
 @@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
@@ -40989,7 +40914,7 @@ index 729bfd5..ead8823 100644
  	[DRM_MGA_INIT] = compat_mga_init,
  	[DRM_MGA_GETPARAM] = compat_mga_getparam,
  	[DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
-@@ -208,18 +208,15 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
+@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
  long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -41003,14 +40928,12 @@ index 729bfd5..ead8823 100644
 -		fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
 index 1b071b8..de8601a 100644
 --- a/drivers/gpu/drm/mga/mga_irq.c
@@ -41052,7 +40975,7 @@ index 1b071b8..de8601a 100644
  
  	*sequence = cur_fence;
 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
-index 7df6acc..84bbe52 100644
+index 0190b69..60c3eaf 100644
 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
 @@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
@@ -41065,7 +40988,7 @@ index 7df6acc..84bbe52 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 8ae36f2..1147a30 100644
+index fc68f09..0511d71 100644
 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h
 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
 @@ -121,7 +121,6 @@ struct nouveau_drm {
@@ -41090,7 +41013,7 @@ index 462679a..88e32a7 100644
  
  	if (nr < DRM_COMMAND_BASE)
 diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
-index 3d1cfcb..0542700 100644
+index 273e501..3b6c0a2 100644
 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
 @@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
@@ -41412,7 +41335,7 @@ index 723e5d6..102dbaf 100644
  	u32 color_fmt;
  	unsigned int front_offset;
 diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
-index 663f38c..c689495 100644
+index 663f38c..ec159a1 100644
 --- a/drivers/gpu/drm/r128/r128_ioc32.c
 +++ b/drivers/gpu/drm/r128/r128_ioc32.c
 @@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
@@ -41424,7 +41347,7 @@ index 663f38c..c689495 100644
  	[DRM_R128_INIT] = compat_r128_init,
  	[DRM_R128_DEPTH] = compat_r128_depth,
  	[DRM_R128_STIPPLE] = compat_r128_stipple,
-@@ -197,18 +197,15 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
+@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
  long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -41438,14 +41361,12 @@ index 663f38c..c689495 100644
 -		fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
 index c2ae496..30b5993 100644
 --- a/drivers/gpu/drm/r128/r128_irq.c
@@ -41533,7 +41454,7 @@ index 46bd393..6ae4719 100644
  	uint32_t irq_enable_reg;
  	uint32_t r500_disp_irq_reg;
 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
-index 0b98ea1..0881827 100644
+index 0b98ea1..a3c770f 100644
 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
 @@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
@@ -41554,7 +41475,7 @@ index 0b98ea1..0881827 100644
  	[DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
  	[DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
  	[DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
-@@ -393,18 +393,15 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
+@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
  long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
  	unsigned int nr = DRM_IOCTL_NR(cmd);
@@ -41568,14 +41489,12 @@ index 0b98ea1..0881827 100644
 -		fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
 -
 -	if (fn != NULL)
-+	if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls)) {
-+		drm_ioctl_compat_t fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
- 		ret = (*fn) (filp, cmd, arg);
--	else
-+	} else
+-		ret = (*fn) (filp, cmd, arg);
++	if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
++		ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
+ 	else
  		ret = drm_ioctl(filp, cmd, arg);
  
- 	return ret;
 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
 index 244b19b..c19226d 100644
 --- a/drivers/gpu/drm/radeon/radeon_irq.c
@@ -41647,10 +41566,10 @@ index b292aca..4e338b5 100644
  	vma->vm_ops = &radeon_ttm_vm_ops;
  	return 0;
 diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
-index 978993f..e36e50e 100644
+index 1a52522..8e78043 100644
 --- a/drivers/gpu/drm/tegra/dc.c
 +++ b/drivers/gpu/drm/tegra/dc.c
-@@ -1416,7 +1416,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
+@@ -1585,7 +1585,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
  	}
  
  	for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
@@ -41660,10 +41579,10 @@ index 978993f..e36e50e 100644
  	err = drm_debugfs_create_files(dc->debugfs_files,
  				       ARRAY_SIZE(debugfs_files),
 diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
-index 33f67fd..55ee9761 100644
+index ed970f6..4eeea42 100644
 --- a/drivers/gpu/drm/tegra/dsi.c
 +++ b/drivers/gpu/drm/tegra/dsi.c
-@@ -39,7 +39,7 @@ struct tegra_dsi {
+@@ -62,7 +62,7 @@ struct tegra_dsi {
  	struct clk *clk_lp;
  	struct clk *clk;
  
@@ -41673,10 +41592,10 @@ index 33f67fd..55ee9761 100644
  	struct dentry *debugfs;
  
 diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
-index ffe2654..03c7b1c 100644
+index 7eaaee74..cc2bc04 100644
 --- a/drivers/gpu/drm/tegra/hdmi.c
 +++ b/drivers/gpu/drm/tegra/hdmi.c
-@@ -60,7 +60,7 @@ struct tegra_hdmi {
+@@ -64,7 +64,7 @@ struct tegra_hdmi {
  	bool stereo;
  	bool dvi;
  
@@ -41883,7 +41802,7 @@ index 01e1d27..aaa018a 100644
  			 nr_free, shrink_pages);
  	}
 diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
-index 8cbcb45..a4d9cf7 100644
+index 5fc16ce..1bd84ec 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)
@@ -42142,10 +42061,10 @@ index 37ac7b5..d52a5c9 100644
  	/* 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 8b63879..a5a5e72 100644
+index 56ce8c2..32ce524 100644
 --- a/drivers/hid/hid-core.c
 +++ b/drivers/hid/hid-core.c
-@@ -2508,7 +2508,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
+@@ -2531,7 +2531,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
  
  int hid_add_device(struct hid_device *hdev)
  {
@@ -42154,7 +42073,7 @@ index 8b63879..a5a5e72 100644
  	int ret;
  
  	if (WARN_ON(hdev->status & HID_STAT_ADDED))
-@@ -2551,7 +2551,7 @@ int hid_add_device(struct hid_device *hdev)
+@@ -2574,7 +2574,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,
@@ -42177,25 +42096,23 @@ index c13fb5b..55a3802 100644
  
  	*off += size;
 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
-index 433f72a..2926005 100644
+index 2978f5e..ac3a23c 100644
 --- a/drivers/hv/channel.c
 +++ b/drivers/hv/channel.c
-@@ -366,8 +366,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
- 	unsigned long flags;
+@@ -367,7 +367,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
  	int ret = 0;
  
--	next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
--	atomic_inc(&vmbus_connection.next_gpadl_handle);
-+	next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
-+	atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
+ 	next_gpadl_handle =
+-		(atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
++		(atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
  
  	ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
  	if (ret)
 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
-index 3e4235c..877d0e5 100644
+index 50e51a5..b0bfd78 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)
+@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
  	u64 output_address = (output) ? virt_to_phys(output) : 0;
  	u32 output_address_hi = output_address >> 32;
  	u32 output_address_lo = output_address & 0xFFFFFFFF;
@@ -42204,7 +42121,7 @@ index 3e4235c..877d0e5 100644
  
  	__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
  			      "=a"(hv_status_lo) : "d" (control_hi),
-@@ -156,7 +156,7 @@ int hv_init(void)
+@@ -164,7 +164,7 @@ int hv_init(void)
  	/* See if the hypercall page is already set */
  	rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
  
@@ -42214,7 +42131,7 @@ index 3e4235c..877d0e5 100644
  	if (!virtaddr)
  		goto cleanup;
 diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
-index b958ded..b2452bb 100644
+index ff16938..e60879c 100644
 --- a/drivers/hv/hv_balloon.c
 +++ b/drivers/hv/hv_balloon.c
 @@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
@@ -42226,7 +42143,7 @@ index b958ded..b2452bb 100644
  
  static int dm_ring_size = (5 * PAGE_SIZE);
  
-@@ -893,7 +893,7 @@ static void hot_add_req(struct work_struct *dummy)
+@@ -947,7 +947,7 @@ static void hot_add_req(struct work_struct *dummy)
  		pr_info("Memory hot add failed\n");
  
  	dm->state = DM_INITIALIZED;
@@ -42235,7 +42152,7 @@ index b958ded..b2452bb 100644
  	vmbus_sendpacket(dm->dev->channel, &resp,
  			sizeof(struct dm_hot_add_response),
  			(unsigned long)NULL,
-@@ -973,7 +973,7 @@ static void post_status(struct hv_dynmem_device *dm)
+@@ -1028,7 +1028,7 @@ static void post_status(struct hv_dynmem_device *dm)
  	memset(&status, 0, sizeof(struct dm_status));
  	status.hdr.type = DM_STATUS_REPORT;
  	status.hdr.size = sizeof(struct dm_status);
@@ -42244,7 +42161,7 @@ index b958ded..b2452bb 100644
  
  	/*
  	 * The host expects the guest to report free memory.
-@@ -993,7 +993,7 @@ static void post_status(struct hv_dynmem_device *dm)
+@@ -1048,7 +1048,7 @@ static void post_status(struct hv_dynmem_device *dm)
  	 * send the status. This can happen if we were interrupted
  	 * after we picked our transaction ID.
  	 */
@@ -42253,7 +42170,7 @@ index b958ded..b2452bb 100644
  		return;
  
  	/*
-@@ -1133,7 +1133,7 @@ static void balloon_up(struct work_struct *dummy)
+@@ -1188,7 +1188,7 @@ static void balloon_up(struct work_struct *dummy)
  		 */
  
  		do {
@@ -42262,7 +42179,7 @@ index b958ded..b2452bb 100644
  			ret = vmbus_sendpacket(dm_device.dev->channel,
  						bl_resp,
  						bl_resp->hdr.size,
-@@ -1179,7 +1179,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
+@@ -1234,7 +1234,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
  
  	memset(&resp, 0, sizeof(struct dm_unballoon_response));
  	resp.hdr.type = DM_UNBALLOON_RESPONSE;
@@ -42271,7 +42188,7 @@ index b958ded..b2452bb 100644
  	resp.hdr.size = sizeof(struct dm_unballoon_response);
  
  	vmbus_sendpacket(dm_device.dev->channel, &resp,
-@@ -1243,7 +1243,7 @@ static void version_resp(struct hv_dynmem_device *dm,
+@@ -1295,7 +1295,7 @@ static void version_resp(struct hv_dynmem_device *dm,
  	memset(&version_req, 0, sizeof(struct dm_version_request));
  	version_req.hdr.type = DM_VERSION_REQUEST;
  	version_req.hdr.size = sizeof(struct dm_version_request);
@@ -42280,7 +42197,7 @@ index b958ded..b2452bb 100644
  	version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
  	version_req.is_last_attempt = 1;
  
-@@ -1413,7 +1413,7 @@ static int balloon_probe(struct hv_device *dev,
+@@ -1468,7 +1468,7 @@ static int balloon_probe(struct hv_device *dev,
  	memset(&version_req, 0, sizeof(struct dm_version_request));
  	version_req.hdr.type = DM_VERSION_REQUEST;
  	version_req.hdr.size = sizeof(struct dm_version_request);
@@ -42289,7 +42206,7 @@ index b958ded..b2452bb 100644
  	version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
  	version_req.is_last_attempt = 0;
  
-@@ -1444,7 +1444,7 @@ static int balloon_probe(struct hv_device *dev,
+@@ -1499,7 +1499,7 @@ static int balloon_probe(struct hv_device *dev,
  	memset(&cap_msg, 0, sizeof(struct dm_capabilities));
  	cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
  	cap_msg.hdr.size = sizeof(struct dm_capabilities);
@@ -42299,10 +42216,10 @@ index b958ded..b2452bb 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 c386d8d..d6004c4 100644
+index 44b1c94..6dccc2c 100644
 --- a/drivers/hv/hyperv_vmbus.h
 +++ b/drivers/hv/hyperv_vmbus.h
-@@ -611,7 +611,7 @@ enum vmbus_connect_state {
+@@ -632,7 +632,7 @@ enum vmbus_connect_state {
  struct vmbus_connection {
  	enum vmbus_connect_state conn_state;
  
@@ -42312,10 +42229,10 @@ index c386d8d..d6004c4 100644
  	/*
  	 * Represents channel interrupts. Each bit position represents a
 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
-index 4d6b269..2e23b86 100644
+index f518b8d7..4bc0b64 100644
 --- a/drivers/hv/vmbus_drv.c
 +++ b/drivers/hv/vmbus_drv.c
-@@ -807,10 +807,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
+@@ -840,10 +840,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
  {
  	int ret = 0;
  
@@ -42656,10 +42573,10 @@ index 0b510ba..4fbb5085 100644
  	}
  }
 diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
-index f009d05..d95b613 100644
+index 4df97f6..c751151 100644
 --- a/drivers/iio/industrialio-core.c
 +++ b/drivers/iio/industrialio-core.c
-@@ -555,7 +555,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
+@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
  }
  
  static
@@ -42883,10 +42800,10 @@ index 9f5ad7c..588cd84 100644
  			}
  		}
 diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
-index 6c52e72..6303e3f 100644
+index a9f0489..27a161b 100644
 --- a/drivers/infiniband/core/uverbs_cmd.c
 +++ b/drivers/infiniband/core/uverbs_cmd.c
-@@ -945,6 +945,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
+@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
  	if (copy_from_user(&cmd, buf, sizeof cmd))
  		return -EFAULT;
  
@@ -42897,7 +42814,7 @@ index 6c52e72..6303e3f 100644
  		   (unsigned long) cmd.response + sizeof resp,
  		   in_len - sizeof cmd, out_len - sizeof resp);
 diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
-index cb43c22..2e12dd7 100644
+index 6791fd1..78bdcdf 100644
 --- a/drivers/infiniband/hw/cxgb4/mem.c
 +++ b/drivers/infiniband/hw/cxgb4/mem.c
 @@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
@@ -42973,7 +42890,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 729382c..2f82b8d 100644
+index 5904026..f1c30e5 100644
 --- a/drivers/infiniband/hw/mlx4/mad.c
 +++ b/drivers/infiniband/hw/mlx4/mad.c
 @@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
@@ -42999,10 +42916,10 @@ index ed327e6..ca1739e0 100644
  	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 6eb743f..a7b0f6d 100644
+index f829fd9..1a8d436 100644
 --- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
 +++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
-@@ -426,7 +426,7 @@ struct mlx4_ib_demux_ctx {
+@@ -439,7 +439,7 @@ struct mlx4_ib_demux_ctx {
  	struct list_head	mcg_mgid0_list;
  	struct workqueue_struct	*mcg_wq;
  	struct mlx4_ib_demux_pv_ctx **tun;
@@ -43449,10 +43366,10 @@ index 4166452..fc952c3 100644
  			}
  
 diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
-index 49eb511..a774366 100644
+index 70acda9..a96de9d 100644
 --- a/drivers/infiniband/hw/nes/nes_nic.c
 +++ b/drivers/infiniband/hw/nes/nes_nic.c
-@@ -1273,39 +1273,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
+@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
  	target_stat_values[++index] = mh_detected;
  	target_stat_values[++index] = mh_pauses_sent;
  	target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
@@ -43548,7 +43465,7 @@ index c0d0296..3185f57 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 b218254..1d1aa3c 100644
+index ffd48bf..83cdb56 100644
 --- a/drivers/infiniband/hw/qib/qib.h
 +++ b/drivers/infiniband/hw/qib/qib.h
 @@ -52,6 +52,7 @@
@@ -43594,10 +43511,10 @@ index e853a21..56fc5a8 100644
  	gameport->dev.release = gameport_release_port;
  	if (gameport->parent)
 diff --git a/drivers/input/input.c b/drivers/input/input.c
-index 213e3a1..4fea837 100644
+index cc357f1..ee42fbc 100644
 --- a/drivers/input/input.c
 +++ b/drivers/input/input.c
-@@ -1775,7 +1775,7 @@ EXPORT_SYMBOL_GPL(input_class);
+@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
   */
  struct input_dev *input_allocate_device(void)
  {
@@ -43606,7 +43523,7 @@ index 213e3a1..4fea837 100644
  	struct input_dev *dev;
  
  	dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
-@@ -1790,7 +1790,7 @@ struct input_dev *input_allocate_device(void)
+@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
  		INIT_LIST_HEAD(&dev->node);
  
  		dev_set_name(&dev->dev, "input%lu",
@@ -43672,10 +43589,10 @@ index ac1fa5f..5f7502c 100644
  	/*
  	 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
 diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
-index f4cf664..3204fda 100644
+index d02e1bd..d719719 100644
 --- a/drivers/input/mouse/psmouse.h
 +++ b/drivers/input/mouse/psmouse.h
-@@ -117,7 +117,7 @@ struct psmouse_attribute {
+@@ -124,7 +124,7 @@ struct psmouse_attribute {
  	ssize_t (*set)(struct psmouse *psmouse, void *data,
  			const char *buf, size_t count);
  	bool protect;
@@ -43755,7 +43672,7 @@ index 92e2243..8fd9092 100644
  		.ident = "Shift",
  		.matches = {
 diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
-index 9802485..2e9941d 100644
+index 48882c1..93e0987 100644
 --- a/drivers/iommu/amd_iommu.c
 +++ b/drivers/iommu/amd_iommu.c
 @@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
@@ -43782,21 +43699,8 @@ index 9802485..2e9941d 100644
  	cmd->data[2] = 1;
  	CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
  }
-diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
-index 6cd47b7..264d14a 100644
---- a/drivers/iommu/arm-smmu.c
-+++ b/drivers/iommu/arm-smmu.c
-@@ -968,7 +968,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
- 		cfg->irptndx = cfg->cbndx;
- 	}
- 
--	ACCESS_ONCE(smmu_domain->smmu) = smmu;
-+	ACCESS_ONCE_RW(smmu_domain->smmu) = smmu;
- 	arm_smmu_init_context_bank(smmu_domain);
- 	spin_unlock_irqrestore(&smmu_domain->lock, flags);
- 
 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index f7718d7..3ef740b 100644
+index 72e683d..c9db262 100644
 --- a/drivers/iommu/iommu.c
 +++ b/drivers/iommu/iommu.c
 @@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
@@ -43809,10 +43713,10 @@ index f7718d7..3ef740b 100644
  		.ops = ops,
  	};
 diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
-index 89c4846..1de796f 100644
+index 390079e..1da9d6c 100644
 --- a/drivers/iommu/irq_remapping.c
 +++ b/drivers/iommu/irq_remapping.c
-@@ -353,7 +353,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
+@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
  void panic_if_irq_remap(const char *msg)
  {
  	if (irq_remapping_enabled)
@@ -43821,7 +43725,7 @@ index 89c4846..1de796f 100644
  }
  
  static void ir_ack_apic_edge(struct irq_data *data)
-@@ -374,10 +374,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
+@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
  
  void irq_remap_modify_chip_defaults(struct irq_chip *chip)
  {
@@ -43839,7 +43743,7 @@ index 89c4846..1de796f 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 d617ee5..df8be8b 100644
+index 471e1cd..b53b870 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;
@@ -43851,7 +43755,7 @@ index d617ee5..df8be8b 100644
  	.irq_eoi	= NULL,
  	.irq_mask	= NULL,
  	.irq_unmask	= NULL,
-@@ -311,7 +311,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
+@@ -318,7 +318,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
  	chained_irq_exit(chip, desc);
  }
  
@@ -43861,10 +43765,10 @@ index d617ee5..df8be8b 100644
  	.irq_mask		= gic_mask_irq,
  	.irq_unmask		= gic_unmask_irq,
 diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
-index 078cac5..fb0f846 100644
+index 9a0767b..5e5f86f 100644
 --- a/drivers/irqchip/irq-renesas-intc-irqpin.c
 +++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
-@@ -353,7 +353,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
+@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
  	struct intc_irqpin_iomem *i;
  	struct resource *io[INTC_IRQPIN_REG_NR];
  	struct resource *irq;
@@ -44238,7 +44142,7 @@ index e2d4e58..40cd045 100644
  
  /* error message helper function */
 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
-index 6a7447c..b4987ea 100644
+index 358a574..b4987ea 100644
 --- a/drivers/isdn/icn/icn.c
 +++ b/drivers/isdn/icn/icn.c
 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
@@ -44250,15 +44154,6 @@ index 6a7447c..b4987ea 100644
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-@@ -1609,7 +1609,7 @@ icn_setup(char *line)
- 	if (ints[0] > 1)
- 		membase = (unsigned long)ints[2];
- 	if (str && *str) {
--		strcpy(sid, str);
-+		strlcpy(sid, str, sizeof(sid));
- 		icn_id = sid;
- 		if ((p = strchr(sid, ','))) {
- 			*p++ = 0;
 diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
 index 87f7dff..7300125 100644
 --- a/drivers/isdn/mISDN/dsp_cmx.c
@@ -44299,7 +44194,7 @@ index 046cb70..6b20d39 100644
  		.callback = ss4200_led_dmi_callback,
  		.ident = "Intel SS4200-E",
 diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
-index 6590558..a74c5dd 100644
+index 7dc93aa..8272379 100644
 --- a/drivers/lguest/core.c
 +++ b/drivers/lguest/core.c
 @@ -96,9 +96,17 @@ static __init int map_switcher(void)
@@ -44330,10 +44225,10 @@ index 6590558..a74c5dd 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 e8b55c3..3514c37 100644
+index e3abebc9..6a35328 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)
+@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
  /*:*/
  
  #ifdef CONFIG_X86_PAE
@@ -44343,10 +44238,10 @@ index e8b55c3..3514c37 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 922a1ac..9dd0c2a 100644
+index 30f2aef..391c748 100644
 --- a/drivers/lguest/x86/core.c
 +++ b/drivers/lguest/x86/core.c
-@@ -59,7 +59,7 @@ static struct {
+@@ -60,7 +60,7 @@ static struct {
  /* Offset from where switcher.S was compiled to where we've copied it */
  static unsigned long switcher_offset(void)
  {
@@ -44355,7 +44250,7 @@ index 922a1ac..9dd0c2a 100644
  }
  
  /* This cpu's struct lguest_pages (after the Switcher text page) */
-@@ -99,7 +99,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
+@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
  	 * These copies are pretty cheap, so we do them unconditionally: */
  	/* Save the current Host top-level page directory.
  	 */
@@ -44369,7 +44264,7 @@ index 922a1ac..9dd0c2a 100644
  	/*
  	 * Set up the Guest's page tables to see this CPU's pages (and no
  	 * other CPU's pages).
-@@ -477,7 +483,7 @@ void __init lguest_arch_host_init(void)
+@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
  	 * compiled-in switcher code and the high-mapped copy we just made.
  	 */
  	for (i = 0; i < IDT_ENTRIES; i++)
@@ -44378,7 +44273,7 @@ index 922a1ac..9dd0c2a 100644
  
  	/*
  	 * Set up the Switcher's per-cpu areas.
-@@ -560,7 +566,7 @@ void __init lguest_arch_host_init(void)
+@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
  	 * it will be undisturbed when we switch.  To change %cs and jump we
  	 * need this structure to feed to Intel's "lcall" instruction.
  	 */
@@ -44463,10 +44358,10 @@ index a08e3ee..df8ade2 100644
  	cl->fn = fn;
  	cl->wq = wq;
 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
-index 1695ee5..89f18ab 100644
+index 3a57679..c58cdaf 100644
 --- a/drivers/md/bitmap.c
 +++ b/drivers/md/bitmap.c
-@@ -1784,7 +1784,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
+@@ -1786,7 +1786,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
  		   chunk_kb ? "KB" : "B");
  	if (bitmap->storage.file) {
  		seq_printf(seq, ", file: ");
@@ -44476,7 +44371,7 @@ index 1695ee5..89f18ab 100644
  
  	seq_printf(seq, "\n");
 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
-index 73f791b..8c5d3ac 100644
+index c8a18e4..0ab43e5 100644
 --- a/drivers/md/dm-ioctl.c
 +++ b/drivers/md/dm-ioctl.c
 @@ -1772,7 +1772,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
@@ -44631,7 +44526,7 @@ index f8b37d4..5c5cafd 100644
  				schedule_work(&sc->trigger_event);
  		}
 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
-index 3afae9e..4e1c954 100644
+index 6554d91..b0221c2 100644
 --- a/drivers/md/dm-table.c
 +++ b/drivers/md/dm-table.c
 @@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
@@ -44644,7 +44539,7 @@ index 3afae9e..4e1c954 100644
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
 diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
-index 43adbb8..7b34305 100644
+index 79f6941..b33b4e0 100644
 --- a/drivers/md/dm-thin-metadata.c
 +++ b/drivers/md/dm-thin-metadata.c
 @@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
@@ -44666,10 +44561,10 @@ index 43adbb8..7b34305 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 b71c600..d0b85b3 100644
+index 8001fe9..abdd0d0 100644
 --- a/drivers/md/dm.c
 +++ b/drivers/md/dm.c
-@@ -185,9 +185,9 @@ struct mapped_device {
+@@ -188,9 +188,9 @@ struct mapped_device {
  	/*
  	 * Event handling.
  	 */
@@ -44681,7 +44576,7 @@ index b71c600..d0b85b3 100644
  	struct list_head uevent_list;
  	spinlock_t uevent_lock; /* Protect access to uevent_list */
  
-@@ -2070,8 +2070,8 @@ static struct mapped_device *alloc_dev(int minor)
+@@ -2163,8 +2163,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);
@@ -44692,7 +44587,7 @@ index b71c600..d0b85b3 100644
  	INIT_LIST_HEAD(&md->uevent_list);
  	INIT_LIST_HEAD(&md->table_devices);
  	spin_lock_init(&md->uevent_lock);
-@@ -2227,7 +2227,7 @@ static void event_callback(void *context)
+@@ -2329,7 +2329,7 @@ static void event_callback(void *context)
  
  	dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
  
@@ -44701,7 +44596,7 @@ index b71c600..d0b85b3 100644
  	wake_up(&md->eventq);
  }
  
-@@ -3055,18 +3055,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
+@@ -3175,18 +3175,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
  
  uint32_t dm_next_uevent_seq(struct mapped_device *md)
  {
@@ -44724,10 +44619,10 @@ index b71c600..d0b85b3 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 709755f..5bc3fa4 100644
+index 717daad..6dd103f 100644
 --- a/drivers/md/md.c
 +++ b/drivers/md/md.c
-@@ -190,10 +190,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
+@@ -191,10 +191,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
   *  start build, activate spare
   */
  static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
@@ -44740,7 +44635,7 @@ index 709755f..5bc3fa4 100644
  	wake_up(&md_event_waiters);
  }
  EXPORT_SYMBOL_GPL(md_new_event);
-@@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
+@@ -204,7 +204,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
   */
  static void md_new_event_inintr(struct mddev *mddev)
  {
@@ -44749,7 +44644,7 @@ index 709755f..5bc3fa4 100644
  	wake_up(&md_event_waiters);
  }
  
-@@ -1422,7 +1422,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
+@@ -1438,7 +1438,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);
@@ -44758,7 +44653,7 @@ index 709755f..5bc3fa4 100644
  
  	rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
  	bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
-@@ -1673,7 +1673,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
+@@ -1689,7 +1689,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
  	else
  		sb->resync_offset = cpu_to_le64(0);
  
@@ -44767,7 +44662,7 @@ index 709755f..5bc3fa4 100644
  
  	sb->raid_disks = cpu_to_le32(mddev->raid_disks);
  	sb->size = cpu_to_le64(mddev->dev_sectors);
-@@ -2543,7 +2543,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
+@@ -2560,7 +2560,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
  static ssize_t
  errors_show(struct md_rdev *rdev, char *page)
  {
@@ -44776,7 +44671,7 @@ index 709755f..5bc3fa4 100644
  }
  
  static ssize_t
-@@ -2552,7 +2552,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
+@@ -2569,7 +2569,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')) {
@@ -44785,7 +44680,7 @@ index 709755f..5bc3fa4 100644
  		return len;
  	}
  	return -EINVAL;
-@@ -2997,8 +2997,8 @@ int md_rdev_init(struct md_rdev *rdev)
+@@ -3005,8 +3005,8 @@ int md_rdev_init(struct md_rdev *rdev)
  	rdev->sb_loaded = 0;
  	rdev->bb_page = NULL;
  	atomic_set(&rdev->nr_pending, 0);
@@ -44796,7 +44691,7 @@ index 709755f..5bc3fa4 100644
  
  	INIT_LIST_HEAD(&rdev->same_set);
  	init_waitqueue_head(&rdev->blocked_wait);
-@@ -6865,7 +6865,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
+@@ -7079,7 +7079,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
  
  		spin_unlock(&pers_lock);
  		seq_printf(seq, "\n");
@@ -44805,7 +44700,7 @@ index 709755f..5bc3fa4 100644
  		return 0;
  	}
  	if (v == (void*)2) {
-@@ -6968,7 +6968,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
+@@ -7182,7 +7182,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
  		return error;
  
  	seq = file->private_data;
@@ -44814,7 +44709,7 @@ index 709755f..5bc3fa4 100644
  	return error;
  }
  
-@@ -6985,7 +6985,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
+@@ -7199,7 +7199,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
  	/* always allow read */
  	mask = POLLIN | POLLRDNORM;
  
@@ -44823,7 +44718,7 @@ index 709755f..5bc3fa4 100644
  		mask |= POLLERR | POLLPRI;
  	return mask;
  }
-@@ -7032,7 +7032,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
+@@ -7246,7 +7246,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]) -
@@ -44833,7 +44728,7 @@ index 709755f..5bc3fa4 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 03cec5b..0a658c1 100644
+index 318ca8f..31e4478 100644
 --- a/drivers/md/md.h
 +++ b/drivers/md/md.h
 @@ -94,13 +94,13 @@ struct md_rdev {
@@ -44852,7 +44747,7 @@ index 03cec5b..0a658c1 100644
  					   * for reporting to userspace and storing
  					   * in superblock.
  					   */
-@@ -448,7 +448,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
+@@ -476,7 +476,7 @@ extern void mddev_unlock(struct mddev *mddev);
  
  static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
  {
@@ -44896,10 +44791,10 @@ index 3e6d115..ffecdeb 100644
  /*----------------------------------------------------------------*/
  
 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
-index 2f2f38f..f6a8ebe 100644
+index d34e238..34f8d98 100644
 --- a/drivers/md/raid1.c
 +++ b/drivers/md/raid1.c
-@@ -1932,7 +1932,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
+@@ -1922,7 +1922,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)
@@ -44908,7 +44803,7 @@ index 2f2f38f..f6a8ebe 100644
  		}
  		sectors -= s;
  		sect += s;
-@@ -2165,7 +2165,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
+@@ -2155,7 +2155,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
  			    !test_bit(Faulty, &rdev->flags)) {
  				if (r1_sync_page_io(rdev, sect, s,
  						    conf->tmppage, READ)) {
@@ -44918,10 +44813,10 @@ index 2f2f38f..f6a8ebe 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 32e282f..5cec803 100644
+index a7196c4..439f012 100644
 --- a/drivers/md/raid10.c
 +++ b/drivers/md/raid10.c
-@@ -1944,7 +1944,7 @@ static void end_sync_read(struct bio *bio, int error)
+@@ -1934,7 +1934,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
  		 */
@@ -44930,7 +44825,7 @@ index 32e282f..5cec803 100644
  			   &conf->mirrors[d].rdev->corrected_errors);
  
  	/* for reconstruct, we always reschedule after a read.
-@@ -2301,7 +2301,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
+@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
  {
  	struct timespec cur_time_mon;
  	unsigned long hours_since_last;
@@ -44939,7 +44834,7 @@ index 32e282f..5cec803 100644
  
  	ktime_get_ts(&cur_time_mon);
  
-@@ -2323,9 +2323,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
+@@ -2313,9 +2313,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))
@@ -44951,7 +44846,7 @@ index 32e282f..5cec803 100644
  }
  
  static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
-@@ -2379,8 +2379,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
  		return;
  
  	check_decay_read_errors(mddev, rdev);
@@ -44962,7 +44857,7 @@ index 32e282f..5cec803 100644
  		char b[BDEVNAME_SIZE];
  		bdevname(rdev->bdev, b);
  
-@@ -2388,7 +2388,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2378,7 +2378,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,
@@ -44971,7 +44866,7 @@ index 32e282f..5cec803 100644
  		printk(KERN_NOTICE
  		       "md/raid10:%s: %s: Failing raid device\n",
  		       mdname(mddev), b);
-@@ -2543,7 +2543,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
+@@ -2533,7 +2533,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));
@@ -44981,10 +44876,10 @@ index 32e282f..5cec803 100644
  
  			rdev_dec_pending(rdev, mddev);
 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index 8577cc7..5779d5b 100644
+index cd2f96b..3876e63 100644
 --- a/drivers/md/raid5.c
 +++ b/drivers/md/raid5.c
-@@ -950,23 +950,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
+@@ -947,23 +947,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
  	struct bio_vec bvl;
  	struct bvec_iter iter;
  	struct page *bio_page;
@@ -45014,7 +44909,7 @@ index 8577cc7..5779d5b 100644
  
  		if (page_offset < 0) {
  			b_offset = -page_offset;
-@@ -1730,6 +1730,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
+@@ -1727,6 +1727,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
  	return 1;
  }
  
@@ -45025,7 +44920,7 @@ index 8577cc7..5779d5b 100644
  static int grow_stripes(struct r5conf *conf, int num)
  {
  	struct kmem_cache *sc;
-@@ -1741,7 +1745,11 @@ static int grow_stripes(struct r5conf *conf, int num)
+@@ -1738,7 +1742,11 @@ static int grow_stripes(struct r5conf *conf, int num)
  			"raid%d-%s", conf->level, mdname(conf->mddev));
  	else
  		sprintf(conf->cache_name[0],
@@ -45037,7 +44932,7 @@ index 8577cc7..5779d5b 100644
  	sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
  
  	conf->active_name = 0;
-@@ -2017,21 +2025,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
+@@ -2014,21 +2022,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));
@@ -45063,7 +44958,7 @@ index 8577cc7..5779d5b 100644
  		if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
  			printk_ratelimited(
  				KERN_WARNING
-@@ -2059,7 +2067,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
+@@ -2056,7 +2064,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
  				mdname(conf->mddev),
  				(unsigned long long)s,
  				bdn);
@@ -45167,7 +45062,7 @@ index 802642d..5534900 100644
  /* Parameter declarations */
  static int cardtype[IVTV_MAX_CARDS];
 diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
-index 8cbe6b4..ea3601c 100644
+index 570d119..ed25830 100644
 --- a/drivers/media/pci/solo6x10/solo6x10-core.c
 +++ b/drivers/media/pci/solo6x10/solo6x10-core.c
 @@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
@@ -45180,7 +45075,7 @@ index 8cbe6b4..ea3601c 100644
  	const char *driver;
  	int i;
 diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
-index c7141f2..5301fec 100644
+index 7ddc767..1c24361 100644
 --- a/drivers/media/pci/solo6x10/solo6x10-g723.c
 +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
 @@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
@@ -45206,10 +45101,10 @@ index 8c84846..27b4f83 100644
  			p2m_id = -p2m_id;
  	}
 diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
-index bd8edfa..e82ed85 100644
+index 1ca54b0..7d7cb9a 100644
 --- a/drivers/media/pci/solo6x10/solo6x10.h
 +++ b/drivers/media/pci/solo6x10/solo6x10.h
-@@ -220,7 +220,7 @@ struct solo_dev {
+@@ -218,7 +218,7 @@ struct solo_dev {
  
  	/* P2M DMA Engine */
  	struct solo_p2m_dev	p2m_dev[SOLO_NR_P2M];
@@ -45307,7 +45202,7 @@ 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 b4d2696..91df48e 100644
+index 72d4f2e..4b2ea0d 100644
 --- a/drivers/media/platform/s5p-tv/mixer_video.c
 +++ b/drivers/media/platform/s5p-tv/mixer_video.c
 @@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
@@ -45361,7 +45256,7 @@ index b4d2696..91df48e 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)
+@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
  	mxr_output_get(mdev);
  
  	mxr_layer_update_output(layer);
@@ -45377,7 +45272,7 @@ index b4d2696..91df48e 100644
  	mxr_streamer_get(mdev);
  
  	return 0;
-@@ -1030,7 +1030,7 @@ static void stop_streaming(struct vb2_queue *vq)
+@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
  	spin_unlock_irqrestore(&layer->enq_slock, flags);
  
  	/* disabling layer in hardware */
@@ -45386,7 +45281,7 @@ index b4d2696..91df48e 100644
  	/* remove one streamer */
  	mxr_streamer_put(mdev);
  	/* allow changes in output configuration */
-@@ -1068,8 +1068,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
+@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
  
  void mxr_layer_release(struct mxr_layer *layer)
  {
@@ -45397,7 +45292,7 @@ index b4d2696..91df48e 100644
  }
  
  void mxr_base_layer_release(struct mxr_layer *layer)
-@@ -1095,7 +1095,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
+@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
  
  	layer->mdev = mdev;
  	layer->idx = idx;
@@ -46303,7 +46198,7 @@ index 015f92a..59e311e 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 faac2f4..e39dcd9 100644
+index b084072..36706d7 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
@@ -46325,7 +46220,7 @@ index faac2f4..e39dcd9 100644
  	const struct v4l2_ioctl_info *info;
  	void *fh = file->private_data;
  	struct v4l2_fh *vfh = NULL;
-@@ -2422,7 +2423,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
+@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
  				ret = -EINVAL;
  				break;
  			}
@@ -46334,7 +46229,7 @@ index faac2f4..e39dcd9 100644
  			*kernel_ptr = (void **)&buf->m.planes;
  			*array_size = sizeof(struct v4l2_plane) * buf->length;
  			ret = 1;
-@@ -2439,7 +2440,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
+@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
  				ret = -EINVAL;
  				break;
  			}
@@ -46343,7 +46238,7 @@ index faac2f4..e39dcd9 100644
  			*kernel_ptr = (void **)&edid->edid;
  			*array_size = edid->blocks * 128;
  			ret = 1;
-@@ -2457,7 +2458,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
+@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
  				ret = -EINVAL;
  				break;
  			}
@@ -46352,7 +46247,7 @@ index faac2f4..e39dcd9 100644
  			*kernel_ptr = (void **)&ctrls->controls;
  			*array_size = sizeof(struct v4l2_ext_control)
  				    * ctrls->count;
-@@ -2558,7 +2559,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
+@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
  	}
  
  	if (has_array_args) {
@@ -46489,197 +46384,6 @@ index 5bdaae1..eced16f 100644
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
-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[] = {
- 	"Array Controller Device"
- };
- 
--static char *chtostr(char *tmp, u8 *chars, int n)
--{
--	tmp[0] = 0;
--	return strncat(tmp, (char *)chars, n);
--}
--
- 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;
- 
- 	i2o_exec_execute_ddm_table ddm_table;
--	char tmp[28 + 1];
- 
- 	result = kmalloc(sizeof(*result), GFP_KERNEL);
- 	if (!result)
-@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
- 
- 		seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
- 		seq_printf(seq, "%-#8x", ddm_table.module_id);
--		seq_printf(seq, "%-29s",
--			   chtostr(tmp, ddm_table.module_name_version, 28));
-+		seq_printf(seq, "%-.28s", ddm_table.module_name_version);
- 		seq_printf(seq, "%9d  ", ddm_table.data_size);
- 		seq_printf(seq, "%8d", ddm_table.code_size);
- 
-@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
- 
- 	i2o_driver_result_table *result;
- 	i2o_driver_store_table *dst;
--	char tmp[28 + 1];
- 
- 	result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
- 	if (result == NULL)
-@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
- 
- 		seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
- 		seq_printf(seq, "%-#8x", dst->module_id);
--		seq_printf(seq, "%-29s",
--			   chtostr(tmp, dst->module_name_version, 28));
--		seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
-+		seq_printf(seq, "%-.28s", dst->module_name_version);
-+		seq_printf(seq, "%-.8s", dst->date);
- 		seq_printf(seq, "%8d ", dst->module_size);
- 		seq_printf(seq, "%8d ", dst->mpb_size);
- 		seq_printf(seq, "0x%04x", dst->module_flags);
-@@ -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;
-+	u16 *work16 = (u16 *) work32;
- 	int token;
--	char tmp[16 + 1];
- 
- 	token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
- 
-@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
- 	seq_printf(seq, "Device Class  : %s\n", i2o_get_class_name(work16[0]));
- 	seq_printf(seq, "Owner TID     : %0#5x\n", work16[2]);
- 	seq_printf(seq, "Parent TID    : %0#5x\n", work16[3]);
--	seq_printf(seq, "Vendor info   : %s\n",
--		   chtostr(tmp, (u8 *) (work32 + 2), 16));
--	seq_printf(seq, "Product info  : %s\n",
--		   chtostr(tmp, (u8 *) (work32 + 6), 16));
--	seq_printf(seq, "Description   : %s\n",
--		   chtostr(tmp, (u8 *) (work32 + 10), 16));
--	seq_printf(seq, "Product rev.  : %s\n",
--		   chtostr(tmp, (u8 *) (work32 + 14), 8));
-+	seq_printf(seq, "Vendor info   : %.16s\n", (u8 *) (work32 + 2));
-+	seq_printf(seq, "Product info  : %.16s\n", (u8 *) (work32 + 6));
-+	seq_printf(seq, "Description   : %.16s\n", (u8 *) (work32 + 10));
-+	seq_printf(seq, "Product rev.  : %.8s\n", (u8 *) (work32 + 14));
- 
- 	seq_printf(seq, "Serial number : ");
- 	print_serial_number(seq, (u8 *) (work32 + 16),
-@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
- 		u8 pad[256];	// allow up to 256 byte (max) serial number
- 	} result;
- 
--	char tmp[24 + 1];
--
- 	token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
- 
- 	if (token < 0) {
-@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
- 	}
- 
- 	seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
--	seq_printf(seq, "Module name         : %s\n",
--		   chtostr(tmp, result.module_name, 24));
--	seq_printf(seq, "Module revision     : %s\n",
--		   chtostr(tmp, result.module_rev, 8));
-+	seq_printf(seq, "Module name         : %.24s\n", result.module_name);
-+	seq_printf(seq, "Module revision     : %.8s\n", result.module_rev);
- 
- 	seq_printf(seq, "Serial number       : ");
- 	print_serial_number(seq, result.serial_number, sizeof(result) - 36);
-@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
- 		u8 instance_number[4];
- 	} result;
- 
--	char tmp[64 + 1];
--
- 	token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
- 
- 	if (token < 0) {
-@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
- 		return 0;
- 	}
- 
--	seq_printf(seq, "Device name     : %s\n",
--		   chtostr(tmp, result.device_name, 64));
--	seq_printf(seq, "Service name    : %s\n",
--		   chtostr(tmp, result.service_name, 64));
--	seq_printf(seq, "Physical name   : %s\n",
--		   chtostr(tmp, result.physical_location, 64));
--	seq_printf(seq, "Instance number : %s\n",
--		   chtostr(tmp, result.instance_number, 4));
-+	seq_printf(seq, "Device name     : %.64s\n", result.device_name);
-+	seq_printf(seq, "Service name    : %.64s\n", result.service_name);
-+	seq_printf(seq, "Physical name   : %.64s\n", result.physical_location);
-+	seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
- 
- 	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 92752fb..a7494f6 100644
---- a/drivers/message/i2o/iop.c
-+++ b/drivers/message/i2o/iop.c
-@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
- 
- 	spin_lock_irqsave(&c->context_list_lock, flags);
- 
--	if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
--		atomic_inc(&c->context_list_counter);
-+	if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
-+		atomic_inc_unchecked(&c->context_list_counter);
- 
--	entry->context = atomic_read(&c->context_list_counter);
-+	entry->context = atomic_read_unchecked(&c->context_list_counter);
- 
- 	list_add(&entry->list, &c->context_list);
- 
-@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
- 
- #if BITS_PER_LONG == 64
- 	spin_lock_init(&c->context_list_lock);
--	atomic_set(&c->context_list_counter, 0);
-+	atomic_set_unchecked(&c->context_list_counter, 0);
- 	INIT_LIST_HEAD(&c->context_list);
- #endif
- 
 diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
 index 9a8e185..27ff17d 100644
 --- a/drivers/mfd/ab8500-debugfs.c
@@ -47169,7 +46873,7 @@ index 82dc574..8539ab2 100644
  
  		break;
 diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
-index 4409d79..d7766d0 100644
+index c69afb5..5c2d0f5 100644
 --- a/drivers/mmc/card/block.c
 +++ b/drivers/mmc/card/block.c
 @@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
@@ -47182,21 +46886,21 @@ index 4409d79..d7766d0 100644
  		goto cmd_rel_host;
  	}
 diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
-index 0d0f7a2..45b8d60 100644
+index 18c4afe..43be71e 100644
 --- a/drivers/mmc/host/dw_mmc.h
 +++ b/drivers/mmc/host/dw_mmc.h
-@@ -276,5 +276,5 @@ struct dw_mci_drv_data {
+@@ -271,5 +271,5 @@ struct dw_mci_drv_data {
+ 	void		(*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
  	int		(*parse_dt)(struct dw_mci *host);
- 	int		(*execute_tuning)(struct dw_mci_slot *slot, u32 opcode,
- 					struct dw_mci_tuning_data *tuning_data);
+ 	int		(*execute_tuning)(struct dw_mci_slot *slot);
 -};
 +} __do_const;
  #endif /* _DW_MMC_H_ */
 diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
-index 8232e9a..7776006 100644
+index 7fe1619..ae0781b 100644
 --- a/drivers/mmc/host/mmci.c
 +++ b/drivers/mmc/host/mmci.c
-@@ -1635,7 +1635,9 @@ static int mmci_probe(struct amba_device *dev,
+@@ -1630,7 +1630,9 @@ static int mmci_probe(struct amba_device *dev,
  	mmc->caps |= MMC_CAP_CMD23;
  
  	if (variant->busy_detect) {
@@ -47208,10 +46912,10 @@ index 8232e9a..7776006 100644
  		mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
  		mmc->max_busy_timeout = 0;
 diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
-index 7c71dcd..74cb746 100644
+index f84cfb0..aebe5d6 100644
 --- a/drivers/mmc/host/omap_hsmmc.c
 +++ b/drivers/mmc/host/omap_hsmmc.c
-@@ -2120,7 +2120,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
+@@ -2054,7 +2054,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
  
  	if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
  		dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
@@ -47223,7 +46927,7 @@ index 7c71dcd..74cb746 100644
  
  	pm_runtime_enable(host->dev);
 diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index af1f7c0..00d368a 100644
+index 10ef824..88461a2 100644
 --- a/drivers/mmc/host/sdhci-esdhc-imx.c
 +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
 @@ -989,9 +989,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
@@ -47242,10 +46946,10 @@ index af1f7c0..00d368a 100644
  	if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
  		writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
 diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
-index c45b893..fba0144 100644
+index c6d2dd7..81b1ca3 100644
 --- a/drivers/mmc/host/sdhci-s3c.c
 +++ b/drivers/mmc/host/sdhci-s3c.c
-@@ -590,9 +590,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
+@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
  	 * we can use overriding functions instead of default.
  	 */
  	if (sc->no_divider) {
@@ -47274,7 +46978,7 @@ index 423666b..81ff5eb 100644
  	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 b3b7ca1..5dd4634 100644
+index f44c606..aa4e804 100644
 --- a/drivers/mtd/nand/denali.c
 +++ b/drivers/mtd/nand/denali.c
 @@ -24,6 +24,7 @@
@@ -47286,7 +46990,7 @@ index b3b7ca1..5dd4634 100644
  #include "denali.h"
  
 diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
-index 4f3851a..f477a23 100644
+index 33f3c3c..d6bbe6a 100644
 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
 +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
 @@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
@@ -47299,7 +47003,7 @@ index 4f3851a..f477a23 100644
  		ret = dma_map_sg(this->dev, sgl, 1, dr);
  		if (ret == 0)
 diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
-index 51b9d6a..52af9a7 100644
+index a5dfbfb..8042ab4 100644
 --- a/drivers/mtd/nftlmount.c
 +++ b/drivers/mtd/nftlmount.c
 @@ -24,6 +24,7 @@
@@ -47350,7 +47054,7 @@ index b3b922a..80bba38 100644
  	.priv_size	= sizeof(struct cfhsi),
  	.setup		= cfhsi_setup,
 diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
-index 98d73aa..63ef9da 100644
+index 58808f65..0bdc7b3 100644
 --- a/drivers/net/can/Kconfig
 +++ b/drivers/net/can/Kconfig
 @@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
@@ -47363,10 +47067,10 @@ index 98d73aa..63ef9da 100644
  	  Say Y here if you want to support for Freescale FlexCAN.
  
 diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
-index 62ca0e8..3bed607 100644
+index b0f6924..59e9640 100644
 --- a/drivers/net/can/dev.c
 +++ b/drivers/net/can/dev.c
-@@ -958,7 +958,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
+@@ -959,7 +959,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
  	return -EOPNOTSUPP;
  }
  
@@ -47419,10 +47123,10 @@ index 0443654..4f0aa18 100644
  
  	if (!request_mem_region(mem->start, mem_size, pdev->name)) {
 diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
-index 760c72c..a99728c 100644
+index 6725dc0..163549c 100644
 --- a/drivers/net/ethernet/altera/altera_tse_main.c
 +++ b/drivers/net/ethernet/altera/altera_tse_main.c
-@@ -1217,7 +1217,7 @@ static int tse_shutdown(struct net_device *dev)
+@@ -1216,7 +1216,7 @@ static int tse_shutdown(struct net_device *dev)
  	return 0;
  }
  
@@ -47431,7 +47135,7 @@ index 760c72c..a99728c 100644
  	.ndo_open		= tse_open,
  	.ndo_stop		= tse_shutdown,
  	.ndo_start_xmit		= tse_start_xmit,
-@@ -1454,11 +1454,13 @@ static int altera_tse_probe(struct platform_device *pdev)
+@@ -1453,11 +1453,13 @@ static int altera_tse_probe(struct platform_device *pdev)
  	ndev->netdev_ops = &altera_tse_netdev_ops;
  	altera_tse_set_ethtool_ops(ndev);
  
@@ -47489,7 +47193,7 @@ index 8a50b01..39c1ad0 100644
  	return 0;
  }
 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
-index a50891f..b26fe24 100644
+index d81fc6b..6f8ab25 100644
 --- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
 @@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
@@ -47510,17 +47214,8 @@ index a50891f..b26fe24 100644
  	struct xgbe_channel *channel;
  	struct xgbe_ring *ring;
  	struct xgbe_ring_desc *rdesc;
-@@ -624,7 +624,7 @@ err_out:
- static void xgbe_realloc_rx_buffer(struct xgbe_channel *channel)
- {
- 	struct xgbe_prv_data *pdata = channel->pdata;
--	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_hw_if *hw_if = pdata->hw_if;
- 	struct xgbe_ring *ring = channel->rx_ring;
- 	struct xgbe_ring_data *rdata;
- 	int i;
-@@ -650,17 +650,12 @@ static void xgbe_realloc_rx_buffer(struct xgbe_channel *channel)
- 	DBGPR("<--xgbe_realloc_rx_buffer\n");
+@@ -620,17 +620,12 @@ err_out:
+ 	return 0;
  }
  
 -void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
@@ -47530,7 +47225,7 @@ index a50891f..b26fe24 100644
 -	desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
 -	desc_if->free_ring_resources = xgbe_free_ring_resources;
 -	desc_if->map_tx_skb = xgbe_map_tx_skb;
--	desc_if->realloc_rx_buffer = xgbe_realloc_rx_buffer;
+-	desc_if->map_rx_buffer = xgbe_map_rx_buffer;
 -	desc_if->unmap_rdata = xgbe_unmap_rdata;
 -	desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
 -	desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
@@ -47541,16 +47236,16 @@ index a50891f..b26fe24 100644
 +	.alloc_ring_resources = xgbe_alloc_ring_resources,
 +	.free_ring_resources = xgbe_free_ring_resources,
 +	.map_tx_skb = xgbe_map_tx_skb,
-+	.realloc_rx_buffer = xgbe_realloc_rx_buffer,
++	.map_rx_buffer = xgbe_map_rx_buffer,
 +	.unmap_rdata = xgbe_unmap_rdata,
 +	.wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
 +	.wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
 +};
 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
-index 4c66cd1..1a20aab 100644
+index 400757b..d8c53f6 100644
 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
-@@ -2703,7 +2703,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
+@@ -2748,7 +2748,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
  
  static int xgbe_init(struct xgbe_prv_data *pdata)
  {
@@ -47559,7 +47254,7 @@ index 4c66cd1..1a20aab 100644
  	int ret;
  
  	DBGPR("-->xgbe_init\n");
-@@ -2767,108 +2767,103 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
+@@ -2813,108 +2813,103 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
  	return 0;
  }
  
@@ -47747,10 +47442,10 @@ index 4c66cd1..1a20aab 100644
 +	.set_rss_lookup_table = xgbe_set_rss_lookup_table,
 +};
 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
-index e5ffb2c..e56d30b 100644
+index 885b02b..4b31a4c 100644
 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
-@@ -239,7 +239,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
+@@ -244,7 +244,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
  		 * support, tell it now
  		 */
  		if (ring->tx.xmit_more)
@@ -47759,7 +47454,7 @@ index e5ffb2c..e56d30b 100644
  
  		return NETDEV_TX_BUSY;
  	}
-@@ -267,7 +267,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
+@@ -272,7 +272,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
  
  static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
  {
@@ -47768,7 +47463,7 @@ index e5ffb2c..e56d30b 100644
  	struct xgbe_channel *channel;
  	enum xgbe_int int_id;
  	unsigned int i;
-@@ -289,7 +289,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
+@@ -294,7 +294,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
  
  static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
  {
@@ -47777,7 +47472,7 @@ index e5ffb2c..e56d30b 100644
  	struct xgbe_channel *channel;
  	enum xgbe_int int_id;
  	unsigned int i;
-@@ -312,7 +312,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
+@@ -317,7 +317,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
  static irqreturn_t xgbe_isr(int irq, void *data)
  {
  	struct xgbe_prv_data *pdata = data;
@@ -47786,7 +47481,7 @@ index e5ffb2c..e56d30b 100644
  	struct xgbe_channel *channel;
  	unsigned int dma_isr, dma_ch_isr;
  	unsigned int mac_isr, mac_tssr;
-@@ -611,7 +611,7 @@ static void xgbe_napi_disable(struct xgbe_prv_data *pdata, unsigned int del)
+@@ -673,7 +673,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
  
  void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
  {
@@ -47795,7 +47490,7 @@ index e5ffb2c..e56d30b 100644
  
  	DBGPR("-->xgbe_init_tx_coalesce\n");
  
-@@ -625,7 +625,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
+@@ -687,7 +687,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
  
  void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
  {
@@ -47804,7 +47499,7 @@ index e5ffb2c..e56d30b 100644
  
  	DBGPR("-->xgbe_init_rx_coalesce\n");
  
-@@ -639,7 +639,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
+@@ -701,7 +701,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
  
  static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
  {
@@ -47813,7 +47508,7 @@ index e5ffb2c..e56d30b 100644
  	struct xgbe_channel *channel;
  	struct xgbe_ring *ring;
  	struct xgbe_ring_data *rdata;
-@@ -664,7 +664,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
+@@ -726,7 +726,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
  
  static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
  {
@@ -47822,7 +47517,7 @@ index e5ffb2c..e56d30b 100644
  	struct xgbe_channel *channel;
  	struct xgbe_ring *ring;
  	struct xgbe_ring_data *rdata;
-@@ -690,7 +690,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
+@@ -752,7 +752,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
  static void xgbe_adjust_link(struct net_device *netdev)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -47831,7 +47526,7 @@ index e5ffb2c..e56d30b 100644
  	struct phy_device *phydev = pdata->phydev;
  	int new_state = 0;
  
-@@ -798,7 +798,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
+@@ -860,7 +860,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
  int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -47840,7 +47535,7 @@ index e5ffb2c..e56d30b 100644
  	unsigned long flags;
  
  	DBGPR("-->xgbe_powerdown\n");
-@@ -836,7 +836,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
+@@ -898,7 +898,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
  int xgbe_powerup(struct net_device *netdev, unsigned int caller)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -47849,16 +47544,16 @@ index e5ffb2c..e56d30b 100644
  	unsigned long flags;
  
  	DBGPR("-->xgbe_powerup\n");
-@@ -873,7 +873,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
+@@ -935,7 +935,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
  
  static int xgbe_start(struct xgbe_prv_data *pdata)
  {
 -	struct xgbe_hw_if *hw_if = &pdata->hw_if;
 +	struct xgbe_hw_if *hw_if = pdata->hw_if;
  	struct net_device *netdev = pdata->netdev;
+ 	int ret;
  
- 	DBGPR("-->xgbe_start\n");
-@@ -899,7 +899,7 @@ static int xgbe_start(struct xgbe_prv_data *pdata)
+@@ -976,7 +976,7 @@ err_napi:
  
  static void xgbe_stop(struct xgbe_prv_data *pdata)
  {
@@ -47867,16 +47562,7 @@ index e5ffb2c..e56d30b 100644
  	struct xgbe_channel *channel;
  	struct net_device *netdev = pdata->netdev;
  	struct netdev_queue *txq;
-@@ -932,7 +932,7 @@ static void xgbe_stop(struct xgbe_prv_data *pdata)
- static void xgbe_restart_dev(struct xgbe_prv_data *pdata, unsigned int reset)
- {
- 	struct xgbe_channel *channel;
--	struct xgbe_hw_if *hw_if = &pdata->hw_if;
-+	struct xgbe_hw_if *hw_if = pdata->hw_if;
- 	unsigned int i;
- 
- 	DBGPR("-->xgbe_restart_dev\n");
-@@ -1135,7 +1135,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
+@@ -1203,7 +1203,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
  		return -ERANGE;
  	}
  
@@ -47885,29 +47571,25 @@ index e5ffb2c..e56d30b 100644
  
  	memcpy(&pdata->tstamp_config, &config, sizeof(config));
  
-@@ -1284,8 +1284,8 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
+@@ -1352,7 +1352,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
  static int xgbe_open(struct net_device *netdev)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
--	struct xgbe_hw_if *hw_if = &pdata->hw_if;
 -	struct xgbe_desc_if *desc_if = &pdata->desc_if;
-+	struct xgbe_hw_if *hw_if = pdata->hw_if;
 +	struct xgbe_desc_if *desc_if = pdata->desc_if;
- 	struct xgbe_channel *channel = NULL;
- 	unsigned int i = 0;
  	int ret;
-@@ -1400,8 +1400,8 @@ err_phy_init:
+ 
+ 	DBGPR("-->xgbe_open\n");
+@@ -1424,7 +1424,7 @@ err_phy_init:
  static int xgbe_close(struct net_device *netdev)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
--	struct xgbe_hw_if *hw_if = &pdata->hw_if;
 -	struct xgbe_desc_if *desc_if = &pdata->desc_if;
-+	struct xgbe_hw_if *hw_if = pdata->hw_if;
 +	struct xgbe_desc_if *desc_if = pdata->desc_if;
- 	struct xgbe_channel *channel;
- 	unsigned int i;
  
-@@ -1442,8 +1442,8 @@ static int xgbe_close(struct net_device *netdev)
+ 	DBGPR("-->xgbe_close\n");
+ 
+@@ -1452,8 +1452,8 @@ static int xgbe_close(struct net_device *netdev)
  static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -47918,7 +47600,7 @@ index e5ffb2c..e56d30b 100644
  	struct xgbe_channel *channel;
  	struct xgbe_ring *ring;
  	struct xgbe_packet_data *packet;
-@@ -1518,7 +1518,7 @@ tx_netdev_return:
+@@ -1521,7 +1521,7 @@ tx_netdev_return:
  static void xgbe_set_rx_mode(struct net_device *netdev)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -47927,7 +47609,7 @@ index e5ffb2c..e56d30b 100644
  	unsigned int pr_mode, am_mode;
  
  	DBGPR("-->xgbe_set_rx_mode\n");
-@@ -1537,7 +1537,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
+@@ -1540,7 +1540,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
  static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -47936,7 +47618,7 @@ index e5ffb2c..e56d30b 100644
  	struct sockaddr *saddr = addr;
  
  	DBGPR("-->xgbe_set_mac_address\n");
-@@ -1604,7 +1604,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
+@@ -1607,7 +1607,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
  
  	DBGPR("-->%s\n", __func__);
  
@@ -47945,7 +47627,7 @@ index e5ffb2c..e56d30b 100644
  
  	s->rx_packets = pstats->rxframecount_gb;
  	s->rx_bytes = pstats->rxoctetcount_gb;
-@@ -1631,7 +1631,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
+@@ -1634,7 +1634,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
  				u16 vid)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -47954,7 +47636,7 @@ index e5ffb2c..e56d30b 100644
  
  	DBGPR("-->%s\n", __func__);
  
-@@ -1647,7 +1647,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
+@@ -1650,7 +1650,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
  				 u16 vid)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -47963,7 +47645,7 @@ index e5ffb2c..e56d30b 100644
  
  	DBGPR("-->%s\n", __func__);
  
-@@ -1713,7 +1713,7 @@ static int xgbe_set_features(struct net_device *netdev,
+@@ -1716,7 +1716,7 @@ static int xgbe_set_features(struct net_device *netdev,
  			     netdev_features_t features)
  {
  	struct xgbe_prv_data *pdata = netdev_priv(netdev);
@@ -47972,16 +47654,18 @@ index e5ffb2c..e56d30b 100644
  	netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
  	int ret = 0;
  
-@@ -1778,7 +1778,7 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
+@@ -1781,8 +1781,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
  static void xgbe_rx_refresh(struct xgbe_channel *channel)
  {
  	struct xgbe_prv_data *pdata = channel->pdata;
+-	struct xgbe_hw_if *hw_if = &pdata->hw_if;
 -	struct xgbe_desc_if *desc_if = &pdata->desc_if;
++	struct xgbe_hw_if *hw_if = pdata->hw_if;
 +	struct xgbe_desc_if *desc_if = pdata->desc_if;
  	struct xgbe_ring *ring = channel->rx_ring;
  	struct xgbe_ring_data *rdata;
  
-@@ -1819,8 +1819,8 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
+@@ -1835,8 +1835,8 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
  static int xgbe_tx_poll(struct xgbe_channel *channel)
  {
  	struct xgbe_prv_data *pdata = channel->pdata;
@@ -47992,7 +47676,7 @@ index e5ffb2c..e56d30b 100644
  	struct xgbe_ring *ring = channel->tx_ring;
  	struct xgbe_ring_data *rdata;
  	struct xgbe_ring_desc *rdesc;
-@@ -1891,7 +1891,7 @@ unlock:
+@@ -1901,7 +1901,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
  static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
  {
  	struct xgbe_prv_data *pdata = channel->pdata;
@@ -48002,7 +47686,7 @@ index e5ffb2c..e56d30b 100644
  	struct xgbe_ring_data *rdata;
  	struct xgbe_packet_data *packet;
 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
-index ebf4893..28108c7 100644
+index ebf4893..a8f51c6 100644
 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
 @@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
@@ -48032,11 +47716,20 @@ index ebf4893..28108c7 100644
  	unsigned int rx_frames, rx_riwt, rx_usecs;
  	unsigned int tx_frames, tx_usecs;
  
+@@ -536,7 +536,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
+ 			 const u8 *key, const u8 hfunc)
+ {
+ 	struct xgbe_prv_data *pdata = netdev_priv(netdev);
+-	struct xgbe_hw_if *hw_if = &pdata->hw_if;
++	struct xgbe_hw_if *hw_if = pdata->hw_if;
+ 	unsigned int ret;
+ 
+ 	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
-index dbd3850..4e31b38 100644
+index 32dd651..225cca3 100644
 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
-@@ -155,12 +155,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
+@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
  	DBGPR("<--xgbe_default_config\n");
  }
  
@@ -48046,11 +47739,11 @@ index dbd3850..4e31b38 100644
 -	xgbe_init_function_ptrs_desc(&pdata->desc_if);
 -}
 -
- static int xgbe_probe(struct platform_device *pdev)
+ #ifdef CONFIG_ACPI
+ static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
  {
- 	struct xgbe_prv_data *pdata;
-@@ -281,9 +275,8 @@ static int xgbe_probe(struct platform_device *pdev)
- 	netdev->base_addr = (unsigned long)pdata->xgmac_regs;
+@@ -396,9 +390,8 @@ static int xgbe_probe(struct platform_device *pdev)
+ 	memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
  
  	/* Set all the function pointers */
 -	xgbe_init_all_fptrs(pdata);
@@ -48062,7 +47755,7 @@ index dbd3850..4e31b38 100644
  	/* Issue software reset to device */
  	hw_if->exit(pdata);
 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
-index 363b210..b241389 100644
+index 59e267f..0842a88 100644
 --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
 @@ -126,7 +126,7 @@
@@ -48084,7 +47777,7 @@ index 363b210..b241389 100644
  
  	DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
-index a1bf9d1c..84adcab 100644
+index f326178..8bd7daf 100644
 --- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
 +++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
 @@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
@@ -48106,21 +47799,21 @@ index a1bf9d1c..84adcab 100644
  	spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
  
 diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
-index f9ec762..988c969 100644
+index 13e8f95..1d8beef 100644
 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h
 +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
-@@ -668,8 +668,8 @@ struct xgbe_prv_data {
+@@ -675,8 +675,8 @@ struct xgbe_prv_data {
  	int dev_irq;
  	unsigned int per_channel_irq;
  
 -	struct xgbe_hw_if hw_if;
 -	struct xgbe_desc_if desc_if;
-+	const struct xgbe_hw_if *hw_if;
-+	const struct xgbe_desc_if *desc_if;
++	struct xgbe_hw_if *hw_if;
++	struct xgbe_desc_if *desc_if;
  
  	/* AXI DMA settings */
- 	unsigned int axdomain;
-@@ -787,6 +787,9 @@ struct xgbe_prv_data {
+ 	unsigned int coherent;
+@@ -798,6 +798,9 @@ struct xgbe_prv_data {
  #endif
  };
  
@@ -48227,10 +47920,10 @@ 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 ccf3436..b720d77 100644
+index d929951..a2c23f5 100644
 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
 +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
-@@ -2277,7 +2277,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
+@@ -2215,7 +2215,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
  
  	int i;
  	struct adapter *ap = netdev2adap(dev);
@@ -48262,10 +47955,10 @@ index badff18..e15c4ec 100644
  	break;
      }
 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
-index d48806b..41cd80f 100644
+index e6b790f..051ba2d 100644
 --- a/drivers/net/ethernet/emulex/benet/be_main.c
 +++ b/drivers/net/ethernet/emulex/benet/be_main.c
-@@ -537,7 +537,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
+@@ -536,7 +536,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
  
  	if (wrapped)
  		newacc += 65536;
@@ -48301,10 +47994,10 @@ index dce5f7b..2433466 100644
  #include "ftmac100.h"
  
 diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
-index 6d1ec92..4d5d97d 100644
+index fabcfa1..188fd22 100644
 --- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
 +++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
-@@ -407,7 +407,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
+@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
  	wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
  
  	/* Update the base adjustement value. */
@@ -48314,10 +48007,10 @@ index 6d1ec92..4d5d97d 100644
  }
  
 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-index 5fd4b52..87aa34b 100644
+index 79c00f5..8da39f6 100644
 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
-@@ -794,7 +794,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
+@@ -785,7 +785,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
  	}
  
  	/* update the base incval used to calculate frequency adjustment */
@@ -48327,7 +48020,7 @@ index 5fd4b52..87aa34b 100644
  
  	/* need lock to prevent incorrect read while modifying cyclecounter */
 diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
-index e3357bf..d4d5348 100644
+index 55f9f5c..18cc64b 100644
 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
 +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
 @@ -466,8 +466,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
@@ -48342,7 +48035,7 @@ index e3357bf..d4d5348 100644
  	netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
  
 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
-index 2bbd01f..e8baa64 100644
+index 6223930..975033d 100644
 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
 +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
 @@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
@@ -48413,7 +48106,7 @@ index be7d7a6..a8983f8 100644
  	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 c9f57fb..208bdc1 100644
+index 332bb8a..e6adcd1 100644
 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
 +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
 @@ -1285,7 +1285,7 @@ flash_temp:
@@ -48426,7 +48119,7 @@ index c9f57fb..208bdc1 100644
  	u32 entry_offset, dump, no_entries, buf_offset = 0;
  	int i, k, ops_cnt, ops_index, dump_size = 0;
 diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
-index 2e2cf80..ebc796d 100644
+index c70ab40..00b28e0 100644
 --- a/drivers/net/ethernet/realtek/r8169.c
 +++ b/drivers/net/ethernet/realtek/r8169.c
 @@ -788,22 +788,22 @@ struct rtl8169_private {
@@ -48498,10 +48191,10 @@ index 08c483b..2c4a553 100644
  
  /* To mask all all interrupts.*/
 diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
-index a191afc..d218a12 100644
+index 17e2766..c332f1e 100644
 --- a/drivers/net/ethernet/via/via-rhine.c
 +++ b/drivers/net/ethernet/via/via-rhine.c
-@@ -2513,7 +2513,7 @@ static struct platform_driver rhine_driver_platform = {
+@@ -2514,7 +2514,7 @@ static struct platform_driver rhine_driver_platform = {
  	}
  };
  
@@ -48524,7 +48217,7 @@ index 384ca4f..dd7d4f9 100644
  	spinlock_t request_lock;
  	struct list_head req_list;
 diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
-index ec0c40a..c9e42eb 100644
+index 7816d98..7890614 100644
 --- a/drivers/net/hyperv/rndis_filter.c
 +++ b/drivers/net/hyperv/rndis_filter.c
 @@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
@@ -48536,7 +48229,7 @@ index ec0c40a..c9e42eb 100644
  
  	/* Add to the request list */
  	spin_lock_irqsave(&dev->request_lock, flags);
-@@ -912,7 +912,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
+@@ -918,7 +918,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
  
  	/* Setup the rndis set */
  	halt = &request->request_msg.msg.halt_req;
@@ -48559,7 +48252,7 @@ index 34f846b..4a0d5b1 100644
  	.priv_size	= sizeof(struct ifb_private),
  	.setup		= ifb_setup,
 diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
-index 612e073..a9f5eda 100644
+index 1df38bd..4bc20b0 100644
 --- a/drivers/net/macvlan.c
 +++ b/drivers/net/macvlan.c
 @@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
@@ -48594,7 +48287,7 @@ index 612e073..a9f5eda 100644
  
  	return rtnl_link_register(ops);
  };
-@@ -1545,7 +1547,7 @@ static int macvlan_device_event(struct notifier_block *unused,
+@@ -1551,7 +1553,7 @@ static int macvlan_device_event(struct notifier_block *unused,
  	return NOTIFY_DONE;
  }
  
@@ -48604,7 +48297,7 @@ index 612e073..a9f5eda 100644
  };
  
 diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
-index 4d050ee..012f6dd 100644
+index 27ecc5c..f636328 100644
 --- a/drivers/net/macvtap.c
 +++ b/drivers/net/macvtap.c
 @@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
@@ -48648,7 +48341,7 @@ index 34924df..a747360 100644
  	.priv_size		= sizeof(struct nlmon),
  	.setup			= nlmon_setup,
 diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
-index 3fc91e8..6c36337 100644
+index bdfe51f..e7845c7 100644
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
 @@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
@@ -48714,10 +48407,10 @@ index 079f7ad..b2a2bfa7 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 2c087ef..4859007 100644
+index 7d39484..d58499d 100644
 --- a/drivers/net/team/team.c
 +++ b/drivers/net/team/team.c
-@@ -2103,7 +2103,7 @@ static unsigned int team_get_num_rx_queues(void)
+@@ -2099,7 +2099,7 @@ static unsigned int team_get_num_rx_queues(void)
  	return TEAM_DEFAULT_NUM_RX_QUEUES;
  }
  
@@ -48726,7 +48419,7 @@ index 2c087ef..4859007 100644
  	.kind			= DRV_NAME,
  	.priv_size		= sizeof(struct team),
  	.setup			= team_setup,
-@@ -2893,7 +2893,7 @@ static int team_device_event(struct notifier_block *unused,
+@@ -2889,7 +2889,7 @@ static int team_device_event(struct notifier_block *unused,
  	return NOTIFY_DONE;
  }
  
@@ -48736,10 +48429,10 @@ index 2c087ef..4859007 100644
  };
  
 diff --git a/drivers/net/tun.c b/drivers/net/tun.c
-index 9a409a8..3d44477 100644
+index 857dca4..642f532 100644
 --- a/drivers/net/tun.c
 +++ b/drivers/net/tun.c
-@@ -1425,7 +1425,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
+@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
  	return -EINVAL;
  }
  
@@ -48748,7 +48441,7 @@ index 9a409a8..3d44477 100644
  	.kind		= DRV_NAME,
  	.priv_size	= sizeof(struct tun_struct),
  	.setup		= tun_setup,
-@@ -1827,7 +1827,7 @@ unlock:
+@@ -1830,7 +1830,7 @@ unlock:
  }
  
  static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
@@ -48757,7 +48450,7 @@ index 9a409a8..3d44477 100644
  {
  	struct tun_file *tfile = file->private_data;
  	struct tun_struct *tun;
-@@ -1841,6 +1841,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
+@@ -1844,6 +1844,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
  	int le;
  	int ret;
  
@@ -48768,10 +48461,10 @@ index 9a409a8..3d44477 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 9c5aa92..8cd0405 100644
+index 778e915..58c4d95 100644
 --- a/drivers/net/usb/hso.c
 +++ b/drivers/net/usb/hso.c
-@@ -71,7 +71,7 @@
+@@ -70,7 +70,7 @@
  #include <asm/byteorder.h>
  #include <linux/serial_core.h>
  #include <linux/serial.h>
@@ -48780,7 +48473,7 @@ index 9c5aa92..8cd0405 100644
  
  #define MOD_AUTHOR			"Option Wireless"
  #define MOD_DESCRIPTION			"USB High Speed Option driver"
-@@ -1178,7 +1178,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
+@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
  	struct urb *urb;
  
  	urb = serial->rx_urb[0];
@@ -48789,7 +48482,7 @@ index 9c5aa92..8cd0405 100644
  		count = put_rxbuf_data(urb, serial);
  		if (count == -1)
  			return;
-@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
+@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
  	DUMP1(urb->transfer_buffer, urb->actual_length);
  
  	/* Anyone listening? */
@@ -48798,7 +48491,7 @@ index 9c5aa92..8cd0405 100644
  		return;
  
  	if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
-@@ -1278,8 +1278,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
+@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
  	tty_port_tty_set(&serial->port, tty);
  
  	/* check for port already opened, if not set the termios */
@@ -48808,16 +48501,16 @@ index 9c5aa92..8cd0405 100644
  		serial->rx_state = RX_IDLE;
  		/* Force default termio settings */
  		_hso_serial_set_termios(tty, NULL);
-@@ -1289,7 +1288,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
+@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
  		result = hso_start_serial_device(serial->parent, GFP_KERNEL);
  		if (result) {
  			hso_stop_serial_device(serial->parent);
 -			serial->port.count--;
 +			atomic_dec(&serial->port.count);
- 			kref_put(&serial->parent->ref, hso_serial_ref_free);
+ 		} else {
+ 			kref_get(&serial->parent->ref);
  		}
- 	} else {
-@@ -1326,10 +1325,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
+@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
  
  	/* reset the rts and dtr */
  	/* do the actual close */
@@ -48831,7 +48524,7 @@ index 9c5aa92..8cd0405 100644
  		tty_port_tty_set(&serial->port, NULL);
  		if (!usb_gone)
  			hso_stop_serial_device(serial->parent);
-@@ -1404,7 +1403,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
+@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
  
  	/* the actual setup */
  	spin_lock_irqsave(&serial->serial_lock, flags);
@@ -48840,7 +48533,7 @@ index 9c5aa92..8cd0405 100644
  		_hso_serial_set_termios(tty, old);
  	else
  		tty->termios = *old;
-@@ -1873,7 +1872,7 @@ static void intr_callback(struct urb *urb)
+@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
  				D1("Pending read interrupt on port %d\n", i);
  				spin_lock(&serial->serial_lock);
  				if (serial->rx_state == RX_IDLE &&
@@ -48849,7 +48542,7 @@ index 9c5aa92..8cd0405 100644
  					/* Setup and send a ctrl req read on
  					 * port i */
  					if (!serial->rx_urb_filled[0]) {
-@@ -3046,7 +3045,7 @@ static int hso_resume(struct usb_interface *iface)
+@@ -3053,7 +3052,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)) {
@@ -48859,10 +48552,10 @@ index 9c5aa92..8cd0405 100644
  				    hso_start_serial_device(serial_table[i], GFP_NOIO);
  				hso_kick_transmit(dev2ser(serial_table[i]));
 diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
-index bf405f1..fd847ee 100644
+index 9f7c0ab..1577b4a 100644
 --- a/drivers/net/usb/r8152.c
 +++ b/drivers/net/usb/r8152.c
-@@ -571,7 +571,7 @@ struct r8152 {
+@@ -601,7 +601,7 @@ struct r8152 {
  		void (*unload)(struct r8152 *);
  		int (*eee_get)(struct r8152 *, struct ethtool_eee *);
  		int (*eee_set)(struct r8152 *, struct ethtool_eee *);
@@ -48894,7 +48587,7 @@ index a2515887..6d13233 100644
  
  	/* we will have to manufacture ethernet headers, prepare template */
 diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
-index 0ad6c0c..4013638 100644
+index 59b0e97..a6ed579 100644
 --- a/drivers/net/virtio_net.c
 +++ b/drivers/net/virtio_net.c
 @@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
@@ -48907,11 +48600,11 @@ index 0ad6c0c..4013638 100644
  #define VIRTNET_DRIVER_VERSION "1.0.0"
  
 diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
-index 6c83846..215144b 100644
+index fceb637..37c70fd 100644
 --- a/drivers/net/vxlan.c
 +++ b/drivers/net/vxlan.c
-@@ -2702,7 +2702,7 @@ nla_put_failure:
- 	return -EMSGSIZE;
+@@ -2935,7 +2935,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
+ 	return vxlan->net;
  }
  
 -static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
@@ -48919,7 +48612,7 @@ index 6c83846..215144b 100644
  	.kind		= "vxlan",
  	.maxtype	= IFLA_VXLAN_MAX,
  	.policy		= vxlan_policy,
-@@ -2749,7 +2749,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
+@@ -2983,7 +2983,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
  	return NOTIFY_DONE;
  }
  
@@ -49136,10 +48829,10 @@ index da92bfa..5a9001a 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 f1946a6..cd367fb 100644
+index 2fd9e18..3f55bdd 100644
 --- a/drivers/net/wireless/ath/ath10k/htc.c
 +++ b/drivers/net/wireless/ath/ath10k/htc.c
-@@ -851,7 +851,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
+@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
  /* registered target arrival callback from the HIF layer */
  int ath10k_htc_init(struct ath10k *ar)
  {
@@ -49151,7 +48844,7 @@ index f1946a6..cd367fb 100644
  	struct ath10k_htc_ep *ep = NULL;
  	struct ath10k_htc *htc = &ar->htc;
  
-@@ -860,8 +863,6 @@ int ath10k_htc_init(struct ath10k *ar)
+@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
  	ath10k_htc_reset_endpoint_states(htc);
  
  	/* setup HIF layer callbacks */
@@ -49404,10 +49097,10 @@ index da84b70..83e4978 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 1cbd335..27dfb40 100644
+index e82e570..8c3cf90 100644
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -640,7 +640,7 @@ struct ath_hw_private_ops {
+@@ -646,7 +646,7 @@ struct ath_hw_private_ops {
  
  	/* ANI */
  	void (*ani_cache_ini_regs)(struct ath_hw *ah);
@@ -49416,7 +49109,7 @@ index 1cbd335..27dfb40 100644
  
  /**
   * struct ath_spec_scan - parameters for Atheros spectral scan
-@@ -716,7 +716,7 @@ struct ath_hw_ops {
+@@ -722,7 +722,7 @@ struct ath_hw_ops {
  #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
  	void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
  #endif
@@ -49426,10 +49119,10 @@ index 1cbd335..27dfb40 100644
  struct ath_nf_limits {
  	s16 max;
 diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
-index 62b0bf4..4ae094c 100644
+index 9ede991..a8f08fb 100644
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -2546,16 +2546,18 @@ void ath9k_fill_chanctx_ops(void)
+@@ -2537,16 +2537,18 @@ void ath9k_fill_chanctx_ops(void)
  	if (!ath9k_is_chanctx_enabled())
  		return;
  
@@ -49472,10 +49165,10 @@ index 058a9f2..d5cb1ba 100644
  	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 dc1d20c..f7a4f06 100644
+index e566580..2c218ca 100644
 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
-@@ -3633,7 +3633,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
  	 */
  	if (il3945_mod_params.disable_hw_scan) {
  		D_INFO("Disabling hw_scan\n");
@@ -49623,10 +49316,10 @@ index 0ffb6ff..c0b7f0e 100644
  	memset(buf, 0, sizeof(buf));
  	buf_size = min(count, sizeof(buf) - 1);
 diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
-index 523fe0c..0d9473b 100644
+index 69935aa..c1ca128 100644
 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
 +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
-@@ -1781,7 +1781,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
+@@ -1836,7 +1836,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
  	struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
  
  	char buf[8];
@@ -49635,7 +49328,7 @@ index 523fe0c..0d9473b 100644
  	u32 reset_flag;
  
  	memset(buf, 0, sizeof(buf));
-@@ -1802,7 +1802,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
+@@ -1857,7 +1857,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
  {
  	struct iwl_trans *trans = file->private_data;
  	char buf[8];
@@ -49645,10 +49338,10 @@ index 523fe0c..0d9473b 100644
  
  	memset(buf, 0, sizeof(buf));
 diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
-index ef58a88..fafa731 100644
+index 8908be6..fe97ddd 100644
 --- a/drivers/net/wireless/mac80211_hwsim.c
 +++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -3066,20 +3066,20 @@ static int __init init_mac80211_hwsim(void)
+@@ -3070,20 +3070,20 @@ static int __init init_mac80211_hwsim(void)
  	if (channels < 1)
  		return -EINVAL;
  
@@ -49684,7 +49377,7 @@ index ef58a88..fafa731 100644
  	spin_lock_init(&hwsim_radio_lock);
  	INIT_LIST_HEAD(&hwsim_radios);
 diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
-index 1a4facd..a2ecbbd 100644
+index 60d44ce..884dd1c 100644
 --- a/drivers/net/wireless/rndis_wlan.c
 +++ b/drivers/net/wireless/rndis_wlan.c
 @@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
@@ -49710,7 +49403,7 @@ index 9bb398b..b0cc047 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 66ff364..3ce34f7 100644
+index 68b620b..92ecd9e 100644
 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
 @@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
@@ -49752,10 +49445,10 @@ index b661f896..ddf7d2b 100644
  		wl1251_info("using SDIO interrupt");
  	}
 diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
-index d6d0d6d..60c23a0 100644
+index 144d1f8..7030936 100644
 --- a/drivers/net/wireless/ti/wl12xx/main.c
 +++ b/drivers/net/wireless/ti/wl12xx/main.c
-@@ -656,7 +656,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
+@@ -657,7 +657,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
  		       sizeof(wl->conf.mem));
  
  		/* read data preparation is only needed by wl127x */
@@ -49766,7 +49459,7 @@ index d6d0d6d..60c23a0 100644
  
  		wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
  			      WL127X_IFTYPE_SR_VER,  WL127X_MAJOR_SR_VER,
-@@ -681,7 +683,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
+@@ -682,7 +684,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
  		       sizeof(wl->conf.mem));
  
  		/* read data preparation is only needed by wl127x */
@@ -49778,10 +49471,10 @@ index d6d0d6d..60c23a0 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 8e56261..9140678 100644
+index 717c4f5..a813aeb 100644
 --- a/drivers/net/wireless/ti/wl18xx/main.c
 +++ b/drivers/net/wireless/ti/wl18xx/main.c
-@@ -1916,8 +1916,10 @@ static int wl18xx_setup(struct wl1271 *wl)
+@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
  	}
  
  	if (!checksum_param) {
@@ -49821,10 +49514,10 @@ index ce2e2cf..f81e500 100644
  	__u32 protocols;
  
 diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
-index f2596c8..50d53af 100644
+index 24d3d24..ff70d28 100644
 --- a/drivers/nfc/st21nfca/st21nfca.c
 +++ b/drivers/nfc/st21nfca/st21nfca.c
-@@ -559,7 +559,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
+@@ -588,7 +588,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
  		goto exit;
  	}
  
@@ -49834,7 +49527,7 @@ index f2596c8..50d53af 100644
  exit:
  	kfree_skb(uid_skb);
 diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
-index 5100742..6ad4e6d 100644
+index 3a896c9..ac7b1c8 100644
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
 @@ -1118,7 +1118,9 @@ static int __init of_fdt_raw_init(void)
@@ -50027,6 +49720,72 @@ index 3b47080..6cd05dd 100644
  }
  #endif /* IEEE1284.3 support. */
  
+diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
+index ba46e58..90cfc24 100644
+--- a/drivers/pci/host/pci-host-generic.c
++++ b/drivers/pci/host/pci-host-generic.c
+@@ -26,9 +26,9 @@
+ #include <linux/platform_device.h>
+ 
+ struct gen_pci_cfg_bus_ops {
++	struct pci_ops ops;
+ 	u32 bus_shift;
+-	void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
+-};
++} __do_const;
+ 
+ struct gen_pci_cfg_windows {
+ 	struct resource				res;
+@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
+ }
+ 
+ static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
++	.ops = {
++		.map_bus	= gen_pci_map_cfg_bus_cam,
++		.read		= pci_generic_config_read,
++		.write		= pci_generic_config_write,
++	},
+ 	.bus_shift	= 16,
+-	.map_bus	= gen_pci_map_cfg_bus_cam,
+ };
+ 
+ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
+@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
+ }
+ 
+ static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
++	.ops = {
++		.map_bus	= gen_pci_map_cfg_bus_ecam,
++		.read		= pci_generic_config_read,
++		.write		= pci_generic_config_write,
++	},
+ 	.bus_shift	= 20,
+-	.map_bus	= gen_pci_map_cfg_bus_ecam,
+-};
+-
+-static struct pci_ops gen_pci_ops = {
+-	.read	= pci_generic_config_read,
+-	.write	= pci_generic_config_write,
+ };
+ 
+ static const struct of_device_id gen_pci_of_match[] = {
+@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
+ 		.private_data	= (void **)&pci,
+ 		.setup		= gen_pci_setup,
+ 		.map_irq	= of_irq_parse_and_map_pci,
+-		.ops		= &gen_pci_ops,
+ 	};
+ 
+ 	if (!pci)
+@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
+ 
+ 	of_id = of_match_node(gen_pci_of_match, np);
+ 	pci->cfg.ops = of_id->data;
+-	gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
++	hw.ops = &pci->cfg.ops->ops;
+ 	pci->host.dev.parent = dev;
+ 	INIT_LIST_HEAD(&pci->host.windows);
+ 	INIT_LIST_HEAD(&pci->resources);
 diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
 index 6ca2399..68d866b 100644
 --- a/drivers/pci/hotplug/acpiphp_ibm.c
@@ -50164,7 +49923,7 @@ index 07aa722..84514b4 100644
  	int retval = -ENOMEM;
  
 diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
-index fd60806..ab6c565 100644
+index c3e7dfc..cbd9625 100644
 --- a/drivers/pci/msi.c
 +++ b/drivers/pci/msi.c
 @@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
@@ -50219,10 +49978,10 @@ index 312f23a..d21181c 100644
  	if (!sysfs_initialized)
  		return -EACCES;
 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index d54632a..198c84d 100644
+index 4091f82..7d98eef 100644
 --- a/drivers/pci/pci.h
 +++ b/drivers/pci/pci.h
-@@ -93,7 +93,7 @@ struct pci_vpd_ops {
+@@ -99,7 +99,7 @@ struct pci_vpd_ops {
  struct pci_vpd {
  	unsigned int len;
  	const struct pci_vpd_ops *ops;
@@ -50232,7 +49991,7 @@ index d54632a..198c84d 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 e1e7026..d28dd33 100644
+index 820740a..8b1c673 100644
 --- a/drivers/pci/pcie/aspm.c
 +++ b/drivers/pci/pcie/aspm.c
 @@ -27,9 +27,9 @@
@@ -50262,7 +50021,7 @@ index be35da2..ec16cdb 100644
  	 * Boxes that should not use MSI for PCIe PME signaling.
  	 */
 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index 23212f8..65e945b 100644
+index 8d2f400..c97cc91 100644
 --- a/drivers/pci/probe.c
 +++ b/drivers/pci/probe.c
 @@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
@@ -50480,10 +50239,10 @@ index 6d2bac0..ec2b029 100644
  	acpi_status status;
  
 diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
-index ce364a4..5074643 100644
+index 9e701b2..c68a7b5 100644
 --- a/drivers/platform/x86/samsung-laptop.c
 +++ b/drivers/platform/x86/samsung-laptop.c
-@@ -1465,7 +1465,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
+@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
  	return 0;
  }
  
@@ -50506,7 +50265,7 @@ index e6aac72..e11ff24 100644
  		.ident = "Samsung Q10",
  		.matches = {
 diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
-index 6dd1c0e..78b9f0a 100644
+index e51c1e7..71bb385 100644
 --- a/drivers/platform/x86/sony-laptop.c
 +++ b/drivers/platform/x86/sony-laptop.c
 @@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
@@ -50573,10 +50332,10 @@ index 6dd1c0e..78b9f0a 100644
  		.ident = "Sony Vaio",
  		.matches = {
 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
-index c3d11fa..f83cded 100644
+index 3b8ceee..e18652c 100644
 --- a/drivers/platform/x86/thinkpad_acpi.c
 +++ b/drivers/platform/x86/thinkpad_acpi.c
-@@ -2092,7 +2092,7 @@ static int hotkey_mask_get(void)
+@@ -2093,7 +2093,7 @@ static int hotkey_mask_get(void)
  	return 0;
  }
  
@@ -50585,7 +50344,7 @@ index c3d11fa..f83cded 100644
  {
  	/* log only what the user can fix... */
  	const u32 wantedmask = hotkey_driver_mask &
-@@ -2436,10 +2436,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
+@@ -2437,10 +2437,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);
  	}
@@ -50658,10 +50417,10 @@ index 438d4c7..ca8a2fb 100644
 +	pax_close_kernel();
  }
 diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
-index 074569e..d807bef 100644
+index facd43b..b291260 100644
 --- a/drivers/pnp/pnpbios/core.c
 +++ b/drivers/pnp/pnpbios/core.c
-@@ -493,7 +493,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
+@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
  	return 0;
  }
  
@@ -50979,24 +50738,24 @@ index 302e626..12579af 100644
  		da->attr.name = info->pin_config[i].name;
  		da->attr.mode = 0644;
 diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
-index a5761d0..a2a4540 100644
+index a4a8a6d..a3456f4 100644
 --- a/drivers/regulator/core.c
 +++ b/drivers/regulator/core.c
-@@ -3591,7 +3591,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
- {
+@@ -3529,7 +3529,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
  	const struct regulation_constraints *constraints = NULL;
  	const struct regulator_init_data *init_data;
--	static atomic_t regulator_no = ATOMIC_INIT(0);
-+	static atomic_unchecked_t regulator_no = ATOMIC_INIT(0);
+ 	struct regulator_config *config = NULL;
+-	static atomic_t regulator_no = ATOMIC_INIT(-1);
++	static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
  	struct regulator_dev *rdev;
  	struct device *dev;
  	int ret, i;
-@@ -3665,7 +3665,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
+@@ -3613,7 +3613,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
  	rdev->dev.class = &regulator_class;
  	rdev->dev.parent = dev;
- 	dev_set_name(&rdev->dev, "regulator.%d",
--		     atomic_inc_return(&regulator_no) - 1);
-+		     atomic_inc_return_unchecked(&regulator_no) - 1);
+ 	dev_set_name(&rdev->dev, "regulator.%lu",
+-		    (unsigned long) atomic_inc_return(&regulator_no));
++		    (unsigned long) atomic_inc_return_unchecked(&regulator_no));
  	ret = device_register(&rdev->dev);
  	if (ret != 0) {
  		put_device(&rdev->dev);
@@ -51072,7 +50831,7 @@ index 5b2e761..c8c8a4a 100644
  	if (retval < 0) {
  		dev_dbg(dev, "can't create nvram file? %d\n", retval);
 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
-index d049393..bb20be0 100644
+index 799c34b..8e9786a 100644
 --- a/drivers/rtc/rtc-dev.c
 +++ b/drivers/rtc/rtc-dev.c
 @@ -16,6 +16,7 @@
@@ -51315,10 +51074,10 @@ index 8bb173e..20236b4 100644
  
  	/* These three are default values which can be overridden */
 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 6bb4611..0203251 100644
+index a1cfbd3..d7f8ebc 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
-@@ -701,10 +701,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
+@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
  	struct reply_queue_buffer *rq = &h->reply_queue[q];
  
  	if (h->transMethod & CFGTBL_Trans_io_accel1)
@@ -51331,25 +51090,16 @@ index 6bb4611..0203251 100644
  
  	if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
  		a = rq->head[rq->current_entry];
-@@ -5360,7 +5360,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
- 	while (!list_empty(&h->reqQ)) {
- 		c = list_entry(h->reqQ.next, struct CommandList, list);
- 		/* can't do anything if fifo is full */
--		if ((h->access.fifo_full(h))) {
-+		if ((h->access->fifo_full(h))) {
- 			h->fifo_recently_full = 1;
- 			dev_warn(&h->pdev->dev, "fifo full\n");
- 			break;
-@@ -5376,7 +5376,7 @@ static void start_io(struct ctlr_info *h, unsigned long *flags)
- 		atomic_inc(&h->commands_outstanding);
- 		spin_unlock_irqrestore(&h->lock, *flags);
- 		/* Tell the controller execute command */
+@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
+ 		break;
+ 	default:
+ 		set_performant_mode(h, c);
 -		h->access.submit_command(h, c);
 +		h->access->submit_command(h, c);
- 		spin_lock_irqsave(&h->lock, *flags);
  	}
  }
-@@ -5392,17 +5392,17 @@ static void lock_and_start_io(struct ctlr_info *h)
+ 
+@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
  
  static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
  {
@@ -51370,16 +51120,16 @@ index 6bb4611..0203251 100644
  		(h->interrupts_enabled == 0);
  }
  
-@@ -6343,7 +6343,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
+@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
  	if (prod_index < 0)
- 		return -ENODEV;
+ 		return prod_index;
  	h->product_name = products[prod_index].product_name;
 -	h->access = *(products[prod_index].access);
 +	h->access = products[prod_index].access;
  
  	pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
  			       PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
-@@ -6690,7 +6690,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
+@@ -6649,7 +6649,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
  	unsigned long flags;
  	u32 lockup_detected;
  
@@ -51388,25 +51138,25 @@ index 6bb4611..0203251 100644
  	spin_lock_irqsave(&h->lock, flags);
  	lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
  	if (!lockup_detected) {
-@@ -6937,7 +6937,7 @@ reinit_after_soft_reset:
+@@ -6924,7 +6924,7 @@ reinit_after_soft_reset:
  	}
  
  	/* make sure the board interrupts are off */
 -	h->access.set_intr_mask(h, HPSA_INTR_OFF);
 +	h->access->set_intr_mask(h, HPSA_INTR_OFF);
  
- 	if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
+ 	if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
  		goto clean2;
-@@ -6972,7 +6972,7 @@ reinit_after_soft_reset:
+@@ -6960,7 +6960,7 @@ reinit_after_soft_reset:
  		 * fake ones to scoop up any residual completions.
  		 */
  		spin_lock_irqsave(&h->lock, flags);
 -		h->access.set_intr_mask(h, HPSA_INTR_OFF);
 +		h->access->set_intr_mask(h, HPSA_INTR_OFF);
  		spin_unlock_irqrestore(&h->lock, flags);
- 		free_irqs(h);
- 		rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
-@@ -6991,9 +6991,9 @@ reinit_after_soft_reset:
+ 		hpsa_free_irqs(h);
+ 		rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
+@@ -6979,9 +6979,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");
@@ -51418,8 +51168,8 @@ index 6bb4611..0203251 100644
  
  		rc = controller_reset_failed(h->cfgtable);
  		if (rc)
-@@ -7019,7 +7019,7 @@ reinit_after_soft_reset:
- 	h->drv_req_rescan = 0;
+@@ -7006,7 +7006,7 @@ reinit_after_soft_reset:
+ 
  
  	/* Turn the interrupts on so we can service requests */
 -	h->access.set_intr_mask(h, HPSA_INTR_ON);
@@ -51427,7 +51177,7 @@ index 6bb4611..0203251 100644
  
  	hpsa_hba_inquiry(h);
  	hpsa_register_scsi(h);	/* hook ourselves into SCSI subsystem */
-@@ -7084,7 +7084,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
+@@ -7079,7 +7079,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
  	 * To write all data in the battery backed cache to disks
  	 */
  	hpsa_flush_cache(h);
@@ -51436,7 +51186,7 @@ index 6bb4611..0203251 100644
  	hpsa_free_irqs_and_disable_msix(h);
  }
  
-@@ -7202,7 +7202,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
+@@ -7200,7 +7200,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
  				CFGTBL_Trans_enable_directed_msix |
  			(trans_support & (CFGTBL_Trans_io_accel1 |
  				CFGTBL_Trans_io_accel2));
@@ -51445,7 +51195,7 @@ index 6bb4611..0203251 100644
  
  	/* This is a bit complicated.  There are 8 registers on
  	 * the controller which we write to to tell it 8 different
-@@ -7244,7 +7244,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
+@@ -7242,7 +7242,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
  	 * perform the superfluous readl() after each command submission.
  	 */
  	if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
@@ -51454,7 +51204,7 @@ index 6bb4611..0203251 100644
  
  	/* Controller spec: zero out this buffer. */
  	for (i = 0; i < h->nreply_queues; i++)
-@@ -7274,12 +7274,12 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
+@@ -7272,12 +7272,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
  	 * enable outbound interrupt coalescing in accelerator mode;
  	 */
  	if (trans_support & CFGTBL_Trans_io_accel1) {
@@ -51470,10 +51220,10 @@ index 6bb4611..0203251 100644
  			writel(4, &h->cfgtable->HostWrite.CoalIntCount);
  		}
 diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
-index 8e06d9e..396e0a1 100644
+index 6577130..955f9a4 100644
 --- a/drivers/scsi/hpsa.h
 +++ b/drivers/scsi/hpsa.h
-@@ -127,7 +127,7 @@ struct ctlr_info {
+@@ -143,7 +143,7 @@ struct ctlr_info {
  	unsigned int msix_vector;
  	unsigned int msi_vector;
  	int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
@@ -51482,18 +51232,16 @@ index 8e06d9e..396e0a1 100644
  	char hba_mode_enabled;
  
  	/* queue and queue Info */
-@@ -523,43 +523,43 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
+@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
  }
  
  static struct access_method SA5_access = {
 -	SA5_submit_command,
 -	SA5_intr_mask,
--	SA5_fifo_full,
 -	SA5_intr_pending,
 -	SA5_completed,
 +	.submit_command = SA5_submit_command,
 +	.set_intr_mask = SA5_intr_mask,
-+	.fifo_full = SA5_fifo_full,
 +	.intr_pending = SA5_intr_pending,
 +	.command_completed = SA5_completed,
  };
@@ -51501,12 +51249,10 @@ index 8e06d9e..396e0a1 100644
  static struct access_method SA5_ioaccel_mode1_access = {
 -	SA5_submit_command,
 -	SA5_performant_intr_mask,
--	SA5_fifo_full,
 -	SA5_ioaccel_mode1_intr_pending,
 -	SA5_ioaccel_mode1_completed,
 +	.submit_command = SA5_submit_command,
 +	.set_intr_mask = SA5_performant_intr_mask,
-+	.fifo_full = SA5_fifo_full,
 +	.intr_pending = SA5_ioaccel_mode1_intr_pending,
 +	.command_completed = SA5_ioaccel_mode1_completed,
  };
@@ -51514,12 +51260,10 @@ index 8e06d9e..396e0a1 100644
  static struct access_method SA5_ioaccel_mode2_access = {
 -	SA5_submit_command_ioaccel2,
 -	SA5_performant_intr_mask,
--	SA5_fifo_full,
 -	SA5_performant_intr_pending,
 -	SA5_performant_completed,
 +	.submit_command = SA5_submit_command_ioaccel2,
 +	.set_intr_mask = SA5_performant_intr_mask,
-+	.fifo_full = SA5_fifo_full,
 +	.intr_pending = SA5_performant_intr_pending,
 +	.command_completed = SA5_performant_completed,
  };
@@ -51527,12 +51271,10 @@ index 8e06d9e..396e0a1 100644
  static struct access_method SA5_performant_access = {
 -	SA5_submit_command,
 -	SA5_performant_intr_mask,
--	SA5_fifo_full,
 -	SA5_performant_intr_pending,
 -	SA5_performant_completed,
 +	.submit_command = SA5_submit_command,
 +	.set_intr_mask = SA5_performant_intr_mask,
-+	.fifo_full = SA5_fifo_full,
 +	.intr_pending = SA5_performant_intr_pending,
 +	.command_completed = SA5_performant_completed,
  };
@@ -51540,12 +51282,10 @@ index 8e06d9e..396e0a1 100644
  static struct access_method SA5_performant_access_no_read = {
 -	SA5_submit_command_no_read,
 -	SA5_performant_intr_mask,
--	SA5_fifo_full,
 -	SA5_performant_intr_pending,
 -	SA5_performant_completed,
 +	.submit_command = SA5_submit_command_no_read,
 +	.set_intr_mask = SA5_performant_intr_mask,
-+	.fifo_full = SA5_fifo_full,
 +	.intr_pending = SA5_performant_intr_pending,
 +	.command_completed = SA5_performant_completed,
  };
@@ -51697,7 +51437,7 @@ index 1b3a094..068e683 100644
  }
  EXPORT_SYMBOL(fc_exch_update_stats);
 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
-index 932d9cc..50c7ee9 100644
+index 9c706d8..d3e3ed2 100644
 --- a/drivers/scsi/libsas/sas_ata.c
 +++ b/drivers/scsi/libsas/sas_ata.c
 @@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
@@ -51878,10 +51618,10 @@ index 4f9222e..f1850e3 100644
  
  /**
 diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
-index 6a1c036..38e0e8d 100644
+index 3f26147..ee8efd1 100644
 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
 +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
-@@ -1508,7 +1508,7 @@ _scsih_get_resync(struct device *dev)
+@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
  {
  	struct scsi_device *sdev = to_scsi_device(dev);
  	struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
@@ -51890,7 +51630,7 @@ index 6a1c036..38e0e8d 100644
  	unsigned long flags;
  	Mpi2RaidVolPage0_t vol_pg0;
  	Mpi2ConfigReply_t mpi_reply;
-@@ -1560,7 +1560,7 @@ _scsih_get_state(struct device *dev)
+@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
  {
  	struct scsi_device *sdev = to_scsi_device(dev);
  	struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
@@ -51899,7 +51639,7 @@ index 6a1c036..38e0e8d 100644
  	unsigned long flags;
  	Mpi2RaidVolPage0_t vol_pg0;
  	Mpi2ConfigReply_t mpi_reply;
-@@ -6602,7 +6602,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
+@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
  	Mpi2EventDataIrOperationStatus_t *event_data =
  		(Mpi2EventDataIrOperationStatus_t *)
  		fw_event->event_data;
@@ -51908,7 +51648,7 @@ index 6a1c036..38e0e8d 100644
  	unsigned long flags;
  	u16 handle;
  
-@@ -7073,7 +7073,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
+@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
  	u64 sas_address;
  	struct _sas_device *sas_device;
  	struct _sas_node *expander_device;
@@ -51918,7 +51658,7 @@ index 6a1c036..38e0e8d 100644
  	unsigned long flags;
  
 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
-index 8c27b6a..607f56e 100644
+index ed31d8c..ab856b3 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)
@@ -51932,7 +51672,7 @@ index 8c27b6a..607f56e 100644
  		rc = 0;
  	}
  	spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
-@@ -2646,9 +2646,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
+@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
  
  	/* If this was a SCSI read/write command keep count of errors */
  	if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
@@ -51944,7 +51684,7 @@ index 8c27b6a..607f56e 100644
  
  	if (!RES_IS_GSCSI(res->cfg_entry) &&
  		masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
-@@ -3474,7 +3474,7 @@ static int pmcraid_queuecommand_lck(
+@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
  	 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
  	 * hrrq_id assigned here in queuecommand
  	 */
@@ -51953,7 +51693,7 @@ index 8c27b6a..607f56e 100644
  			  pinstance->num_hrrq;
  	cmd->cmd_done = pmcraid_io_done;
  
-@@ -3788,7 +3788,7 @@ static long pmcraid_ioctl_passthrough(
+@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
  	 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
  	 * hrrq_id assigned here in queuecommand
  	 */
@@ -51962,7 +51702,7 @@ index 8c27b6a..607f56e 100644
  			  pinstance->num_hrrq;
  
  	if (request_size) {
-@@ -4426,7 +4426,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
+@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
  
  	pinstance = container_of(workp, struct pmcraid_instance, worker_q);
  	/* add resources only after host is added into system */
@@ -51971,7 +51711,7 @@ index 8c27b6a..607f56e 100644
  		return;
  
  	fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
-@@ -5243,8 +5243,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
+@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
  	init_waitqueue_head(&pinstance->reset_wait_q);
  
  	atomic_set(&pinstance->outstanding_cmds, 0);
@@ -51982,7 +51722,7 @@ index 8c27b6a..607f56e 100644
  
  	INIT_LIST_HEAD(&pinstance->free_res_q);
  	INIT_LIST_HEAD(&pinstance->used_res_q);
-@@ -5957,7 +5957,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
+@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
  	/* Schedule worker thread to handle CCN and take care of adding and
  	 * removing devices to OS
  	 */
@@ -52120,7 +51860,7 @@ index 6d25879..3031a9f 100644
  	ddb_entry->default_relogin_timeout =
  		(def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
-index 7129701..b49c4e5 100644
+index b1a2631..5bcd9c8 100644
 --- a/drivers/scsi/scsi_lib.c
 +++ b/drivers/scsi/scsi_lib.c
 @@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
@@ -52269,7 +52009,7 @@ index ae45bd9..c32a586 100644
  
  	transport_setup_device(&rport->dev);
 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 05ea0d4..5af8049 100644
+index 6b78476..d40476f 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
 @@ -3006,7 +3006,7 @@ static int sd_probe(struct device *dev)
@@ -52282,10 +52022,10 @@ index 05ea0d4..5af8049 100644
  	if (!sdp->request_queue->rq_timeout) {
  		if (sdp->type != TYPE_MOD)
 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
-index dbf8e77..0d565c7 100644
+index 2270bd5..98408a5 100644
 --- a/drivers/scsi/sg.c
 +++ b/drivers/scsi/sg.c
-@@ -1098,7 +1098,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
+@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
  				       sdp->disk->disk_name,
  				       MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
  				       NULL,
@@ -52295,7 +52035,7 @@ index dbf8e77..0d565c7 100644
  		return blk_trace_startstop(sdp->device->request_queue, 1);
  	case BLKTRACESTOP:
 diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
-index 011a336..fb2b7a0 100644
+index c0d660f..24a5854 100644
 --- a/drivers/soc/tegra/fuse/fuse-tegra.c
 +++ b/drivers/soc/tegra/fuse/fuse-tegra.c
 @@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
@@ -52308,10 +52048,10 @@ index 011a336..fb2b7a0 100644
  	.read = fuse_read,
  };
 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index a17f533..a2ff039 100644
+index 57a1950..ae54e21 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -2239,7 +2239,7 @@ int spi_bus_unlock(struct spi_master *master)
+@@ -2307,7 +2307,7 @@ int spi_bus_unlock(struct spi_master *master)
  EXPORT_SYMBOL_GPL(spi_bus_unlock);
  
  /* portable code must never pass more than 32 bytes */
@@ -52352,10 +52092,10 @@ index b41429f..2de5373 100644
  		MKDEV(0, tdev->index), NULL, "%s", tdev->name);
  	if (IS_ERR(tdev->dev))
 diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
-index f143cb6..6fb8255 100644
+index 727640e..55bf61c 100644
 --- a/drivers/staging/comedi/comedi_fops.c
 +++ b/drivers/staging/comedi/comedi_fops.c
-@@ -273,8 +273,8 @@ static void comedi_file_reset(struct file *file)
+@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
  	}
  	cfp->last_attached = dev->attached;
  	cfp->last_detach_count = dev->detach_count;
@@ -52366,7 +52106,7 @@ index f143cb6..6fb8255 100644
  }
  
  static void comedi_file_check(struct file *file)
-@@ -1885,7 +1885,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
+@@ -1924,7 +1924,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
  	    !(s_old->async->cmd.flags & CMDF_WRITE))
  		return -EBUSY;
  
@@ -52375,7 +52115,7 @@ index f143cb6..6fb8255 100644
  	return 0;
  }
  
-@@ -1927,7 +1927,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
+@@ -1966,7 +1966,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
  	    (s_old->async->cmd.flags & CMDF_WRITE))
  		return -EBUSY;
  
@@ -52384,6 +52124,32 @@ index f143cb6..6fb8255 100644
  	return 0;
  }
  
+diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
+index 37dcf7e..f3c2016 100644
+--- a/drivers/staging/fbtft/fbtft-core.c
++++ b/drivers/staging/fbtft/fbtft-core.c
+@@ -689,7 +689,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
+ {
+ 	struct fb_info *info;
+ 	struct fbtft_par *par;
+-	struct fb_ops *fbops = NULL;
++	fb_ops_no_const *fbops = NULL;
+ 	struct fb_deferred_io *fbdefio = NULL;
+ 	struct fbtft_platform_data *pdata = dev->platform_data;
+ 	u8 *vmem = NULL;
+diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
+index 0dbf3f9..fed0063 100644
+--- a/drivers/staging/fbtft/fbtft.h
++++ b/drivers/staging/fbtft/fbtft.h
+@@ -106,7 +106,7 @@ struct fbtft_ops {
+ 
+ 	int (*set_var)(struct fbtft_par *par);
+ 	int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
+-};
++} __no_const;
+ 
+ /**
+  * struct fbtft_display - Describes the display properties
 diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
 index 001348c..cfaac8a 100644
 --- a/drivers/staging/gdm724x/gdm_tty.c
@@ -52397,141 +52163,210 @@ index 001348c..cfaac8a 100644
  
  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/line6/driver.c b/drivers/staging/line6/driver.c
-index 503b2d7..c904931 100644
---- a/drivers/staging/line6/driver.c
-+++ b/drivers/staging/line6/driver.c
-@@ -463,7 +463,7 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
+diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
+index d23c3c2..eb63c81 100644
+--- a/drivers/staging/i2o/i2o.h
++++ b/drivers/staging/i2o/i2o.h
+@@ -565,7 +565,7 @@ struct i2o_controller {
+ 	struct i2o_device *exec;	/* Executive */
+ #if BITS_PER_LONG == 64
+ 	spinlock_t context_list_lock;	/* lock for context_list */
+-	atomic_t context_list_counter;	/* needed for unique contexts */
++	atomic_unchecked_t context_list_counter;	/* needed for unique contexts */
+ 	struct list_head context_list;	/* list of context id's
+ 					   and pointers */
+ #endif
+diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
+index ad84f33..c5bdf65 100644
+--- a/drivers/staging/i2o/i2o_proc.c
++++ b/drivers/staging/i2o/i2o_proc.c
+@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
+ 	"Array Controller Device"
+ };
+ 
+-static char *chtostr(char *tmp, u8 *chars, int n)
+-{
+-	tmp[0] = 0;
+-	return strncat(tmp, (char *)chars, n);
+-}
+-
+ static int i2o_report_query_status(struct seq_file *seq, int block_status,
+ 				   char *group)
  {
- 	struct usb_device *usbdev = line6->usbdev;
- 	int ret;
--	unsigned char len;
-+	unsigned char *plen;
+@@ -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;
  
- 	/* query the serial number: */
- 	ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
-@@ -476,27 +476,34 @@ int line6_read_data(struct usb_line6 *line6, int address, void *data,
- 		return ret;
- 	}
+@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
+ 	} *result;
  
-+	plen = kmalloc(1, GFP_KERNEL);
-+	if (plen == NULL)
-+		return -ENOMEM;
-+
- 	/* Wait for data length. We'll get 0xff until length arrives. */
- 	do {
- 		ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
- 				      USB_TYPE_VENDOR | USB_RECIP_DEVICE |
- 				      USB_DIR_IN,
--				      0x0012, 0x0000, &len, 1,
-+				      0x0012, 0x0000, plen, 1,
- 				      LINE6_TIMEOUT * HZ);
- 		if (ret < 0) {
- 			dev_err(line6->ifcdev,
- 				"receive length failed (error %d)\n", ret);
-+			kfree(plen);
- 			return ret;
- 		}
--	} while (len == 0xff);
-+	} while (*plen == 0xff);
+ 	i2o_exec_execute_ddm_table ddm_table;
+-	char tmp[28 + 1];
  
--	if (len != datalen) {
-+	if (*plen != datalen) {
- 		/* should be equal or something went wrong */
- 		dev_err(line6->ifcdev,
- 			"length mismatch (expected %d, got %d)\n",
--			(int)datalen, (int)len);
-+			(int)datalen, (int)*plen);
-+		kfree(plen);
- 		return -EINVAL;
- 	}
-+	kfree(plen);
+ 	result = kmalloc(sizeof(*result), GFP_KERNEL);
+ 	if (!result)
+@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
  
- 	/* receive the result: */
- 	ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
-@@ -520,7 +527,7 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
+ 		seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
+ 		seq_printf(seq, "%-#8x", ddm_table.module_id);
+-		seq_printf(seq, "%-29s",
+-			   chtostr(tmp, ddm_table.module_name_version, 28));
++		seq_printf(seq, "%-.28s", ddm_table.module_name_version);
+ 		seq_printf(seq, "%9d  ", ddm_table.data_size);
+ 		seq_printf(seq, "%8d", ddm_table.code_size);
+ 
+@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
+ 
+ 	i2o_driver_result_table *result;
+ 	i2o_driver_store_table *dst;
+-	char tmp[28 + 1];
+ 
+ 	result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
+ 	if (result == NULL)
+@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
+ 
+ 		seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
+ 		seq_printf(seq, "%-#8x", dst->module_id);
+-		seq_printf(seq, "%-29s",
+-			   chtostr(tmp, dst->module_name_version, 28));
+-		seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
++		seq_printf(seq, "%-.28s", dst->module_name_version);
++		seq_printf(seq, "%-.8s", dst->date);
+ 		seq_printf(seq, "%8d ", dst->module_size);
+ 		seq_printf(seq, "%8d ", dst->mpb_size);
+ 		seq_printf(seq, "0x%04x", dst->module_flags);
+@@ -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 usb_device *usbdev = line6->usbdev;
- 	int ret;
--	unsigned char status;
-+	unsigned char *status;
+ 	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;
++	u16 *work16 = (u16 *) work32;
+ 	int token;
+-	char tmp[16 + 1];
  
- 	ret = usb_control_msg(usbdev, usb_sndctrlpipe(usbdev, 0), 0x67,
- 			      USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_OUT,
-@@ -533,26 +540,34 @@ int line6_write_data(struct usb_line6 *line6, int address, void *data,
- 		return ret;
+ 	token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
+ 
+@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
+ 	seq_printf(seq, "Device Class  : %s\n", i2o_get_class_name(work16[0]));
+ 	seq_printf(seq, "Owner TID     : %0#5x\n", work16[2]);
+ 	seq_printf(seq, "Parent TID    : %0#5x\n", work16[3]);
+-	seq_printf(seq, "Vendor info   : %s\n",
+-		   chtostr(tmp, (u8 *) (work32 + 2), 16));
+-	seq_printf(seq, "Product info  : %s\n",
+-		   chtostr(tmp, (u8 *) (work32 + 6), 16));
+-	seq_printf(seq, "Description   : %s\n",
+-		   chtostr(tmp, (u8 *) (work32 + 10), 16));
+-	seq_printf(seq, "Product rev.  : %s\n",
+-		   chtostr(tmp, (u8 *) (work32 + 14), 8));
++	seq_printf(seq, "Vendor info   : %.16s\n", (u8 *) (work32 + 2));
++	seq_printf(seq, "Product info  : %.16s\n", (u8 *) (work32 + 6));
++	seq_printf(seq, "Description   : %.16s\n", (u8 *) (work32 + 10));
++	seq_printf(seq, "Product rev.  : %.8s\n", (u8 *) (work32 + 14));
+ 
+ 	seq_printf(seq, "Serial number : ");
+ 	print_serial_number(seq, (u8 *) (work32 + 16),
+@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
+ 		u8 pad[256];	// allow up to 256 byte (max) serial number
+ 	} result;
+ 
+-	char tmp[24 + 1];
+-
+ 	token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
+ 
+ 	if (token < 0) {
+@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
  	}
  
-+	status = kmalloc(1, GFP_KERNEL);
-+	if (status == NULL)
-+		return -ENOMEM;
-+
- 	do {
- 		ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0),
- 				      0x67,
- 				      USB_TYPE_VENDOR | USB_RECIP_DEVICE |
- 				      USB_DIR_IN,
- 				      0x0012, 0x0000,
--				      &status, 1, LINE6_TIMEOUT * HZ);
-+				      status, 1, LINE6_TIMEOUT * HZ);
+ 	seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
+-	seq_printf(seq, "Module name         : %s\n",
+-		   chtostr(tmp, result.module_name, 24));
+-	seq_printf(seq, "Module revision     : %s\n",
+-		   chtostr(tmp, result.module_rev, 8));
++	seq_printf(seq, "Module name         : %.24s\n", result.module_name);
++	seq_printf(seq, "Module revision     : %.8s\n", result.module_rev);
  
- 		if (ret < 0) {
- 			dev_err(line6->ifcdev,
- 				"receiving status failed (error %d)\n", ret);
-+			kfree(status);
- 			return ret;
- 		}
--	} while (status == 0xff);
-+	} while (*status == 0xff);
+ 	seq_printf(seq, "Serial number       : ");
+ 	print_serial_number(seq, result.serial_number, sizeof(result) - 36);
+@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
+ 		u8 instance_number[4];
+ 	} result;
  
--	if (status != 0) {
-+	if (*status != 0) {
- 		dev_err(line6->ifcdev, "write failed (error %d)\n", ret);
-+		kfree(status);
- 		return -EINVAL;
+-	char tmp[64 + 1];
+-
+ 	token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
+ 
+ 	if (token < 0) {
+@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
+ 		return 0;
  	}
  
-+	kfree(status);
-+
+-	seq_printf(seq, "Device name     : %s\n",
+-		   chtostr(tmp, result.device_name, 64));
+-	seq_printf(seq, "Service name    : %s\n",
+-		   chtostr(tmp, result.service_name, 64));
+-	seq_printf(seq, "Physical name   : %s\n",
+-		   chtostr(tmp, result.physical_location, 64));
+-	seq_printf(seq, "Instance number : %s\n",
+-		   chtostr(tmp, result.instance_number, 4));
++	seq_printf(seq, "Device name     : %.64s\n", result.device_name);
++	seq_printf(seq, "Service name    : %.64s\n", result.service_name);
++	seq_printf(seq, "Physical name   : %.64s\n", result.physical_location);
++	seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
+ 
  	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;
  
-diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c
-index 6943715..0a93632 100644
---- a/drivers/staging/line6/toneport.c
-+++ b/drivers/staging/line6/toneport.c
-@@ -11,6 +11,7 @@
-  */
+ 	token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
+diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
+index 52334fc..d7f40b3 100644
+--- a/drivers/staging/i2o/iop.c
++++ b/drivers/staging/i2o/iop.c
+@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
  
- #include <linux/wait.h>
-+#include <linux/slab.h>
- #include <sound/control.h>
+ 	spin_lock_irqsave(&c->context_list_lock, flags);
  
- #include "audio.h"
-@@ -307,14 +308,20 @@ static void toneport_destruct(struct usb_interface *interface)
- */
- static void toneport_setup(struct usb_line6_toneport *toneport)
- {
--	int ticks;
-+	int *ticks;
- 	struct usb_line6 *line6 = &toneport->line6;
- 	struct usb_device *usbdev = line6->usbdev;
- 	u16 idProduct = le16_to_cpu(usbdev->descriptor.idProduct);
+-	if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
+-		atomic_inc(&c->context_list_counter);
++	if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
++		atomic_inc_unchecked(&c->context_list_counter);
  
-+	ticks = kmalloc(sizeof(int), GFP_KERNEL);
-+	if (ticks == NULL)
-+		return;
-+
- 	/* sync time on device with host: */
--	ticks = (int)get_seconds();
--	line6_write_data(line6, 0x80c6, &ticks, 4);
-+	*ticks = (int)get_seconds();
-+	line6_write_data(line6, 0x80c6, ticks, sizeof(int));
-+
-+	kfree(ticks);
+-	entry->context = atomic_read(&c->context_list_counter);
++	entry->context = atomic_read_unchecked(&c->context_list_counter);
+ 
+ 	list_add(&entry->list, &c->context_list);
+ 
+@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
+ 
+ #if BITS_PER_LONG == 64
+ 	spin_lock_init(&c->context_list_lock);
+-	atomic_set(&c->context_list_counter, 0);
++	atomic_set_unchecked(&c->context_list_counter, 0);
+ 	INIT_LIST_HEAD(&c->context_list);
+ #endif
  
- 	/* enable device: */
- 	toneport_send_cmd(usbdev, 0x0301, 0x0000);
 diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
 index 463da07..e791ce9 100644
 --- a/drivers/staging/lustre/lnet/selftest/brw_test.c
@@ -52556,7 +52391,7 @@ index 463da07..e791ce9 100644
  
  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 cc9d182..8fabce3 100644
+index 5709148..ccd9e0d 100644
 --- a/drivers/staging/lustre/lnet/selftest/framework.c
 +++ b/drivers/staging/lustre/lnet/selftest/framework.c
 @@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
@@ -52650,11 +52485,11 @@ index a4c252f..b21acac 100644
  	CDEBUG(D_DLMTRACE,
  	       "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
 diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
-index 83d3f08..b03adad 100644
+index c539e37..743b213 100644
 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
 +++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
-@@ -236,7 +236,7 @@ int proc_console_max_delay_cs(struct ctl_table *table, int write,
- 			      void __user *buffer, size_t *lenp, loff_t *ppos)
+@@ -237,7 +237,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
+ 				     loff_t *ppos)
  {
  	int rc, max_delay_cs;
 -	struct ctl_table dummy = *table;
@@ -52662,8 +52497,8 @@ index 83d3f08..b03adad 100644
  	long d;
  
  	dummy.data = &max_delay_cs;
-@@ -268,7 +268,7 @@ int proc_console_min_delay_cs(struct ctl_table *table, int write,
- 			      void __user *buffer, size_t *lenp, loff_t *ppos)
+@@ -270,7 +270,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
+ 				     loff_t *ppos)
  {
  	int rc, min_delay_cs;
 -	struct ctl_table dummy = *table;
@@ -52671,8 +52506,8 @@ index 83d3f08..b03adad 100644
  	long d;
  
  	dummy.data = &min_delay_cs;
-@@ -300,7 +300,7 @@ int proc_console_backoff(struct ctl_table *table, int write,
- 			 void __user *buffer, size_t *lenp, loff_t *ppos)
+@@ -302,7 +302,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
+ 				void __user *buffer, size_t *lenp, loff_t *ppos)
  {
  	int rc, backoff;
 -	struct ctl_table dummy = *table;
@@ -52681,10 +52516,10 @@ index 83d3f08..b03adad 100644
  	dummy.data = &backoff;
  	dummy.proc_handler = &proc_dointvec;
 diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
-index 2c4fc74..b04ca79 100644
+index 7dc77dd..289d03e 100644
 --- a/drivers/staging/lustre/lustre/libcfs/module.c
 +++ b/drivers/staging/lustre/lustre/libcfs/module.c
-@@ -315,11 +315,11 @@ out:
+@@ -313,11 +313,11 @@ out:
  
  
  struct cfs_psdev_ops libcfs_psdev_ops = {
@@ -52702,10 +52537,10 @@ index 2c4fc74..b04ca79 100644
  
  extern int insert_proc(void);
 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
-index fcbe836..8a7ada4 100644
+index 22667db..8b703b6 100644
 --- a/drivers/staging/octeon/ethernet-rx.c
 +++ b/drivers/staging/octeon/ethernet-rx.c
-@@ -352,14 +352,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
+@@ -354,14 +354,14 @@ 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
@@ -52724,7 +52559,7 @@ index fcbe836..8a7ada4 100644
  						   (atomic_t *)&priv->stats.rx_bytes);
  #endif
  				}
-@@ -371,10 +371,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
+@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
  					   dev->name);
  				*/
  #ifdef CONFIG_64BIT
@@ -52738,7 +52573,7 @@ index fcbe836..8a7ada4 100644
  #endif
  				dev_kfree_skb_irq(skb);
 diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
-index ee32149..052d1836 100644
+index 460e854..f926452 100644
 --- a/drivers/staging/octeon/ethernet.c
 +++ b/drivers/staging/octeon/ethernet.c
 @@ -241,11 +241,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
@@ -52784,10 +52619,10 @@ index 070cc03..6806e37 100644
  struct io_req {
  	struct list_head list;
 diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
-index 46dad63..fe4acdc 100644
+index 98f3ba4..c6a7fce 100644
 --- a/drivers/staging/unisys/visorchipset/visorchipset.h
 +++ b/drivers/staging/unisys/visorchipset/visorchipset.h
-@@ -226,7 +226,7 @@ struct visorchipset_busdev_notifiers {
+@@ -171,7 +171,7 @@ struct visorchipset_busdev_notifiers {
  	void (*device_resume)(ulong bus_no, ulong dev_no);
  	int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
  				ulong *max_size);
@@ -52796,7 +52631,7 @@ index 46dad63..fe4acdc 100644
  
  /*  These functions live inside visorchipset, and will be called to indicate
   *  responses to specific events (by code outside of visorchipset).
-@@ -241,7 +241,7 @@ struct visorchipset_busdev_responders {
+@@ -186,7 +186,7 @@ struct visorchipset_busdev_responders {
  	void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
  	void (*device_pause)(ulong bus_no, ulong dev_no, int response);
  	void (*device_resume)(ulong bus_no, ulong dev_no, int response);
@@ -52828,10 +52663,10 @@ index 9512af6..045bf5a 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 54da2a4..3dd6f57 100644
+index 7faa6ae..ae6c410 100644
 --- a/drivers/target/target_core_device.c
 +++ b/drivers/target/target_core_device.c
-@@ -1469,7 +1469,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
+@@ -1495,7 +1495,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);
@@ -52854,10 +52689,10 @@ index ac3cbab..f0d1dd2 100644
  			cmd->se_ordered_id, cmd->sam_task_attr,
  			dev->transport->name);
 diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
-index 65a98a9..d93d3a8 100644
+index 031018e..90981a1 100644
 --- a/drivers/thermal/int340x_thermal/int3400_thermal.c
 +++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
-@@ -277,8 +277,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
+@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
  	platform_set_drvdata(pdev, priv);
  
  	if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
@@ -52871,7 +52706,7 @@ index 65a98a9..d93d3a8 100644
  	priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
  						priv, &int3400_thermal_ops,
 diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
-index d717f3d..cae1cc3e 100644
+index 668fb1b..2737bbe 100644
 --- a/drivers/thermal/of-thermal.c
 +++ b/drivers/thermal/of-thermal.c
 @@ -31,6 +31,7 @@
@@ -52897,7 +52732,7 @@ index d717f3d..cae1cc3e 100644
  	mutex_unlock(&tzd->lock);
  
  	return tzd;
-@@ -541,9 +544,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
+@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
  		return;
  
  	mutex_lock(&tzd->lock);
@@ -53378,10 +53213,10 @@ index c434376..114ce13 100644
  
  	dlci->modem_rx = 0;
 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
-index 6f8cf3a..c690dfb 100644
+index cf6e0f2..4283167 100644
 --- a/drivers/tty/n_tty.c
 +++ b/drivers/tty/n_tty.c
-@@ -115,7 +115,7 @@ struct n_tty_data {
+@@ -116,7 +116,7 @@ struct n_tty_data {
  	int minimum_to_wake;
  
  	/* consumer-published */
@@ -53390,7 +53225,7 @@ index 6f8cf3a..c690dfb 100644
  	size_t line_start;
  
  	/* protected by output lock */
-@@ -2555,6 +2555,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
+@@ -2547,6 +2547,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
  {
  	*ops = tty_ldisc_N_TTY;
  	ops->owner = NULL;
@@ -53400,10 +53235,10 @@ index 6f8cf3a..c690dfb 100644
  }
  EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
 diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
-index 6e1f150..c3ba598 100644
+index e72ee62..d977ad9 100644
 --- a/drivers/tty/pty.c
 +++ b/drivers/tty/pty.c
-@@ -850,8 +850,10 @@ static void __init unix98_pty_init(void)
+@@ -848,8 +848,10 @@ static void __init unix98_pty_init(void)
  		panic("Couldn't register Unix98 pts driver");
  
  	/* Now create the /dev/ptmx special device */
@@ -53416,7 +53251,7 @@ index 6e1f150..c3ba598 100644
  	cdev_init(&ptmx_cdev, &ptmx_fops);
  	if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
 diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
-index 383c4c7..d408e21 100644
+index c8dd8dc..dca6cfd 100644
 --- a/drivers/tty/rocket.c
 +++ b/drivers/tty/rocket.c
 @@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
@@ -53599,10 +53434,10 @@ index a260cde..6b2b5ce 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 c88b522..e763029 100644
+index b73889c..9f74f0a 100644
 --- a/drivers/tty/serial/msm_serial.c
 +++ b/drivers/tty/serial/msm_serial.c
-@@ -1028,7 +1028,7 @@ static struct uart_driver msm_uart_driver = {
+@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
  	.cons = MSM_CONSOLE,
  };
  
@@ -53611,7 +53446,7 @@ index c88b522..e763029 100644
  
  static const struct of_device_id msm_uartdm_table[] = {
  	{ .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
-@@ -1052,7 +1052,7 @@ static int msm_serial_probe(struct platform_device *pdev)
+@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
  		line = pdev->id;
  
  	if (line < 0)
@@ -53621,11 +53456,11 @@ index c88b522..e763029 100644
  	if (unlikely(line < 0 || line >= UART_NR))
  		return -ENXIO;
 diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
-index 107e807..d4a02fa 100644
+index cf08876..711e0bf 100644
 --- a/drivers/tty/serial/samsung.c
 +++ b/drivers/tty/serial/samsung.c
-@@ -480,11 +480,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
- 	}
+@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
+ 	ourport->tx_in_progress = 0;
  }
  
 +static int s3c64xx_serial_startup(struct uart_port *port);
@@ -53641,7 +53476,7 @@ index 107e807..d4a02fa 100644
  	dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
  	    port, (unsigned long long)port->mapbase, port->membase);
  
-@@ -1169,10 +1174,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
+@@ -1697,10 +1702,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
  	/* setup info for port */
  	port->dev	= &platdev->dev;
  
@@ -53653,10 +53488,10 @@ index 107e807..d4a02fa 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 984605b..e538330 100644
+index 6a1055a..5ca9ad9 100644
 --- a/drivers/tty/serial/serial_core.c
 +++ b/drivers/tty/serial/serial_core.c
-@@ -1396,7 +1396,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
+@@ -1377,7 +1377,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
  		state = drv->state + tty->index;
  		port = &state->port;
  		spin_lock_irq(&port->lock);
@@ -53665,7 +53500,7 @@ index 984605b..e538330 100644
  		spin_unlock_irq(&port->lock);
  		return;
  	}
-@@ -1406,7 +1406,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
+@@ -1387,7 +1387,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
  
  	pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
  
@@ -53674,7 +53509,7 @@ index 984605b..e538330 100644
  		return;
  
  	/*
-@@ -1530,7 +1530,7 @@ static void uart_hangup(struct tty_struct *tty)
+@@ -1511,7 +1511,7 @@ static void uart_hangup(struct tty_struct *tty)
  		uart_flush_buffer(tty);
  		uart_shutdown(tty, state);
  		spin_lock_irqsave(&port->lock, flags);
@@ -53683,7 +53518,7 @@ index 984605b..e538330 100644
  		clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
  		spin_unlock_irqrestore(&port->lock, flags);
  		tty_port_tty_set(port, NULL);
-@@ -1617,7 +1617,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
+@@ -1598,7 +1598,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
  	pr_debug("uart_open(%d) called\n", line);
  
  	spin_lock_irq(&port->lock);
@@ -54078,10 +53913,10 @@ index c3f9091..abe4601 100644
  	if (!retval)
  		port->flags |= ASYNC_NORMAL_ACTIVE;
 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
-index 42bad18..447d7a2 100644
+index 259a4d5..9b0c9e7 100644
 --- a/drivers/tty/sysrq.c
 +++ b/drivers/tty/sysrq.c
-@@ -1084,7 +1084,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
+@@ -1085,7 +1085,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)
  {
@@ -54480,7 +54315,7 @@ index 2a3bbdf..91d72cf 100644
  		file->f_version = event_count;
  		return POLLIN | POLLRDNORM;
 diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
-index e500243..401300f 100644
+index 1163553..f292679 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,
@@ -54542,7 +54377,7 @@ index 45a915c..09f9735 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 b4bfa3a..008f926 100644
+index d7c3d5a..2f87607 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
 @@ -26,6 +26,7 @@
@@ -54553,7 +54388,7 @@ index b4bfa3a..008f926 100644
  
  #include <asm/uaccess.h>
  #include <asm/byteorder.h>
-@@ -4664,6 +4665,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
+@@ -4665,6 +4666,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
  			goto done;
  		return;
  	}
@@ -54663,7 +54498,7 @@ index 8cfc319..4868255 100644
  	return 0;
  }
 diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
-index e971584..03495ab 100644
+index 9719abf..789d5d9 100644
 --- a/drivers/usb/gadget/function/f_uac1.c
 +++ b/drivers/usb/gadget/function/f_uac1.c
 @@ -14,6 +14,7 @@
@@ -54760,7 +54595,7 @@ index 491082a..dfd7d17 100644
  	gs_free_requests(gser->out, &port->read_pool, NULL);
  	gs_free_requests(gser->out, &port->read_queue, NULL);
 diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
-index 53842a1..2bef3b6 100644
+index c78c841..48fd281 100644
 --- a/drivers/usb/gadget/function/u_uac1.c
 +++ b/drivers/usb/gadget/function/u_uac1.c
 @@ -17,6 +17,7 @@
@@ -54772,7 +54607,7 @@ index 53842a1..2bef3b6 100644
  #include "u_uac1.h"
  
 diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
-index 118edb7..7a6415f 100644
+index 87cf86f..3de9809 100644
 --- a/drivers/usb/host/ehci-hub.c
 +++ b/drivers/usb/host/ehci-hub.c
 @@ -769,7 +769,7 @@ static struct urb *request_single_step_set_feature_urb(
@@ -54846,10 +54681,10 @@ index b3d245e..99549ed 100644
  	props.type = BACKLIGHT_RAW;
  	props.max_brightness = 0xff;
 diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
-index 29fa1c3..a57b08e 100644
+index 3806e70..55c508b 100644
 --- a/drivers/usb/serial/console.c
 +++ b/drivers/usb/serial/console.c
-@@ -125,7 +125,7 @@ static int usb_console_setup(struct console *co, char *options)
+@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
  
  	info->port = port;
  
@@ -54858,7 +54693,7 @@ index 29fa1c3..a57b08e 100644
  	if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
  		if (serial->type->set_termios) {
  			/*
-@@ -173,7 +173,7 @@ static int usb_console_setup(struct console *co, char *options)
+@@ -175,7 +175,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 */
@@ -54867,7 +54702,7 @@ index 29fa1c3..a57b08e 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;
-@@ -186,7 +186,7 @@ static int usb_console_setup(struct console *co, char *options)
+@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
   put_tty:
  	tty_kref_put(tty);
   reset_open_count:
@@ -54876,7 +54711,7 @@ index 29fa1c3..a57b08e 100644
  	usb_autopm_put_interface(serial->interface);
   error_get_interface:
  	usb_serial_put(serial);
-@@ -197,7 +197,7 @@ static int usb_console_setup(struct console *co, char *options)
+@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
  static void usb_console_write(struct console *co,
  					const char *buf, unsigned count)
  {
@@ -54912,10 +54747,10 @@ index a863a98..d272795 100644
  	/*
  	 * NOTE:
 diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
-index 1ae9d40..c62604b 100644
+index 11f6f61..1087910 100644
 --- a/drivers/usb/usbip/vhci_hcd.c
 +++ b/drivers/usb/usbip/vhci_hcd.c
-@@ -439,7 +439,7 @@ static void vhci_tx_urb(struct urb *urb)
+@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
  
  	spin_lock(&vdev->priv_lock);
  
@@ -54924,7 +54759,7 @@ index 1ae9d40..c62604b 100644
  	if (priv->seqnum == 0xffff)
  		dev_info(&urb->dev->dev, "seqnum max\n");
  
-@@ -684,7 +684,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
  			return -ENOMEM;
  		}
  
@@ -54933,7 +54768,7 @@ index 1ae9d40..c62604b 100644
  		if (unlink->seqnum == 0xffff)
  			pr_info("seqnum max\n");
  
-@@ -888,7 +888,7 @@ static int vhci_start(struct usb_hcd *hcd)
+@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
  		vdev->rhport = rhport;
  	}
  
@@ -54991,10 +54826,10 @@ index 69af4fd..da390d7 100644
  
  /* Return the xfer's ID. */
 diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
-index f018d8d..ccab63f 100644
+index 4cde855..b23d05d 100644
 --- a/drivers/vfio/vfio.c
 +++ b/drivers/vfio/vfio.c
-@@ -481,7 +481,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
+@@ -518,7 +518,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
  		return 0;
  
  	/* TODO Prevent device auto probing */
@@ -55003,22 +54838,6 @@ index f018d8d..ccab63f 100644
  	     iommu_group_id(group->iommu_group));
  
  	return 0;
-diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
-index 9484d56..d415d69 100644
---- a/drivers/vhost/net.c
-+++ b/drivers/vhost/net.c
-@@ -650,10 +650,8 @@ static void handle_rx(struct vhost_net *net)
- 			break;
- 		}
- 		/* TODO: Should check and handle checksum. */
--
--		hdr.num_buffers = cpu_to_vhost16(vq, headcount);
- 		if (likely(mergeable) &&
--		    memcpy_toiovecend(nvq->hdr, (void *)&hdr.num_buffers,
-+		    memcpy_toiovecend(nvq->hdr, (unsigned char *)&headcount,
- 				      offsetof(typeof(hdr), num_buffers),
- 				      sizeof hdr.num_buffers)) {
- 			vq_err(vq, "Failed num_buffers write");
 diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
 index 3bb02c6..a01ff38 100644
 --- a/drivers/vhost/vringh.c
@@ -55132,7 +54951,7 @@ index aedf2fb..47c9aca 100644
  	"PCI",
  	"PRO AGP",
 diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
-index 37ec09b..98f8862 100644
+index 8789e48..698fe4c 100644
 --- a/drivers/video/fbdev/aty/atyfb_base.c
 +++ b/drivers/video/fbdev/aty/atyfb_base.c
 @@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
@@ -58574,7 +58393,7 @@ index eb14e05..5156de7 100644
  	if (retval > 0)
  		retval = 0;
 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
-index 9ee5343..5165e3c 100644
+index 3662f1d..90558b5 100644
 --- a/fs/9p/vfs_inode.c
 +++ b/fs/9p/vfs_inode.c
 @@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
@@ -58587,7 +58406,7 @@ index 9ee5343..5165e3c 100644
  	p9_debug(P9_DEBUG_VFS, " %pd %s\n",
  		 dentry, IS_ERR(s) ? "<error>" : s);
 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
-index c055d56e..a46f4f5 100644
+index 270c481..0d8a962 100644
 --- a/fs/Kconfig.binfmt
 +++ b/fs/Kconfig.binfmt
 @@ -106,7 +106,7 @@ config HAVE_AOUT
@@ -58622,10 +58441,10 @@ index 8a1d38e..300a14e 100644
  			     &data);
  	if (!inode) {
 diff --git a/fs/aio.c b/fs/aio.c
-index ebd0e9b..c577c91 100644
+index a793f70..46f45af 100644
 --- a/fs/aio.c
 +++ b/fs/aio.c
-@@ -413,7 +413,7 @@ static int aio_setup_ring(struct kioctx *ctx)
+@@ -404,7 +404,7 @@ static int aio_setup_ring(struct kioctx *ctx)
  	size += sizeof(struct io_event) * nr_events;
  
  	nr_pages = PFN_UP(size);
@@ -59716,10 +59535,10 @@ index 995986b..dcc4ef2 100644
  {
  	register_binfmt(&elf_format);
 diff --git a/fs/block_dev.c b/fs/block_dev.c
-index b48c41b..e070416 100644
+index 975266b..c3d1856 100644
 --- a/fs/block_dev.c
 +++ b/fs/block_dev.c
-@@ -703,7 +703,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
+@@ -734,7 +734,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 */
  
@@ -59729,10 +59548,10 @@ index b48c41b..e070416 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 f54511d..58acdec 100644
+index 6d67f32..8f33187 100644
 --- a/fs/btrfs/ctree.c
 +++ b/fs/btrfs/ctree.c
-@@ -1173,9 +1173,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
+@@ -1181,9 +1181,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
  		free_extent_buffer(buf);
  		add_root_to_dirty_list(root);
  	} else {
@@ -59749,7 +59568,7 @@ index f54511d..58acdec 100644
  
  		WARN_ON(trans->transid != btrfs_header_generation(parent));
 diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
-index de4e70f..b41dc45 100644
+index 82f0c7c..dff78a8 100644
 --- a/fs/btrfs/delayed-inode.c
 +++ b/fs/btrfs/delayed-inode.c
 @@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
@@ -59802,7 +59621,7 @@ index f70119f..ab5894d 100644
  	spin_lock_init(&delayed_root->lock);
  	init_waitqueue_head(&delayed_root->wait);
 diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
-index 6f49b28..483410f 100644
+index 05fef19..f3774b8 100644
 --- a/fs/btrfs/super.c
 +++ b/fs/btrfs/super.c
 @@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
@@ -59815,7 +59634,7 @@ index 6f49b28..483410f 100644
  	wake_up(&root->fs_info->transaction_wait);
  	wake_up(&root->fs_info->transaction_blocked_wait);
 diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
-index 92db3f6..898a561 100644
+index 94edb0a..e94dc93 100644
 --- a/fs/btrfs/sysfs.c
 +++ b/fs/btrfs/sysfs.c
 @@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
@@ -59900,7 +59719,7 @@ index fbb08e9..0fda764 100644
  	       cache->brun_percent  < 100);
  
 diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
-index ce1b115..4a6852c 100644
+index f601def..b2cf704 100644
 --- a/fs/cachefiles/daemon.c
 +++ b/fs/cachefiles/daemon.c
 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
@@ -59978,7 +59797,7 @@ index 8c52472..c4e3a69 100644
  
  #else
 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
-index 7f8e83f..8951aa4 100644
+index 1e51714..411eded 100644
 --- a/fs/cachefiles/namei.c
 +++ b/fs/cachefiles/namei.c
 @@ -309,7 +309,7 @@ try_again:
@@ -60021,10 +59840,10 @@ index eccd339..4c1d995 100644
  			return 0;
  
 diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
-index c241603..56bae60 100644
+index 83e9976..bfd1eee 100644
 --- a/fs/ceph/dir.c
 +++ b/fs/ceph/dir.c
-@@ -129,6 +129,8 @@ static int __dcache_readdir(struct file *file,  struct dir_context *ctx,
+@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file,  struct dir_context *ctx,
  	struct dentry *dentry, *last;
  	struct ceph_dentry_info *di;
  	int err = 0;
@@ -60033,7 +59852,7 @@ index c241603..56bae60 100644
  
  	/* claim ref on last dentry we returned */
  	last = fi->dentry;
-@@ -192,7 +194,12 @@ more:
+@@ -190,7 +192,12 @@ more:
  
  	dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
  	     dentry, dentry, dentry->d_inode);
@@ -60047,7 +59866,7 @@ index c241603..56bae60 100644
  		      dentry->d_name.len,
  		      ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
  		      dentry->d_inode->i_mode >> 12)) {
-@@ -250,7 +257,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
+@@ -248,7 +255,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(ctx->pos);
@@ -60057,10 +59876,10 @@ index c241603..56bae60 100644
  	u32 ftype;
  	struct ceph_mds_reply_info_parsed *rinfo;
 diff --git a/fs/ceph/super.c b/fs/ceph/super.c
-index 50f06cd..c7eba3e 100644
+index a63997b..ddc0577 100644
 --- a/fs/ceph/super.c
 +++ b/fs/ceph/super.c
-@@ -896,7 +896,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
+@@ -889,7 +889,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
  /*
   * construct our own bdi so we can control readahead, etc.
   */
@@ -60069,8 +59888,8 @@ index 50f06cd..c7eba3e 100644
  
  static int ceph_register_bdi(struct super_block *sb,
  			     struct ceph_fs_client *fsc)
-@@ -913,7 +913,7 @@ static int ceph_register_bdi(struct super_block *sb,
- 			default_backing_dev_info.ra_pages;
+@@ -906,7 +906,7 @@ static int ceph_register_bdi(struct super_block *sb,
+ 			VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
  
  	err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
 -			   atomic_long_inc_return(&bdi_seq));
@@ -60240,10 +60059,10 @@ index 22b289a..bbbba08 100644
  GLOBAL_EXTERN atomic_t smBufAllocCount;
  GLOBAL_EXTERN atomic_t midCount;
 diff --git a/fs/cifs/file.c b/fs/cifs/file.c
-index 3e30d92..2c9f066 100644
+index ca30c39..570fb94 100644
 --- a/fs/cifs/file.c
 +++ b/fs/cifs/file.c
-@@ -2061,10 +2061,14 @@ static int cifs_writepages(struct address_space *mapping,
+@@ -2055,10 +2055,14 @@ static int cifs_writepages(struct address_space *mapping,
  		index = mapping->writeback_index; /* Start from prev offset */
  		end = -1;
  	} else {
@@ -60514,10 +60333,10 @@ index eab05e1..ffe5ea4 100644
  }
  
 diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
-index 3417340..b942390 100644
+index 65cd7a8..3518676 100644
 --- a/fs/cifs/smb2pdu.c
 +++ b/fs/cifs/smb2pdu.c
-@@ -2144,8 +2144,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
+@@ -2147,8 +2147,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);
@@ -60750,10 +60569,10 @@ index afec645..9c65620 100644
  		return 1;
  	if (a < b)
 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
-index c9c298b..544d100 100644
+index cf0db00..c7f70e8 100644
 --- a/fs/configfs/dir.c
 +++ b/fs/configfs/dir.c
-@@ -1548,7 +1548,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
+@@ -1540,7 +1540,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;
@@ -60763,7 +60582,7 @@ index c9c298b..544d100 100644
  		int len;
  		struct inode *inode = NULL;
  
-@@ -1557,7 +1558,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
+@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
  			continue;
  
  		name = configfs_get_name(next);
@@ -60778,7 +60597,7 @@ index c9c298b..544d100 100644
  		/*
  		 * We'll have a dentry and an inode for
 diff --git a/fs/coredump.c b/fs/coredump.c
-index b5c86ff..0dac262 100644
+index f319926..55f4ec2 100644
 --- a/fs/coredump.c
 +++ b/fs/coredump.c
 @@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
@@ -60884,28 +60703,57 @@ index b5c86ff..0dac262 100644
  		return 0;
  	while (nr) {
 diff --git a/fs/dcache.c b/fs/dcache.c
-index e368d4f..b40ba59 100644
+index c71e373..5c1f656 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -508,7 +508,7 @@ static void __dentry_kill(struct dentry *dentry)
+@@ -511,7 +511,7 @@ static void __dentry_kill(struct dentry *dentry)
  	 * dentry_iput drops the locks, at which point nobody (except
  	 * transient RCU lookups) can reach this dentry.
  	 */
--	BUG_ON((int)dentry->d_lockref.count > 0);
-+	BUG_ON((int)__lockref_read(&dentry->d_lockref) > 0);
+-	BUG_ON(dentry->d_lockref.count > 0);
++	BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
  	this_cpu_dec(nr_dentry);
  	if (dentry->d_op && dentry->d_op->d_release)
  		dentry->d_op->d_release(dentry);
-@@ -561,7 +561,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
+@@ -564,7 +564,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
  	struct dentry *parent = dentry->d_parent;
  	if (IS_ROOT(dentry))
  		return NULL;
--	if (unlikely((int)dentry->d_lockref.count < 0))
-+	if (unlikely((int)__lockref_read(&dentry->d_lockref) < 0))
+-	if (unlikely(dentry->d_lockref.count < 0))
++	if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
  		return NULL;
  	if (likely(spin_trylock(&parent->d_lock)))
  		return parent;
-@@ -638,7 +638,7 @@ repeat:
+@@ -626,8 +626,8 @@ static inline bool fast_dput(struct dentry *dentry)
+ 	 */
+ 	if (unlikely(ret < 0)) {
+ 		spin_lock(&dentry->d_lock);
+-		if (dentry->d_lockref.count > 1) {
+-			dentry->d_lockref.count--;
++		if (__lockref_read(&dentry->d_lockref) > 1) {
++			__lockref_dec(&dentry->d_lockref);
+ 			spin_unlock(&dentry->d_lock);
+ 			return 1;
+ 		}
+@@ -682,7 +682,7 @@ static inline bool fast_dput(struct dentry *dentry)
+ 	 * else could have killed it and marked it dead. Either way, we
+ 	 * don't need to do anything else.
+ 	 */
+-	if (dentry->d_lockref.count) {
++	if (__lockref_read(&dentry->d_lockref)) {
+ 		spin_unlock(&dentry->d_lock);
+ 		return 1;
+ 	}
+@@ -692,7 +692,7 @@ static inline bool fast_dput(struct dentry *dentry)
+ 	 * lock, and we just tested that it was zero, so we can just
+ 	 * set it to 1.
+ 	 */
+-	dentry->d_lockref.count = 1;
++	__lockref_set(&dentry->d_lockref, 1);
+ 	return 0;
+ }
+ 
+@@ -751,7 +751,7 @@ repeat:
  		dentry->d_flags |= DCACHE_REFERENCED;
  	dentry_lru_add(dentry);
  
@@ -60914,7 +60762,7 @@ index e368d4f..b40ba59 100644
  	spin_unlock(&dentry->d_lock);
  	return;
  
-@@ -653,7 +653,7 @@ EXPORT_SYMBOL(dput);
+@@ -766,7 +766,7 @@ EXPORT_SYMBOL(dput);
  /* This must be called with d_lock held */
  static inline void __dget_dlock(struct dentry *dentry)
  {
@@ -60923,7 +60771,7 @@ index e368d4f..b40ba59 100644
  }
  
  static inline void __dget(struct dentry *dentry)
-@@ -694,8 +694,8 @@ repeat:
+@@ -807,8 +807,8 @@ repeat:
  		goto repeat;
  	}
  	rcu_read_unlock();
@@ -60934,7 +60782,7 @@ index e368d4f..b40ba59 100644
  	spin_unlock(&ret->d_lock);
  	return ret;
  }
-@@ -773,9 +773,9 @@ restart:
+@@ -886,9 +886,9 @@ restart:
  	spin_lock(&inode->i_lock);
  	hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
  		spin_lock(&dentry->d_lock);
@@ -60946,16 +60794,16 @@ index e368d4f..b40ba59 100644
  				__dentry_kill(dentry);
  				dput(parent);
  				goto restart;
-@@ -810,7 +810,7 @@ static void shrink_dentry_list(struct list_head *list)
+@@ -923,7 +923,7 @@ static void shrink_dentry_list(struct list_head *list)
  		 * We found an inuse dentry which was not removed from
  		 * the LRU because of laziness during lookup. Do not free it.
  		 */
--		if ((int)dentry->d_lockref.count > 0) {
-+		if ((int)__lockref_read(&dentry->d_lockref) > 0) {
+-		if (dentry->d_lockref.count > 0) {
++		if (__lockref_read(&dentry->d_lockref) > 0) {
  			spin_unlock(&dentry->d_lock);
  			if (parent)
  				spin_unlock(&parent->d_lock);
-@@ -848,8 +848,8 @@ static void shrink_dentry_list(struct list_head *list)
+@@ -961,8 +961,8 @@ static void shrink_dentry_list(struct list_head *list)
  		dentry = parent;
  		while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
  			parent = lock_parent(dentry);
@@ -60966,16 +60814,16 @@ index e368d4f..b40ba59 100644
  				spin_unlock(&dentry->d_lock);
  				if (parent)
  					spin_unlock(&parent->d_lock);
-@@ -889,7 +889,7 @@ dentry_lru_isolate(struct list_head *item, spinlock_t *lru_lock, void *arg)
+@@ -1002,7 +1002,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
  	 * counts, just remove them from the LRU. Otherwise give them
  	 * another pass through the LRU.
  	 */
 -	if (dentry->d_lockref.count) {
-+	if (__lockref_read(&dentry->d_lockref) > 0) {
- 		d_lru_isolate(dentry);
++	if (__lockref_read(&dentry->d_lockref)) {
+ 		d_lru_isolate(lru, dentry);
  		spin_unlock(&dentry->d_lock);
  		return LRU_REMOVED;
-@@ -1225,7 +1225,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
+@@ -1336,7 +1336,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
  	} else {
  		if (dentry->d_flags & DCACHE_LRU_LIST)
  			d_lru_del(dentry);
@@ -60984,7 +60832,7 @@ index e368d4f..b40ba59 100644
  			d_shrink_add(dentry, &data->dispose);
  			data->found++;
  		}
-@@ -1273,7 +1273,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
+@@ -1384,7 +1384,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
  		return D_WALK_CONTINUE;
  
  	/* root with refcount 1 is fine */
@@ -60993,7 +60841,7 @@ index e368d4f..b40ba59 100644
  		return D_WALK_CONTINUE;
  
  	printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
-@@ -1282,7 +1282,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
+@@ -1393,7 +1393,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
  		       dentry->d_inode ?
  		       dentry->d_inode->i_ino : 0UL,
  		       dentry,
@@ -61002,7 +60850,7 @@ index e368d4f..b40ba59 100644
  		       dentry->d_sb->s_type->name,
  		       dentry->d_sb->s_id);
  	WARN_ON(1);
-@@ -1423,7 +1423,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
+@@ -1534,7 +1534,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
  	dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
  	if (name->len > DNAME_INLINE_LEN-1) {
  		size_t size = offsetof(struct external_name, name[1]);
@@ -61011,7 +60859,7 @@ index e368d4f..b40ba59 100644
  		if (!p) {
  			kmem_cache_free(dentry_cache, dentry); 
  			return NULL;
-@@ -1443,7 +1443,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
+@@ -1557,7 +1557,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
  	smp_wmb();
  	dentry->d_name.name = dname;
  
@@ -61020,7 +60868,7 @@ index e368d4f..b40ba59 100644
  	dentry->d_flags = 0;
  	spin_lock_init(&dentry->d_lock);
  	seqcount_init(&dentry->d_seq);
-@@ -1452,6 +1452,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
+@@ -1566,6 +1566,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
  	dentry->d_sb = sb;
  	dentry->d_op = NULL;
  	dentry->d_fsdata = NULL;
@@ -61030,7 +60878,7 @@ index e368d4f..b40ba59 100644
  	INIT_HLIST_BL_NODE(&dentry->d_hash);
  	INIT_LIST_HEAD(&dentry->d_lru);
  	INIT_LIST_HEAD(&dentry->d_subdirs);
-@@ -2151,7 +2154,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
+@@ -2290,7 +2293,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
  				goto next;
  		}
  
@@ -61039,7 +60887,7 @@ index e368d4f..b40ba59 100644
  		found = dentry;
  		spin_unlock(&dentry->d_lock);
  		break;
-@@ -2250,7 +2253,7 @@ again:
+@@ -2358,7 +2361,7 @@ again:
  	spin_lock(&dentry->d_lock);
  	inode = dentry->d_inode;
  	isdir = S_ISDIR(inode->i_mode);
@@ -61048,7 +60896,7 @@ index e368d4f..b40ba59 100644
  		if (!spin_trylock(&inode->i_lock)) {
  			spin_unlock(&dentry->d_lock);
  			cpu_relax();
-@@ -3203,7 +3206,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
+@@ -3311,7 +3314,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
  
  		if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
  			dentry->d_flags |= DCACHE_GENOCIDE;
@@ -61057,7 +60905,7 @@ index e368d4f..b40ba59 100644
  		}
  	}
  	return D_WALK_CONTINUE;
-@@ -3319,7 +3322,8 @@ void __init vfs_caches_init(unsigned long mempages)
+@@ -3427,7 +3430,8 @@ void __init vfs_caches_init(unsigned long mempages)
  	mempages -= reserve;
  
  	names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
@@ -61068,10 +60916,21 @@ index e368d4f..b40ba59 100644
  	dcache_init();
  	inode_init();
 diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
-index 6f0ce53..92bba36 100644
+index 96400ab..906103d 100644
 --- a/fs/debugfs/inode.c
 +++ b/fs/debugfs/inode.c
-@@ -423,10 +423,20 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
+@@ -386,6 +386,10 @@ struct dentry *debugfs_create_file_size(const char *name, umode_t mode,
+ }
+ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
+ 
++#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
++extern int grsec_enable_sysfs_restrict;
++#endif
++
+ /**
+  * debugfs_create_dir - create a directory in the debugfs filesystem
+  * @name: a pointer to a string containing the name of the directory to
+@@ -404,6 +408,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
   * If debugfs is not enabled in the kernel, the value -%ENODEV will be
   * returned.
   */
@@ -61081,24 +60940,26 @@ index 6f0ce53..92bba36 100644
 +
  struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
  {
--	return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
--				   parent, NULL, NULL);
-+	umode_t mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
-+
+ 	struct dentry *dentry = start_creating(name, parent);
+@@ -416,7 +424,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
+ 	if (unlikely(!inode))
+ 		return failed_creating(dentry);
+ 
+-	inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
 +	if (grsec_enable_sysfs_restrict)
-+		mode = S_IFDIR | S_IRWXU;
++		inode->i_mode = S_IFDIR | S_IRWXU;
++	else
 +#endif
-+
-+	return __create_file(name, mode, parent, NULL, NULL);
- }
- EXPORT_SYMBOL_GPL(debugfs_create_dir);
++		inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
+ 	inode->i_op = &simple_dir_inode_operations;
+ 	inode->i_fop = &simple_dir_operations;
  
 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
-index 1686dc2..9611c50 100644
+index b08b518..d6acffa 100644
 --- a/fs/ecryptfs/inode.c
 +++ b/fs/ecryptfs/inode.c
-@@ -664,7 +664,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
+@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
  	old_fs = get_fs();
  	set_fs(get_ds());
  	rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
@@ -61121,7 +60982,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 4617a4e..e3f50ec 100644
+index 00400cf..b9dca28 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
 @@ -56,8 +56,20 @@
@@ -61424,7 +61285,7 @@ index 4617a4e..e3f50ec 100644
  
  out:
  	return file;
-@@ -809,7 +887,7 @@ int kernel_read(struct file *file, loff_t offset,
+@@ -815,7 +893,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() */
@@ -61433,7 +61294,7 @@ index 4617a4e..e3f50ec 100644
  	set_fs(old_fs);
  	return result;
  }
-@@ -854,6 +932,7 @@ static int exec_mmap(struct mm_struct *mm)
+@@ -860,6 +938,7 @@ static int exec_mmap(struct mm_struct *mm)
  	tsk->mm = mm;
  	tsk->active_mm = mm;
  	activate_mm(active_mm, mm);
@@ -61441,7 +61302,7 @@ index 4617a4e..e3f50ec 100644
  	tsk->mm->vmacache_seqnum = 0;
  	vmacache_flush(tsk);
  	task_unlock(tsk);
-@@ -920,10 +999,14 @@ static int de_thread(struct task_struct *tsk)
+@@ -926,10 +1005,14 @@ static int de_thread(struct task_struct *tsk)
  	if (!thread_group_leader(tsk)) {
  		struct task_struct *leader = tsk->group_leader;
  
@@ -61457,7 +61318,7 @@ index 4617a4e..e3f50ec 100644
  			if (likely(leader->exit_state))
  				break;
  			__set_current_state(TASK_KILLABLE);
-@@ -1252,7 +1335,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
+@@ -1258,7 +1341,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
  	}
  	rcu_read_unlock();
  
@@ -61466,7 +61327,7 @@ index 4617a4e..e3f50ec 100644
  		bprm->unsafe |= LSM_UNSAFE_SHARE;
  	else
  		p->fs->in_exec = 1;
-@@ -1453,6 +1536,31 @@ static int exec_binprm(struct linux_binprm *bprm)
+@@ -1459,6 +1542,31 @@ static int exec_binprm(struct linux_binprm *bprm)
  	return ret;
  }
  
@@ -61498,7 +61359,7 @@ index 4617a4e..e3f50ec 100644
  /*
   * sys_execve() executes a new program.
   */
-@@ -1461,6 +1569,11 @@ static int do_execveat_common(int fd, struct filename *filename,
+@@ -1467,6 +1575,11 @@ static int do_execveat_common(int fd, struct filename *filename,
  			      struct user_arg_ptr envp,
  			      int flags)
  {
@@ -61510,7 +61371,7 @@ index 4617a4e..e3f50ec 100644
  	char *pathbuf = NULL;
  	struct linux_binprm *bprm;
  	struct file *file;
-@@ -1470,6 +1583,8 @@ static int do_execveat_common(int fd, struct filename *filename,
+@@ -1476,6 +1589,8 @@ static int do_execveat_common(int fd, struct filename *filename,
  	if (IS_ERR(filename))
  		return PTR_ERR(filename);
  
@@ -61519,7 +61380,7 @@ index 4617a4e..e3f50ec 100644
  	/*
  	 * We move the actual failure in case of RLIMIT_NPROC excess from
  	 * set*uid() to execve() because too many poorly written programs
-@@ -1507,6 +1622,11 @@ static int do_execveat_common(int fd, struct filename *filename,
+@@ -1513,6 +1628,11 @@ static int do_execveat_common(int fd, struct filename *filename,
  	if (IS_ERR(file))
  		goto out_unmark;
  
@@ -61531,7 +61392,7 @@ index 4617a4e..e3f50ec 100644
  	sched_exec();
  
  	bprm->file = file;
-@@ -1533,6 +1653,11 @@ static int do_execveat_common(int fd, struct filename *filename,
+@@ -1539,6 +1659,11 @@ static int do_execveat_common(int fd, struct filename *filename,
  	}
  	bprm->interp = bprm->filename;
  
@@ -61543,7 +61404,7 @@ index 4617a4e..e3f50ec 100644
  	retval = bprm_mm_init(bprm);
  	if (retval)
  		goto out_unmark;
-@@ -1549,24 +1674,70 @@ static int do_execveat_common(int fd, struct filename *filename,
+@@ -1555,24 +1680,70 @@ static int do_execveat_common(int fd, struct filename *filename,
  	if (retval < 0)
  		goto out;
  
@@ -61618,7 +61479,7 @@ index 4617a4e..e3f50ec 100644
  	current->fs->in_exec = 0;
  	current->in_execve = 0;
  	acct_update_integrals(current);
-@@ -1578,6 +1749,14 @@ static int do_execveat_common(int fd, struct filename *filename,
+@@ -1584,6 +1755,14 @@ static int do_execveat_common(int fd, struct filename *filename,
  		put_files_struct(displaced);
  	return retval;
  
@@ -61633,7 +61494,7 @@ index 4617a4e..e3f50ec 100644
  out:
  	if (bprm->mm) {
  		acct_arg_size(bprm, 0);
-@@ -1724,3 +1903,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
+@@ -1730,3 +1909,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
  				  argv, envp, flags);
  }
  #endif
@@ -61964,10 +61825,10 @@ index 9f9992b..8b59411 100644
  	}
  	return 1;
 diff --git a/fs/ext2/super.c b/fs/ext2/super.c
-index ae55fdd..5e64c27 100644
+index d0e746e..82e06f0 100644
 --- a/fs/ext2/super.c
 +++ b/fs/ext2/super.c
-@@ -268,10 +268,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
+@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
  #ifdef CONFIG_EXT2_FS_XATTR
  	if (test_opt(sb, XATTR_USER))
  		seq_puts(seq, ",user_xattr");
@@ -61979,7 +61840,7 @@ index ae55fdd..5e64c27 100644
  #endif
  
  #ifdef CONFIG_EXT2_FS_POSIX_ACL
-@@ -850,8 +848,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
+@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
  	if (def_mount_opts & EXT2_DEFM_UID16)
  		set_opt(sbi->s_mount_opt, NO_UID32);
  #ifdef CONFIG_EXT2_FS_XATTR
@@ -62033,10 +61894,10 @@ index 158b5d4..2432610 100644
  	}
  	return 1;
 diff --git a/fs/ext3/super.c b/fs/ext3/super.c
-index 9b4e7d7..048d025 100644
+index d4dbf3c..906a6fb 100644
 --- a/fs/ext3/super.c
 +++ b/fs/ext3/super.c
-@@ -653,10 +653,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
+@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
  #ifdef CONFIG_EXT3_FS_XATTR
  	if (test_opt(sb, XATTR_USER))
  		seq_puts(seq, ",user_xattr");
@@ -62048,7 +61909,7 @@ index 9b4e7d7..048d025 100644
  #endif
  #ifdef CONFIG_EXT3_FS_POSIX_ACL
  	if (test_opt(sb, POSIX_ACL))
-@@ -1758,8 +1756,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
+@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
  	if (def_mount_opts & EXT3_DEFM_UID16)
  		set_opt(sbi->s_mount_opt, NO_UID32);
  #ifdef CONFIG_EXT3_FS_XATTR
@@ -62100,10 +61961,10 @@ index 83a6f49..d4e4d03 100644
  		if (free_clusters >= (nclusters + dirty_clusters +
  				      resv_clusters))
 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index a75fba6..8235fca 100644
+index f63c3d5..3c1a033 100644
 --- a/fs/ext4/ext4.h
 +++ b/fs/ext4/ext4.h
-@@ -1274,19 +1274,19 @@ struct ext4_sb_info {
+@@ -1287,19 +1287,19 @@ struct ext4_sb_info {
  	unsigned long s_mb_last_start;
  
  	/* stats for buddy allocator */
@@ -62306,10 +62167,10 @@ index 8a8ec62..1b02de5 100644
  		err = ext4_handle_dirty_metadata(handle, NULL, bh);
  		if (unlikely(err))
 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index fc29b2c..6c8b255 100644
+index e061e66..87bc092 100644
 --- a/fs/ext4/super.c
 +++ b/fs/ext4/super.c
-@@ -1252,7 +1252,7 @@ static ext4_fsblk_t get_sb_block(void **data)
+@@ -1243,7 +1243,7 @@ static ext4_fsblk_t get_sb_block(void **data)
  }
  
  #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
@@ -62318,7 +62179,7 @@ index fc29b2c..6c8b255 100644
  	"Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
  
  #ifdef CONFIG_QUOTA
-@@ -2440,7 +2440,7 @@ struct ext4_attr {
+@@ -2443,7 +2443,7 @@ struct ext4_attr {
  		int offset;
  		int deprecated_val;
  	} u;
@@ -63999,10 +63860,10 @@ index 28d0c7a..04816b7 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 71c4619..6a9f6d4 100644
+index 39706c5..a803c71 100644
 --- a/fs/fuse/dev.c
 +++ b/fs/fuse/dev.c
-@@ -1394,7 +1394,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
+@@ -1405,7 +1405,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
  	ret = 0;
  	pipe_lock(pipe);
  
@@ -64011,7 +63872,7 @@ index 71c4619..6a9f6d4 100644
  		send_sig(SIGPIPE, current, 0);
  		if (!ret)
  			ret = -EPIPE;
-@@ -1423,7 +1423,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
+@@ -1434,7 +1434,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
  		page_nr++;
  		ret += buf->len;
  
@@ -64021,7 +63882,7 @@ index 71c4619..6a9f6d4 100644
  	}
  
 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
-index 08e7b1a..d91c6ee 100644
+index 1545b71..7fabe47 100644
 --- a/fs/fuse/dir.c
 +++ b/fs/fuse/dir.c
 @@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
@@ -64033,6 +63894,135 @@ index 08e7b1a..d91c6ee 100644
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
+diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
+index f42dffb..4a4c435 100644
+--- a/fs/gfs2/glock.c
++++ b/fs/gfs2/glock.c
+@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
+ 	if (held1 != held2) {
+ 		GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
+ 		if (held2)
+-			gl->gl_lockref.count++;
++			__lockref_inc(&gl->gl_lockref);
+ 		else
+-			gl->gl_lockref.count--;
++			__lockref_dec(&gl->gl_lockref);
+ 	}
+ 	if (held1 && held2 && list_empty(&gl->gl_holders))
+ 		clear_bit(GLF_QUEUED, &gl->gl_flags);
+@@ -614,9 +614,9 @@ out:
+ out_sched:
+ 	clear_bit(GLF_LOCK, &gl->gl_flags);
+ 	smp_mb__after_atomic();
+-	gl->gl_lockref.count++;
++	__lockref_inc(&gl->gl_lockref);
+ 	if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
+-		gl->gl_lockref.count--;
++		__lockref_dec(&gl->gl_lockref);
+ 	return;
+ 
+ out_unlock:
+@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
+ 	gl->gl_sbd = sdp;
+ 	gl->gl_flags = 0;
+ 	gl->gl_name = name;
+-	gl->gl_lockref.count = 1;
++	__lockref_set(&gl->gl_lockref, 1);
+ 	gl->gl_state = LM_ST_UNLOCKED;
+ 	gl->gl_target = LM_ST_UNLOCKED;
+ 	gl->gl_demote_state = LM_ST_EXCLUSIVE;
+@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
+ 	if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
+ 		     test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
+ 		set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
+-		gl->gl_lockref.count++;
++		__lockref_inc(&gl->gl_lockref);
+ 		if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
+-			gl->gl_lockref.count--;
++			__lockref_dec(&gl->gl_lockref);
+ 	}
+ 	run_queue(gl, 1);
+ 	spin_unlock(&gl->gl_spin);
+@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
+ 		}
+ 	}
+ 
+-	gl->gl_lockref.count++;
++	__lockref_inc(&gl->gl_lockref);
+ 	set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
+ 	spin_unlock(&gl->gl_spin);
+ 
+@@ -1384,12 +1384,12 @@ add_back_to_lru:
+ 			goto add_back_to_lru;
+ 		}
+ 		clear_bit(GLF_LRU, &gl->gl_flags);
+-		gl->gl_lockref.count++;
++		__lockref_inc(&gl->gl_lockref);
+ 		if (demote_ok(gl))
+ 			handle_callback(gl, LM_ST_UNLOCKED, 0, false);
+ 		WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
+ 		if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
+-			gl->gl_lockref.count--;
++			__lockref_dec(&gl->gl_lockref);
+ 		spin_unlock(&gl->gl_spin);
+ 		cond_resched_lock(&lru_lock);
+ 	}
+@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
+ 		  state2str(gl->gl_demote_state), dtime,
+ 		  atomic_read(&gl->gl_ail_count),
+ 		  atomic_read(&gl->gl_revokes),
+-		  (int)gl->gl_lockref.count, gl->gl_hold_time);
++		  __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
+ 
+ 	list_for_each_entry(gh, &gl->gl_holders, gh_list)
+ 		dump_holder(seq, gh);
+diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
+index fe91951..ce38a6e 100644
+--- a/fs/gfs2/glops.c
++++ b/fs/gfs2/glops.c
+@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
+ 
+ 	if (gl->gl_demote_state == LM_ST_UNLOCKED &&
+ 	    gl->gl_state == LM_ST_SHARED && ip) {
+-		gl->gl_lockref.count++;
++		__lockref_inc(&gl->gl_lockref);
+ 		if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
+-			gl->gl_lockref.count--;
++			__lockref_dec(&gl->gl_lockref);
+ 	}
+ }
+ 
+diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
+index 3aa17d4..b338075 100644
+--- a/fs/gfs2/quota.c
++++ b/fs/gfs2/quota.c
+@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
+ 	if (!spin_trylock(&qd->qd_lockref.lock))
+ 		return LRU_SKIP;
+ 
+-	if (qd->qd_lockref.count == 0) {
++	if (__lockref_read(&qd->qd_lockref) == 0) {
+ 		lockref_mark_dead(&qd->qd_lockref);
+ 		list_lru_isolate_move(lru, &qd->qd_lru, dispose);
+ 	}
+@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
+ 		return NULL;
+ 
+ 	qd->qd_sbd = sdp;
+-	qd->qd_lockref.count = 1;
++	__lockref_set(&qd->qd_lockref, 1);
+ 	spin_lock_init(&qd->qd_lockref.lock);
+ 	qd->qd_id = qid;
+ 	qd->qd_slot = -1;
+@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
+ 	if (lockref_put_or_lock(&qd->qd_lockref))
+ 		return;
+ 
+-	qd->qd_lockref.count = 0;
++	__lockref_set(&qd->qd_lockref, 0);
+ 	list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
+ 	spin_unlock(&qd->qd_lockref.lock);
+ 
 diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
 index fd62cae..3494dfa 100644
 --- a/fs/hostfs/hostfs_kern.c
@@ -64047,10 +64037,10 @@ index fd62cae..3494dfa 100644
  		__putname(s);
  }
 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
-index 5eba47f..d353c22 100644
+index c274aca..772fa5e 100644
 --- a/fs/hugetlbfs/inode.c
 +++ b/fs/hugetlbfs/inode.c
-@@ -154,6 +154,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -148,6 +148,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
  	struct mm_struct *mm = current->mm;
  	struct vm_area_struct *vma;
  	struct hstate *h = hstate_file(file);
@@ -64058,7 +64048,7 @@ index 5eba47f..d353c22 100644
  	struct vm_unmapped_area_info info;
  
  	if (len & ~huge_page_mask(h))
-@@ -167,17 +168,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -161,17 +162,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
  		return addr;
  	}
  
@@ -64087,7 +64077,7 @@ index 5eba47f..d353c22 100644
  	info.high_limit = TASK_SIZE;
  	info.align_mask = PAGE_MASK & ~huge_page_mask(h);
  	info.align_offset = 0;
-@@ -919,7 +929,7 @@ static struct file_system_type hugetlbfs_fs_type = {
+@@ -912,7 +922,7 @@ static struct file_system_type hugetlbfs_fs_type = {
  };
  MODULE_ALIAS_FS("hugetlbfs");
  
@@ -64097,10 +64087,10 @@ index 5eba47f..d353c22 100644
  static int can_do_hugetlb_shm(void)
  {
 diff --git a/fs/inode.c b/fs/inode.c
-index aa149e7..46f1f65 100644
+index f00b16f..b653fea 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -842,16 +842,20 @@ unsigned int get_next_ino(void)
+@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
  	unsigned int *p = &get_cpu_var(last_ino);
  	unsigned int res = *p;
  
@@ -64153,10 +64143,10 @@ index 09ed551..45684f8 100644
  
  /*
 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
-index 16c3a95..e9cb75d 100644
+index 5d30c56..8c45372 100644
 --- a/fs/jfs/super.c
 +++ b/fs/jfs/super.c
-@@ -902,7 +902,7 @@ static int __init init_jfs_fs(void)
+@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
  
  	jfs_inode_cachep =
  	    kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
@@ -64166,7 +64156,7 @@ index 16c3a95..e9cb75d 100644
  	if (jfs_inode_cachep == NULL)
  		return -ENOMEM;
 diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index 2d881b3..fe1ac77 100644
+index 6acc964..eca491f 100644
 --- a/fs/kernfs/dir.c
 +++ b/fs/kernfs/dir.c
 @@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
@@ -64178,7 +64168,7 @@ index 2d881b3..fe1ac77 100644
  {
  	unsigned long hash = init_name_hash();
  	unsigned int len = strlen(name);
-@@ -833,6 +833,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
+@@ -831,6 +831,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
  	ret = scops->mkdir(parent, dentry->d_name.name, mode);
  
  	kernfs_put_active(parent);
@@ -64192,7 +64182,7 @@ index 2d881b3..fe1ac77 100644
  }
  
 diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
-index ddc9f96..4e450ad 100644
+index 2bacb99..f745182 100644
 --- a/fs/kernfs/file.c
 +++ b/fs/kernfs/file.c
 @@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
@@ -64213,7 +64203,16 @@ index ddc9f96..4e450ad 100644
  
  	return of->kn->attr.ops->seq_show(sf, v);
  }
-@@ -271,7 +271,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
+@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
+ 		goto out_free;
+ 	}
+ 
+-	of->event = atomic_read(&of->kn->attr.open->event);
++	of->event = atomic_read_unchecked(&of->kn->attr.open->event);
+ 	ops = kernfs_ops(of->kn);
+ 	if (ops->read)
+ 		len = ops->read(of, buf, len, *ppos);
+@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
  {
  	struct kernfs_open_file *of = kernfs_of(file);
  	const struct kernfs_ops *ops;
@@ -64222,7 +64221,7 @@ index ddc9f96..4e450ad 100644
  	char *buf;
  
  	if (of->atomic_write_len) {
-@@ -384,12 +384,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
+@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
  	return ret;
  }
  
@@ -64238,7 +64237,7 @@ index ddc9f96..4e450ad 100644
  
  	if (!of->vm_ops)
  		return -EINVAL;
-@@ -568,7 +568,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
+@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
  		return -ENOMEM;
  
  	atomic_set(&new_on->refcnt, 0);
@@ -64247,7 +64246,7 @@ index ddc9f96..4e450ad 100644
  	init_waitqueue_head(&new_on->poll);
  	INIT_LIST_HEAD(&new_on->files);
  	goto retry;
-@@ -792,7 +792,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
+@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
  
  	kernfs_put_active(kn);
  
@@ -64256,7 +64255,7 @@ index ddc9f96..4e450ad 100644
  		goto trigger;
  
  	return DEFAULT_POLLMASK;
-@@ -823,7 +823,7 @@ repeat:
+@@ -824,7 +824,7 @@ repeat:
  
  	on = kn->attr.open;
  	if (on) {
@@ -64279,7 +64278,7 @@ index 8a19889..4c3069a 100644
  		free_page((unsigned long)page);
  }
 diff --git a/fs/libfs.c b/fs/libfs.c
-index 005843c..06c4191 100644
+index 0ab6512..cd9982d 100644
 --- a/fs/libfs.c
 +++ b/fs/libfs.c
 @@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
@@ -64333,37 +64332,11 @@ index acd3947..1f896e2 100644
  
  	memcpy(c->data, &cookie, 4);
  	c->len=4;
-diff --git a/fs/locks.c b/fs/locks.c
-index 59e2f90..bd69071 100644
---- a/fs/locks.c
-+++ b/fs/locks.c
-@@ -2374,7 +2374,7 @@ void locks_remove_file(struct file *filp)
- 	locks_remove_posix(filp, filp);
- 
- 	if (filp->f_op->flock) {
--		struct file_lock fl = {
-+		struct file_lock flock = {
- 			.fl_owner = filp,
- 			.fl_pid = current->tgid,
- 			.fl_file = filp,
-@@ -2382,9 +2382,9 @@ void locks_remove_file(struct file *filp)
- 			.fl_type = F_UNLCK,
- 			.fl_end = OFFSET_MAX,
- 		};
--		filp->f_op->flock(filp, F_SETLKW, &fl);
--		if (fl.fl_ops && fl.fl_ops->fl_release_private)
--			fl.fl_ops->fl_release_private(&fl);
-+		filp->f_op->flock(filp, F_SETLKW, &flock);
-+		if (flock.fl_ops && flock.fl_ops->fl_release_private)
-+			flock.fl_ops->fl_release_private(&flock);
- 	}
- 
- 	spin_lock(&inode->i_lock);
 diff --git a/fs/mount.h b/fs/mount.h
-index 0ad6f76..a04c146 100644
+index 6a61c2b..bd79179 100644
 --- a/fs/mount.h
 +++ b/fs/mount.h
-@@ -12,7 +12,7 @@ struct mnt_namespace {
+@@ -13,7 +13,7 @@ struct mnt_namespace {
  	u64			seq;	/* Sequence number to prevent loops */
  	wait_queue_head_t poll;
  	u64 event;
@@ -64372,20 +64345,20 @@ index 0ad6f76..a04c146 100644
  
  struct mnt_pcp {
  	int mnt_count;
-@@ -63,7 +63,7 @@ struct mount {
- 	int mnt_expiry_mark;		/* true if marked for expiry */
+@@ -65,7 +65,7 @@ struct mount {
  	struct hlist_head mnt_pins;
- 	struct path mnt_ex_mountpoint;
+ 	struct fs_pin mnt_umount;
+ 	struct dentry *mnt_ex_mountpoint;
 -};
 +} __randomize_layout;
  
  #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
  
 diff --git a/fs/namei.c b/fs/namei.c
-index bc35b02..7ed1f1d 100644
+index c83145a..a78aa13 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
-@@ -331,17 +331,32 @@ int generic_permission(struct inode *inode, int mask)
+@@ -337,17 +337,32 @@ int generic_permission(struct inode *inode, int mask)
  	if (ret != -EACCES)
  		return ret;
  
@@ -64422,7 +64395,7 @@ index bc35b02..7ed1f1d 100644
  	 * Read/write DACs are always overridable.
  	 * Executable DACs are overridable when there is
  	 * at least one exec bit set.
-@@ -350,14 +365,6 @@ int generic_permission(struct inode *inode, int mask)
+@@ -356,14 +371,6 @@ int generic_permission(struct inode *inode, int mask)
  		if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
  			return 0;
  
@@ -64437,7 +64410,7 @@ index bc35b02..7ed1f1d 100644
  	return -EACCES;
  }
  EXPORT_SYMBOL(generic_permission);
-@@ -497,7 +504,7 @@ struct nameidata {
+@@ -503,7 +510,7 @@ struct nameidata {
  	int		last_type;
  	unsigned	depth;
  	struct file	*base;
@@ -64446,7 +64419,7 @@ index bc35b02..7ed1f1d 100644
  };
  
  /*
-@@ -708,13 +715,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
+@@ -714,13 +721,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
  	nd->flags |= LOOKUP_JUMPED;
  }
  
@@ -64462,7 +64435,7 @@ index bc35b02..7ed1f1d 100644
  {
  	return nd->saved_names[nd->depth];
  }
-@@ -849,7 +856,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
+@@ -855,7 +862,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
  {
  	struct dentry *dentry = link->dentry;
  	int error;
@@ -64471,7 +64444,7 @@ index bc35b02..7ed1f1d 100644
  
  	BUG_ON(nd->flags & LOOKUP_RCU);
  
-@@ -870,6 +877,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
+@@ -876,6 +883,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
  	if (error)
  		goto out_put_nd_path;
  
@@ -64484,7 +64457,7 @@ index bc35b02..7ed1f1d 100644
  	nd->last_type = LAST_BIND;
  	*p = dentry->d_inode->i_op->follow_link(dentry, nd);
  	error = PTR_ERR(*p);
-@@ -1633,6 +1646,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
+@@ -1639,6 +1652,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
  		if (res)
  			break;
  		res = walk_component(nd, path, LOOKUP_FOLLOW);
@@ -64493,7 +64466,7 @@ index bc35b02..7ed1f1d 100644
  		put_link(nd, &link, cookie);
  	} while (res > 0);
  
-@@ -1705,7 +1720,7 @@ EXPORT_SYMBOL(full_name_hash);
+@@ -1711,7 +1726,7 @@ EXPORT_SYMBOL(full_name_hash);
  static inline u64 hash_name(const char *name)
  {
  	unsigned long a, b, adata, bdata, mask, hash, len;
@@ -64502,7 +64475,7 @@ index bc35b02..7ed1f1d 100644
  
  	hash = a = 0;
  	len = -sizeof(unsigned long);
-@@ -2000,6 +2015,8 @@ static int path_lookupat(int dfd, const char *name,
+@@ -2006,6 +2021,8 @@ static int path_lookupat(int dfd, const char *name,
  			if (err)
  				break;
  			err = lookup_last(nd, &path);
@@ -64511,7 +64484,7 @@ index bc35b02..7ed1f1d 100644
  			put_link(nd, &link, cookie);
  		}
  	}
-@@ -2007,6 +2024,13 @@ static int path_lookupat(int dfd, const char *name,
+@@ -2013,6 +2030,13 @@ static int path_lookupat(int dfd, const char *name,
  	if (!err)
  		err = complete_walk(nd);
  
@@ -64525,7 +64498,7 @@ index bc35b02..7ed1f1d 100644
  	if (!err && nd->flags & LOOKUP_DIRECTORY) {
  		if (!d_can_lookup(nd->path.dentry)) {
  			path_put(&nd->path);
-@@ -2028,8 +2052,15 @@ static int filename_lookup(int dfd, struct filename *name,
+@@ -2034,8 +2058,15 @@ static int filename_lookup(int dfd, struct filename *name,
  		retval = path_lookupat(dfd, name->name,
  						flags | LOOKUP_REVAL, nd);
  
@@ -64542,7 +64515,7 @@ index bc35b02..7ed1f1d 100644
  	return retval;
  }
  
-@@ -2595,6 +2626,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
+@@ -2614,6 +2645,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
  	if (flag & O_NOATIME && !inode_owner_or_capable(inode))
  		return -EPERM;
  
@@ -64556,7 +64529,7 @@ index bc35b02..7ed1f1d 100644
  	return 0;
  }
  
-@@ -2826,7 +2864,7 @@ looked_up:
+@@ -2845,7 +2883,7 @@ looked_up:
   * cleared otherwise prior to returning.
   */
  static int lookup_open(struct nameidata *nd, struct path *path,
@@ -64565,7 +64538,7 @@ index bc35b02..7ed1f1d 100644
  			const struct open_flags *op,
  			bool got_write, int *opened)
  {
-@@ -2861,6 +2899,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+@@ -2880,6 +2918,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;
@@ -64583,7 +64556,7 @@ index bc35b02..7ed1f1d 100644
  		if (!IS_POSIXACL(dir->d_inode))
  			mode &= ~current_umask();
  		/*
-@@ -2882,6 +2931,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
+@@ -2901,6 +2950,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
  				   nd->flags & LOOKUP_EXCL);
  		if (error)
  			goto out_dput;
@@ -64592,7 +64565,7 @@ index bc35b02..7ed1f1d 100644
  	}
  out_no_open:
  	path->dentry = dentry;
-@@ -2896,7 +2947,7 @@ out_dput:
+@@ -2915,7 +2966,7 @@ out_dput:
  /*
   * Handle the last step of open()
   */
@@ -64601,7 +64574,7 @@ index bc35b02..7ed1f1d 100644
  		   struct file *file, const struct open_flags *op,
  		   int *opened, struct filename *name)
  {
-@@ -2946,6 +2997,15 @@ static int do_last(struct nameidata *nd, struct path *path,
+@@ -2965,6 +3016,15 @@ static int do_last(struct nameidata *nd, struct path *path,
  		if (error)
  			return error;
  
@@ -64617,7 +64590,7 @@ index bc35b02..7ed1f1d 100644
  		audit_inode(name, dir, LOOKUP_PARENT);
  		error = -EISDIR;
  		/* trailing slashes? */
-@@ -2965,7 +3025,7 @@ retry_lookup:
+@@ -2984,7 +3044,7 @@ retry_lookup:
  		 */
  	}
  	mutex_lock(&dir->d_inode->i_mutex);
@@ -64626,7 +64599,7 @@ index bc35b02..7ed1f1d 100644
  	mutex_unlock(&dir->d_inode->i_mutex);
  
  	if (error <= 0) {
-@@ -2989,11 +3049,28 @@ retry_lookup:
+@@ -3008,11 +3068,28 @@ retry_lookup:
  		goto finish_open_created;
  	}
  
@@ -64656,7 +64629,7 @@ index bc35b02..7ed1f1d 100644
  
  	/*
  	 * If atomic_open() acquired write access it is dropped now due to
-@@ -3034,6 +3111,11 @@ finish_lookup:
+@@ -3053,6 +3130,11 @@ finish_lookup:
  			}
  		}
  		BUG_ON(inode != path->dentry->d_inode);
@@ -64668,7 +64641,7 @@ index bc35b02..7ed1f1d 100644
  		return 1;
  	}
  
-@@ -3053,7 +3135,18 @@ finish_open:
+@@ -3072,7 +3154,18 @@ finish_open:
  		path_put(&save_parent);
  		return error;
  	}
@@ -64687,7 +64660,7 @@ index bc35b02..7ed1f1d 100644
  	error = -EISDIR;
  	if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
  		goto out;
-@@ -3214,7 +3307,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
+@@ -3233,7 +3326,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
  	if (unlikely(error))
  		goto out;
  
@@ -64696,7 +64669,7 @@ index bc35b02..7ed1f1d 100644
  	while (unlikely(error > 0)) { /* trailing symlink */
  		struct path link = path;
  		void *cookie;
-@@ -3232,7 +3325,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
+@@ -3251,7 +3344,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
  		error = follow_link(&link, nd, &cookie);
  		if (unlikely(error))
  			break;
@@ -64705,7 +64678,7 @@ index bc35b02..7ed1f1d 100644
  		put_link(nd, &link, cookie);
  	}
  out:
-@@ -3329,9 +3422,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname,
+@@ -3353,9 +3446,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
  		goto unlock;
  
  	error = -EEXIST;
@@ -64719,7 +64692,7 @@ index bc35b02..7ed1f1d 100644
  	/*
  	 * Special case - lookup gave negative, but... we had foo/bar/
  	 * From the vfs_mknod() POV we just have a negative dentry -
-@@ -3383,6 +3478,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
+@@ -3420,6 +3515,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
  }
  EXPORT_SYMBOL(user_path_create);
  
@@ -64740,7 +64713,7 @@ index bc35b02..7ed1f1d 100644
  int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
  {
  	int error = may_create(dir, dentry);
-@@ -3446,6 +3555,17 @@ retry:
+@@ -3483,6 +3592,17 @@ retry:
  
  	if (!IS_POSIXACL(path.dentry->d_inode))
  		mode &= ~current_umask();
@@ -64758,7 +64731,7 @@ index bc35b02..7ed1f1d 100644
  	error = security_path_mknod(&path, dentry, mode, dev);
  	if (error)
  		goto out;
-@@ -3461,6 +3581,8 @@ retry:
+@@ -3498,6 +3618,8 @@ retry:
  			error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
  			break;
  	}
@@ -64767,7 +64740,7 @@ index bc35b02..7ed1f1d 100644
  out:
  	done_path_create(&path, dentry);
  	if (retry_estale(error, lookup_flags)) {
-@@ -3515,9 +3637,16 @@ retry:
+@@ -3552,9 +3674,16 @@ retry:
  
  	if (!IS_POSIXACL(path.dentry->d_inode))
  		mode &= ~current_umask();
@@ -64784,7 +64757,16 @@ index bc35b02..7ed1f1d 100644
  	done_path_create(&path, dentry);
  	if (retry_estale(error, lookup_flags)) {
  		lookup_flags |= LOOKUP_REVAL;
-@@ -3601,6 +3730,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
+@@ -3587,7 +3716,7 @@ void dentry_unhash(struct dentry *dentry)
+ {
+ 	shrink_dcache_parent(dentry);
+ 	spin_lock(&dentry->d_lock);
+-	if (dentry->d_lockref.count == 1)
++	if (__lockref_read(&dentry->d_lockref) == 1)
+ 		__d_drop(dentry);
+ 	spin_unlock(&dentry->d_lock);
+ }
+@@ -3638,6 +3767,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
  	struct filename *name;
  	struct dentry *dentry;
  	struct nameidata nd;
@@ -64793,7 +64775,7 @@ index bc35b02..7ed1f1d 100644
  	unsigned int lookup_flags = 0;
  retry:
  	name = user_path_parent(dfd, pathname, &nd, lookup_flags);
-@@ -3633,10 +3764,21 @@ retry:
+@@ -3670,10 +3801,21 @@ retry:
  		error = -ENOENT;
  		goto exit3;
  	}
@@ -64815,7 +64797,7 @@ index bc35b02..7ed1f1d 100644
  exit3:
  	dput(dentry);
  exit2:
-@@ -3729,6 +3871,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
+@@ -3766,6 +3908,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
  	struct nameidata nd;
  	struct inode *inode = NULL;
  	struct inode *delegated_inode = NULL;
@@ -64824,7 +64806,7 @@ index bc35b02..7ed1f1d 100644
  	unsigned int lookup_flags = 0;
  retry:
  	name = user_path_parent(dfd, pathname, &nd, lookup_flags);
-@@ -3755,10 +3899,22 @@ retry_deleg:
+@@ -3792,10 +3936,22 @@ retry_deleg:
  		if (d_is_negative(dentry))
  			goto slashes;
  		ihold(inode);
@@ -64847,7 +64829,7 @@ index bc35b02..7ed1f1d 100644
  exit2:
  		dput(dentry);
  	}
-@@ -3847,9 +4003,17 @@ retry:
+@@ -3884,9 +4040,17 @@ retry:
  	if (IS_ERR(dentry))
  		goto out_putname;
  
@@ -64865,7 +64847,7 @@ index bc35b02..7ed1f1d 100644
  	done_path_create(&path, dentry);
  	if (retry_estale(error, lookup_flags)) {
  		lookup_flags |= LOOKUP_REVAL;
-@@ -3953,6 +4117,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+@@ -3990,6 +4154,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
  	struct dentry *new_dentry;
  	struct path old_path, new_path;
  	struct inode *delegated_inode = NULL;
@@ -64873,7 +64855,7 @@ index bc35b02..7ed1f1d 100644
  	int how = 0;
  	int error;
  
-@@ -3976,7 +4141,7 @@ retry:
+@@ -4013,7 +4178,7 @@ retry:
  	if (error)
  		return error;
  
@@ -64882,7 +64864,7 @@ index bc35b02..7ed1f1d 100644
  					(how & LOOKUP_REVAL));
  	error = PTR_ERR(new_dentry);
  	if (IS_ERR(new_dentry))
-@@ -3988,11 +4153,28 @@ retry:
+@@ -4025,11 +4190,28 @@ retry:
  	error = may_linkat(&old_path);
  	if (unlikely(error))
  		goto out_dput;
@@ -64911,7 +64893,7 @@ index bc35b02..7ed1f1d 100644
  	done_path_create(&new_path, new_dentry);
  	if (delegated_inode) {
  		error = break_deleg_wait(&delegated_inode);
-@@ -4308,6 +4490,20 @@ retry_deleg:
+@@ -4345,6 +4527,20 @@ retry_deleg:
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -64932,7 +64914,7 @@ index bc35b02..7ed1f1d 100644
  	error = security_path_rename(&oldnd.path, old_dentry,
  				     &newnd.path, new_dentry, flags);
  	if (error)
-@@ -4315,6 +4511,9 @@ retry_deleg:
+@@ -4352,6 +4548,9 @@ retry_deleg:
  	error = vfs_rename(old_dir->d_inode, old_dentry,
  			   new_dir->d_inode, new_dentry,
  			   &delegated_inode, flags);
@@ -64942,7 +64924,7 @@ index bc35b02..7ed1f1d 100644
  exit5:
  	dput(new_dentry);
  exit4:
-@@ -4371,14 +4570,24 @@ EXPORT_SYMBOL(vfs_whiteout);
+@@ -4408,14 +4607,24 @@ EXPORT_SYMBOL(vfs_whiteout);
  
  int readlink_copy(char __user *buffer, int buflen, const char *link)
  {
@@ -64969,10 +64951,10 @@ index bc35b02..7ed1f1d 100644
  out:
  	return len;
 diff --git a/fs/namespace.c b/fs/namespace.c
-index cd1e968..e64ff16 100644
+index 82ef140..5335e75 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
-@@ -1448,6 +1448,9 @@ static int do_umount(struct mount *mnt, int flags)
+@@ -1438,6 +1438,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);
@@ -64982,7 +64964,7 @@ index cd1e968..e64ff16 100644
  		return retval;
  	}
  
-@@ -1470,6 +1473,9 @@ static int do_umount(struct mount *mnt, int flags)
+@@ -1460,6 +1463,9 @@ static int do_umount(struct mount *mnt, int flags)
  	}
  	unlock_mount_hash();
  	namespace_unlock();
@@ -64992,7 +64974,7 @@ index cd1e968..e64ff16 100644
  	return retval;
  }
  
-@@ -1520,7 +1526,7 @@ static inline bool may_mount(void)
+@@ -1510,7 +1516,7 @@ static inline bool may_mount(void)
   * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
   */
  
@@ -65001,7 +64983,7 @@ index cd1e968..e64ff16 100644
  {
  	struct path path;
  	struct mount *mnt;
-@@ -1565,7 +1571,7 @@ out:
+@@ -1555,7 +1561,7 @@ out:
  /*
   *	The 2.0 compatible umount. No flags.
   */
@@ -65010,7 +64992,7 @@ index cd1e968..e64ff16 100644
  {
  	return sys_umount(name, 0);
  }
-@@ -2631,6 +2637,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
+@@ -2621,6 +2627,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
  		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
  		   MS_STRICTATIME);
  
@@ -65027,7 +65009,7 @@ index cd1e968..e64ff16 100644
  	if (flags & MS_REMOUNT)
  		retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
  				    data_page);
-@@ -2644,7 +2660,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
+@@ -2634,7 +2650,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
  		retval = do_new_mount(&path, type_page, flags, mnt_flags,
  				      dev_name, data_page);
  dput_out:
@@ -65038,7 +65020,7 @@ index cd1e968..e64ff16 100644
  	return retval;
  }
  
-@@ -2662,7 +2681,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
+@@ -2652,7 +2671,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.
   */
@@ -65047,7 +65029,7 @@ index cd1e968..e64ff16 100644
  
  static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
  {
-@@ -2678,7 +2697,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
+@@ -2668,7 +2687,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
  		return ERR_PTR(ret);
  	}
  	new_ns->ns.ops = &mntns_operations;
@@ -65056,7 +65038,7 @@ index cd1e968..e64ff16 100644
  	atomic_set(&new_ns->count, 1);
  	new_ns->root = NULL;
  	INIT_LIST_HEAD(&new_ns->list);
-@@ -2688,7 +2707,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
+@@ -2678,7 +2697,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
  	return new_ns;
  }
  
@@ -65065,7 +65047,7 @@ index cd1e968..e64ff16 100644
  		struct user_namespace *user_ns, struct fs_struct *new_fs)
  {
  	struct mnt_namespace *new_ns;
-@@ -2809,8 +2828,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
+@@ -2799,8 +2818,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
  }
  EXPORT_SYMBOL(mount_subtree);
  
@@ -65076,7 +65058,7 @@ index cd1e968..e64ff16 100644
  {
  	int ret;
  	char *kernel_type;
-@@ -2916,6 +2935,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
+@@ -2906,6 +2925,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
  	if (error)
  		goto out2;
  
@@ -65088,7 +65070,7 @@ index cd1e968..e64ff16 100644
  	get_fs_root(current->fs, &root);
  	old_mp = lock_mount(&old);
  	error = PTR_ERR(old_mp);
-@@ -3190,7 +3214,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
+@@ -3180,7 +3204,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
  	    !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
  		return -EPERM;
  
@@ -65098,7 +65080,7 @@ index cd1e968..e64ff16 100644
  
  	get_mnt_ns(mnt_ns);
 diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
-index 02f8d09..a5c25d1 100644
+index 19ca95c..b28702c 100644
 --- a/fs/nfs/callback_xdr.c
 +++ b/fs/nfs/callback_xdr.c
 @@ -51,7 +51,7 @@ struct callback_op {
@@ -65111,11 +65093,11 @@ index 02f8d09..a5c25d1 100644
  static struct callback_op callback_ops[];
  
 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index 2211f6b..30d0950 100644
+index d42dff6..ecbdf42 100644
 --- a/fs/nfs/inode.c
 +++ b/fs/nfs/inode.c
-@@ -1234,16 +1234,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);
+@@ -1270,16 +1270,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
+ 	return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
  }
  
 -static atomic_long_t nfs_attr_generation_counter;
@@ -65132,13 +65114,13 @@ index 2211f6b..30d0950 100644
 -	return atomic_long_inc_return(&nfs_attr_generation_counter);
 +	return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
  }
+ EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
  
- void nfs_fattr_init(struct nfs_fattr *fattr)
 diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
-index ac71d13..a2e590a 100644
+index 92b9d97..045e58c 100644
 --- a/fs/nfsd/nfs4proc.c
 +++ b/fs/nfsd/nfs4proc.c
-@@ -1237,7 +1237,7 @@ struct nfsd4_operation {
+@@ -1492,7 +1492,7 @@ struct nfsd4_operation {
  	nfsd4op_rsize op_rsize_bop;
  	stateid_getter op_get_currentstateid;
  	stateid_setter op_set_currentstateid;
@@ -65148,10 +65130,10 @@ index ac71d13..a2e590a 100644
  static struct nfsd4_operation nfsd4_ops[];
  
 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index 15f7b73..00e230b 100644
+index 5fb7e78..cc8a22e 100644
 --- a/fs/nfsd/nfs4xdr.c
 +++ b/fs/nfsd/nfs4xdr.c
-@@ -1560,7 +1560,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
+@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
  
  typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
  
@@ -65161,10 +65143,10 @@ index 15f7b73..00e230b 100644
  	[OP_CLOSE]		= (nfsd4_dec)nfsd4_decode_close,
  	[OP_COMMIT]		= (nfsd4_dec)nfsd4_decode_commit,
 diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
-index 83a9694..6b7f928 100644
+index 46ec934..f384e41 100644
 --- a/fs/nfsd/nfscache.c
 +++ b/fs/nfsd/nfscache.c
-@@ -537,7 +537,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
+@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
  	struct kvec	*resv = &rqstp->rq_res.head[0], *cachv;
  	u32		hash;
  	struct nfsd_drc_bucket *b;
@@ -65173,7 +65155,7 @@ index 83a9694..6b7f928 100644
  	size_t		bufsize = 0;
  
  	if (!rp)
-@@ -546,11 +546,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
+@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
  	hash = nfsd_cache_hash(rp->c_xid);
  	b = &drc_hashtbl[hash];
  
@@ -65191,7 +65173,7 @@ index 83a9694..6b7f928 100644
  		nfsd_reply_cache_free(b, rp);
  		return;
  	}
-@@ -558,7 +561,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
+@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
  	switch (cachetype) {
  	case RC_REPLSTAT:
  		if (len != 1)
@@ -65201,7 +65183,7 @@ index 83a9694..6b7f928 100644
  		break;
  	case RC_REPLBUFF:
 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
-index 5685c67..73029ef 100644
+index 3685265..e77261e 100644
 --- a/fs/nfsd/vfs.c
 +++ b/fs/nfsd/vfs.c
 @@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
@@ -65337,7 +65319,7 @@ index a80a741..7b96e1b 100644
  	}
  
 diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
-index bff8567..83281c6 100644
+index cf27550..6c70f29d 100644
 --- a/fs/notify/fanotify/fanotify_user.c
 +++ b/fs/notify/fanotify/fanotify_user.c
 @@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
@@ -65387,10 +65369,10 @@ index 9e38daf..5727cae 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 643faa4..ef9027e 100644
+index 1da9b2d..9cca092a 100644
 --- a/fs/ntfs/file.c
 +++ b/fs/ntfs/file.c
-@@ -1280,7 +1280,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
+@@ -1281,7 +1281,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
  	char *addr;
  	size_t total = 0;
  	unsigned len;
@@ -65444,10 +65426,10 @@ index 0440134..d52c93a 100644
  bail:
  	if (handle)
 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
-index 7d6b7d0..5fb529a 100644
+index 460c6c3..b4ef513 100644
 --- a/fs/ocfs2/ocfs2.h
 +++ b/fs/ocfs2/ocfs2.h
-@@ -242,11 +242,11 @@ enum ocfs2_vol_state
+@@ -247,11 +247,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
  {
@@ -65465,10 +65447,10 @@ index 7d6b7d0..5fb529a 100644
  
  enum ocfs2_local_alloc_state
 diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
-index d81f6e2..e794c38 100644
+index ee541f9..df3a500 100644
 --- a/fs/ocfs2/refcounttree.c
 +++ b/fs/ocfs2/refcounttree.c
-@@ -4278,7 +4278,7 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
+@@ -4276,7 +4276,7 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
  	error = posix_acl_create(dir, &mode, &default_acl, &acl);
  	if (error) {
  		mlog_errno(error);
@@ -65536,10 +65518,10 @@ index 0cb889a..6a26b24 100644
  		}
  	}
 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
-index 8372317..ec86e79 100644
+index 2667518..24bcf79 100644
 --- a/fs/ocfs2/super.c
 +++ b/fs/ocfs2/super.c
-@@ -306,11 +306,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
+@@ -308,11 +308,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",
@@ -65556,7 +65538,7 @@ index 8372317..ec86e79 100644
  
  	out += snprintf(buf + out, len - out,
  			"%10s => State: %u  Descriptor: %llu  Size: %u bits  "
-@@ -2113,11 +2113,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
+@@ -2093,11 +2093,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
  
  	mutex_init(&osb->system_file_mutex);
  
@@ -65574,7 +65556,7 @@ index 8372317..ec86e79 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 813be03..781941d 100644
+index 33f9cbf..8abe053 100644
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -32,6 +32,8 @@
@@ -65678,7 +65660,7 @@ index 813be03..781941d 100644
  	newattrs.ia_valid =  ATTR_CTIME;
  	if (user != (uid_t) -1) {
  		if (!uid_valid(uid))
-@@ -1014,6 +1051,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
+@@ -1017,6 +1054,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
  		} else {
  			fsnotify_open(f);
  			fd_install(fd, f);
@@ -65686,6 +65668,30 @@ index 813be03..781941d 100644
  		}
  	}
  	putname(tmp);
+diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
+index 5f0d199..13b74b9 100644
+--- a/fs/overlayfs/super.c
++++ b/fs/overlayfs/super.c
+@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
+ {
+ 	struct ovl_entry *oe = dentry->d_fsdata;
+ 
+-	*path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
++	*path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
+ }
+ 
+ int ovl_want_write(struct dentry *dentry)
+@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
+ 
+ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
+ {
+-	struct path upperpath = { NULL, NULL };
+-	struct path workpath = { NULL, NULL };
++	struct path upperpath = { .dentry = NULL, .mnt = NULL };
++	struct path workpath = { .dentry = NULL, .mnt = NULL };
+ 	struct dentry *root_dentry;
+ 	struct ovl_entry *oe;
+ 	struct ovl_fs *ufs;
 diff --git a/fs/pipe.c b/fs/pipe.c
 index 21981e5..3d5f55c 100644
 --- a/fs/pipe.c
@@ -65897,7 +65903,7 @@ index 21981e5..3d5f55c 100644
  	ret = -ERESTARTSYS;
  	goto err;
 diff --git a/fs/posix_acl.c b/fs/posix_acl.c
-index 0855f77..6787d50 100644
+index 3a48bb7..403067b 100644
 --- a/fs/posix_acl.c
 +++ b/fs/posix_acl.c
 @@ -20,6 +20,7 @@
@@ -65935,7 +65941,7 @@ index 0855f77..6787d50 100644
  		err = posix_acl_create_masq(clone, mode_p);
  		if (err < 0) {
  			posix_acl_release(clone);
-@@ -659,11 +662,12 @@ struct posix_acl *
+@@ -663,11 +666,12 @@ struct posix_acl *
  posix_acl_from_xattr(struct user_namespace *user_ns,
  		     const void *value, size_t size)
  {
@@ -65950,7 +65956,7 @@ index 0855f77..6787d50 100644
  
  	if (!value)
  		return NULL;
-@@ -689,12 +693,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
+@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
  
  		switch(acl_e->e_tag) {
  			case ACL_USER_OBJ:
@@ -65969,7 +65975,7 @@ index 0855f77..6787d50 100644
  				acl_e->e_uid =
  					make_kuid(user_ns,
  						  le32_to_cpu(entry->e_id));
-@@ -702,6 +712,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
+@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
  					goto fail;
  				break;
  			case ACL_GROUP:
@@ -66013,7 +66019,7 @@ index 2183fcf..3c32a98 100644
   	help
  	  Various /proc files exist to monitor process memory utilization:
 diff --git a/fs/proc/array.c b/fs/proc/array.c
-index bd117d0..e6872d7 100644
+index 1295a00..4c91a6b 100644
 --- a/fs/proc/array.c
 +++ b/fs/proc/array.c
 @@ -60,6 +60,7 @@
@@ -66024,8 +66030,8 @@ index bd117d0..e6872d7 100644
  #include <linux/proc_fs.h>
  #include <linux/ioport.h>
  #include <linux/uaccess.h>
-@@ -344,6 +345,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
- 	seq_putc(m, '\n');
+@@ -322,6 +323,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
+ 		   cpumask_pr_args(&task->cpus_allowed));
  }
  
 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
@@ -66046,7 +66052,7 @@ index bd117d0..e6872d7 100644
  int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
  			struct pid *pid, struct task_struct *task)
  {
-@@ -362,9 +378,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
+@@ -340,9 +356,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
  	task_cpus_allowed(m, task);
  	cpuset_task_status_allowed(m, task);
  	task_context_switch_counts(m, task);
@@ -66071,7 +66077,7 @@ index bd117d0..e6872d7 100644
  static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  			struct pid *pid, struct task_struct *task, int whole)
  {
-@@ -386,6 +417,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -364,6 +395,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  	char tcomm[sizeof(task->comm)];
  	unsigned long flags;
  
@@ -66085,7 +66091,7 @@ index bd117d0..e6872d7 100644
  	state = *get_task_state(task);
  	vsize = eip = esp = 0;
  	permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
-@@ -456,6 +494,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -434,6 +472,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  		gtime = task_gtime(task);
  	}
  
@@ -66105,7 +66111,7 @@ index bd117d0..e6872d7 100644
  	/* scale priority and nice values from timeslices to -20..20 */
  	/* to make it look like a "normal" Unix priority/nice value  */
  	priority = task_prio(task);
-@@ -487,9 +538,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -465,9 +516,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  	seq_put_decimal_ull(m, ' ', vsize);
  	seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
  	seq_put_decimal_ull(m, ' ', rsslim);
@@ -66121,7 +66127,7 @@ index bd117d0..e6872d7 100644
  	seq_put_decimal_ull(m, ' ', esp);
  	seq_put_decimal_ull(m, ' ', eip);
  	/* The signal information here is obsolete.
-@@ -511,7 +568,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -489,7 +546,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  	seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
  	seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
  
@@ -66134,7 +66140,7 @@ index bd117d0..e6872d7 100644
  		seq_put_decimal_ull(m, ' ', mm->start_data);
  		seq_put_decimal_ull(m, ' ', mm->end_data);
  		seq_put_decimal_ull(m, ' ', mm->start_brk);
-@@ -549,8 +610,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+@@ -527,8 +588,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
  			struct pid *pid, struct task_struct *task)
  {
  	unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
@@ -66151,7 +66157,7 @@ index bd117d0..e6872d7 100644
  	if (mm) {
  		size = task_statm(mm, &shared, &text, &data, &resident);
  		mmput(mm);
-@@ -573,6 +641,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+@@ -551,6 +619,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
  	return 0;
  }
  
@@ -66644,7 +66650,7 @@ index 8e5ad83..1f07a8c 100644
  }
  
 diff --git a/fs/proc/generic.c b/fs/proc/generic.c
-index b502bba..849e216 100644
+index be65b20..2998ba8 100644
 --- a/fs/proc/generic.c
 +++ b/fs/proc/generic.c
 @@ -22,6 +22,7 @@
@@ -66714,23 +66720,7 @@ index b502bba..849e216 100644
  static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
  {
  	int ret;
-@@ -339,8 +371,13 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
- 		return ret;
- 
- 	if (S_ISDIR(dp->mode)) {
--		dp->proc_fops = &proc_dir_operations;
--		dp->proc_iops = &proc_dir_inode_operations;
-+		if (dp->restricted) {
-+			dp->proc_fops = &proc_dir_restricted_operations;
-+			dp->proc_iops = &proc_dir_restricted_inode_operations;
-+		} else {
-+			dp->proc_fops = &proc_dir_operations;
-+			dp->proc_iops = &proc_dir_inode_operations;
-+		}
- 		dir->nlink++;
- 	} else if (S_ISLNK(dp->mode)) {
- 		dp->proc_iops = &proc_link_inode_operations;
-@@ -453,6 +490,27 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
+@@ -441,6 +473,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
  }
  EXPORT_SYMBOL_GPL(proc_mkdir_data);
  
@@ -66746,8 +66736,12 @@ index b502bba..849e216 100644
 +	if (ent) {
 +		ent->data = data;
 +		ent->restricted = 1;
++		ent->proc_fops = &proc_dir_restricted_operations;
++		ent->proc_iops = &proc_dir_restricted_inode_operations;
++		parent->nlink++;
 +		if (proc_register(parent, ent) < 0) {
 +			kfree(ent);
++			parent->nlink--;
 +			ent = NULL;
 +		}
 +	}
@@ -66758,7 +66752,7 @@ index b502bba..849e216 100644
  struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
  				       struct proc_dir_entry *parent)
  {
-@@ -467,6 +525,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
+@@ -455,6 +512,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
  }
  EXPORT_SYMBOL(proc_mkdir);
  
@@ -66773,7 +66767,7 @@ index b502bba..849e216 100644
  					struct proc_dir_entry *parent,
  					const struct file_operations *proc_fops,
 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
-index 3b0f838..a0e0f63e 100644
+index 7697b66..8d8e541 100644
 --- a/fs/proc/inode.c
 +++ b/fs/proc/inode.c
 @@ -24,11 +24,17 @@
@@ -66885,7 +66879,7 @@ index a352d57..cb94a5c 100644
  }
  fs_initcall(proc_interrupts_init);
 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
-index 91a4e64..cb007c0 100644
+index 91a4e64..69f1a3e 100644
 --- a/fs/proc/kcore.c
 +++ b/fs/proc/kcore.c
 @@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
@@ -66946,6 +66940,15 @@ index 91a4e64..cb007c0 100644
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  	if (kcore_need_update)
+@@ -580,7 +587,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
+ 	return NOTIFY_OK;
+ }
+ 
+-static struct notifier_block kcore_callback_nb __meminitdata = {
++static struct notifier_block kcore_callback_nb __meminitconst = {
+ 	.notifier_call = kcore_callback,
+ 	.priority = 0,
+ };
 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
 index d3ebf2e..6ad42d1 100644
 --- a/fs/proc/meminfo.c
@@ -67374,7 +67377,7 @@ index 510413eb..34d9a8c 100644
  	seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
  
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index f86e549..3a88fcd 100644
+index 6dee68d..1b4add0 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
 @@ -13,12 +13,19 @@
@@ -67396,11 +67399,11 @@ index f86e549..3a88fcd 100644
 +
  void task_mem(struct seq_file *m, struct mm_struct *mm)
  {
- 	unsigned long data, text, lib, swap;
-@@ -54,8 +61,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
- 		"VmExe:\t%8lu kB\n"
+ 	unsigned long data, text, lib, swap, ptes, pmds;
+@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
  		"VmLib:\t%8lu kB\n"
  		"VmPTE:\t%8lu kB\n"
+ 		"VmPMD:\t%8lu kB\n"
 -		"VmSwap:\t%8lu kB\n",
 -		hiwater_vm << (PAGE_SHIFT-10),
 +		"VmSwap:\t%8lu kB\n"
@@ -67413,10 +67416,10 @@ index f86e549..3a88fcd 100644
  		total_vm << (PAGE_SHIFT-10),
  		mm->locked_vm << (PAGE_SHIFT-10),
  		mm->pinned_vm << (PAGE_SHIFT-10),
-@@ -65,7 +77,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
+@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
  		mm->stack_vm << (PAGE_SHIFT-10), text, lib,
- 		(PTRS_PER_PTE * sizeof(pte_t) *
- 		 atomic_long_read(&mm->nr_ptes)) >> 10,
+ 		ptes >> 10,
+ 		pmds >> 10,
 -		swap << (PAGE_SHIFT-10));
 +		swap << (PAGE_SHIFT-10)
 +
@@ -67434,7 +67437,7 @@ index f86e549..3a88fcd 100644
  }
  
  unsigned long task_vsize(struct mm_struct *mm)
-@@ -282,13 +306,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
  	}
  
@@ -67453,7 +67456,7 @@ index f86e549..3a88fcd 100644
  
  	seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
  	seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
-@@ -298,7 +322,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -301,7 +325,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',
@@ -67465,7 +67468,7 @@ index f86e549..3a88fcd 100644
  			MAJOR(dev), MINOR(dev), ino);
  
  	/*
-@@ -307,7 +335,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
  	 */
  	if (file) {
  		seq_pad(m, ' ');
@@ -67474,7 +67477,7 @@ index f86e549..3a88fcd 100644
  		goto done;
  	}
  
-@@ -338,8 +366,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -341,8 +369,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.
  			 */
@@ -67486,7 +67489,7 @@ index f86e549..3a88fcd 100644
  				name = "[stack]";
  			} else {
  				/* Thread stack in /proc/PID/maps */
-@@ -359,6 +388,12 @@ done:
+@@ -362,6 +391,12 @@ done:
  
  static int show_map(struct seq_file *m, void *v, int is_pid)
  {
@@ -67499,7 +67502,7 @@ index f86e549..3a88fcd 100644
  	show_map_vma(m, v, is_pid);
  	m_cache_vma(m, v);
  	return 0;
-@@ -629,12 +664,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
+@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
  		.private = &mss,
  	};
  
@@ -67510,25 +67513,17 @@ index f86e549..3a88fcd 100644
 +	}
 +#endif
  	memset(&mss, 0, sizeof mss);
--	mss.vma = vma;
 -	/* mmap_sem is held in m_start */
--	if (vma->vm_mm && !is_vm_hugetlb_page(vma))
--		walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
--
+-	walk_page_vma(vma, &smaps_walk);
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
-+	if (!PAX_RAND_FLAGS(vma->vm_mm)) {
++	if (!PAX_RAND_FLAGS(vma->vm_mm))
 +#endif
-+		mss.vma = vma;
 +		/* mmap_sem is held in m_start */
-+		if (vma->vm_mm && !is_vm_hugetlb_page(vma))
-+			walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
-+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
-+	}
-+#endif
++		walk_page_vma(vma, &smaps_walk);
+ 
  	show_map_vma(m, vma, is_pid);
  
- 	seq_printf(m,
-@@ -652,7 +698,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
+@@ -641,7 +685,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",
@@ -67540,7 +67535,7 @@ index f86e549..3a88fcd 100644
  		   mss.resident >> 10,
  		   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
  		   mss.shared_clean  >> 10,
-@@ -1489,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
  	char buffer[64];
  	int nid;
  
@@ -67554,7 +67549,7 @@ index f86e549..3a88fcd 100644
  	if (!mm)
  		return 0;
  
-@@ -1510,11 +1567,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
  		mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
  	}
  
@@ -67594,7 +67589,7 @@ index 599ec2e..f1413ae 100644
  		pid_t tid = pid_of_stack(priv, vma, is_pid);
  
 diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
-index a90d6d35..d08047c 100644
+index 4e61388..1a2523d 100644
 --- a/fs/proc/vmcore.c
 +++ b/fs/proc/vmcore.c
 @@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
@@ -67686,10 +67681,10 @@ index bb2869f..d34ada8 100644
  	if (!msg_head) {
  		printk(KERN_ERR
 diff --git a/fs/read_write.c b/fs/read_write.c
-index c0805c93..d39f2eb 100644
+index 8e1b687..bad2eec 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -507,7 +507,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
+@@ -553,7 +553,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
  
  	old_fs = get_fs();
  	set_fs(get_ds());
@@ -67889,7 +67884,7 @@ index 71fbbe3..eff29ba 100644
  	sbi->s_alloc_options.preallocmin = 0;
  	/* Preallocate by 16 blocks (17-1) at once */
 diff --git a/fs/select.c b/fs/select.c
-index 467bb1c..cf9d65a 100644
+index f684c75..4117611 100644
 --- a/fs/select.c
 +++ b/fs/select.c
 @@ -20,6 +20,7 @@
@@ -67909,7 +67904,7 @@ index 467bb1c..cf9d65a 100644
  		return -EINVAL;
  
 diff --git a/fs/seq_file.c b/fs/seq_file.c
-index dbf3a59..daf023f 100644
+index 555f821..34684d7 100644
 --- a/fs/seq_file.c
 +++ b/fs/seq_file.c
 @@ -12,6 +12,8 @@
@@ -67975,7 +67970,7 @@ index dbf3a59..daf023f 100644
  	loff_t pos;
  	size_t n;
  	void *p;
-@@ -589,7 +595,7 @@ static void single_stop(struct seq_file *p, void *v)
+@@ -557,7 +563,7 @@ static void single_stop(struct seq_file *p, void *v)
  int single_open(struct file *file, int (*show)(struct seq_file *, void *),
  		void *data)
  {
@@ -67984,7 +67979,7 @@ index dbf3a59..daf023f 100644
  	int res = -ENOMEM;
  
  	if (op) {
-@@ -625,6 +631,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
+@@ -593,6 +599,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
  }
  EXPORT_SYMBOL(single_open_size);
  
@@ -68003,7 +67998,7 @@ index dbf3a59..daf023f 100644
  {
  	const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
 diff --git a/fs/splice.c b/fs/splice.c
-index 75c6058..770d40c 100644
+index 7968da9..275187d 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
@@ -68085,7 +68080,7 @@ index 75c6058..770d40c 100644
  			return 0;
  
  		if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1040,7 +1040,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
+@@ -1025,7 +1025,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
  				ops->release(pipe, buf);
  				pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
  				pipe->nrbufs--;
@@ -68094,7 +68089,7 @@ index 75c6058..770d40c 100644
  					sd.need_wakeup = true;
  			} else {
  				buf->offset += ret;
-@@ -1200,7 +1200,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
+@@ -1185,7 +1185,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.
  		 */
@@ -68103,7 +68098,7 @@ index 75c6058..770d40c 100644
  
  		current->splice_pipe = pipe;
  	}
-@@ -1497,6 +1497,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
+@@ -1482,6 +1482,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
  
  			partial[buffers].offset = off;
  			partial[buffers].len = plen;
@@ -68111,7 +68106,7 @@ index 75c6058..770d40c 100644
  
  			off = 0;
  			len -= plen;
-@@ -1733,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1718,9 +1719,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -68123,7 +68118,7 @@ index 75c6058..770d40c 100644
  			if (flags & SPLICE_F_NONBLOCK) {
  				ret = -EAGAIN;
  				break;
-@@ -1767,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1752,7 +1753,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
  	pipe_lock(pipe);
  
  	while (pipe->nrbufs >= pipe->buffers) {
@@ -68132,7 +68127,7 @@ index 75c6058..770d40c 100644
  			send_sig(SIGPIPE, current, 0);
  			ret = -EPIPE;
  			break;
-@@ -1780,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1765,9 +1766,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -68144,7 +68139,7 @@ index 75c6058..770d40c 100644
  	}
  
  	pipe_unlock(pipe);
-@@ -1818,14 +1819,14 @@ retry:
+@@ -1803,14 +1804,14 @@ retry:
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -68161,7 +68156,7 @@ index 75c6058..770d40c 100644
  			break;
  
  		/*
-@@ -1922,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1907,7 +1908,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -68170,7 +68165,7 @@ index 75c6058..770d40c 100644
  			send_sig(SIGPIPE, current, 0);
  			if (!ret)
  				ret = -EPIPE;
-@@ -1967,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1952,7 +1953,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
  	 */
@@ -68486,7 +68481,7 @@ index 4ef6985..a6cd6567 100644
  	}
  	fdput(f);
 diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
-index 4e20fe7..6d1a55a 100644
+index 61ec015..7c18807 100644
 --- a/fs/xfs/libxfs/xfs_bmap.c
 +++ b/fs/xfs/libxfs/xfs_bmap.c
 @@ -580,7 +580,7 @@ xfs_bmap_validate_ret(
@@ -68517,10 +68512,10 @@ index 098cd78..724d3f8 100644
  			return 0;
  		sfep = dp->d_ops->sf_nextentry(sfp, sfep);
 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
-index a183198..6b52f52 100644
+index ac4feae..386d551 100644
 --- a/fs/xfs/xfs_ioctl.c
 +++ b/fs/xfs/xfs_ioctl.c
-@@ -119,7 +119,7 @@ xfs_find_handle(
+@@ -120,7 +120,7 @@ xfs_find_handle(
  	}
  
  	error = -EFAULT;
@@ -79754,10 +79749,10 @@ index 0000000..158b330
 +	return retval;
 +}
 diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
-index 77ff547..181834f 100644
+index 5bdab6b..9ae82fe 100644
 --- a/include/asm-generic/4level-fixup.h
 +++ b/include/asm-generic/4level-fixup.h
-@@ -13,8 +13,10 @@
+@@ -14,8 +14,10 @@
  #define pmd_alloc(mm, pud, address) \
  	((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
   		NULL: pmd_offset(pud, address))
@@ -80386,10 +80381,10 @@ 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 177d597..2826237 100644
+index 4d46085..f4e92ef 100644
 --- a/include/asm-generic/pgtable.h
 +++ b/include/asm-generic/pgtable.h
-@@ -839,6 +839,22 @@ static inline void pmdp_set_numa(struct mm_struct *mm, unsigned long addr,
+@@ -689,6 +689,22 @@ static inline int pmd_protnone(pmd_t pmd)
  }
  #endif /* CONFIG_NUMA_BALANCING */
  
@@ -80438,7 +80433,7 @@ index 72d8803..cb9749c 100644
 +
  #endif /* __ASM_GENERIC_UACCESS_H */
 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
-index bee5d68..8d362d1 100644
+index ac78910..775a306 100644
 --- a/include/asm-generic/vmlinux.lds.h
 +++ b/include/asm-generic/vmlinux.lds.h
 @@ -234,6 +234,7 @@
@@ -80449,7 +80444,7 @@ index bee5d68..8d362d1 100644
  		*(__vermagic)		/* Kernel version magic */	\
  		. = ALIGN(8);						\
  		VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .;		\
-@@ -726,17 +727,18 @@
+@@ -727,17 +728,18 @@
   * section in the linker script will go there too.  @phdr should have
   * a leading colon.
   *
@@ -80486,7 +80481,7 @@ index 623a59c..1e79ab9 100644
  struct crypto_instance {
  	struct crypto_alg alg;
 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index e1b2e8b..2697bd2 100644
+index e928625..78c2c05 100644
 --- a/include/drm/drmP.h
 +++ b/include/drm/drmP.h
 @@ -59,6 +59,7 @@
@@ -80497,7 +80492,7 @@ index e1b2e8b..2697bd2 100644
  #include <asm/uaccess.h>
  
  #include <uapi/drm/drm.h>
-@@ -223,10 +224,12 @@ void drm_err(const char *format, ...);
+@@ -224,10 +225,12 @@ void drm_err(const char *format, ...);
   * \param cmd command.
   * \param arg argument.
   */
@@ -80512,7 +80507,7 @@ index e1b2e8b..2697bd2 100644
  			       unsigned long arg);
  
  #define DRM_IOCTL_NR(n)                _IOC_NR(n)
-@@ -242,10 +245,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
+@@ -243,10 +246,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
  struct drm_ioctl_desc {
  	unsigned int cmd;
  	int flags;
@@ -80525,7 +80520,7 @@ index e1b2e8b..2697bd2 100644
  
  /**
   * Creates a driver or general drm_ioctl_desc array entry for the given
-@@ -629,7 +632,8 @@ struct drm_info_list {
+@@ -632,7 +635,8 @@ struct drm_info_list {
  	int (*show)(struct seq_file*, void*); /** show callback */
  	u32 driver_features; /**< Required driver features for this entry */
  	void *data;
@@ -80535,7 +80530,7 @@ index e1b2e8b..2697bd2 100644
  
  /**
   * debugfs node structure. This structure represents a debugfs file.
-@@ -713,7 +717,7 @@ struct drm_device {
+@@ -716,7 +720,7 @@ struct drm_device {
  
  	/** \name Usage Counters */
  	/*@{ */
@@ -80545,18 +80540,18 @@ index e1b2e8b..2697bd2 100644
  	int buf_use;			/**< Buffers in use -- cannot alloc */
  	atomic_t buf_alloc;		/**< Buffer allocation in progress */
 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index 7adbb65..2a1eb1f 100644
+index c250a22..59d2094 100644
 --- a/include/drm/drm_crtc_helper.h
 +++ b/include/drm/drm_crtc_helper.h
-@@ -116,7 +116,7 @@ struct drm_encoder_helper_funcs {
- 					    struct drm_connector *connector);
- 	/* disable encoder when not in use - more explicit than dpms off */
- 	void (*disable)(struct drm_encoder *encoder);
+@@ -160,7 +160,7 @@ struct drm_encoder_helper_funcs {
+ 	int (*atomic_check)(struct drm_encoder *encoder,
+ 			    struct drm_crtc_state *crtc_state,
+ 			    struct drm_connector_state *conn_state);
 -};
 +} __no_const;
  
  /**
-  * drm_connector_helper_funcs - helper operations for connectors
+  * struct drm_connector_helper_funcs - helper operations for connectors
 diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
 index d016dc5..3951fe0 100644
 --- a/include/drm/i915_pciids.h
@@ -80644,10 +80639,10 @@ index 5b08a85..60922fb 100644
  	return __atomic_add_unless(v, a, u) != u;
  }
 diff --git a/include/linux/audit.h b/include/linux/audit.h
-index af84234..4177a40 100644
+index c2e7e3a..8bfc0e1 100644
 --- a/include/linux/audit.h
 +++ b/include/linux/audit.h
-@@ -225,7 +225,7 @@ static inline void audit_ptrace(struct task_struct *t)
+@@ -223,7 +223,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);
@@ -80682,10 +80677,10 @@ index 576e463..28fd926 100644
  extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
  
 diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
-index 202e403..16e6617 100644
+index dbfbf49..10be372 100644
 --- a/include/linux/bitmap.h
 +++ b/include/linux/bitmap.h
-@@ -302,7 +302,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
+@@ -299,7 +299,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
  		return __bitmap_full(src, nbits);
  }
  
@@ -80726,10 +80721,10 @@ index 5d858e0..336c1d9 100644
  	if (sizeof(l) == 4)
  		return fls(l);
 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index 92f4b4b..483d537 100644
+index 7f9a516..8889453 100644
 --- a/include/linux/blkdev.h
 +++ b/include/linux/blkdev.h
-@@ -1613,7 +1613,7 @@ struct block_device_operations {
+@@ -1616,7 +1616,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;
@@ -80815,10 +80810,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 d936409..ce9f842 100644
+index 5591ea7..61b77ce 100644
 --- a/include/linux/clk-provider.h
 +++ b/include/linux/clk-provider.h
-@@ -191,6 +191,7 @@ struct clk_ops {
+@@ -195,6 +195,7 @@ struct clk_ops {
  	void		(*init)(struct clk_hw *hw);
  	int		(*debug_init)(struct clk_hw *hw, struct dentry *dentry);
  };
@@ -80827,7 +80822,7 @@ index d936409..ce9f842 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 7450ca2..a824b81 100644
+index ab25814..9026bca 100644
 --- a/include/linux/compat.h
 +++ b/include/linux/compat.h
 @@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
@@ -80849,7 +80844,7 @@ index 7450ca2..a824b81 100644
  asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
  /*
 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
-index d1a5582..4424efa 100644
+index 769e198..f670585 100644
 --- a/include/linux/compiler-gcc4.h
 +++ b/include/linux/compiler-gcc4.h
 @@ -39,9 +39,34 @@
@@ -80888,7 +80883,7 @@ index d1a5582..4424efa 100644
   * Mark a position in code as unreachable.  This can be used to
   * suppress control flow warnings after asm blocks that transfer
 diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
-index c8c5659..9b20f4e 100644
+index efee493..c388661 100644
 --- a/include/linux/compiler-gcc5.h
 +++ b/include/linux/compiler-gcc5.h
 @@ -28,6 +28,25 @@
@@ -80918,7 +80913,7 @@ index c8c5659..9b20f4e 100644
   * Mark a position in code as unreachable.  This can be used to
   * suppress control flow warnings after asm blocks that transfer
 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
-index fa6a314..a1b01ad 100644
+index 1b45e4a..33028cd 100644
 --- a/include/linux/compiler.h
 +++ b/include/linux/compiler.h
 @@ -5,11 +5,14 @@
@@ -80986,7 +80981,7 @@ index fa6a314..a1b01ad 100644
  #endif
  
  /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
-@@ -201,32 +223,32 @@ static __always_inline void data_access_exceeds_word_size(void)
+@@ -205,32 +227,32 @@ static __always_inline void data_access_exceeds_word_size(void)
  static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
  {
  	switch (size) {
@@ -81030,7 +81025,7 @@ index fa6a314..a1b01ad 100644
  		data_access_exceeds_word_size();
  		barrier();
  	}
-@@ -360,6 +382,34 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
+@@ -364,6 +386,34 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
  # define __attribute_const__	/* unimplemented */
  #endif
  
@@ -81065,7 +81060,7 @@ index fa6a314..a1b01ad 100644
  /*
   * Tell gcc if a function is cold. The compiler will assume any path
   * directly leading to the call is unlikely.
-@@ -369,6 +419,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
+@@ -373,6 +423,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
  #define __cold
  #endif
  
@@ -81088,7 +81083,7 @@ index fa6a314..a1b01ad 100644
  /* Simple shorthand for a section definition */
  #ifndef __section
  # define __section(S) __attribute__ ((__section__(#S)))
-@@ -383,6 +449,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
+@@ -387,6 +453,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
  # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
  #endif
  
@@ -81096,8 +81091,8 @@ index fa6a314..a1b01ad 100644
 +
  /* Is this type a native word size -- useful for atomic operations */
  #ifndef __native_word
- # define __native_word(t) (sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
-@@ -462,8 +530,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
+ # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
+@@ -466,8 +534,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
   */
  #define __ACCESS_ONCE(x) ({ \
  	 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
@@ -81149,10 +81144,10 @@ index 34025df..d94bbbc 100644
  /*
   * Users often need to create attribute structures for their configurable
 diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
-index 4d078ce..c970f4d 100644
+index 2ee4888..0451f5e 100644
 --- a/include/linux/cpufreq.h
 +++ b/include/linux/cpufreq.h
-@@ -206,6 +206,7 @@ struct global_attr {
+@@ -207,6 +207,7 @@ struct global_attr {
  	ssize_t (*store)(struct kobject *a, struct attribute *b,
  			 const char *c, size_t count);
  };
@@ -81160,7 +81155,7 @@ index 4d078ce..c970f4d 100644
  
  #define define_one_global_ro(_name)		\
  static struct global_attr _name =		\
-@@ -277,7 +278,7 @@ struct cpufreq_driver {
+@@ -278,7 +279,7 @@ struct cpufreq_driver {
  	bool		boost_supported;
  	bool		boost_enabled;
  	int		(*set_boost)(int state);
@@ -81170,20 +81165,20 @@ index 4d078ce..c970f4d 100644
  /* flags */
  #define CPUFREQ_STICKY		(1 << 0)	/* driver isn't removed even if
 diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
-index 948df62..4602717 100644
+index 9c5e892..feb34e0 100644
 --- a/include/linux/cpuidle.h
 +++ b/include/linux/cpuidle.h
-@@ -50,7 +50,8 @@ struct cpuidle_state {
- 			int index);
- 
- 	int (*enter_dead) (struct cpuidle_device *dev, int index);
+@@ -59,7 +59,8 @@ struct cpuidle_state {
+ 	void (*enter_freeze) (struct cpuidle_device *dev,
+ 			      struct cpuidle_driver *drv,
+ 			      int index);
 -};
 +} __do_const;
 +typedef struct cpuidle_state __no_const cpuidle_state_no_const;
  
  /* Idle State Flags */
  #define CPUIDLE_FLAG_COUPLED	(0x02) /* state applies to multiple cpus */
-@@ -205,7 +206,7 @@ struct cpuidle_governor {
+@@ -227,7 +228,7 @@ struct cpuidle_governor {
  	void (*reflect)		(struct cpuidle_device *dev, int index);
  
  	struct module 		*owner;
@@ -81193,10 +81188,10 @@ index 948df62..4602717 100644
  #ifdef CONFIG_CPU_IDLE
  extern int cpuidle_register_governor(struct cpuidle_governor *gov);
 diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
-index b950e9d..63810aa 100644
+index 086549a..a572d94 100644
 --- a/include/linux/cpumask.h
 +++ b/include/linux/cpumask.h
-@@ -118,17 +118,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
+@@ -126,17 +126,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
  }
  
  /* Valid inputs for n are -1 and 0. */
@@ -81217,7 +81212,7 @@ index b950e9d..63810aa 100644
  					    const struct cpumask *srcp,
  					    const struct cpumask *andp)
  {
-@@ -174,7 +174,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
+@@ -182,7 +182,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
   *
   * Returns >= nr_cpu_ids if no further cpus set.
   */
@@ -81226,7 +81221,7 @@ index b950e9d..63810aa 100644
  {
  	/* -1 is a legal arg here. */
  	if (n != -1)
-@@ -189,7 +189,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
+@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
   *
   * Returns >= nr_cpu_ids if no further cpus unset.
   */
@@ -81235,7 +81230,7 @@ index b950e9d..63810aa 100644
  {
  	/* -1 is a legal arg here. */
  	if (n != -1)
-@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
+@@ -205,7 +205,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
  	return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
  }
  
@@ -81244,7 +81239,7 @@ index b950e9d..63810aa 100644
  int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
  int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
  
-@@ -464,7 +464,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
+@@ -472,7 +472,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
   * cpumask_weight - Count of bits in *srcp
   * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
   */
@@ -81294,7 +81289,7 @@ index 2fb2ca2..d6a3340 100644
  #define current_cred_xxx(xxx)			\
  ({						\
 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
-index 9c8776d..8c526c2 100644
+index fb5ef16..05d1e59 100644
 --- a/include/linux/crypto.h
 +++ b/include/linux/crypto.h
 @@ -626,7 +626,7 @@ struct cipher_tfm {
@@ -81336,7 +81331,7 @@ index 653589e..4ef254a 100644
  	return c | 0x20;
  }
 diff --git a/include/linux/dcache.h b/include/linux/dcache.h
-index 5a81398..6bbee30 100644
+index d835879..c8e5b92 100644
 --- a/include/linux/dcache.h
 +++ b/include/linux/dcache.h
 @@ -123,6 +123,9 @@ struct dentry {
@@ -81358,6 +81353,24 @@ index 5a81398..6bbee30 100644
  
  /*
   * dentry->d_lock spinlock nesting subclasses:
+@@ -319,7 +322,7 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
+ 
+ static inline unsigned d_count(const struct dentry *dentry)
+ {
+-	return dentry->d_lockref.count;
++	return __lockref_read(&dentry->d_lockref);
+ }
+ 
+ /*
+@@ -347,7 +350,7 @@ extern char *dentry_path(struct dentry *, char *, int);
+ static inline struct dentry *dget_dlock(struct dentry *dentry)
+ {
+ 	if (dentry)
+-		dentry->d_lockref.count++;
++		__lockref_inc(&dentry->d_lockref);
+ 	return dentry;
+ }
+ 
 diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
 index 7925bf0..d5143d2 100644
 --- a/include/linux/decompress/mm.h
@@ -81385,7 +81398,7 @@ index ce447f0..83c66bd 100644
  /**
   * struct devfreq - Device devfreq structure
 diff --git a/include/linux/device.h b/include/linux/device.h
-index fb50673..ec0b35b 100644
+index 0eb8ee2..c603b6a 100644
 --- a/include/linux/device.h
 +++ b/include/linux/device.h
 @@ -311,7 +311,7 @@ struct subsys_interface {
@@ -81434,10 +81447,10 @@ index c3007cb..43efc8c 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 40cd75e..38572a9 100644
+index b6997a0..108be6c 100644
 --- a/include/linux/dmaengine.h
 +++ b/include/linux/dmaengine.h
-@@ -1137,9 +1137,9 @@ struct dma_pinned_list {
+@@ -1133,9 +1133,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);
  
@@ -81450,10 +81463,10 @@ index 40cd75e..38572a9 100644
  	unsigned int offset, size_t len);
  
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 0238d61..34a758f 100644
+index cf7e431..d239dce 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -1054,6 +1054,7 @@ struct efivar_operations {
+@@ -1056,6 +1056,7 @@ struct efivar_operations {
  	efi_set_variable_nonblocking_t *set_variable_nonblocking;
  	efi_query_variable_store_t *query_variable_store;
  };
@@ -81514,15 +81527,16 @@ index 36f49c4..a2a1f4c 100644
  
  /**
 diff --git a/include/linux/fb.h b/include/linux/fb.h
-index 09bb7a1..d98870a 100644
+index 043f328..180ccbf 100644
 --- a/include/linux/fb.h
 +++ b/include/linux/fb.h
-@@ -305,7 +305,7 @@ struct fb_ops {
+@@ -305,7 +305,8 @@ struct fb_ops {
  	/* called at KDB enter and leave time to prepare the console */
  	int (*fb_debug_enter)(struct fb_info *info);
  	int (*fb_debug_leave)(struct fb_info *info);
 -};
 +} __do_const;
++typedef struct fb_ops __no_const fb_ops_no_const;
  
  #ifdef CONFIG_FB_TILEBLITTING
  #define FB_TILE_CURSOR_NONE        0
@@ -81553,10 +81567,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 42efe13..72d42ee 100644
+index 52cc449..58b25c9 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -413,7 +413,7 @@ struct address_space {
+@@ -410,7 +410,7 @@ struct address_space {
  	spinlock_t		private_lock;	/* for use by the address_space */
  	struct list_head	private_list;	/* ditto */
  	void			*private_data;	/* ditto */
@@ -81565,7 +81579,7 @@ index 42efe13..72d42ee 100644
  	/*
  	 * On most architectures that alignment is already the case; but
  	 * must be enforced here for CRIS, to let the least significant bit
-@@ -456,7 +456,7 @@ struct block_device {
+@@ -453,7 +453,7 @@ struct block_device {
  	int			bd_fsfreeze_count;
  	/* Mutex for freeze */
  	struct mutex		bd_fsfreeze_mutex;
@@ -81574,7 +81588,7 @@ index 42efe13..72d42ee 100644
  
  /*
   * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
-@@ -642,7 +642,7 @@ struct inode {
+@@ -639,7 +639,7 @@ struct inode {
  #endif
  
  	void			*i_private; /* fs or device private pointer */
@@ -81583,7 +81597,7 @@ index 42efe13..72d42ee 100644
  
  static inline int inode_unhashed(struct inode *inode)
  {
-@@ -837,7 +837,7 @@ struct file {
+@@ -834,7 +834,7 @@ struct file {
  	struct list_head	f_tfile_llink;
  #endif /* #ifdef CONFIG_EPOLL */
  	struct address_space	*f_mapping;
@@ -81599,9 +81613,9 @@ index 42efe13..72d42ee 100644
 -};
 +} __randomize_layout;
  
- /* The following constant reflects the upper bound of the file/locking space */
- #ifndef OFFSET_MAX
-@@ -1305,7 +1305,7 @@ struct super_block {
+ struct file_lock_context {
+ 	spinlock_t		flc_lock;
+@@ -1316,7 +1316,7 @@ struct super_block {
  	 * Indicates how deep in a filesystem stack this SB is
  	 */
  	int s_stack_depth;
@@ -81610,17 +81624,17 @@ index 42efe13..72d42ee 100644
  
  extern struct timespec current_fs_time(struct super_block *sb);
  
-@@ -1536,7 +1536,8 @@ struct file_operations {
- 	long (*fallocate)(struct file *file, int mode, loff_t offset,
- 			  loff_t len);
- 	void (*show_fdinfo)(struct seq_file *m, struct file *f);
+@@ -1570,7 +1570,8 @@ struct file_operations {
+ #ifndef CONFIG_MMU
+ 	unsigned (*mmap_capabilities)(struct file *);
+ #endif
 -};
 +} __do_const __randomize_layout;
 +typedef struct file_operations __no_const file_operations_no_const;
  
  struct inode_operations {
  	struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
-@@ -2854,4 +2855,14 @@ static inline bool dir_relax(struct inode *inode)
+@@ -2918,4 +2919,14 @@ static inline bool dir_relax(struct inode *inode)
  	return !IS_DEADDIR(inode);
  }
  
@@ -81759,7 +81773,7 @@ index 667c311..abac2a7 100644
  };
  
 diff --git a/include/linux/gfp.h b/include/linux/gfp.h
-index b840e3b..aeaeef9 100644
+index 51bd1e7..0486343 100644
 --- a/include/linux/gfp.h
 +++ b/include/linux/gfp.h
 @@ -34,6 +34,13 @@ struct vm_area_struct;
@@ -83162,10 +83176,10 @@ index 1c7b89a..7dda400 100644
  	container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
  
 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
-index 7c76959..153e597 100644
+index f17da50..2f8b203 100644
 --- a/include/linux/i2c.h
 +++ b/include/linux/i2c.h
-@@ -413,6 +413,7 @@ struct i2c_algorithm {
+@@ -409,6 +409,7 @@ struct i2c_algorithm {
  	int (*unreg_slave)(struct i2c_client *client);
  #endif
  };
@@ -83173,19 +83187,6 @@ index 7c76959..153e597 100644
  
  /**
   * struct i2c_bus_recovery_info - I2C bus recovery information
-diff --git a/include/linux/i2o.h b/include/linux/i2o.h
-index d23c3c2..eb63c81 100644
---- a/include/linux/i2o.h
-+++ b/include/linux/i2o.h
-@@ -565,7 +565,7 @@ struct i2o_controller {
- 	struct i2o_device *exec;	/* Executive */
- #if BITS_PER_LONG == 64
- 	spinlock_t context_list_lock;	/* lock for context_list */
--	atomic_t context_list_counter;	/* needed for unique contexts */
-+	atomic_unchecked_t context_list_counter;	/* needed for unique contexts */
- 	struct list_head context_list;	/* list of context id's
- 					   and pointers */
- #endif
 diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
 index aff7ad8..3942bbd 100644
 --- a/include/linux/if_pppox.h
@@ -83232,7 +83233,7 @@ index 2df8e8d..3e1280d 100644
  #define __meminitconst   __constsection(.meminit.rodata)
  #define __memexit        __section(.memexit.text) __exitused __cold notrace
 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index 3037fc0..c6527ce 100644
+index 696d223..6d6b39f 100644
 --- a/include/linux/init_task.h
 +++ b/include/linux/init_task.h
 @@ -158,6 +158,12 @@ extern struct task_group root_task_group;
@@ -83248,7 +83249,7 @@ index 3037fc0..c6527ce 100644
  #ifdef CONFIG_RT_MUTEXES
  # define INIT_RT_MUTEXES(tsk)						\
  	.pi_waiters = RB_ROOT,						\
-@@ -214,6 +220,7 @@ extern struct task_group root_task_group;
+@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
  	RCU_POINTER_INITIALIZER(cred, &init_cred),			\
  	.comm		= INIT_TASK_COMM,				\
  	.thread		= INIT_THREAD,					\
@@ -83257,10 +83258,10 @@ index 3037fc0..c6527ce 100644
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index d9b05b5..e5f5b7b 100644
+index 2e88580..f6a99a0 100644
 --- a/include/linux/interrupt.h
 +++ b/include/linux/interrupt.h
-@@ -413,8 +413,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
+@@ -420,8 +420,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
  
  struct softirq_action
  {
@@ -83271,7 +83272,7 @@ index d9b05b5..e5f5b7b 100644
  
  asmlinkage void do_softirq(void);
  asmlinkage void __do_softirq(void);
-@@ -428,7 +428,7 @@ static inline void do_softirq_own_stack(void)
+@@ -435,7 +435,7 @@ static inline void do_softirq_own_stack(void)
  }
  #endif
  
@@ -83347,7 +83348,7 @@ index 71d706d..817cdec 100644
  void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
  		    u32 offset, struct device_node *);
 diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
-index faf433a..7dcb186 100644
+index dd1109f..4f4fdda 100644
 --- a/include/linux/irqdesc.h
 +++ b/include/linux/irqdesc.h
 @@ -61,7 +61,7 @@ struct irq_desc {
@@ -83428,7 +83429,7 @@ index 6883e19..e854fcb 100644
  /* This macro allows us to keep printk typechecking */
  static __printf(1, 2)
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 64ce58b..6bcdbfa 100644
+index d6d630d..feea1f5 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
 @@ -378,7 +378,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
@@ -83586,10 +83587,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 26f1060..bafc04a 100644
+index d12b210..d91fd76 100644
 --- a/include/linux/kvm_host.h
 +++ b/include/linux/kvm_host.h
-@@ -470,7 +470,7 @@ static inline void kvm_irqfd_exit(void)
+@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
  {
  }
  #endif
@@ -83598,7 +83599,7 @@ index 26f1060..bafc04a 100644
  		  struct module *module);
  void kvm_exit(void);
  
-@@ -639,7 +639,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
+@@ -633,7 +633,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);
  
@@ -83608,10 +83609,10 @@ index 26f1060..bafc04a 100644
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
 diff --git a/include/linux/libata.h b/include/linux/libata.h
-index 91f705d..24be831 100644
+index 6b08cc1..248c5e9 100644
 --- a/include/linux/libata.h
 +++ b/include/linux/libata.h
-@@ -979,7 +979,7 @@ struct ata_port_operations {
+@@ -980,7 +980,7 @@ struct ata_port_operations {
  	 * fields must be pointers.
  	 */
  	const struct ata_port_operations	*inherits;
@@ -83666,45 +83667,49 @@ index feb773c..98f3075 100644
   * list_move - delete from one list and add as another's head
   * @list: the entry to move
 diff --git a/include/linux/lockref.h b/include/linux/lockref.h
-index 4bfde0e..d6e2e09 100644
+index b10b122..d37b3de 100644
 --- a/include/linux/lockref.h
 +++ b/include/linux/lockref.h
-@@ -47,4 +47,36 @@ static inline int __lockref_is_dead(const struct lockref *l)
- 	return ((int)l->count < 0);
- }
+@@ -28,7 +28,7 @@ struct lockref {
+ #endif
+ 		struct {
+ 			spinlock_t lock;
+-			int count;
++			atomic_t count;
+ 		};
+ 	};
+ };
+@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
+ extern int lockref_get_not_dead(struct lockref *);
  
-+static inline unsigned int __lockref_read(struct lockref *lockref)
+ /* Must be called under spinlock for reliable results */
+-static inline int __lockref_is_dead(const struct lockref *l)
++static inline int __lockref_is_dead(const struct lockref *lockref)
+ {
+-	return ((int)l->count < 0);
++	return atomic_read(&lockref->count) < 0;
++}
++
++static inline int __lockref_read(const struct lockref *lockref)
 +{
-+	return lockref->count;
++	return atomic_read(&lockref->count);
 +}
 +
-+static inline void __lockref_set(struct lockref *lockref, unsigned int count)
++static inline void __lockref_set(struct lockref *lockref, int count)
 +{
-+	lockref->count = count;
++	atomic_set(&lockref->count, count);
 +}
 +
 +static inline void __lockref_inc(struct lockref *lockref)
 +{
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+	atomic_inc((atomic_t *)&lockref->count);
-+#else
-+	lockref->count++;
-+#endif
-+
++	atomic_inc(&lockref->count);
 +}
 +
 +static inline void __lockref_dec(struct lockref *lockref)
 +{
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+	atomic_dec((atomic_t *)&lockref->count);
-+#else
-+	lockref->count--;
-+#endif
-+
-+}
-+
++	atomic_dec(&lockref->count);
+ }
+ 
  #endif /* __LINUX_LOCKREF_H */
 diff --git a/include/linux/math64.h b/include/linux/math64.h
 index c45c089..298841c 100644
@@ -83781,7 +83786,7 @@ index 3d385c8..deacb6a 100644
  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 dd5ea30..cf81cd1 100644
+index 47a9392..ef645bc 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
 @@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
@@ -83796,7 +83801,7 @@ index dd5ea30..cf81cd1 100644
  #define VM_ACCOUNT	0x00100000	/* Is a VM accounted object */
  #define VM_NORESERVE	0x00200000	/* should the VM suppress accounting */
  #define VM_HUGETLB	0x00400000	/* Huge TLB Page VM */
-@@ -256,8 +261,8 @@ struct vm_operations_struct {
+@@ -254,8 +259,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
  	 */
@@ -83807,15 +83812,15 @@ index dd5ea30..cf81cd1 100644
  
  	/* Called by the /proc/PID/maps code to ask the vma whether it
  	 * has a special name.  Returning non-NULL will also cause this
-@@ -291,6 +296,7 @@ struct vm_operations_struct {
- 	int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
- 			   unsigned long size, pgoff_t pgoff);
+@@ -293,6 +298,7 @@ struct vm_operations_struct {
+ 	struct page *(*find_special_page)(struct vm_area_struct *vma,
+ 					  unsigned long addr);
  };
 +typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
  
  struct mmu_gather;
  struct inode;
-@@ -1183,8 +1189,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
+@@ -1213,8 +1219,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);
@@ -83826,7 +83831,7 @@ index dd5ea30..cf81cd1 100644
  
  static inline void unmap_shared_mapping_range(struct address_space *mapping,
  		loff_t const holebegin, loff_t const holelen)
-@@ -1224,9 +1230,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
+@@ -1254,9 +1260,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
  }
  #endif
  
@@ -83839,7 +83844,7 @@ index dd5ea30..cf81cd1 100644
  
  long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
  		      unsigned long start, unsigned long nr_pages,
-@@ -1258,34 +1264,6 @@ int set_page_dirty_lock(struct page *page);
+@@ -1299,34 +1305,6 @@ int set_page_dirty_lock(struct page *page);
  int clear_page_dirty_for_io(struct page *page);
  int get_cmdline(struct task_struct *task, char *buffer, int buflen);
  
@@ -83874,7 +83879,7 @@ index dd5ea30..cf81cd1 100644
  extern struct task_struct *task_of_stack(struct task_struct *task,
  				struct vm_area_struct *vma, bool in_group);
  
-@@ -1403,8 +1381,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
+@@ -1449,8 +1427,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
  {
  	return 0;
  }
@@ -83889,24 +83894,29 @@ index dd5ea30..cf81cd1 100644
 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
  #endif
  
- #ifdef __PAGETABLE_PMD_FOLDED
-@@ -1413,8 +1398,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
- {
+ #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
+@@ -1460,6 +1445,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
  	return 0;
  }
-+
+ 
 +static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
 +						unsigned long address)
 +{
 +	return 0;
 +}
++
+ static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
+ 
+ static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
+@@ -1472,6 +1463,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
+ 
  #else
  int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
- #endif
  
- int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
-@@ -1432,11 +1424,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
+ static inline void mm_nr_pmds_init(struct mm_struct *mm)
+ {
+@@ -1509,11 +1501,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
  		NULL: pud_offset(pgd, address);
  }
  
@@ -83930,7 +83940,7 @@ index dd5ea30..cf81cd1 100644
  #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
  
  #if USE_SPLIT_PTE_PTLOCKS
-@@ -1819,12 +1823,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
+@@ -1890,12 +1894,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
  	bool *need_rmap_locks);
  extern void exit_mmap(struct mm_struct *);
  
@@ -83954,7 +83964,7 @@ index dd5ea30..cf81cd1 100644
  	if (rlim < RLIM_INFINITY) {
  		if (((new - start) + (end_data - start_data)) > rlim)
  			return -ENOSPC;
-@@ -1849,7 +1864,7 @@ extern int install_special_mapping(struct mm_struct *mm,
+@@ -1920,7 +1935,7 @@ extern int install_special_mapping(struct mm_struct *mm,
  				   unsigned long addr, unsigned long len,
  				   unsigned long flags, struct page **pages);
  
@@ -83963,7 +83973,7 @@ index dd5ea30..cf81cd1 100644
  
  extern unsigned long mmap_region(struct file *file, unsigned long addr,
  	unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
-@@ -1857,6 +1872,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1928,6 +1943,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);
@@ -83971,7 +83981,7 @@ index dd5ea30..cf81cd1 100644
  
  #ifdef CONFIG_MMU
  extern int __mm_populate(unsigned long addr, unsigned long len,
-@@ -1885,10 +1901,11 @@ struct vm_unmapped_area_info {
+@@ -1956,10 +1972,11 @@ struct vm_unmapped_area_info {
  	unsigned long high_limit;
  	unsigned long align_mask;
  	unsigned long align_offset;
@@ -83985,7 +83995,7 @@ index dd5ea30..cf81cd1 100644
  
  /*
   * Search for an unmapped address range.
-@@ -1900,7 +1917,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
+@@ -1971,7 +1988,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
@@ -83994,7 +84004,7 @@ index dd5ea30..cf81cd1 100644
  {
  	if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
  		return unmapped_area(info);
-@@ -1962,6 +1979,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
+@@ -2033,6 +2050,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);
  
@@ -84005,7 +84015,7 @@ index dd5ea30..cf81cd1 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)
-@@ -1991,10 +2012,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
+@@ -2062,10 +2083,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
  }
  
  #ifdef CONFIG_MMU
@@ -84018,7 +84028,7 @@ index dd5ea30..cf81cd1 100644
  {
  	return __pgprot(0);
  }
-@@ -2056,6 +2077,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
+@@ -2127,6 +2148,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)
  {
@@ -84030,7 +84040,7 @@ index dd5ea30..cf81cd1 100644
  	mm->total_vm += pages;
  }
  #endif /* CONFIG_PROC_FS */
-@@ -2159,7 +2185,7 @@ extern int unpoison_memory(unsigned long pfn);
+@@ -2229,7 +2255,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);
@@ -84039,7 +84049,7 @@ index dd5ea30..cf81cd1 100644
  extern int soft_offline_page(struct page *page, int flags);
  
  #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
-@@ -2210,5 +2236,11 @@ void __init setup_nr_node_ids(void);
+@@ -2280,5 +2306,11 @@ void __init setup_nr_node_ids(void);
  static inline void setup_nr_node_ids(void) {}
  #endif
  
@@ -84052,10 +84062,10 @@ index dd5ea30..cf81cd1 100644
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 6d34aa2..d73d848 100644
+index 199a03a..7328440 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -309,7 +309,9 @@ struct vm_area_struct {
+@@ -313,7 +313,9 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
  	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
  #endif
@@ -84066,7 +84076,7 @@ index 6d34aa2..d73d848 100644
  
  struct core_thread {
  	struct task_struct *task;
-@@ -459,7 +461,25 @@ struct mm_struct {
+@@ -464,7 +466,25 @@ struct mm_struct {
  	/* address of the bounds directory */
  	void __user *bd_addr;
  #endif
@@ -84094,7 +84104,7 @@ index 6d34aa2..d73d848 100644
  static inline void mm_init_cpumask(struct mm_struct *mm)
  {
 diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
-index cb2b040..f3c9f5c 100644
+index 160448f..7b332b7 100644
 --- a/include/linux/mmc/core.h
 +++ b/include/linux/mmc/core.h
 @@ -79,7 +79,7 @@ struct mmc_command {
@@ -84129,10 +84139,10 @@ index c5d5278..f0b68c8 100644
  }
  
 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
-index 2f0856d..5a4bc1e 100644
+index 2782df4..abe756e 100644
 --- a/include/linux/mmzone.h
 +++ b/include/linux/mmzone.h
-@@ -527,7 +527,7 @@ struct zone {
+@@ -526,7 +526,7 @@ struct zone {
  
  	ZONE_PADDING(_pad3_)
  	/* Zone statistics */
@@ -84142,7 +84152,7 @@ index 2f0856d..5a4bc1e 100644
  
  enum zone_flags {
 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
-index 745def8..08a820b 100644
+index e530533..c9620c7 100644
 --- a/include/linux/mod_devicetable.h
 +++ b/include/linux/mod_devicetable.h
 @@ -139,7 +139,7 @@ struct usb_device_id {
@@ -84154,7 +84164,7 @@ index 745def8..08a820b 100644
  #define HID_BUS_ANY				0xffff
  #define HID_GROUP_ANY				0x0000
  
-@@ -475,7 +475,7 @@ struct dmi_system_id {
+@@ -470,7 +470,7 @@ struct dmi_system_id {
  	const char *ident;
  	struct dmi_strmatch matches[4];
  	void *driver_data;
@@ -84164,7 +84174,7 @@ index 745def8..08a820b 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 b653d7c..22a238f 100644
+index b03485b..a26974f 100644
 --- a/include/linux/module.h
 +++ b/include/linux/module.h
 @@ -17,9 +17,11 @@
@@ -84247,7 +84257,7 @@ index b653d7c..22a238f 100644
  #endif
  #ifdef CONFIG_FTRACE_MCOUNT_RECORD
  	unsigned int num_ftrace_callsites;
-@@ -361,7 +365,7 @@ struct module {
+@@ -365,7 +369,7 @@ struct module {
  	ctor_fn_t *ctors;
  	unsigned int num_ctors;
  #endif
@@ -84256,7 +84266,7 @@ index b653d7c..22a238f 100644
  #ifndef MODULE_ARCH_INIT
  #define MODULE_ARCH_INIT {}
  #endif
-@@ -382,18 +386,48 @@ bool is_module_address(unsigned long addr);
+@@ -386,18 +390,48 @@ bool is_module_address(unsigned long addr);
  bool is_module_percpu_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
  
@@ -84310,7 +84320,7 @@ index b653d7c..22a238f 100644
  
  static inline bool within_module(unsigned long addr, const struct module *mod)
 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
-index f755626..641f822 100644
+index 4d0cb9b..3169ac7 100644
 --- a/include/linux/moduleloader.h
 +++ b/include/linux/moduleloader.h
 @@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
@@ -84421,10 +84431,10 @@ index 17d8339..81656c0 100644
  struct iovec;
  struct kvec;
 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index 840fb7f..547ad02 100644
+index 2787388..1dd8e88 100644
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
-@@ -1191,6 +1191,7 @@ struct net_device_ops {
+@@ -1198,6 +1198,7 @@ struct net_device_ops {
  							      u8 state);
  #endif
  };
@@ -84432,7 +84442,7 @@ index 840fb7f..547ad02 100644
  
  /**
   * enum net_device_priv_flags - &struct net_device priv_flags
-@@ -1537,10 +1538,10 @@ struct net_device {
+@@ -1546,10 +1547,10 @@ struct net_device {
  
  	struct net_device_stats	stats;
  
@@ -84601,10 +84611,10 @@ index caebf2a..4c3ae9d 100644
  
  /*
 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
-index 664de5a..b3e1bf4 100644
+index 2b62198..2b74233 100644
 --- a/include/linux/perf_event.h
 +++ b/include/linux/perf_event.h
-@@ -336,8 +336,8 @@ struct perf_event {
+@@ -343,8 +343,8 @@ struct perf_event {
  
  	enum perf_event_active_state	state;
  	unsigned int			attach_state;
@@ -84615,7 +84625,7 @@ index 664de5a..b3e1bf4 100644
  
  	/*
  	 * These are the total time in nanoseconds that the event
-@@ -388,8 +388,8 @@ struct perf_event {
+@@ -395,8 +395,8 @@ struct perf_event {
  	 * These accumulate total time (in nanoseconds) that children
  	 * events have been enabled and running, respectively.
  	 */
@@ -84626,7 +84636,7 @@ index 664de5a..b3e1bf4 100644
  
  	/*
  	 * Protect attach/detach and child_list:
-@@ -733,7 +733,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
+@@ -752,7 +752,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
  		entry->ip[entry->nr++] = ip;
  }
  
@@ -84635,7 +84645,7 @@ index 664de5a..b3e1bf4 100644
  extern int sysctl_perf_event_mlock;
  extern int sysctl_perf_event_sample_rate;
  extern int sysctl_perf_cpu_time_max_percent;
-@@ -748,19 +748,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
+@@ -767,19 +767,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
  		loff_t *ppos);
  
  
@@ -84663,17 +84673,17 @@ index 664de5a..b3e1bf4 100644
  }
  
  extern void perf_event_init(void);
-@@ -891,7 +896,7 @@ struct perf_pmu_events_attr {
+@@ -912,7 +917,7 @@ struct perf_pmu_events_attr {
  	struct device_attribute attr;
  	u64 id;
  	const char *event_str;
 -};
 +} __do_const;
  
- #define PMU_EVENT_ATTR(_name, _var, _id, _show)				\
- static struct perf_pmu_events_attr _var = {				\
+ ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
+ 			      char *page);
 diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
-index b9cf6c5..5462472 100644
+index 918b117..7af374b7 100644
 --- a/include/linux/pid_namespace.h
 +++ b/include/linux/pid_namespace.h
 @@ -45,7 +45,7 @@ struct pid_namespace {
@@ -84705,7 +84715,7 @@ index eb8b8ac..62649e1 100644
  	unsigned int w_counter;
  	struct page *tmp_page;
 diff --git a/include/linux/pm.h b/include/linux/pm.h
-index 8b59763..8a05939 100644
+index e2f1be6..78a0506 100644
 --- a/include/linux/pm.h
 +++ b/include/linux/pm.h
 @@ -608,6 +608,7 @@ struct dev_pm_domain {
@@ -84717,7 +84727,7 @@ index 8b59763..8a05939 100644
  /*
   * 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 a9edab2..8bada56 100644
+index 080e778..cbdaef7 100644
 --- a/include/linux/pm_domain.h
 +++ b/include/linux/pm_domain.h
 @@ -39,11 +39,11 @@ struct gpd_dev_ops {
@@ -84748,10 +84758,10 @@ index 30e84d4..22278b4 100644
  
  static inline bool pm_runtime_is_irq_safe(struct device *dev)
 diff --git a/include/linux/pnp.h b/include/linux/pnp.h
-index 195aafc..49a7bc2 100644
+index 6512e9c..ec27fa2 100644
 --- a/include/linux/pnp.h
 +++ b/include/linux/pnp.h
-@@ -297,7 +297,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
+@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
  struct pnp_fixup {
  	char id[7];
  	void (*quirk_function) (struct pnp_dev * dev);	/* fixup function */
@@ -84874,7 +84884,7 @@ index de83b4e..c4b997d 100644
  #define preempt_set_need_resched() \
  do { \
 diff --git a/include/linux/printk.h b/include/linux/printk.h
-index 4d5bf57..d94eccf 100644
+index baa3f97..168cff1 100644
 --- a/include/linux/printk.h
 +++ b/include/linux/printk.h
 @@ -121,6 +121,7 @@ void early_printk(const char *s, ...) { }
@@ -84965,7 +84975,7 @@ index 42dfc61..8113a99 100644
  extern const struct proc_ns_operations netns_operations;
  extern const struct proc_ns_operations utsns_operations;
 diff --git a/include/linux/quota.h b/include/linux/quota.h
-index b86df49..8002997 100644
+index d534e8e..782e604 100644
 --- a/include/linux/quota.h
 +++ b/include/linux/quota.h
 @@ -75,7 +75,7 @@ struct kqid {			/* Type in which we store the quota identifier */
@@ -85053,7 +85063,7 @@ index 378c5ee..aa84a47 100644
  
  
 diff --git a/include/linux/rculist.h b/include/linux/rculist.h
-index 529bc94..82ce778 100644
+index a18b16f..2683096 100644
 --- a/include/linux/rculist.h
 +++ b/include/linux/rculist.h
 @@ -29,8 +29,8 @@
@@ -85112,12 +85122,12 @@ index 529bc94..82ce778 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/rcupdate.h b/include/linux/rcupdate.h
-index ed4f593..8a51501 100644
+index 7809749..1cd9315 100644
 --- a/include/linux/rcupdate.h
 +++ b/include/linux/rcupdate.h
-@@ -332,7 +332,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
- #define rcu_note_voluntary_context_switch(t) \
+@@ -333,7 +333,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
  	do { \
+ 		rcu_all_qs(); \
  		if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
 -			ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
 +			ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
@@ -85204,7 +85214,7 @@ index 6bda06f..bf39a9b 100644
  #define RIO_RESOURCE_MEM	0x00000100
  #define RIO_RESOURCE_DOORBELL	0x00000200
 diff --git a/include/linux/rmap.h b/include/linux/rmap.h
-index d9d7e7e..86f47ac 100644
+index c4c559a..6ba9a26 100644
 --- a/include/linux/rmap.h
 +++ b/include/linux/rmap.h
 @@ -154,8 +154,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
@@ -85244,7 +85254,7 @@ index ed8f9e70..999bc96 100644
  }
  
 diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 8db31ef..0af1f81 100644
+index a419b65..6dd8f3f 100644
 --- a/include/linux/sched.h
 +++ b/include/linux/sched.h
 @@ -133,6 +133,7 @@ struct fs_struct;
@@ -85255,7 +85265,7 @@ index 8db31ef..0af1f81 100644
  
  #define VMACACHE_BITS 2
  #define VMACACHE_SIZE (1U << VMACACHE_BITS)
-@@ -415,7 +416,7 @@ extern char __sched_text_start[], __sched_text_end[];
+@@ -412,7 +413,7 @@ extern char __sched_text_start[], __sched_text_end[];
  extern int in_sched_functions(unsigned long addr);
  
  #define	MAX_SCHEDULE_TIMEOUT	LONG_MAX
@@ -85264,7 +85274,7 @@ index 8db31ef..0af1f81 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);
-@@ -426,6 +427,19 @@ struct nsproxy;
+@@ -430,6 +431,19 @@ struct nsproxy;
  struct user_namespace;
  
  #ifdef CONFIG_MMU
@@ -85284,7 +85294,7 @@ index 8db31ef..0af1f81 100644
  extern void arch_pick_mmap_layout(struct mm_struct *mm);
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
-@@ -724,6 +738,17 @@ struct signal_struct {
+@@ -728,6 +742,17 @@ struct signal_struct {
  #ifdef CONFIG_TASKSTATS
  	struct taskstats *stats;
  #endif
@@ -85302,7 +85312,7 @@ index 8db31ef..0af1f81 100644
  #ifdef CONFIG_AUDIT
  	unsigned audit_tty;
  	unsigned audit_tty_log_passwd;
-@@ -750,7 +775,7 @@ struct signal_struct {
+@@ -754,7 +779,7 @@ struct signal_struct {
  	struct mutex cred_guard_mutex;	/* guard against foreign influences on
  					 * credential calculations
  					 * (notably. ptrace) */
@@ -85311,7 +85321,7 @@ index 8db31ef..0af1f81 100644
  
  /*
   * Bits in flags field of signal_struct.
-@@ -803,6 +828,14 @@ struct user_struct {
+@@ -807,6 +832,14 @@ struct user_struct {
  	struct key *session_keyring;	/* UID's default session keyring */
  #endif
  
@@ -85326,7 +85336,7 @@ index 8db31ef..0af1f81 100644
  	/* Hash table maintenance information */
  	struct hlist_node uidhash_node;
  	kuid_t uid;
-@@ -810,7 +843,7 @@ struct user_struct {
+@@ -814,7 +847,7 @@ struct user_struct {
  #ifdef CONFIG_PERF_EVENTS
  	atomic_long_t locked_vm;
  #endif
@@ -85335,7 +85345,7 @@ index 8db31ef..0af1f81 100644
  
  extern int uids_sysfs_init(void);
  
-@@ -1274,6 +1307,9 @@ enum perf_event_task_context {
+@@ -1278,6 +1311,9 @@ enum perf_event_task_context {
  struct task_struct {
  	volatile long state;	/* -1 unrunnable, 0 runnable, >0 stopped */
  	void *stack;
@@ -85345,7 +85355,7 @@ index 8db31ef..0af1f81 100644
  	atomic_t usage;
  	unsigned int flags;	/* per process flags, defined below */
  	unsigned int ptrace;
-@@ -1405,8 +1441,8 @@ struct task_struct {
+@@ -1411,8 +1447,8 @@ struct task_struct {
  	struct list_head thread_node;
  
  	struct completion *vfork_done;		/* for vfork() */
@@ -85356,7 +85366,7 @@ index 8db31ef..0af1f81 100644
  
  	cputime_t utime, stime, utimescaled, stimescaled;
  	cputime_t gtime;
-@@ -1431,11 +1467,6 @@ struct task_struct {
+@@ -1437,11 +1473,6 @@ struct task_struct {
  	struct task_cputime cputime_expires;
  	struct list_head cpu_timers[3];
  
@@ -85368,7 +85378,7 @@ index 8db31ef..0af1f81 100644
  	char comm[TASK_COMM_LEN]; /* executable name excluding path
  				     - access with [gs]et_task_comm (which lock
  				       it with task_lock())
-@@ -1453,6 +1484,10 @@ struct task_struct {
+@@ -1459,6 +1490,10 @@ struct task_struct {
  #endif
  /* CPU-specific state of this task */
  	struct thread_struct thread;
@@ -85379,7 +85389,7 @@ index 8db31ef..0af1f81 100644
  /* filesystem information */
  	struct fs_struct *fs;
  /* open file information */
-@@ -1527,6 +1562,10 @@ struct task_struct {
+@@ -1533,6 +1568,10 @@ struct task_struct {
  	gfp_t lockdep_reclaim_gfp;
  #endif
  
@@ -85390,7 +85400,7 @@ index 8db31ef..0af1f81 100644
  /* journalling filesystem info */
  	void *journal_info;
  
-@@ -1565,6 +1604,10 @@ struct task_struct {
+@@ -1571,6 +1610,10 @@ struct task_struct {
  	/* cg_list protected by css_set_lock and tsk->alloc_lock */
  	struct list_head cg_list;
  #endif
@@ -85401,7 +85411,7 @@ index 8db31ef..0af1f81 100644
  #ifdef CONFIG_FUTEX
  	struct robust_list_head __user *robust_list;
  #ifdef CONFIG_COMPAT
-@@ -1673,7 +1716,7 @@ struct task_struct {
+@@ -1682,7 +1725,7 @@ struct task_struct {
  	 * Number of functions that haven't been traced
  	 * because of depth overrun.
  	 */
@@ -85410,7 +85420,7 @@ index 8db31ef..0af1f81 100644
  	/* Pause for the tracing */
  	atomic_t tracing_graph_pause;
  #endif
-@@ -1701,7 +1744,78 @@ struct task_struct {
+@@ -1710,7 +1753,78 @@ struct task_struct {
  #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
  	unsigned long	task_state_change;
  #endif
@@ -85490,7 +85500,7 @@ index 8db31ef..0af1f81 100644
  
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
-@@ -1783,7 +1897,7 @@ struct pid_namespace;
+@@ -1793,7 +1907,7 @@ struct pid_namespace;
  pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
  			struct pid_namespace *ns);
  
@@ -85499,7 +85509,7 @@ index 8db31ef..0af1f81 100644
  {
  	return tsk->pid;
  }
-@@ -2150,6 +2264,25 @@ extern u64 sched_clock_cpu(int cpu);
+@@ -2161,6 +2275,25 @@ extern u64 sched_clock_cpu(int cpu);
  
  extern void sched_clock_init(void);
  
@@ -85525,7 +85535,7 @@ index 8db31ef..0af1f81 100644
  #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
  static inline void sched_clock_tick(void)
  {
-@@ -2283,7 +2416,9 @@ void yield(void);
+@@ -2294,7 +2427,9 @@ void yield(void);
  extern struct exec_domain	default_exec_domain;
  
  union thread_union {
@@ -85535,7 +85545,7 @@ index 8db31ef..0af1f81 100644
  	unsigned long stack[THREAD_SIZE/sizeof(long)];
  };
  
-@@ -2316,6 +2451,7 @@ extern struct pid_namespace init_pid_ns;
+@@ -2327,6 +2462,7 @@ extern struct pid_namespace init_pid_ns;
   */
  
  extern struct task_struct *find_task_by_vpid(pid_t nr);
@@ -85543,7 +85553,7 @@ index 8db31ef..0af1f81 100644
  extern struct task_struct *find_task_by_pid_ns(pid_t nr,
  		struct pid_namespace *ns);
  
-@@ -2480,7 +2616,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
+@@ -2491,7 +2627,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -85552,7 +85562,7 @@ index 8db31ef..0af1f81 100644
  
  extern int do_execve(struct filename *,
  		     const char __user * const __user *,
-@@ -2701,9 +2837,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
+@@ -2712,9 +2848,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
  #define task_stack_end_corrupted(task) \
  		(*(end_of_stack(task)) != STACK_END_MAGIC)
  
@@ -85577,7 +85587,7 @@ index 596a0e0..bea77ec 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 ba96471..74fb3f6 100644
+index a1b7dbd..036f47f 100644
 --- a/include/linux/security.h
 +++ b/include/linux/security.h
 @@ -27,6 +27,7 @@
@@ -85597,7 +85607,7 @@ index ba96471..74fb3f6 100644
  #ifdef CONFIG_MMU
  extern unsigned long mmap_min_addr;
  extern unsigned long dac_mmap_min_addr;
-@@ -1729,7 +1728,7 @@ struct security_operations {
+@@ -1756,7 +1755,7 @@ struct security_operations {
  				 struct audit_context *actx);
  	void (*audit_rule_free) (void *lsmrule);
  #endif /* CONFIG_AUDIT */
@@ -85620,7 +85630,7 @@ index dc368b8..e895209 100644
  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 cf6a9da..bd86b1f 100644
+index afbb1fd..e1d205d 100644
 --- a/include/linux/seq_file.h
 +++ b/include/linux/seq_file.h
 @@ -27,6 +27,9 @@ struct seq_file {
@@ -85649,8 +85659,8 @@ index cf6a9da..bd86b1f 100644
  ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
  loff_t seq_lseek(struct file *, loff_t, int);
  int seq_release(struct inode *, struct file *);
-@@ -153,6 +158,7 @@ static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
- }
+@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
+ 		  const struct path *root, const char *esc);
  
  int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
 +int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
@@ -85686,10 +85696,10 @@ index ab1e039..ad4229e 100644
  
  static inline void disallow_signal(int sig)
 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index 85ab7d7..eb1585a 100644
+index f54d665..e41848d 100644
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -763,7 +763,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
+@@ -770,7 +770,7 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
  struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
  			    int node);
  struct sk_buff *build_skb(void *data, unsigned int frag_size);
@@ -85698,7 +85708,7 @@ index 85ab7d7..eb1585a 100644
  					gfp_t priority)
  {
  	return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
-@@ -1952,7 +1952,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
+@@ -1966,7 +1966,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
  	return skb->inner_transport_header - skb->inner_network_header;
  }
  
@@ -85707,7 +85717,7 @@ index 85ab7d7..eb1585a 100644
  {
  	return skb_network_header(skb) - skb->data;
  }
-@@ -2012,7 +2012,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
+@@ -2026,7 +2026,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
@@ -85716,7 +85726,7 @@ index 85ab7d7..eb1585a 100644
  #endif
  
  int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-@@ -2655,9 +2655,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
+@@ -2668,9 +2668,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
  				  int *err);
  unsigned int datagram_poll(struct file *file, struct socket *sock,
  			   struct poll_table_struct *wait);
@@ -85728,7 +85738,7 @@ index 85ab7d7..eb1585a 100644
  					struct msghdr *msg, int size)
  {
  	return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
-@@ -3131,6 +3131,9 @@ static inline void nf_reset(struct sk_buff *skb)
+@@ -3180,6 +3180,9 @@ static inline void nf_reset(struct sk_buff *skb)
  	nf_bridge_put(skb->nf_bridge);
  	skb->nf_bridge = NULL;
  #endif
@@ -85739,7 +85749,7 @@ index 85ab7d7..eb1585a 100644
  
  static inline void nf_reset_trace(struct sk_buff *skb)
 diff --git a/include/linux/slab.h b/include/linux/slab.h
-index 9a139b6..aab37b4 100644
+index 76f1fee..d95e6d2 100644
 --- a/include/linux/slab.h
 +++ b/include/linux/slab.h
 @@ -14,15 +14,29 @@
@@ -85789,8 +85799,8 @@ index 9a139b6..aab37b4 100644
 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
  
  #include <linux/kmemleak.h>
- 
-@@ -144,6 +161,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
+ #include <linux/kasan.h>
+@@ -143,6 +160,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
  void kfree(const void *);
  void kzfree(const void *);
  size_t ksize(const void *);
@@ -85799,7 +85809,7 @@ index 9a139b6..aab37b4 100644
  
  /*
   * Some archs want to perform DMA into kmalloc caches and need a guaranteed
-@@ -236,6 +255,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
+@@ -235,6 +254,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
  extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
  #endif
  
@@ -85810,7 +85820,7 @@ index 9a139b6..aab37b4 100644
  /*
   * Figure out which kmalloc slab an allocation of a certain size
   * belongs to.
-@@ -244,7 +267,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
+@@ -243,7 +266,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
   * 2 = 120 .. 192 bytes
   * n = 2^(n-1) .. 2^n -1
   */
@@ -85819,13 +85829,14 @@ index 9a139b6..aab37b4 100644
  {
  	if (!size)
  		return 0;
-@@ -287,14 +310,14 @@ static __always_inline int kmalloc_index(size_t size)
+@@ -286,15 +309,15 @@ 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) __size_overflow(1);
  void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
+ void kmem_cache_free(struct kmem_cache *, void *);
  
  #ifdef CONFIG_NUMA
 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
@@ -85838,7 +85849,7 @@ index 9a139b6..aab37b4 100644
  	return __kmalloc(size, flags);
  }
 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
-index b869d16..1453c73 100644
+index 33d0490..70a6313 100644
 --- a/include/linux/slab_def.h
 +++ b/include/linux/slab_def.h
 @@ -40,7 +40,7 @@ struct kmem_cache {
@@ -85870,7 +85881,7 @@ index b869d16..1453c73 100644
  	/*
  	 * If debugging is enabled, then the allocator can add additional
 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
-index d82abd4..408c3a0 100644
+index 3388511..6252f90 100644
 --- a/include/linux/slub_def.h
 +++ b/include/linux/slub_def.h
 @@ -74,7 +74,7 @@ struct kmem_cache {
@@ -85883,10 +85894,10 @@ index d82abd4..408c3a0 100644
  	int inuse;		/* Offset to metadata */
  	int align;		/* Alignment */
 diff --git a/include/linux/smp.h b/include/linux/smp.h
-index 93dff5f..933c561 100644
+index be91db2..3f23232 100644
 --- a/include/linux/smp.h
 +++ b/include/linux/smp.h
-@@ -176,7 +176,9 @@ static inline void wake_up_all_idle_cpus(void) {  }
+@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
  #endif
  
  #define get_cpu()		({ preempt_disable(); smp_processor_id(); })
@@ -85970,7 +85981,7 @@ index 598ba80..d90cba6 100644
  #ifdef __KERNEL__
  
 diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
-index 6f22cfe..9fd0909 100644
+index fae6fb9..023fbcd 100644
 --- a/include/linux/sunrpc/svc.h
 +++ b/include/linux/sunrpc/svc.h
 @@ -420,7 +420,7 @@ struct svc_procedure {
@@ -85983,7 +85994,7 @@ index 6f22cfe..9fd0909 100644
  /*
   * Function prototypes.
 diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
-index 975da75..318c083 100644
+index df8edf8..d140fec 100644
 --- a/include/linux/sunrpc/svc_rdma.h
 +++ b/include/linux/sunrpc/svc_rdma.h
 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
@@ -86009,8 +86020,8 @@ index 975da75..318c083 100644
 +extern atomic_unchecked_t rdma_stat_sq_poll;
 +extern atomic_unchecked_t rdma_stat_sq_prod;
  
- #define RPCRDMA_VERSION 1
- 
+ /*
+  * Contexts are built when an RDMA request is created and are a
 diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
 index 8d71d65..f79586e 100644
 --- a/include/linux/sunrpc/svcauth.h
@@ -86039,7 +86050,7 @@ index e7a018e..49f8b17 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 85893d7..e78c660 100644
+index 76d1e38..d92ff38 100644
 --- a/include/linux/syscalls.h
 +++ b/include/linux/syscalls.h
 @@ -102,7 +102,12 @@ union bpf_attr;
@@ -86072,7 +86083,7 @@ index 85893d7..e78c660 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,
-@@ -600,7 +605,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
+@@ -604,7 +609,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,
@@ -86191,10 +86202,10 @@ index ff307b5..f1a4468 100644
  
  #endif /* _LINUX_THREAD_INFO_H */
 diff --git a/include/linux/tty.h b/include/linux/tty.h
-index 7d66ae5..0327149 100644
+index 358a337..8829c1f 100644
 --- a/include/linux/tty.h
 +++ b/include/linux/tty.h
-@@ -202,7 +202,7 @@ struct tty_port {
+@@ -225,7 +225,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 */
@@ -86203,7 +86214,7 @@ index 7d66ae5..0327149 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 */
-@@ -290,7 +290,7 @@ struct tty_struct {
+@@ -313,7 +313,7 @@ struct tty_struct {
  	/* If the tty has a pending do_SAK, queue it here - akpm */
  	struct work_struct SAK_work;
  	struct tty_port *port;
@@ -86212,7 +86223,7 @@ index 7d66ae5..0327149 100644
  
  /* Each of a tty's open files has private_data pointing to tty_file_private */
  struct tty_file_private {
-@@ -549,7 +549,7 @@ extern int tty_port_open(struct tty_port *port,
+@@ -572,7 +572,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)
  {
@@ -86257,10 +86268,10 @@ index 00c9d68..bc0188b 100644
  
  struct tty_ldisc {
 diff --git a/include/linux/types.h b/include/linux/types.h
-index a0bb704..f511c77 100644
+index 6747247..fc7ec8b 100644
 --- a/include/linux/types.h
 +++ b/include/linux/types.h
-@@ -177,10 +177,26 @@ typedef struct {
+@@ -174,10 +174,26 @@ typedef struct {
  	int counter;
  } atomic_t;
  
@@ -86385,7 +86396,7 @@ 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 058a769..c17a1c2c 100644
+index 7ee1b5c..82e2c1a 100644
 --- a/include/linux/usb.h
 +++ b/include/linux/usb.h
 @@ -566,7 +566,7 @@ struct usb_device {
@@ -86522,22 +86533,22 @@ index b483abd..af305ad 100644
  #endif
  #endif /* _LINUX_VGA_SWITCHEROO_H_ */
 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
-index b87696f..1d11de7 100644
+index 0ec5983..cc61051 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 */
+@@ -18,6 +18,11 @@ struct vm_area_struct;		/* vma defining user mapping in mm_types.h */
  #define VM_UNINITIALIZED	0x00000020	/* vm_struct is not fully initialized */
+ #define VM_NO_GUARD		0x00000040      /* don't add guard page */
+ #define VM_KASAN		0x00000080      /* has allocated kasan shadow memory */
 +
 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
-+#define VM_KERNEXEC		0x00000040	/* allocate from executable kernel memory range */
++#define VM_KERNEXEC		0x00000100	/* allocate from executable kernel memory range */
 +#endif
 +
  /* bits [20..32] reserved for arch specific ioremap internals */
  
  /*
-@@ -82,6 +87,10 @@ extern void *vmap(struct page **pages, unsigned int count,
+@@ -86,6 +91,10 @@ extern void *vmap(struct page **pages, unsigned int count,
  			unsigned long flags, pgprot_t prot);
  extern void vunmap(const void *addr);
  
@@ -86548,7 +86559,7 @@ index b87696f..1d11de7 100644
  extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
  				       unsigned long uaddr, void *kaddr,
  				       unsigned long size);
-@@ -142,7 +151,7 @@ extern void free_vm_area(struct vm_struct *area);
+@@ -150,7 +159,7 @@ extern void free_vm_area(struct vm_struct *area);
  
  /* for /dev/kmem */
  extern long vread(char *buf, char *addr, unsigned long count);
@@ -86671,7 +86682,7 @@ index 92dbbd3..13ab0b3 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 eb76cfd..9fd0e7c 100644
+index 3e4fddf..5ec9104 100644
 --- a/include/media/v4l2-dev.h
 +++ b/include/media/v4l2-dev.h
 @@ -75,7 +75,7 @@ struct v4l2_file_operations {
@@ -86723,10 +86734,10 @@ index a175ba4..196eb8242 100644
  #define UNIXCB(skb) 	(*(struct unix_skb_parms *)&((skb)->cb))
  #define UNIXSID(skb)	(&UNIXCB((skb)).secid)
 diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
-index d1bb342..e12f7d2 100644
+index 2239a37..a83461f 100644
 --- a/include/net/bluetooth/l2cap.h
 +++ b/include/net/bluetooth/l2cap.h
-@@ -608,7 +608,7 @@ struct l2cap_ops {
+@@ -609,7 +609,7 @@ struct l2cap_ops {
  	struct sk_buff		*(*alloc_skb) (struct l2cap_chan *chan,
  					       unsigned long hdr_len,
  					       unsigned long len, int nb);
@@ -86736,10 +86747,10 @@ index d1bb342..e12f7d2 100644
  struct l2cap_conn {
  	struct hci_conn		*hcon;
 diff --git a/include/net/bonding.h b/include/net/bonding.h
-index 983a94b..7aa9b16 100644
+index fda6fee..dbdf83c 100644
 --- a/include/net/bonding.h
 +++ b/include/net/bonding.h
-@@ -647,7 +647,7 @@ extern struct rtnl_link_ops bond_link_ops;
+@@ -665,7 +665,7 @@ extern struct rtnl_link_ops bond_link_ops;
  
  static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
  {
@@ -86785,7 +86796,7 @@ index 8109a15..504466d 100644
  
  #endif
 diff --git a/include/net/genetlink.h b/include/net/genetlink.h
-index 6c92415..3a352d8 100644
+index 0574abd..0f16881 100644
 --- a/include/net/genetlink.h
 +++ b/include/net/genetlink.h
 @@ -130,7 +130,7 @@ struct genl_ops {
@@ -86798,11 +86809,11 @@ index 6c92415..3a352d8 100644
  int __genl_register_family(struct genl_family *family);
  
 diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
-index 734d9b5..48a9a4b 100644
+index 0f712c0..cd762c4 100644
 --- a/include/net/gro_cells.h
 +++ b/include/net/gro_cells.h
-@@ -29,7 +29,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
- 		cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
+@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
+ 	cell = this_cpu_ptr(gcells->cells);
  
  	if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
 -		atomic_long_inc(&dev->rx_dropped);
@@ -86811,7 +86822,7 @@ index 734d9b5..48a9a4b 100644
  		return;
  	}
 diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
-index 848e85c..051c7de 100644
+index 5976bde..3a81660 100644
 --- a/include/net/inet_connection_sock.h
 +++ b/include/net/inet_connection_sock.h
 @@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
@@ -86837,7 +86848,7 @@ index 80479ab..0c3f647 100644
  		struct rcu_head         rcu;
  		struct inet_peer	*gc_next;
 diff --git a/include/net/ip.h b/include/net/ip.h
-index c0c26c3..29f0420 100644
+index 6cc1eaf..14059b0 100644
 --- a/include/net/ip.h
 +++ b/include/net/ip.h
 @@ -317,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
@@ -86850,7 +86861,7 @@ index c0c26c3..29f0420 100644
  
  static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
 diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
-index 09a819e..3ab9e14 100644
+index 5bd120e4..03fb812 100644
 --- a/include/net/ip_fib.h
 +++ b/include/net/ip_fib.h
 @@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
@@ -86991,10 +87002,10 @@ index c4359e2..76dbc4a 100644
  struct llc_sap_state {
  	u8			   curr_state;
 diff --git a/include/net/mac80211.h b/include/net/mac80211.h
-index 29c7be8..746bd73 100644
+index d52914b..2b13cec 100644
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -4869,7 +4869,7 @@ struct rate_control_ops {
+@@ -4915,7 +4915,7 @@ struct rate_control_ops {
  	void (*remove_sta_debugfs)(void *priv, void *priv_sta);
  
  	u32 (*get_expected_throughput)(void *priv_sta);
@@ -87026,10 +87037,10 @@ index 76f7084..8f36e39 100644
  enum {
  	NEIGH_ARP_TABLE = 0,
 diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
-index 2e8756b8..0bd0083 100644
+index 36faf49..6927638 100644
 --- a/include/net/net_namespace.h
 +++ b/include/net/net_namespace.h
-@@ -130,8 +130,8 @@ struct net {
+@@ -131,8 +131,8 @@ struct net {
  	struct netns_ipvs	*ipvs;
  #endif
  	struct sock		*diag_nlsk;
@@ -87040,7 +87051,7 @@ index 2e8756b8..0bd0083 100644
  
  #include <linux/seq_file_net.h>
  
-@@ -287,7 +287,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
+@@ -288,7 +288,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
  #define __net_init	__init
  #define __net_exit	__exit_refok
  #define __net_initdata	__initdata
@@ -87051,8 +87062,8 @@ index 2e8756b8..0bd0083 100644
 +#endif
  #endif
  
- struct pernet_operations {
-@@ -297,7 +301,7 @@ struct pernet_operations {
+ int peernet2id(struct net *net, struct net *peer);
+@@ -301,7 +305,7 @@ struct pernet_operations {
  	void (*exit_batch)(struct list_head *net_exit_list);
  	int *id;
  	size_t size;
@@ -87061,7 +87072,7 @@ index 2e8756b8..0bd0083 100644
  
  /*
   * Use these carefully.  If you implement a network device and it
-@@ -345,12 +349,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
+@@ -349,12 +353,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
  
  static inline int rt_genid_ipv4(struct net *net)
  {
@@ -87076,7 +87087,7 @@ index 2e8756b8..0bd0083 100644
  }
  
  extern void (*__fib6_flush_trees)(struct net *net);
-@@ -377,12 +381,12 @@ static inline void rt_genid_bump_all(struct net *net)
+@@ -381,12 +385,12 @@ static inline void rt_genid_bump_all(struct net *net)
  
  static inline int fnhe_genid(struct net *net)
  {
@@ -87092,18 +87103,18 @@ index 2e8756b8..0bd0083 100644
  
  #endif /* __NET_NET_NAMESPACE_H */
 diff --git a/include/net/netlink.h b/include/net/netlink.h
-index 6415835..ab96d87 100644
+index e010ee8..405b9f4 100644
 --- a/include/net/netlink.h
 +++ b/include/net/netlink.h
-@@ -521,7 +521,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
- static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
+@@ -518,7 +518,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
  {
- 	if (mark)
+ 	if (mark) {
+ 		WARN_ON((unsigned char *) mark < skb->data);
 -		skb_trim(skb, (unsigned char *) mark - skb->data);
 +		skb_trim(skb, (const unsigned char *) mark - skb->data);
+ 	}
  }
  
- /**
 diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
 index 29d6a94..235d3d84 100644
 --- a/include/net/netns/conntrack.h
@@ -87131,10 +87142,10 @@ index 29d6a94..235d3d84 100644
  };
  
 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
-index 0ffef1a..2ce1ceb 100644
+index dbe2254..ed0c151 100644
 --- a/include/net/netns/ipv4.h
 +++ b/include/net/netns/ipv4.h
-@@ -84,7 +84,7 @@ struct netns_ipv4 {
+@@ -87,7 +87,7 @@ struct netns_ipv4 {
  
  	struct ping_group_range ping_group_range;
  
@@ -87143,7 +87154,7 @@ index 0ffef1a..2ce1ceb 100644
  
  #ifdef CONFIG_SYSCTL
  	unsigned long *sysctl_local_reserved_ports;
-@@ -98,6 +98,6 @@ struct netns_ipv4 {
+@@ -101,6 +101,6 @@ struct netns_ipv4 {
  	struct fib_rules_ops	*mr_rules_ops;
  #endif
  #endif
@@ -87180,7 +87191,7 @@ index 730d82a..045f2c4 100644
  	spinlock_t		flow_cache_gc_lock;
  	struct work_struct	flow_cache_gc_work;
 diff --git a/include/net/ping.h b/include/net/ping.h
-index f074060..830fba0 100644
+index cc16d41..664f40b 100644
 --- a/include/net/ping.h
 +++ b/include/net/ping.h
 @@ -54,7 +54,7 @@ struct ping_iter_state {
@@ -87215,13 +87226,13 @@ index d6fcc1f..ca277058 100644
  #define INET6_PROTO_NOPOLICY	0x1
  #define INET6_PROTO_FINAL	0x2
 diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
-index e21b9f9..0191ef0 100644
+index 6c6d539..af70817 100644
 --- a/include/net/rtnetlink.h
 +++ b/include/net/rtnetlink.h
-@@ -93,7 +93,7 @@ struct rtnl_link_ops {
- 	int			(*fill_slave_info)(struct sk_buff *skb,
+@@ -95,7 +95,7 @@ struct rtnl_link_ops {
  						   const struct net_device *dev,
  						   const struct net_device *slave_dev);
+ 	struct net		*(*get_link_net)(const struct net_device *dev);
 -};
 +} __do_const;
  
@@ -87278,7 +87289,7 @@ index 2bb2fcf..d17c291 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 45b54d3..10efeac 100644
+index e4079c2..79c5d3a 100644
 --- a/include/net/sock.h
 +++ b/include/net/sock.h
 @@ -362,7 +362,7 @@ struct sock {
@@ -87290,7 +87301,7 @@ index 45b54d3..10efeac 100644
  	int			sk_rcvbuf;
  
  	struct sk_filter __rcu	*sk_filter;
-@@ -1061,7 +1061,7 @@ struct proto {
+@@ -1039,7 +1039,7 @@ struct proto {
  	void			(*destroy_cgroup)(struct mem_cgroup *memcg);
  	struct cg_proto		*(*proto_cgroup)(struct mem_cgroup *memcg);
  #endif
@@ -87299,7 +87310,7 @@ index 45b54d3..10efeac 100644
  
  /*
   * Bits in struct cg_proto.flags
-@@ -1239,7 +1239,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
+@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
  	page_counter_uncharge(&prot->memory_allocated, amt);
  }
  
@@ -87308,25 +87319,16 @@ index 45b54d3..10efeac 100644
  sk_memory_allocated(const struct sock *sk)
  {
  	struct proto *prot = sk->sk_prot;
-@@ -1385,7 +1385,7 @@ struct sock_iocb {
- 	struct scm_cookie	*scm;
- 	struct msghdr		*msg, async_msg;
- 	struct kiocb		*kiocb;
--};
-+} __randomize_layout;
- 
- static inline struct sock_iocb *kiocb_to_siocb(struct kiocb *iocb)
- {
-@@ -1828,7 +1828,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
+@@ -1778,7 +1778,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,
--					   char __user *from, char *to,
-+					   char __user *from, unsigned char *to,
+-					   struct iov_iter *from, char *to,
++					   struct iov_iter *from, unsigned char *to,
  					   int copy, int offset)
  {
  	if (skb->ip_summed == CHECKSUM_NONE) {
-@@ -2077,7 +2077,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
+@@ -2025,7 +2025,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
  	}
  }
  
@@ -87336,7 +87338,7 @@ index 45b54d3..10efeac 100644
  /**
   * sk_page_frag - return an appropriate page_frag
 diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 9d9111e..349c847 100644
+index 8d6b983..5813205 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -516,7 +516,7 @@ void tcp_retransmit_timer(struct sock *sk);
@@ -87348,7 +87350,7 @@ index 9d9111e..349c847 100644
  
  void tcp_send_probe0(struct sock *);
  void tcp_send_partial(struct sock *);
-@@ -689,8 +689,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
+@@ -694,8 +694,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
   * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
   */
  struct tcp_skb_cb {
@@ -87359,7 +87361,7 @@ index 9d9111e..349c847 100644
  	union {
  		/* Note : tcp_tw_isn is used in input path only
  		 *	  (isn chosen by tcp_timewait_state_process())
-@@ -715,7 +715,7 @@ struct tcp_skb_cb {
+@@ -720,7 +720,7 @@ struct tcp_skb_cb {
  
  	__u8		ip_dsfield;	/* IPv4 tos or IPv6 dsfield	*/
  	/* 1 byte hole */
@@ -87469,7 +87471,7 @@ index 93d14da..734b3d8 100644
  	u8			       qfull;
  	enum fc_lport_state	       state;
 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
-index 3a4edd1..feb2e3e 100644
+index a4c9336..d6f8f34 100644
 --- a/include/scsi/scsi_device.h
 +++ b/include/scsi/scsi_device.h
 @@ -185,9 +185,9 @@ struct scsi_device {
@@ -87500,10 +87502,10 @@ index 007a0bc..7188db8 100644
  
  /**
 diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
-index 396e8f7..b037e89 100644
+index f48089d..73abe48 100644
 --- a/include/sound/compress_driver.h
 +++ b/include/sound/compress_driver.h
-@@ -129,7 +129,7 @@ struct snd_compr_ops {
+@@ -130,7 +130,7 @@ struct snd_compr_ops {
  			struct snd_compr_caps *caps);
  	int (*get_codec_caps) (struct snd_compr_stream *stream,
  			struct snd_compr_codec_caps *codec);
@@ -87513,10 +87515,10 @@ index 396e8f7..b037e89 100644
  /**
   * struct snd_compr: Compressed device
 diff --git a/include/sound/soc.h b/include/sound/soc.h
-index ac8b333..59c3692 100644
+index 0d1ade1..34e77d3 100644
 --- a/include/sound/soc.h
 +++ b/include/sound/soc.h
-@@ -853,7 +853,7 @@ struct snd_soc_codec_driver {
+@@ -856,7 +856,7 @@ struct snd_soc_codec_driver {
  			     enum snd_soc_dapm_type, int);
  
  	bool ignore_pmdown_time;  /* Doesn't benefit from pmdown delay */
@@ -87525,7 +87527,7 @@ index ac8b333..59c3692 100644
  
  /* SoC platform interface */
  struct snd_soc_platform_driver {
-@@ -880,7 +880,7 @@ struct snd_soc_platform_driver {
+@@ -883,7 +883,7 @@ struct snd_soc_platform_driver {
  	const struct snd_compr_ops *compr_ops;
  
  	int (*bespoke_trigger)(struct snd_pcm_substream *, int);
@@ -87903,10 +87905,10 @@ index 30f5362..8ed8ac9 100644
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
 diff --git a/init/Kconfig b/init/Kconfig
-index 9afb971..27d6fca 100644
+index f5dbc6d..8259396 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1129,6 +1129,7 @@ endif # CGROUPS
+@@ -1136,6 +1136,7 @@ endif # CGROUPS
  
  config CHECKPOINT_RESTORE
  	bool "Checkpoint/restore support" if EXPERT
@@ -87914,7 +87916,7 @@ index 9afb971..27d6fca 100644
  	default n
  	help
  	  Enables additional kernel features in a sake of checkpoint/restore.
-@@ -1654,7 +1655,7 @@ config SLUB_DEBUG
+@@ -1646,7 +1647,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
  	bool "Disable heap randomization"
@@ -87923,7 +87925,7 @@ index 9afb971..27d6fca 100644
  	help
  	  Randomizing heap placement makes heap exploits harder, but it
  	  also breaks ancient binaries (including anything libc5 based).
-@@ -1985,7 +1986,7 @@ config INIT_ALL_POSSIBLE
+@@ -1977,7 +1978,7 @@ config INIT_ALL_POSSIBLE
  config STOP_MACHINE
  	bool
  	default y
@@ -88272,10 +88274,10 @@ index ad1bd77..dca2c1b 100644
  	next_state = Reset;
  	return 0;
 diff --git a/init/main.c b/init/main.c
-index 61b99376..1e346cb 100644
+index 6f0f1c5f..a542824 100644
 --- a/init/main.c
 +++ b/init/main.c
-@@ -100,6 +100,8 @@ extern void radix_tree_init(void);
+@@ -96,6 +96,8 @@ extern void radix_tree_init(void);
  static inline void mark_rodata_ro(void) { }
  #endif
  
@@ -88284,7 +88286,7 @@ index 61b99376..1e346cb 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
-@@ -161,6 +163,85 @@ static int __init set_reset_devices(char *str)
+@@ -157,6 +159,85 @@ static int __init set_reset_devices(char *str)
  
  __setup("reset_devices", set_reset_devices);
  
@@ -88370,7 +88372,7 @@ index 61b99376..1e346cb 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;
-@@ -735,7 +816,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
+@@ -722,7 +803,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
  	struct blacklist_entry *entry;
  	char *fn_name;
  
@@ -88379,7 +88381,7 @@ index 61b99376..1e346cb 100644
  	if (!fn_name)
  		return false;
  
-@@ -787,7 +868,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
+@@ -774,7 +855,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
  {
  	int count = preempt_count();
  	int ret;
@@ -88388,7 +88390,7 @@ index 61b99376..1e346cb 100644
  
  	if (initcall_blacklisted(fn))
  		return -EPERM;
-@@ -797,18 +878,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
+@@ -784,18 +865,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
  	else
  		ret = fn();
  
@@ -88411,7 +88413,7 @@ index 61b99376..1e346cb 100644
  	return ret;
  }
  
-@@ -914,8 +994,8 @@ static int run_init_process(const char *init_filename)
+@@ -901,8 +981,8 @@ static int run_init_process(const char *init_filename)
  {
  	argv_init[0] = init_filename;
  	return do_execve(getname_kernel(init_filename),
@@ -88422,7 +88424,7 @@ index 61b99376..1e346cb 100644
  }
  
  static int try_to_run_init_process(const char *init_filename)
-@@ -932,6 +1012,10 @@ static int try_to_run_init_process(const char *init_filename)
+@@ -919,6 +999,10 @@ static int try_to_run_init_process(const char *init_filename)
  	return ret;
  }
  
@@ -88433,7 +88435,7 @@ index 61b99376..1e346cb 100644
  static noinline void __init kernel_init_freeable(void);
  
  static int __ref kernel_init(void *unused)
-@@ -956,6 +1040,11 @@ static int __ref kernel_init(void *unused)
+@@ -943,6 +1027,11 @@ static int __ref kernel_init(void *unused)
  		       ramdisk_execute_command, ret);
  	}
  
@@ -88445,7 +88447,7 @@ index 61b99376..1e346cb 100644
  	/*
  	 * We try each of these until one succeeds.
  	 *
-@@ -1016,7 +1105,7 @@ static noinline void __init kernel_init_freeable(void)
+@@ -998,7 +1087,7 @@ static noinline void __init kernel_init_freeable(void)
  	do_basic_setup();
  
  	/* Open the /dev/console on the rootfs, this should never fail */
@@ -88454,7 +88456,7 @@ index 61b99376..1e346cb 100644
  		pr_err("Warning: unable to open an initial console.\n");
  
  	(void) sys_dup(0);
-@@ -1029,11 +1118,13 @@ static noinline void __init kernel_init_freeable(void)
+@@ -1011,11 +1100,13 @@ static noinline void __init kernel_init_freeable(void)
  	if (!ramdisk_execute_command)
  		ramdisk_execute_command = "/init";
  
@@ -88689,10 +88691,10 @@ index 72ab759..757deba 100644
  		s.feature_bitmap	= AUDIT_FEATURE_BITMAP_ALL;
  		s.backlog_wait_time	= audit_backlog_wait_time;
 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index 072566d..1190489 100644
+index dc4ae70..2a2bddc 100644
 --- a/kernel/auditsc.c
 +++ b/kernel/auditsc.c
-@@ -2056,7 +2056,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
+@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
  }
  
  /* global counter which is incremented every time something logs in */
@@ -88701,7 +88703,7 @@ index 072566d..1190489 100644
  
  static int audit_set_loginuid_perm(kuid_t loginuid)
  {
-@@ -2123,7 +2123,7 @@ int audit_set_loginuid(kuid_t loginuid)
+@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
  
  	/* are we setting or clearing? */
  	if (uid_valid(loginuid))
@@ -88863,10 +88865,10 @@ index 989f5bf..d317ca0 100644
 +}
 +EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
 diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index 04cfe8a..adadcc0 100644
+index 29a7b2c..a64e30a 100644
 --- a/kernel/cgroup.c
 +++ b/kernel/cgroup.c
-@@ -5343,6 +5343,9 @@ static void cgroup_release_agent(struct work_struct *work)
+@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
  	if (!pathbuf || !agentbuf)
  		goto out;
  
@@ -88876,7 +88878,7 @@ index 04cfe8a..adadcc0 100644
  	path = cgroup_path(cgrp, pathbuf, PATH_MAX);
  	if (!path)
  		goto out;
-@@ -5528,7 +5531,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
+@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
  		struct task_struct *task;
  		int count = 0;
  
@@ -88886,7 +88888,7 @@ index 04cfe8a..adadcc0 100644
  		list_for_each_entry(task, &cset->tasks, cg_list) {
  			if (count++ > MAX_TASKS_SHOWN_PER_CSS)
 diff --git a/kernel/compat.c b/kernel/compat.c
-index ebb3c36..1df606e 100644
+index 24f0061..ea80802 100644
 --- a/kernel/compat.c
 +++ b/kernel/compat.c
 @@ -13,6 +13,7 @@
@@ -88915,7 +88917,7 @@ index ebb3c36..1df606e 100644
  				HRTIMER_MODE_REL, CLOCK_MONOTONIC);
  	set_fs(oldfs);
  
-@@ -379,7 +380,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
+@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
  	mm_segment_t old_fs = get_fs();
  
  	set_fs(KERNEL_DS);
@@ -88924,7 +88926,7 @@ index ebb3c36..1df606e 100644
  	set_fs(old_fs);
  	if (ret == 0)
  		ret = put_user(s, set);
-@@ -469,7 +470,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
+@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
  	mm_segment_t old_fs = get_fs();
  
  	set_fs(KERNEL_DS);
@@ -88933,7 +88935,7 @@ index ebb3c36..1df606e 100644
  	set_fs(old_fs);
  
  	if (!ret) {
-@@ -551,8 +552,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
+@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
  		set_fs (KERNEL_DS);
  		ret = sys_wait4(pid,
  				(stat_addr ?
@@ -88944,7 +88946,7 @@ index ebb3c36..1df606e 100644
  		set_fs (old_fs);
  
  		if (ret > 0) {
-@@ -578,8 +579,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
+@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
  	memset(&info, 0, sizeof(info));
  
  	set_fs(KERNEL_DS);
@@ -88955,7 +88957,7 @@ index ebb3c36..1df606e 100644
  	set_fs(old_fs);
  
  	if ((ret < 0) || (info.si_signo == 0))
-@@ -713,8 +714,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
+@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_timer_settime(timer_id, flags,
@@ -88966,7 +88968,7 @@ index ebb3c36..1df606e 100644
  	set_fs(oldfs);
  	if (!err && old && put_compat_itimerspec(old, &oldts))
  		return -EFAULT;
-@@ -731,7 +732,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
+@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_timer_gettime(timer_id,
@@ -88975,7 +88977,7 @@ index ebb3c36..1df606e 100644
  	set_fs(oldfs);
  	if (!err && put_compat_itimerspec(setting, &ts))
  		return -EFAULT;
-@@ -750,7 +751,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
+@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_clock_settime(which_clock,
@@ -88984,7 +88986,7 @@ index ebb3c36..1df606e 100644
  	set_fs(oldfs);
  	return err;
  }
-@@ -765,7 +766,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
+@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_clock_gettime(which_clock,
@@ -88993,7 +88995,7 @@ index ebb3c36..1df606e 100644
  	set_fs(oldfs);
  	if (!err && compat_put_timespec(&ts, tp))
  		return -EFAULT;
-@@ -785,7 +786,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
+@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
  
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
@@ -89002,7 +89004,7 @@ index ebb3c36..1df606e 100644
  	set_fs(oldfs);
  
  	err = compat_put_timex(utp, &txc);
-@@ -805,7 +806,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
+@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_clock_getres(which_clock,
@@ -89011,7 +89013,7 @@ index ebb3c36..1df606e 100644
  	set_fs(oldfs);
  	if (!err && tp && compat_put_timespec(&ts, tp))
  		return -EFAULT;
-@@ -819,7 +820,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
+@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
  	struct timespec tu;
  	struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
  
@@ -89020,7 +89022,7 @@ index ebb3c36..1df606e 100644
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = clock_nanosleep_restart(restart);
-@@ -851,8 +852,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
+@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
  	oldfs = get_fs();
  	set_fs(KERNEL_DS);
  	err = sys_clock_nanosleep(which_clock, flags,
@@ -89031,7 +89033,7 @@ index ebb3c36..1df606e 100644
  	set_fs(oldfs);
  
  	if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
-@@ -1146,7 +1147,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
+@@ -1145,7 +1146,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
  	mm_segment_t old_fs = get_fs();
  
  	set_fs(KERNEL_DS);
@@ -89210,7 +89212,7 @@ index e0573a4..26c0fd3 100644
  
  /**
 diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
-index ac5c0f9..4b1c6c2 100644
+index 0874e2e..5b32cc9 100644
 --- a/kernel/debug/debug_core.c
 +++ b/kernel/debug/debug_core.c
 @@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
@@ -89251,7 +89253,7 @@ index ac5c0f9..4b1c6c2 100644
  		if (kgdb_info[sstep_cpu].task)
  			kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
  		else
-@@ -932,18 +932,18 @@ static void kgdb_unregister_callbacks(void)
+@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
  static void kgdb_tasklet_bpt(unsigned long ing)
  {
  	kgdb_breakpoint();
@@ -89274,7 +89276,7 @@ index ac5c0f9..4b1c6c2 100644
  }
  EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
-index 60f6bb8..104bb07 100644
+index 4121345..861e178 100644
 --- a/kernel/debug/kdb/kdb_main.c
 +++ b/kernel/debug/kdb/kdb_main.c
 @@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
@@ -89296,7 +89298,7 @@ index 60f6bb8..104bb07 100644
  #ifdef CONFIG_MODULE_UNLOAD
  		{
 diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 7959624..c01b886 100644
+index 2fabc06..79cceec 100644
 --- a/kernel/events/core.c
 +++ b/kernel/events/core.c
 @@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
@@ -89334,7 +89336,7 @@ index 7959624..c01b886 100644
  
  static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
  			      enum event_type_t event_type);
-@@ -3102,7 +3109,7 @@ static void __perf_event_read(void *info)
+@@ -3220,7 +3227,7 @@ static void __perf_event_read(void *info)
  
  static inline u64 perf_event_count(struct perf_event *event)
  {
@@ -89343,7 +89345,7 @@ index 7959624..c01b886 100644
  }
  
  static u64 perf_event_read(struct perf_event *event)
-@@ -3528,9 +3535,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
+@@ -3656,9 +3663,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 +
@@ -89355,7 +89357,7 @@ index 7959624..c01b886 100644
  
  	list_for_each_entry(child, &event->child_list, child_list) {
  		total += perf_event_read(child);
-@@ -3994,10 +4001,10 @@ void perf_event_update_userpage(struct perf_event *event)
+@@ -4147,10 +4154,10 @@ void perf_event_update_userpage(struct perf_event *event)
  		userpg->offset -= local64_read(&event->hw.prev_count);
  
  	userpg->time_enabled = enabled +
@@ -89366,9 +89368,9 @@ index 7959624..c01b886 100644
 -			atomic64_read(&event->child_total_time_running);
 +			atomic64_read_unchecked(&event->child_total_time_running);
  
- 	arch_perf_update_userpage(userpg, now);
+ 	arch_perf_update_userpage(event, userpg, now);
  
-@@ -4578,7 +4585,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
+@@ -4740,7 +4747,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
  
  		/* Data. */
  		sp = perf_user_stack_pointer(regs);
@@ -89377,7 +89379,7 @@ index 7959624..c01b886 100644
  		dyn_size = dump_size - rem;
  
  		perf_output_skip(handle, rem);
-@@ -4669,11 +4676,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
+@@ -4831,11 +4838,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 +
@@ -89391,7 +89393,7 @@ index 7959624..c01b886 100644
  	}
  	if (read_format & PERF_FORMAT_ID)
  		values[n++] = primary_event_id(event);
-@@ -7004,7 +7011,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
+@@ -7180,7 +7187,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));
@@ -89400,7 +89402,7 @@ index 7959624..c01b886 100644
  
  	event->state		= PERF_EVENT_STATE_INACTIVE;
  
-@@ -7285,6 +7292,11 @@ SYSCALL_DEFINE5(perf_event_open,
+@@ -7470,6 +7477,11 @@ SYSCALL_DEFINE5(perf_event_open,
  	if (flags & ~PERF_FLAG_ALL)
  		return -EINVAL;
  
@@ -89412,7 +89414,7 @@ index 7959624..c01b886 100644
  	err = perf_copy_attr(attr_uptr, &attr);
  	if (err)
  		return err;
-@@ -7652,10 +7664,10 @@ static void sync_child_event(struct perf_event *child_event,
+@@ -7892,10 +7904,10 @@ static void sync_child_event(struct perf_event *child_event,
  	/*
  	 * Add back the child's count to the parent's count:
  	 */
@@ -89484,7 +89486,7 @@ index cb346f2..e4dc317 100644
  	pagefault_disable();
  	result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
 diff --git a/kernel/exit.c b/kernel/exit.c
-index 6806c55..a5fb128 100644
+index feff10b..f623dd5 100644
 --- a/kernel/exit.c
 +++ b/kernel/exit.c
 @@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
@@ -89498,7 +89500,7 @@ index 6806c55..a5fb128 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();
-@@ -655,6 +659,8 @@ void do_exit(long code)
+@@ -656,6 +660,8 @@ void do_exit(long code)
  	int group_dead;
  	TASKS_RCU(int tasks_rcu_i);
  
@@ -89507,7 +89509,7 @@ index 6806c55..a5fb128 100644
  	profile_task_exit(tsk);
  
  	WARN_ON(blk_needs_flush_plug(tsk));
-@@ -671,7 +677,6 @@ void do_exit(long code)
+@@ -672,7 +678,6 @@ void do_exit(long code)
  	 * mm_release()->clear_child_tid() from writing to a user-controlled
  	 * kernel address.
  	 */
@@ -89515,7 +89517,7 @@ index 6806c55..a5fb128 100644
  
  	ptrace_event(PTRACE_EVENT_EXIT, code);
  
-@@ -729,6 +734,9 @@ void do_exit(long code)
+@@ -730,6 +735,9 @@ void do_exit(long code)
  	tsk->exit_code = code;
  	taskstats_exit(tsk, group_dead);
  
@@ -89525,7 +89527,7 @@ index 6806c55..a5fb128 100644
  	exit_mm(tsk);
  
  	if (group_dead)
-@@ -848,7 +856,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
+@@ -849,7 +857,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).
   */
@@ -89535,7 +89537,7 @@ index 6806c55..a5fb128 100644
  {
  	struct signal_struct *sig = current->signal;
 diff --git a/kernel/fork.c b/kernel/fork.c
-index 4dc2dda..651add0 100644
+index cf65139..704476e 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
 @@ -177,12 +177,54 @@ static void free_thread_info(struct thread_info *ti)
@@ -89656,7 +89658,7 @@ index 4dc2dda..651add0 100644
  #endif
  
  	/*
-@@ -352,24 +402,92 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
+@@ -352,24 +402,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
  	tsk->splice_pipe = NULL;
  	tsk->task_frag.page = NULL;
  
@@ -89717,10 +89719,7 @@ index 4dc2dda..651add0 100644
 +			atomic_inc(&mapping->i_mmap_writable);
 +		flush_dcache_mmap_lock(mapping);
 +		/* insert tmp into the share list, just after mpnt */
-+		if (unlikely(tmp->vm_flags & VM_NONLINEAR))
-+			vma_nonlinear_insert(tmp, &mapping->i_mmap_nonlinear);
-+		else
-+			vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
++		vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
 +		flush_dcache_mmap_unlock(mapping);
 +		i_mmap_unlock_write(mapping);
 +	}
@@ -89753,7 +89752,7 @@ index 4dc2dda..651add0 100644
  
  	uprobe_start_dup_mmap();
  	down_write(&oldmm->mmap_sem);
-@@ -397,55 +515,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -397,51 +512,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
  
  	prev = NULL;
  	for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
@@ -89798,12 +89797,8 @@ index 4dc2dda..651add0 100644
 -				atomic_inc(&mapping->i_mmap_writable);
 -			flush_dcache_mmap_lock(mapping);
 -			/* insert tmp into the share list, just after mpnt */
--			if (unlikely(tmp->vm_flags & VM_NONLINEAR))
--				vma_nonlinear_insert(tmp,
--						&mapping->i_mmap_nonlinear);
--			else
--				vma_interval_tree_insert_after(tmp, mpnt,
--							&mapping->i_mmap);
+-			vma_interval_tree_insert_after(tmp, mpnt,
+-					&mapping->i_mmap);
 -			flush_dcache_mmap_unlock(mapping);
 -			i_mmap_unlock_write(mapping);
 +		tmp = dup_vma(mm, oldmm, mpnt);
@@ -89813,7 +89808,7 @@ index 4dc2dda..651add0 100644
  		}
  
  		/*
-@@ -477,6 +555,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -473,6 +552,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
  		if (retval)
  			goto out;
  	}
@@ -89845,7 +89840,7 @@ index 4dc2dda..651add0 100644
  	/* a new mm has just been created */
  	arch_dup_mmap(oldmm, mm);
  	retval = 0;
-@@ -486,14 +589,6 @@ out:
+@@ -482,14 +586,6 @@ out:
  	up_write(&oldmm->mmap_sem);
  	uprobe_end_dup_mmap();
  	return retval;
@@ -89860,7 +89855,7 @@ index 4dc2dda..651add0 100644
  }
  
  static inline int mm_alloc_pgd(struct mm_struct *mm)
-@@ -734,8 +829,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
+@@ -739,8 +835,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
  		return ERR_PTR(err);
  
  	mm = get_task_mm(task);
@@ -89871,7 +89866,7 @@ index 4dc2dda..651add0 100644
  		mmput(mm);
  		mm = ERR_PTR(-EACCES);
  	}
-@@ -938,13 +1033,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
+@@ -943,13 +1039,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
  			spin_unlock(&fs->lock);
  			return -EAGAIN;
  		}
@@ -89893,7 +89888,7 @@ index 4dc2dda..651add0 100644
  	return 0;
  }
  
-@@ -1182,7 +1284,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
+@@ -1187,7 +1290,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.
   */
@@ -89902,7 +89897,7 @@ index 4dc2dda..651add0 100644
  					unsigned long stack_start,
  					unsigned long stack_size,
  					int __user *child_tidptr,
-@@ -1253,6 +1355,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1258,6 +1361,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
  	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
  #endif
  	retval = -EAGAIN;
@@ -89912,7 +89907,7 @@ index 4dc2dda..651add0 100644
  	if (atomic_read(&p->real_cred->user->processes) >=
  			task_rlimit(p, RLIMIT_NPROC)) {
  		if (p->real_cred->user != INIT_USER &&
-@@ -1502,6 +1607,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1507,6 +1613,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
  		goto bad_fork_free_pid;
  	}
  
@@ -89924,7 +89919,7 @@ index 4dc2dda..651add0 100644
  	if (likely(p->pid)) {
  		ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
  
-@@ -1592,6 +1702,8 @@ bad_fork_cleanup_count:
+@@ -1597,6 +1708,8 @@ bad_fork_cleanup_count:
  bad_fork_free:
  	free_task(p);
  fork_out:
@@ -89933,7 +89928,7 @@ index 4dc2dda..651add0 100644
  	return ERR_PTR(retval);
  }
  
-@@ -1653,6 +1765,7 @@ long do_fork(unsigned long clone_flags,
+@@ -1658,6 +1771,7 @@ long do_fork(unsigned long clone_flags,
  
  	p = copy_process(clone_flags, stack_start, stack_size,
  			 child_tidptr, NULL, trace);
@@ -89941,7 +89936,7 @@ index 4dc2dda..651add0 100644
  	/*
  	 * Do this prior waking up the new thread - the thread pointer
  	 * might get invalid after that point, if the thread exits quickly.
-@@ -1669,6 +1782,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1674,6 +1788,8 @@ long do_fork(unsigned long clone_flags,
  		if (clone_flags & CLONE_PARENT_SETTID)
  			put_user(nr, parent_tidptr);
  
@@ -89950,7 +89945,7 @@ index 4dc2dda..651add0 100644
  		if (clone_flags & CLONE_VFORK) {
  			p->vfork_done = &vfork;
  			init_completion(&vfork);
-@@ -1787,7 +1902,7 @@ void __init proc_caches_init(void)
+@@ -1792,7 +1908,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);
@@ -89959,7 +89954,7 @@ index 4dc2dda..651add0 100644
  	mmap_init();
  	nsproxy_cache_init();
  }
-@@ -1827,7 +1942,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
+@@ -1832,7 +1948,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 */
@@ -89968,7 +89963,7 @@ index 4dc2dda..651add0 100644
  		return 0;
  
  	*new_fsp = copy_fs_struct(fs);
-@@ -1939,7 +2054,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
+@@ -1944,7 +2060,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
  			fs = current->fs;
  			spin_lock(&fs->lock);
  			current->fs = new_fs;
@@ -89979,7 +89974,7 @@ index 4dc2dda..651add0 100644
  			else
  				new_fs = fs;
 diff --git a/kernel/futex.c b/kernel/futex.c
-index 63678b5..512f9af 100644
+index 2a5e383..878bac6 100644
 --- a/kernel/futex.c
 +++ b/kernel/futex.c
 @@ -201,7 +201,7 @@ struct futex_pi_state {
@@ -90080,10 +90075,10 @@ index b358a80..fc25240 100644
  			if (gcov_events_enabled)
  				gcov_event(GCOV_REMOVE, info);
 diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
-index 8069237..fe712d0 100644
+index 886d09e..c7ff4e5 100644
 --- a/kernel/irq/manage.c
 +++ b/kernel/irq/manage.c
-@@ -871,7 +871,7 @@ static int irq_thread(void *data)
+@@ -874,7 +874,7 @@ static int irq_thread(void *data)
  
  		action_ret = handler_fn(desc, action);
  		if (action_ret == IRQ_HANDLED)
@@ -90261,10 +90256,10 @@ index 0aa69ea..a7fcafb 100644
  
  	/*
 diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 9a8a01a..3c35dd6 100644
+index 38c25b1..12b3f69 100644
 --- a/kernel/kexec.c
 +++ b/kernel/kexec.c
-@@ -1349,7 +1349,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
+@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
  		       compat_ulong_t, flags)
  {
  	struct compat_kexec_segment in;
@@ -90477,7 +90472,7 @@ index 2777f40..a689506 100644
  	kernel_cap_t new_cap;
  	int err, i;
 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
-index ee61992..62142b1 100644
+index c90e417..e6c515d 100644
 --- a/kernel/kprobes.c
 +++ b/kernel/kprobes.c
 @@ -31,6 +31,9 @@
@@ -90505,7 +90500,7 @@ index ee61992..62142b1 100644
  }
  
  struct kprobe_insn_cache kprobe_insn_slots = {
-@@ -2191,11 +2194,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
+@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
  		kprobe_type = "k";
  
  	if (sym)
@@ -90542,7 +90537,7 @@ index 6683cce..daf8999 100644
  		.name = "notes",
  		.mode = S_IRUGO,
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 88d0d44..e9ce0ee 100644
+index ba77ab5..d6a3e20 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -599,6 +599,10 @@ static int static_obj(void *obj)
@@ -90556,7 +90551,7 @@ index 88d0d44..e9ce0ee 100644
  	/*
  	 * static variable?
  	 */
-@@ -740,6 +744,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
+@@ -743,6 +747,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
  	if (!static_obj(lock->key)) {
  		debug_locks_off();
  		printk("INFO: trying to register non-static key.\n");
@@ -90564,7 +90559,7 @@ index 88d0d44..e9ce0ee 100644
  		printk("the code is fine but needs lockdep annotation.\n");
  		printk("turning off the locking correctness validator.\n");
  		dump_stack();
-@@ -3081,7 +3086,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
+@@ -3088,7 +3093,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
  		if (!class)
  			return 0;
  	}
@@ -90622,48 +90617,8 @@ index ef43ac4..2720dfa 100644
  				(void *)class->contending_point[i]);
  		seq_printf(m, "%40s %14lu %29s %pS\n",
  			   name, stats->contending_point[i],
-diff --git a/kernel/locking/mcs_spinlock.c b/kernel/locking/mcs_spinlock.c
-index 9887a90..0cd2b1d 100644
---- a/kernel/locking/mcs_spinlock.c
-+++ b/kernel/locking/mcs_spinlock.c
-@@ -100,7 +100,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
- 
- 	prev = decode_cpu(old);
- 	node->prev = prev;
--	ACCESS_ONCE(prev->next) = node;
-+	ACCESS_ONCE_RW(prev->next) = node;
- 
- 	/*
- 	 * Normally @prev is untouchable after the above store; because at that
-@@ -172,8 +172,8 @@ unqueue:
- 	 * it will wait in Step-A.
- 	 */
- 
--	ACCESS_ONCE(next->prev) = prev;
--	ACCESS_ONCE(prev->next) = next;
-+	ACCESS_ONCE_RW(next->prev) = prev;
-+	ACCESS_ONCE_RW(prev->next) = next;
- 
- 	return false;
- }
-@@ -195,13 +195,13 @@ void osq_unlock(struct optimistic_spin_queue *lock)
- 	node = this_cpu_ptr(&osq_node);
- 	next = xchg(&node->next, NULL);
- 	if (next) {
--		ACCESS_ONCE(next->locked) = 1;
-+		ACCESS_ONCE_RW(next->locked) = 1;
- 		return;
- 	}
- 
- 	next = osq_wait_next(lock, node, NULL);
- 	if (next)
--		ACCESS_ONCE(next->locked) = 1;
-+		ACCESS_ONCE_RW(next->locked) = 1;
- }
- 
- #endif
 diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
-index 4d60986..5d351c1 100644
+index d1fe2ba..180cd65e 100644
 --- a/kernel/locking/mcs_spinlock.h
 +++ b/kernel/locking/mcs_spinlock.h
 @@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
@@ -90724,10 +90679,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/locking/mutex.c b/kernel/locking/mutex.c
-index 4541951..39fe90a 100644
+index 94674e5..de4966f 100644
 --- a/kernel/locking/mutex.c
 +++ b/kernel/locking/mutex.c
-@@ -524,7 +524,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
+@@ -542,7 +542,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
  		goto skip_wait;
  
  	debug_mutex_lock_common(lock, &waiter);
@@ -90736,16 +90691,16 @@ index 4541951..39fe90a 100644
  
  	/* add waiting tasks to the end of the waitqueue (FIFO): */
  	list_add_tail(&waiter.list, &lock->wait_list);
-@@ -569,7 +569,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
- 		schedule_preempt_disabled();
- 		spin_lock_mutex(&lock->wait_lock, flags);
+@@ -589,7 +589,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
  	}
+ 	__set_task_state(task, TASK_RUNNING);
+ 
 -	mutex_remove_waiter(lock, &waiter, current_thread_info());
 +	mutex_remove_waiter(lock, &waiter, task);
  	/* set it to 0 if there are no waiters left: */
  	if (likely(list_empty(&lock->wait_list)))
  		atomic_set(&lock->count, 0);
-@@ -606,7 +606,7 @@ skip_wait:
+@@ -610,7 +610,7 @@ skip_wait:
  	return 0;
  
  err:
@@ -90754,6 +90709,44 @@ index 4541951..39fe90a 100644
  	spin_unlock_mutex(&lock->wait_lock, flags);
  	debug_mutex_free_waiter(&waiter);
  	mutex_release(&lock->dep_map, 1, ip);
+diff --git a/kernel/locking/osq_lock.c b/kernel/locking/osq_lock.c
+index c112d00..1946ad9 100644
+--- a/kernel/locking/osq_lock.c
++++ b/kernel/locking/osq_lock.c
+@@ -98,7 +98,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
+ 
+ 	prev = decode_cpu(old);
+ 	node->prev = prev;
+-	ACCESS_ONCE(prev->next) = node;
++	ACCESS_ONCE_RW(prev->next) = node;
+ 
+ 	/*
+ 	 * Normally @prev is untouchable after the above store; because at that
+@@ -170,8 +170,8 @@ unqueue:
+ 	 * it will wait in Step-A.
+ 	 */
+ 
+-	ACCESS_ONCE(next->prev) = prev;
+-	ACCESS_ONCE(prev->next) = next;
++	ACCESS_ONCE_RW(next->prev) = prev;
++	ACCESS_ONCE_RW(prev->next) = next;
+ 
+ 	return false;
+ }
+@@ -193,11 +193,11 @@ void osq_unlock(struct optimistic_spin_queue *lock)
+ 	node = this_cpu_ptr(&osq_node);
+ 	next = xchg(&node->next, NULL);
+ 	if (next) {
+-		ACCESS_ONCE(next->locked) = 1;
++		ACCESS_ONCE_RW(next->locked) = 1;
+ 		return;
+ 	}
+ 
+ 	next = osq_wait_next(lock, node, NULL);
+ 	if (next)
+-		ACCESS_ONCE(next->locked) = 1;
++		ACCESS_ONCE_RW(next->locked) = 1;
+ }
 diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
 index 1d96dd0..994ff19 100644
 --- a/kernel/locking/rtmutex-tester.c
@@ -90849,7 +90842,7 @@ index 1d96dd0..994ff19 100644
  
  	default:
 diff --git a/kernel/module.c b/kernel/module.c
-index d856e96..b82225c 100644
+index ec53f59..67d9655 100644
 --- a/kernel/module.c
 +++ b/kernel/module.c
 @@ -59,6 +59,7 @@
@@ -90945,7 +90938,7 @@ index d856e96..b82225c 100644
  	return 0;
  }
  
-@@ -1275,7 +1294,7 @@ resolve_symbol_wait(struct module *mod,
+@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
   */
  #ifdef CONFIG_SYSFS
  
@@ -90954,7 +90947,7 @@ index d856e96..b82225c 100644
  static inline bool sect_empty(const Elf_Shdr *sect)
  {
  	return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
-@@ -1413,7 +1432,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
+@@ -1419,7 +1438,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;
@@ -90963,7 +90956,7 @@ index d856e96..b82225c 100644
  
  	/* failed to create section attributes, so can't create notes */
  	if (!mod->sect_attrs)
-@@ -1525,7 +1544,7 @@ static void del_usage_links(struct module *mod)
+@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
  static int module_add_modinfo_attrs(struct module *mod)
  {
  	struct module_attribute *attr;
@@ -90972,7 +90965,7 @@ index d856e96..b82225c 100644
  	int error = 0;
  	int i;
  
-@@ -1735,21 +1754,21 @@ static void set_section_ro_nx(void *base,
+@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
  
  static void unset_module_core_ro_nx(struct module *mod)
  {
@@ -91002,7 +90995,7 @@ index d856e96..b82225c 100644
  		set_memory_rw);
  }
  
-@@ -1762,14 +1781,14 @@ void set_all_modules_text_rw(void)
+@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
  	list_for_each_entry_rcu(mod, &modules, list) {
  		if (mod->state == MODULE_STATE_UNFORMED)
  			continue;
@@ -91023,7 +91016,7 @@ index d856e96..b82225c 100644
  						set_memory_rw);
  		}
  	}
-@@ -1785,14 +1804,14 @@ void set_all_modules_text_ro(void)
+@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
  	list_for_each_entry_rcu(mod, &modules, list) {
  		if (mod->state == MODULE_STATE_UNFORMED)
  			continue;
@@ -91044,7 +91037,7 @@ index d856e96..b82225c 100644
  						set_memory_ro);
  		}
  	}
-@@ -1801,7 +1820,15 @@ void set_all_modules_text_ro(void)
+@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
  #else
  static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
  static void unset_module_core_ro_nx(struct module *mod) { }
@@ -91061,7 +91054,7 @@ index d856e96..b82225c 100644
  #endif
  
  void __weak module_memfree(void *module_region)
-@@ -1855,16 +1882,19 @@ static void free_module(struct module *mod)
+@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
  	/* This may be NULL, but that's OK */
  	unset_module_init_ro_nx(mod);
  	module_arch_freeing_init(mod);
@@ -91071,7 +91064,7 @@ index d856e96..b82225c 100644
  	kfree(mod->args);
  	percpu_modfree(mod);
  
- 	/* Free lock-classes: */
+ 	/* Free lock-classes; relies on the preceding sync_rcu(). */
 -	lockdep_free_key_range(mod->module_core, mod->core_size);
 +	lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
 +	lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
@@ -91084,7 +91077,7 @@ index d856e96..b82225c 100644
  
  #ifdef CONFIG_MPU
  	update_protections(current->mm);
-@@ -1933,9 +1963,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
  	int ret = 0;
  	const struct kernel_symbol *ksym;
  
@@ -91116,7 +91109,7 @@ index d856e96..b82225c 100644
  		switch (sym[i].st_shndx) {
  		case SHN_COMMON:
  			/* Ignore common symbols */
-@@ -1960,7 +2012,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1966,7 +2018,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)) {
@@ -91126,7 +91119,7 @@ index d856e96..b82225c 100644
  				break;
  			}
  
-@@ -1979,11 +2033,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1985,11 +2039,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;
@@ -91147,7 +91140,7 @@ index d856e96..b82225c 100644
  	return ret;
  }
  
-@@ -2067,22 +2130,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
  			    || s->sh_entsize != ~0UL
  			    || strstarts(sname, ".init"))
  				continue;
@@ -91174,7 +91167,7 @@ index d856e96..b82225c 100644
  	}
  
  	pr_debug("Init section allocation order:\n");
-@@ -2096,23 +2149,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
  			    || s->sh_entsize != ~0UL
  			    || !strstarts(sname, ".init"))
  				continue;
@@ -91203,7 +91196,7 @@ index d856e96..b82225c 100644
  	}
  }
  
-@@ -2285,7 +2328,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2291,7 +2334,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;
@@ -91212,25 +91205,30 @@ index d856e96..b82225c 100644
  					 info->index.sym) | INIT_OFFSET_MASK;
  	pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
  
-@@ -2302,13 +2345,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
  	}
  
  	/* Append room for core symbols at end of core part. */
 -	info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
 -	info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
 -	mod->core_size += strtab_size;
+-	mod->core_size = debug_align(mod->core_size);
 +	info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
 +	info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
 +	mod->core_size_rx += strtab_size;
++	mod->core_size_rx = debug_align(mod->core_size_rx);
  
  	/* Put string table section at end of init part of module. */
  	strsect->sh_flags |= SHF_ALLOC;
 -	strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
 +	strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
  					 info->index.str) | INIT_OFFSET_MASK;
+-	mod->init_size = debug_align(mod->init_size);
++	mod->init_size_rx = debug_align(mod->init_size_rx);
  	pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
  }
-@@ -2326,12 +2369,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+ 
+@@ -2334,12 +2377,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;
  
@@ -91247,7 +91245,7 @@ index d856e96..b82225c 100644
  	src = mod->symtab;
  	for (ndst = i = 0; i < mod->num_symtab; i++) {
  		if (i == 0 ||
-@@ -2343,6 +2388,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
  		}
  	}
  	mod->core_num_syms = ndst;
@@ -91256,7 +91254,7 @@ index d856e96..b82225c 100644
  }
  #else
  static inline void layout_symtab(struct module *mod, struct load_info *info)
-@@ -2376,17 +2423,33 @@ void * __weak module_alloc(unsigned long size)
+@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
  	return vmalloc_exec(size);
  }
  
@@ -91295,7 +91293,7 @@ index d856e96..b82225c 100644
  		mutex_unlock(&module_mutex);
  	}
  	return ret;
-@@ -2640,7 +2703,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
+@@ -2665,7 +2728,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
  	mod = (void *)info->sechdrs[info->index.mod].sh_addr;
  
  	if (info->index.sym == 0) {
@@ -91311,7 +91309,7 @@ index d856e96..b82225c 100644
  		return ERR_PTR(-ENOEXEC);
  	}
  
-@@ -2656,8 +2727,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
+@@ -2681,8 +2752,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");
@@ -91326,7 +91324,7 @@ index d856e96..b82225c 100644
  	if (flags & MODULE_INIT_IGNORE_VERMAGIC)
  		modmagic = NULL;
  
-@@ -2682,7 +2759,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
+@@ -2707,7 +2784,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
  	}
  
  	/* Set up license info based on the info section */
@@ -91335,7 +91333,7 @@ index d856e96..b82225c 100644
  
  	return 0;
  }
-@@ -2776,7 +2853,7 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2801,7 +2878,7 @@ static int move_module(struct module *mod, struct load_info *info)
  	void *ptr;
  
  	/* Do the allocs. */
@@ -91344,7 +91342,7 @@ index d856e96..b82225c 100644
  	/*
  	 * The pointer to this block is stored in the module structure
  	 * which is inside the block. Just mark it as not being a
-@@ -2786,11 +2863,11 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2811,11 +2888,11 @@ static int move_module(struct module *mod, struct load_info *info)
  	if (!ptr)
  		return -ENOMEM;
  
@@ -91360,7 +91358,7 @@ index d856e96..b82225c 100644
  		/*
  		 * The pointer to this block is stored in the module structure
  		 * which is inside the block. This block doesn't need to be
-@@ -2799,13 +2876,45 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2824,13 +2901,45 @@ static int move_module(struct module *mod, struct load_info *info)
  		 */
  		kmemleak_ignore(ptr);
  		if (!ptr) {
@@ -91410,7 +91408,7 @@ index d856e96..b82225c 100644
  
  	/* Transfer each section which specifies SHF_ALLOC */
  	pr_debug("final section addresses:\n");
-@@ -2816,16 +2925,45 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2841,16 +2950,45 @@ static int move_module(struct module *mod, struct load_info *info)
  		if (!(shdr->sh_flags & SHF_ALLOC))
  			continue;
  
@@ -91463,7 +91461,7 @@ index d856e96..b82225c 100644
  		pr_debug("\t0x%lx %s\n",
  			 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
  	}
-@@ -2882,12 +3020,12 @@ static void flush_module_icache(const struct module *mod)
+@@ -2907,12 +3045,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.
  	 */
@@ -91482,7 +91480,7 @@ index d856e96..b82225c 100644
  
  	set_fs(old_fs);
  }
-@@ -2945,8 +3083,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
+@@ -2970,8 +3108,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
  {
  	percpu_modfree(mod);
  	module_arch_freeing_init(mod);
@@ -91495,7 +91493,7 @@ index d856e96..b82225c 100644
  }
  
  int __weak module_finalize(const Elf_Ehdr *hdr,
-@@ -2959,7 +3099,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
+@@ -2984,7 +3124,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. */
@@ -91505,7 +91503,7 @@ index d856e96..b82225c 100644
  
  	/* Copy relocated percpu area over. */
  	percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
-@@ -3001,13 +3143,15 @@ static void do_mod_ctors(struct module *mod)
+@@ -3032,13 +3174,15 @@ static void do_mod_ctors(struct module *mod)
  /* For freeing module_init on success, in case kallsyms traversing */
  struct mod_initfree {
  	struct rcu_head rcu;
@@ -91523,7 +91521,7 @@ index d856e96..b82225c 100644
  	kfree(m);
  }
  
-@@ -3022,7 +3166,8 @@ static int do_init_module(struct module *mod)
+@@ -3058,7 +3202,8 @@ static noinline int do_init_module(struct module *mod)
  		ret = -ENOMEM;
  		goto fail;
  	}
@@ -91533,7 +91531,7 @@ index d856e96..b82225c 100644
  
  	/*
  	 * We want to find out whether @mod uses async during init.  Clear
-@@ -3081,10 +3226,10 @@ static int do_init_module(struct module *mod)
+@@ -3117,10 +3262,10 @@ static noinline int do_init_module(struct module *mod)
  #endif
  	unset_module_init_ro_nx(mod);
  	module_arch_freeing_init(mod);
@@ -91548,7 +91546,7 @@ index d856e96..b82225c 100644
  	/*
  	 * We want to free module_init, but be aware that kallsyms may be
  	 * walking this with preempt disabled.  In all the failure paths,
-@@ -3198,16 +3343,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
+@@ -3208,16 +3353,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
  	module_bug_finalize(info->hdr, info->sechdrs, mod);
  
  	/* Set RO and NX regions for core */
@@ -91573,7 +91571,7 @@ index d856e96..b82225c 100644
  
  	/* Mark state as coming so strong_try_module_get() ignores us,
  	 * but kallsyms etc. can see us. */
-@@ -3291,9 +3436,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
+@@ -3301,9 +3446,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
  	if (err)
  		goto free_unload;
  
@@ -91612,7 +91610,7 @@ index d856e96..b82225c 100644
  	/* Fix up syms, so that st_value is a pointer to location. */
  	err = simplify_symbols(mod, info);
  	if (err < 0)
-@@ -3309,13 +3483,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
+@@ -3319,13 +3493,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
  
  	flush_module_icache(mod);
  
@@ -91626,7 +91624,7 @@ index d856e96..b82225c 100644
  	dynamic_debug_setup(info->debug, info->num_debug);
  
  	/* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
-@@ -3363,11 +3530,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
+@@ -3373,11 +3540,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
   ddebug_cleanup:
  	dynamic_debug_remove(info->debug);
  	synchronize_sched();
@@ -91639,7 +91637,17 @@ index d856e96..b82225c 100644
   free_unload:
  	module_unload_free(mod);
   unlink_mod:
-@@ -3454,10 +3620,16 @@ static const char *get_ksymbol(struct module *mod,
+@@ -3390,7 +3556,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
+ 	mutex_unlock(&module_mutex);
+  free_module:
+ 	/* Free lock-classes; relies on the preceding sync_rcu() */
+-	lockdep_free_key_range(mod->module_core, mod->core_size);
++	lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
++	lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
+ 
+ 	module_deallocate(mod, info);
+  free_copy:
+@@ -3467,10 +3634,16 @@ static const char *get_ksymbol(struct module *mod,
  	unsigned long nextval;
  
  	/* At worse, next value is at end of module */
@@ -91659,7 +91667,7 @@ index d856e96..b82225c 100644
  
  	/* Scan for closest preceding symbol, and next symbol. (ELF
  	   starts real symbols at 1). */
-@@ -3705,7 +3877,7 @@ static int m_show(struct seq_file *m, void *p)
+@@ -3718,7 +3891,7 @@ static int m_show(struct seq_file *m, void *p)
  		return 0;
  
  	seq_printf(m, "%s %u",
@@ -91668,7 +91676,7 @@ index d856e96..b82225c 100644
  	print_unload_info(m, mod);
  
  	/* Informative for users. */
-@@ -3714,7 +3886,7 @@ static int m_show(struct seq_file *m, void *p)
+@@ -3727,7 +3900,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. */
@@ -91677,7 +91685,7 @@ index d856e96..b82225c 100644
  
  	/* Taints info */
  	if (mod->taints)
-@@ -3750,7 +3922,17 @@ static const struct file_operations proc_modules_operations = {
+@@ -3763,7 +3936,17 @@ static const struct file_operations proc_modules_operations = {
  
  static int __init proc_modules_init(void)
  {
@@ -91695,7 +91703,7 @@ index d856e96..b82225c 100644
  	return 0;
  }
  module_init(proc_modules_init);
-@@ -3811,7 +3993,8 @@ struct module *__module_address(unsigned long addr)
+@@ -3824,7 +4007,8 @@ struct module *__module_address(unsigned long addr)
  {
  	struct module *mod;
  
@@ -91705,7 +91713,7 @@ index d856e96..b82225c 100644
  		return NULL;
  
  	list_for_each_entry_rcu(mod, &modules, list) {
-@@ -3852,11 +4035,20 @@ bool is_module_text_address(unsigned long addr)
+@@ -3865,11 +4049,20 @@ bool is_module_text_address(unsigned long addr)
   */
  struct module *__module_text_address(unsigned long addr)
  {
@@ -91730,7 +91738,7 @@ index d856e96..b82225c 100644
  	}
  	return mod;
 diff --git a/kernel/notifier.c b/kernel/notifier.c
-index 4803da6..1c5eea6 100644
+index ae9fc7c..5085fbf 100644
 --- a/kernel/notifier.c
 +++ b/kernel/notifier.c
 @@ -5,6 +5,7 @@
@@ -91786,7 +91794,7 @@ index 4803da6..1c5eea6 100644
  	return -ENOENT;
  }
 diff --git a/kernel/padata.c b/kernel/padata.c
-index 161402f..598814c 100644
+index b38bea9..91acfbe 100644
 --- a/kernel/padata.c
 +++ b/kernel/padata.c
 @@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
@@ -91808,7 +91816,7 @@ index 161402f..598814c 100644
  	atomic_set(&pd->refcnt, 0);
  	pd->pinst = pinst;
 diff --git a/kernel/panic.c b/kernel/panic.c
-index 4d8d6f9..97b9b9c 100644
+index 8136ad7..15c857b 100644
 --- a/kernel/panic.c
 +++ b/kernel/panic.c
 @@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
@@ -91820,7 +91828,7 @@ index 4d8d6f9..97b9b9c 100644
  {
  	while (1)
  		cpu_relax();
-@@ -423,7 +423,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
+@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
  	disable_trace_on_warning();
  
  	pr_warn("------------[ cut here ]------------\n");
@@ -91829,7 +91837,7 @@ index 4d8d6f9..97b9b9c 100644
  		raw_smp_processor_id(), current->pid, file, line, caller);
  
  	if (args)
-@@ -488,7 +488,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
+@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
   */
  __visible void __stack_chk_fail(void)
  {
@@ -91909,7 +91917,7 @@ index a65ba13..f600dbb 100644
  	if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
  		return -EPERM;
 diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
-index 48b28d3..c63ccaf 100644
+index 7e01f78..f5da19d 100644
 --- a/kernel/power/Kconfig
 +++ b/kernel/power/Kconfig
 @@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
@@ -91922,7 +91930,7 @@ index 48b28d3..c63ccaf 100644
  	select LZO_COMPRESS
  	select LZO_DECOMPRESS
 diff --git a/kernel/power/process.c b/kernel/power/process.c
-index 5a6ec86..3a8c884 100644
+index 564f786..361a18e 100644
 --- a/kernel/power/process.c
 +++ b/kernel/power/process.c
 @@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
@@ -91965,7 +91973,7 @@ index 5a6ec86..3a8c884 100644
  
  		if (pm_wakeup_pending()) {
 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index 2cdd353..7df1786 100644
+index bb0635b..9aff9f3 100644
 --- a/kernel/printk/printk.c
 +++ b/kernel/printk/printk.c
 @@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
@@ -91981,7 +91989,7 @@ index 2cdd353..7df1786 100644
  		if (capable(CAP_SYSLOG))
  			return 0;
 diff --git a/kernel/profile.c b/kernel/profile.c
-index 54bf5ba..df6e0a2 100644
+index a7bcd28..5b368fa 100644
 --- a/kernel/profile.c
 +++ b/kernel/profile.c
 @@ -37,7 +37,7 @@ struct profile_hit {
@@ -92023,7 +92031,7 @@ index 54bf5ba..df6e0a2 100644
  }
  #endif /* !CONFIG_SMP */
  
-@@ -490,7 +490,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
+@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
  			return -EFAULT;
  		buf++; p++; count--; read++;
  	}
@@ -92032,7 +92040,7 @@ index 54bf5ba..df6e0a2 100644
  	if (copy_to_user(buf, (void *)pnt, count))
  		return -EFAULT;
  	read += count;
-@@ -521,7 +521,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
+@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
  	}
  #endif
  	profile_discard_flip_buffers();
@@ -92042,7 +92050,7 @@ index 54bf5ba..df6e0a2 100644
  }
  
 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 1eb9d90..d40d21e 100644
+index 227fec3..3aea55b 100644
 --- a/kernel/ptrace.c
 +++ b/kernel/ptrace.c
 @@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
@@ -92104,7 +92112,7 @@ index 1eb9d90..d40d21e 100644
  }
  
  int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
-@@ -1158,7 +1165,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
+@@ -1157,7 +1164,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
  }
  
  COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
@@ -92113,7 +92121,7 @@ index 1eb9d90..d40d21e 100644
  {
  	struct task_struct *child;
  	long ret;
-@@ -1174,14 +1181,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
+@@ -1173,14 +1180,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
  		goto out;
  	}
  
@@ -92137,7 +92145,7 @@ index 1eb9d90..d40d21e 100644
  	}
  
 diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
-index 4d559ba..053da37 100644
+index 30d42aa..cac5d66 100644
 --- a/kernel/rcu/rcutorture.c
 +++ b/kernel/rcu/rcutorture.c
 @@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
@@ -92191,7 +92199,7 @@ index 4d559ba..053da37 100644
  	spin_lock_bh(&rcu_torture_lock);
  	list_add_tail(&p->rtort_free, &rcu_torture_freelist);
  	spin_unlock_bh(&rcu_torture_lock);
-@@ -312,7 +312,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
+@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
  	i = rp->rtort_pipe_count;
  	if (i > RCU_TORTURE_PIPE_LEN)
  		i = RCU_TORTURE_PIPE_LEN;
@@ -92200,7 +92208,7 @@ index 4d559ba..053da37 100644
  	if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
  		rp->rtort_mbtest = 0;
  		return true;
-@@ -799,7 +799,7 @@ rcu_torture_cbflood(void *arg)
+@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
  	VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
  	do {
  		schedule_timeout_interruptible(cbflood_inter_holdoff);
@@ -92209,7 +92217,7 @@ index 4d559ba..053da37 100644
  		WARN_ON(signal_pending(current));
  		for (i = 0; i < cbflood_n_burst; i++) {
  			for (j = 0; j < cbflood_n_per_burst; j++) {
-@@ -918,7 +918,7 @@ rcu_torture_writer(void *arg)
+@@ -915,7 +915,7 @@ rcu_torture_writer(void *arg)
  			i = old_rp->rtort_pipe_count;
  			if (i > RCU_TORTURE_PIPE_LEN)
  				i = RCU_TORTURE_PIPE_LEN;
@@ -92227,7 +92235,7 @@ index 4d559ba..053da37 100644
  	spin_lock(&rand_lock);
  	cur_ops->read_delay(&rand);
  	n_rcu_torture_timers++;
-@@ -1106,7 +1106,7 @@ rcu_torture_reader(void *arg)
+@@ -1111,7 +1111,7 @@ rcu_torture_reader(void *arg)
  			continue;
  		}
  		if (p->rtort_mbtest == 0)
@@ -92236,7 +92244,7 @@ index 4d559ba..053da37 100644
  		cur_ops->read_delay(&rand);
  		preempt_disable();
  		pipe_count = p->rtort_pipe_count;
-@@ -1173,11 +1173,11 @@ rcu_torture_stats_print(void)
+@@ -1180,11 +1180,11 @@ rcu_torture_stats_print(void)
  		rcu_torture_current,
  		rcu_torture_current_version,
  		list_empty(&rcu_torture_freelist),
@@ -92252,7 +92260,7 @@ index 4d559ba..053da37 100644
  		n_rcu_torture_boost_ktrerror,
  		n_rcu_torture_boost_rterror);
  	pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
-@@ -1189,17 +1189,17 @@ rcu_torture_stats_print(void)
+@@ -1196,17 +1196,17 @@ rcu_torture_stats_print(void)
  		n_barrier_successes,
  		n_barrier_attempts,
  		n_rcu_torture_barrier_error);
@@ -92273,7 +92281,7 @@ index 4d559ba..053da37 100644
  		WARN_ON_ONCE(1);
  	}
  	pr_cont("Reader Pipe: ");
-@@ -1216,7 +1216,7 @@ rcu_torture_stats_print(void)
+@@ -1223,7 +1223,7 @@ rcu_torture_stats_print(void)
  	pr_alert("%s%s ", torture_type, TORTURE_FLAG);
  	pr_cont("Free-Block Circulation: ");
  	for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
@@ -92282,7 +92290,7 @@ index 4d559ba..053da37 100644
  	}
  	pr_cont("\n");
  
-@@ -1560,7 +1560,7 @@ rcu_torture_cleanup(void)
+@@ -1570,7 +1570,7 @@ rcu_torture_cleanup(void)
  
  	rcu_torture_stats_print();  /* -After- the stats thread is stopped! */
  
@@ -92291,7 +92299,7 @@ index 4d559ba..053da37 100644
  		rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
  	else if (torture_onoff_failures())
  		rcu_torture_print_module_parms(cur_ops,
-@@ -1685,18 +1685,18 @@ rcu_torture_init(void)
+@@ -1695,18 +1695,18 @@ rcu_torture_init(void)
  
  	rcu_torture_current = NULL;
  	rcu_torture_current_version = 0;
@@ -92317,7 +92325,7 @@ index 4d559ba..053da37 100644
  		for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  			per_cpu(rcu_torture_count, cpu)[i] = 0;
 diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
-index 0db5649..e6ec167 100644
+index cc9ceca..ce075a6 100644
 --- a/kernel/rcu/tiny.c
 +++ b/kernel/rcu/tiny.c
 @@ -42,7 +42,7 @@
@@ -92329,7 +92337,7 @@ index 0db5649..e6ec167 100644
  static void __call_rcu(struct rcu_head *head,
  		       void (*func)(struct rcu_head *rcu),
  		       struct rcu_ctrlblk *rcp);
-@@ -310,7 +310,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
+@@ -210,7 +210,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
  				      false));
  }
  
@@ -92339,22 +92347,23 @@ index 0db5649..e6ec167 100644
  	__rcu_process_callbacks(&rcu_sched_ctrlblk);
  	__rcu_process_callbacks(&rcu_bh_ctrlblk);
 diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
-index 858c565..7efd915 100644
+index f94e209..d2985bd 100644
 --- a/kernel/rcu/tiny_plugin.h
 +++ b/kernel/rcu/tiny_plugin.h
-@@ -152,17 +152,17 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
+@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
+ 		       rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
+ 		       jiffies - rcp->gp_start, rcp->qlen);
  		dump_stack();
- 	}
- 	if (*rcp->curtail && ULONG_CMP_GE(j, js))
 -		ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
 +		ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
  			3 * rcu_jiffies_till_stall_check() + 3;
- 	else if (ULONG_CMP_GE(j, js))
+ 	} else if (ULONG_CMP_GE(j, js)) {
 -		ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
 +		ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
+ 	}
  }
  
- static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
+@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
  {
  	rcp->ticks_this_gp = 0;
  	rcp->gp_start = jiffies;
@@ -92364,10 +92373,10 @@ index 858c565..7efd915 100644
  
  static void check_cpu_stalls(void)
 diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
-index 7680fc2..b8e9161 100644
+index 48d640c..9401d30 100644
 --- a/kernel/rcu/tree.c
 +++ b/kernel/rcu/tree.c
-@@ -261,7 +261,7 @@ static void rcu_momentary_dyntick_idle(void)
+@@ -268,7 +268,7 @@ static void rcu_momentary_dyntick_idle(void)
  		 */
  		rdtp = this_cpu_ptr(&rcu_dynticks);
  		smp_mb__before_atomic(); /* Earlier stuff before QS. */
@@ -92376,7 +92385,7 @@ index 7680fc2..b8e9161 100644
  		smp_mb__after_atomic(); /* Later stuff after QS. */
  		break;
  	}
-@@ -521,9 +521,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
+@@ -580,9 +580,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
  	rcu_prepare_for_idle();
  	/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
  	smp_mb__before_atomic();  /* See above. */
@@ -92388,7 +92397,7 @@ index 7680fc2..b8e9161 100644
  	rcu_dynticks_task_enter();
  
  	/*
-@@ -644,10 +644,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
+@@ -703,10 +703,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
  
  	rcu_dynticks_task_exit();
  	smp_mb__before_atomic();  /* Force ordering w/previous sojourn. */
@@ -92401,26 +92410,33 @@ index 7680fc2..b8e9161 100644
  	rcu_cleanup_after_idle();
  	trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
  	if (!user && !is_idle_task(current)) {
-@@ -768,14 +768,14 @@ void rcu_nmi_enter(void)
- 	struct rcu_dynticks *rdtp = this_cpu_ptr(&rcu_dynticks);
- 
- 	if (rdtp->dynticks_nmi_nesting == 0 &&
--	    (atomic_read(&rdtp->dynticks) & 0x1))
-+	    (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
- 		return;
- 	rdtp->dynticks_nmi_nesting++;
- 	smp_mb__before_atomic();  /* Force delay from prior write. */
--	atomic_inc(&rdtp->dynticks);
-+	atomic_inc_unchecked(&rdtp->dynticks);
- 	/* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
- 	smp_mb__after_atomic();  /* See above. */
+@@ -840,12 +840,12 @@ void rcu_nmi_enter(void)
+ 	 * to be in the outermost NMI handler that interrupted an RCU-idle
+ 	 * period (observation due to Andy Lutomirski).
+ 	 */
+-	if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
++	if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
+ 		smp_mb__before_atomic();  /* Force delay from prior write. */
+-		atomic_inc(&rdtp->dynticks);
++		atomic_inc_unchecked(&rdtp->dynticks);
+ 		/* atomic_inc() before later RCU read-side crit sects */
+ 		smp_mb__after_atomic();  /* See above. */
+-		WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
++		WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
+ 		incby = 1;
+ 	}
+ 	rdtp->dynticks_nmi_nesting += incby;
+@@ -870,7 +870,7 @@ void rcu_nmi_exit(void)
+ 	 * to us!)
+ 	 */
+ 	WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
 -	WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
 +	WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
- }
  
- /**
-@@ -794,9 +794,9 @@ void rcu_nmi_exit(void)
- 		return;
+ 	/*
+ 	 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
+@@ -885,9 +885,9 @@ void rcu_nmi_exit(void)
+ 	rdtp->dynticks_nmi_nesting = 0;
  	/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
  	smp_mb__before_atomic();  /* See above. */
 -	atomic_inc(&rdtp->dynticks);
@@ -92431,7 +92447,7 @@ index 7680fc2..b8e9161 100644
  }
  
  /**
-@@ -809,7 +809,7 @@ void rcu_nmi_exit(void)
+@@ -900,7 +900,7 @@ void rcu_nmi_exit(void)
   */
  bool notrace __rcu_is_watching(void)
  {
@@ -92440,7 +92456,7 @@ index 7680fc2..b8e9161 100644
  }
  
  /**
-@@ -892,7 +892,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
+@@ -983,7 +983,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)
  {
@@ -92449,7 +92465,16 @@ index 7680fc2..b8e9161 100644
  	rcu_sysidle_check_cpu(rdp, isidle, maxj);
  	if ((rdp->dynticks_snap & 0x1) == 0) {
  		trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
-@@ -921,7 +921,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
+@@ -991,7 +991,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
+ 	} else {
+ 		if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
+ 				 rdp->mynode->gpnum))
+-			ACCESS_ONCE(rdp->gpwrap) = true;
++			ACCESS_ONCE_RW(rdp->gpwrap) = true;
+ 		return 0;
+ 	}
+ }
+@@ -1009,7 +1009,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
  	int *rcrmp;
  	unsigned int snap;
  
@@ -92458,7 +92483,7 @@ index 7680fc2..b8e9161 100644
  	snap = (unsigned int)rdp->dynticks_snap;
  
  	/*
-@@ -984,10 +984,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
+@@ -1072,10 +1072,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
  			 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
  	    ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
  		if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
@@ -92471,16 +92496,16 @@ index 7680fc2..b8e9161 100644
  				ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
  			resched_cpu(rdp->cpu);  /* Force CPU into scheduler. */
  			rdp->rsp->jiffies_resched += 5; /* Enable beating. */
-@@ -1009,7 +1009,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
+@@ -1097,7 +1097,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
  	rsp->gp_start = j;
  	smp_wmb(); /* Record start time before stall time. */
  	j1 = rcu_jiffies_till_stall_check();
 -	ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
 +	ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
  	rsp->jiffies_resched = j + j1 / 2;
+ 	rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
  }
- 
-@@ -1050,7 +1050,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp)
+@@ -1156,7 +1156,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
  		raw_spin_unlock_irqrestore(&rnp->lock, flags);
  		return;
  	}
@@ -92489,7 +92514,7 @@ index 7680fc2..b8e9161 100644
  	raw_spin_unlock_irqrestore(&rnp->lock, flags);
  
  	/*
-@@ -1127,7 +1127,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
+@@ -1240,7 +1240,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
  
  	raw_spin_lock_irqsave(&rnp->lock, flags);
  	if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
@@ -92498,7 +92523,7 @@ index 7680fc2..b8e9161 100644
  				     3 * rcu_jiffies_till_stall_check() + 3;
  	raw_spin_unlock_irqrestore(&rnp->lock, flags);
  
-@@ -1211,7 +1211,7 @@ void rcu_cpu_stall_reset(void)
+@@ -1324,7 +1324,7 @@ void rcu_cpu_stall_reset(void)
  	struct rcu_state *rsp;
  
  	for_each_rcu_flavor(rsp)
@@ -92507,7 +92532,25 @@ index 7680fc2..b8e9161 100644
  }
  
  /*
-@@ -1597,7 +1597,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
+@@ -1671,7 +1671,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
+ 		rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
+ 		rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
+ 		zero_cpu_stall_ticks(rdp);
+-		ACCESS_ONCE(rdp->gpwrap) = false;
++		ACCESS_ONCE_RW(rdp->gpwrap) = false;
+ 	}
+ 	return ret;
+ }
+@@ -1706,7 +1706,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
+ 	struct rcu_data *rdp;
+ 	struct rcu_node *rnp = rcu_get_root(rsp);
+ 
+-	ACCESS_ONCE(rsp->gp_activity) = jiffies;
++	ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
+ 	rcu_bind_gp_kthread();
+ 	raw_spin_lock_irq(&rnp->lock);
+ 	smp_mb__after_unlock_lock();
+@@ -1715,7 +1715,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
  		raw_spin_unlock_irq(&rnp->lock);
  		return 0;
  	}
@@ -92516,7 +92559,7 @@ index 7680fc2..b8e9161 100644
  
  	if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
  		/*
-@@ -1638,9 +1638,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
+@@ -1756,9 +1756,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;
@@ -92528,7 +92571,25 @@ index 7680fc2..b8e9161 100644
  		if (rnp == rdp->mynode)
  			(void)__note_gp_changes(rsp, rnp, rdp);
  		rcu_preempt_boost_start_gp(rnp);
-@@ -1685,7 +1685,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
+@@ -1767,7 +1767,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
+ 					    rnp->grphi, rnp->qsmask);
+ 		raw_spin_unlock_irq(&rnp->lock);
+ 		cond_resched_rcu_qs();
+-		ACCESS_ONCE(rsp->gp_activity) = jiffies;
++		ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
+ 	}
+ 
+ 	mutex_unlock(&rsp->onoff_mutex);
+@@ -1784,7 +1784,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
+ 	unsigned long maxj;
+ 	struct rcu_node *rnp = rcu_get_root(rsp);
+ 
+-	ACCESS_ONCE(rsp->gp_activity) = jiffies;
++	ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
+ 	rsp->n_force_qs++;
+ 	if (fqs_state == RCU_SAVE_DYNTICK) {
+ 		/* Collect dyntick-idle snapshots. */
+@@ -1805,7 +1805,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
  	if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
  		raw_spin_lock_irq(&rnp->lock);
  		smp_mb__after_unlock_lock();
@@ -92537,7 +92598,16 @@ index 7680fc2..b8e9161 100644
  			ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
  		raw_spin_unlock_irq(&rnp->lock);
  	}
-@@ -1731,7 +1731,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
+@@ -1823,7 +1823,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
+ 	struct rcu_data *rdp;
+ 	struct rcu_node *rnp = rcu_get_root(rsp);
+ 
+-	ACCESS_ONCE(rsp->gp_activity) = jiffies;
++	ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
+ 	raw_spin_lock_irq(&rnp->lock);
+ 	smp_mb__after_unlock_lock();
+ 	gp_duration = jiffies - rsp->gp_start;
+@@ -1852,7 +1852,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
  	rcu_for_each_node_breadth_first(rsp, rnp) {
  		raw_spin_lock_irq(&rnp->lock);
  		smp_mb__after_unlock_lock();
@@ -92546,7 +92616,16 @@ index 7680fc2..b8e9161 100644
  		rdp = this_cpu_ptr(rsp->rda);
  		if (rnp == rdp->mynode)
  			needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
-@@ -1746,14 +1746,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
+@@ -1860,7 +1860,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
+ 		nocb += rcu_future_gp_cleanup(rsp, rnp);
+ 		raw_spin_unlock_irq(&rnp->lock);
+ 		cond_resched_rcu_qs();
+-		ACCESS_ONCE(rsp->gp_activity) = jiffies;
++		ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
+ 	}
+ 	rnp = rcu_get_root(rsp);
+ 	raw_spin_lock_irq(&rnp->lock);
+@@ -1868,14 +1868,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
  	rcu_nocb_gp_set(rnp, nocb);
  
  	/* Declare grace period done. */
@@ -92563,7 +92642,30 @@ index 7680fc2..b8e9161 100644
  		trace_rcu_grace_period(rsp->name,
  				       ACCESS_ONCE(rsp->gpnum),
  				       TPS("newreq"));
-@@ -1878,7 +1878,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
+@@ -1910,7 +1910,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
+ 			if (rcu_gp_init(rsp))
+ 				break;
+ 			cond_resched_rcu_qs();
+-			ACCESS_ONCE(rsp->gp_activity) = jiffies;
++			ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
+ 			WARN_ON(signal_pending(current));
+ 			trace_rcu_grace_period(rsp->name,
+ 					       ACCESS_ONCE(rsp->gpnum),
+@@ -1954,11 +1954,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
+ 						       ACCESS_ONCE(rsp->gpnum),
+ 						       TPS("fqsend"));
+ 				cond_resched_rcu_qs();
+-				ACCESS_ONCE(rsp->gp_activity) = jiffies;
++				ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
+ 			} else {
+ 				/* Deal with stray signal. */
+ 				cond_resched_rcu_qs();
+-				ACCESS_ONCE(rsp->gp_activity) = jiffies;
++				ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
+ 				WARN_ON(signal_pending(current));
+ 				trace_rcu_grace_period(rsp->name,
+ 						       ACCESS_ONCE(rsp->gpnum),
+@@ -2003,7 +2003,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
  		 */
  		return false;
  	}
@@ -92572,7 +92674,7 @@ index 7680fc2..b8e9161 100644
  	trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
  			       TPS("newreq"));
  
-@@ -2099,7 +2099,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
+@@ -2228,7 +2228,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;
@@ -92581,7 +92683,7 @@ index 7680fc2..b8e9161 100644
  	}
  
  	/*
-@@ -2344,7 +2344,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
+@@ -2490,7 +2490,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;
@@ -92590,7 +92692,7 @@ index 7680fc2..b8e9161 100644
  	rdp->n_cbs_invoked += count;
  
  	/* Reinstate batch limit if we have worked down the excess. */
-@@ -2507,7 +2507,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
+@@ -2647,7 +2647,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
  		raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
  		return;  /* Someone beat us to it. */
  	}
@@ -92599,7 +92701,7 @@ index 7680fc2..b8e9161 100644
  		ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
  	raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
  	rcu_gp_kthread_wake(rsp);
-@@ -2553,7 +2553,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
+@@ -2693,7 +2693,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
  /*
   * Do RCU core processing for the current CPU.
   */
@@ -92608,7 +92710,7 @@ index 7680fc2..b8e9161 100644
  {
  	struct rcu_state *rsp;
  
-@@ -2665,7 +2665,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
+@@ -2805,7 +2805,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
  	WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
  	if (debug_rcu_head_queue(head)) {
  		/* Probable double call_rcu(), so leak the callback. */
@@ -92617,7 +92719,7 @@ index 7680fc2..b8e9161 100644
  		WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
  		return;
  	}
-@@ -2693,7 +2693,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
+@@ -2833,7 +2833,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
  		local_irq_restore(flags);
  		return;
  	}
@@ -92626,7 +92728,7 @@ index 7680fc2..b8e9161 100644
  	if (lazy)
  		rdp->qlen_lazy++;
  	else
-@@ -2966,11 +2966,11 @@ void synchronize_sched_expedited(void)
+@@ -3106,11 +3106,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.
  	 */
@@ -92640,7 +92742,7 @@ index 7680fc2..b8e9161 100644
  		return;
  	}
  
-@@ -2978,12 +2978,12 @@ void synchronize_sched_expedited(void)
+@@ -3118,12 +3118,12 @@ void synchronize_sched_expedited(void)
  	 * Take a ticket.  Note that atomic_inc_return() implies a
  	 * full memory barrier.
  	 */
@@ -92655,7 +92757,7 @@ index 7680fc2..b8e9161 100644
  		return;
  	}
  	WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
-@@ -2996,7 +2996,7 @@ void synchronize_sched_expedited(void)
+@@ -3136,7 +3136,7 @@ void synchronize_sched_expedited(void)
  		for_each_cpu(cpu, cm) {
  			struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
  
@@ -92664,7 +92766,7 @@ index 7680fc2..b8e9161 100644
  				cpumask_clear_cpu(cpu, cm);
  		}
  		if (cpumask_weight(cm) == 0)
-@@ -3011,14 +3011,14 @@ void synchronize_sched_expedited(void)
+@@ -3151,14 +3151,14 @@ void synchronize_sched_expedited(void)
  			     synchronize_sched_expedited_cpu_stop,
  			     NULL) == -EAGAIN) {
  		put_online_cpus();
@@ -92681,7 +92783,7 @@ index 7680fc2..b8e9161 100644
  			free_cpumask_var(cm);
  			return;
  		}
-@@ -3028,7 +3028,7 @@ void synchronize_sched_expedited(void)
+@@ -3168,7 +3168,7 @@ void synchronize_sched_expedited(void)
  			udelay(trycount * num_online_cpus());
  		} else {
  			wait_rcu_gp(call_rcu_sched);
@@ -92690,7 +92792,7 @@ index 7680fc2..b8e9161 100644
  			free_cpumask_var(cm);
  			return;
  		}
-@@ -3038,7 +3038,7 @@ void synchronize_sched_expedited(void)
+@@ -3178,7 +3178,7 @@ void synchronize_sched_expedited(void)
  		if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
  			/* ensure test happens before caller kfree */
  			smp_mb__before_atomic(); /* ^^^ */
@@ -92699,7 +92801,7 @@ index 7680fc2..b8e9161 100644
  			free_cpumask_var(cm);
  			return;
  		}
-@@ -3053,14 +3053,14 @@ void synchronize_sched_expedited(void)
+@@ -3193,14 +3193,14 @@ void synchronize_sched_expedited(void)
  		if (!try_get_online_cpus()) {
  			/* CPU hotplug operation in flight, use normal GP. */
  			wait_rcu_gp(call_rcu_sched);
@@ -92717,7 +92819,7 @@ index 7680fc2..b8e9161 100644
  
  all_cpus_idle:
  	free_cpumask_var(cm);
-@@ -3072,16 +3072,16 @@ all_cpus_idle:
+@@ -3212,16 +3212,16 @@ all_cpus_idle:
  	 * than we did already did their update.
  	 */
  	do {
@@ -92737,7 +92839,7 @@ index 7680fc2..b8e9161 100644
  
  	put_online_cpus();
  }
-@@ -3287,7 +3287,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
+@@ -3431,7 +3431,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.
  	 */
@@ -92746,7 +92848,7 @@ index 7680fc2..b8e9161 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. */
-@@ -3342,7 +3342,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
+@@ -3487,7 +3487,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
  
  	/* Increment ->n_barrier_done to prevent duplicate work. */
  	smp_mb(); /* Keep increment after above mechanism. */
@@ -92755,12 +92857,8 @@ index 7680fc2..b8e9161 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. */
-@@ -3387,10 +3387,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
+@@ -3532,7 +3532,7 @@ 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;
--	ACCESS_ONCE(rdp->qlen) = 0;
-+	ACCESS_ONCE_RW(rdp->qlen) = 0;
  	rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
  	WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
 -	WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
@@ -92768,7 +92866,7 @@ index 7680fc2..b8e9161 100644
  	rdp->cpu = cpu;
  	rdp->rsp = rsp;
  	rcu_boot_init_nocb_percpu_data(rdp);
-@@ -3423,8 +3423,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
+@@ -3565,8 +3565,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
  	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);
@@ -92780,10 +92878,10 @@ index 7680fc2..b8e9161 100644
  
  	/* Add CPU to rcu_node bitmasks. */
 diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
-index 8e7b184..9c55768 100644
+index 119de39..f07d31a 100644
 --- a/kernel/rcu/tree.h
 +++ b/kernel/rcu/tree.h
-@@ -87,11 +87,11 @@ struct rcu_dynticks {
+@@ -86,11 +86,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. */
@@ -92797,7 +92895,7 @@ index 8e7b184..9c55768 100644
  				    /*  "Idle" excludes userspace execution. */
  	unsigned long dynticks_idle_jiffies;
  				    /* End of last non-NMI non-idle period. */
-@@ -466,17 +466,17 @@ struct rcu_state {
+@@ -457,17 +457,17 @@ struct rcu_state {
  						/*  _rcu_barrier(). */
  	/* End of fields guarded by barrier_mutex. */
  
@@ -92827,10 +92925,10 @@ index 8e7b184..9c55768 100644
  	unsigned long jiffies_force_qs;		/* Time at which to invoke */
  						/*  force_quiescent_state(). */
 diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
-index 3ec85cb..3687925 100644
+index 0a571e9..fbfd611 100644
 --- a/kernel/rcu/tree_plugin.h
 +++ b/kernel/rcu/tree_plugin.h
-@@ -709,7 +709,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
+@@ -619,7 +619,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) &&
@@ -92839,7 +92937,7 @@ index 3ec85cb..3687925 100644
  }
  
  /*
-@@ -870,7 +870,7 @@ void synchronize_rcu_expedited(void)
+@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
  
  	/* Clean up and exit. */
  	smp_mb(); /* ensure expedited GP seen before counter increment. */
@@ -92848,7 +92946,7 @@ index 3ec85cb..3687925 100644
  					sync_rcu_preempt_exp_count + 1;
  unlock_mb_ret:
  	mutex_unlock(&sync_rcu_preempt_exp_mutex);
-@@ -1426,7 +1426,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
+@@ -1290,7 +1290,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
  	free_cpumask_var(cm);
  }
  
@@ -92857,16 +92955,16 @@ index 3ec85cb..3687925 100644
  	.store			= &rcu_cpu_kthread_task,
  	.thread_should_run	= rcu_cpu_kthread_should_run,
  	.thread_fn		= rcu_cpu_kthread,
-@@ -1900,7 +1900,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
+@@ -1761,7 +1761,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
  	print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
- 	pr_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 fqs=%ld %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);
-@@ -2044,7 +2044,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
+ 	       ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
+@@ -1906,7 +1906,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
  		return;
  	if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
  		/* Prior smp_mb__after_atomic() orders against prior enqueue. */
@@ -92875,45 +92973,34 @@ index 3ec85cb..3687925 100644
  		wake_up(&rdp_leader->nocb_wq);
  	}
  }
-@@ -2096,7 +2096,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
- 
- 	/* Enqueue the callback on the nocb list and update counts. */
+@@ -1978,7 +1978,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
+ 	atomic_long_add(rhcount, &rdp->nocb_q_count);
+ 	/* rcu_barrier() relies on ->nocb_q_count add before xchg. */
  	old_rhpp = xchg(&rdp->nocb_tail, rhtp);
 -	ACCESS_ONCE(*old_rhpp) = rhp;
 +	ACCESS_ONCE_RW(*old_rhpp) = rhp;
- 	atomic_long_add(rhcount, &rdp->nocb_q_count);
  	atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
  	smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
-@@ -2286,7 +2286,7 @@ wait_again:
+ 
+@@ -2167,7 +2167,7 @@ wait_again:
  			continue;  /* No CBs here, try next follower. */
  
  		/* Move callbacks to wait-for-GP list, which is empty. */
 -		ACCESS_ONCE(rdp->nocb_head) = NULL;
 +		ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
  		rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
- 		rdp->nocb_gp_count = atomic_long_xchg(&rdp->nocb_q_count, 0);
- 		rdp->nocb_gp_count_lazy =
-@@ -2413,7 +2413,7 @@ static int rcu_nocb_kthread(void *arg)
+ 		gotcbs = true;
+ 	}
+@@ -2288,7 +2288,7 @@ static int rcu_nocb_kthread(void *arg)
  		list = ACCESS_ONCE(rdp->nocb_follower_head);
  		BUG_ON(!list);
  		trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
 -		ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
 +		ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
  		tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
- 		c = atomic_long_xchg(&rdp->nocb_follower_count, 0);
- 		cl = atomic_long_xchg(&rdp->nocb_follower_count_lazy, 0);
-@@ -2443,8 +2443,8 @@ static int rcu_nocb_kthread(void *arg)
- 			list = next;
- 		}
- 		trace_rcu_batch_end(rdp->rsp->name, c, !!list, 0, 0, 1);
--		ACCESS_ONCE(rdp->nocb_p_count) = rdp->nocb_p_count - c;
--		ACCESS_ONCE(rdp->nocb_p_count_lazy) =
-+		ACCESS_ONCE_RW(rdp->nocb_p_count) = rdp->nocb_p_count - c;
-+		ACCESS_ONCE_RW(rdp->nocb_p_count_lazy) =
- 						rdp->nocb_p_count_lazy - cl;
- 		rdp->n_nocbs_invoked += c;
- 	}
-@@ -2465,7 +2465,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
+ 
+ 		/* Each pass through the following loop invokes a callback. */
+@@ -2338,7 +2338,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
  	if (!rcu_nocb_need_deferred_wakeup(rdp))
  		return;
  	ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
@@ -92922,7 +93009,7 @@ index 3ec85cb..3687925 100644
  	wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
  	trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
  }
-@@ -2588,7 +2588,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
+@@ -2461,7 +2461,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
  	t = kthread_run(rcu_nocb_kthread, rdp_spawn,
  			"rcuo%c/%d", rsp->abbr, cpu);
  	BUG_ON(IS_ERR(t));
@@ -92931,7 +93018,7 @@ index 3ec85cb..3687925 100644
  }
  
  /*
-@@ -2793,11 +2793,11 @@ static void rcu_sysidle_enter(int irq)
+@@ -2666,11 +2666,11 @@ static void rcu_sysidle_enter(int irq)
  
  	/* Record start of fully idle period. */
  	j = jiffies;
@@ -92946,7 +93033,7 @@ index 3ec85cb..3687925 100644
  }
  
  /*
-@@ -2868,9 +2868,9 @@ static void rcu_sysidle_exit(int irq)
+@@ -2741,9 +2741,9 @@ static void rcu_sysidle_exit(int irq)
  
  	/* Record end of idle period. */
  	smp_mb__before_atomic();
@@ -92958,7 +93045,7 @@ index 3ec85cb..3687925 100644
  
  	/*
  	 * If we are the timekeeping CPU, we are permitted to be non-idle
-@@ -2915,7 +2915,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
+@@ -2788,7 +2788,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. */
@@ -92967,7 +93054,7 @@ index 3ec85cb..3687925 100644
  	if (cur & 0x1) {
  		*isidle = false; /* We are not idle! */
  		return;
-@@ -2964,7 +2964,7 @@ static void rcu_sysidle(unsigned long j)
+@@ -2837,7 +2837,7 @@ static void rcu_sysidle(unsigned long j)
  	case RCU_SYSIDLE_NOT:
  
  		/* First time all are idle, so note a short idle period. */
@@ -92976,7 +93063,7 @@ index 3ec85cb..3687925 100644
  		break;
  
  	case RCU_SYSIDLE_SHORT:
-@@ -3002,7 +3002,7 @@ static void rcu_sysidle_cancel(void)
+@@ -2875,7 +2875,7 @@ static void rcu_sysidle_cancel(void)
  {
  	smp_mb();
  	if (full_sysidle_state > RCU_SYSIDLE_SHORT)
@@ -92985,7 +93072,7 @@ index 3ec85cb..3687925 100644
  }
  
  /*
-@@ -3054,7 +3054,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
+@@ -2927,7 +2927,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);
@@ -92994,7 +93081,7 @@ index 3ec85cb..3687925 100644
  }
  
  /*
-@@ -3207,7 +3207,7 @@ static void rcu_bind_gp_kthread(void)
+@@ -3080,7 +3080,7 @@ static void rcu_bind_gp_kthread(void)
  static void rcu_dynticks_task_enter(void)
  {
  #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
@@ -93003,7 +93090,7 @@ index 3ec85cb..3687925 100644
  #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
  }
  
-@@ -3215,6 +3215,6 @@ static void rcu_dynticks_task_enter(void)
+@@ -3088,6 +3088,6 @@ static void rcu_dynticks_task_enter(void)
  static void rcu_dynticks_task_exit(void)
  {
  #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
@@ -93012,19 +93099,19 @@ index 3ec85cb..3687925 100644
  #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
  }
 diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
-index 5cdc62e..cc52e88 100644
+index fbb6240..f6c5097 100644
 --- a/kernel/rcu/tree_trace.c
 +++ b/kernel/rcu/tree_trace.c
-@@ -121,7 +121,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
- 		   ulong2long(rdp->completed), ulong2long(rdp->gpnum),
- 		   rdp->passed_quiesce, rdp->qs_pending);
+@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
+ 		   rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
+ 		   rdp->qs_pending);
  	seq_printf(m, " dt=%d/%llx/%d df=%lu",
 -		   atomic_read(&rdp->dynticks->dynticks),
 +		   atomic_read_unchecked(&rdp->dynticks->dynticks),
  		   rdp->dynticks->dynticks_nesting,
  		   rdp->dynticks->dynticks_nmi_nesting,
  		   rdp->dynticks_fqs);
-@@ -182,17 +182,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
+@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
  	struct rcu_state *rsp = (struct rcu_state *)m->private;
  
  	seq_printf(m, "s=%lu d=%lu w=%lu tf=%lu wd1=%lu wd2=%lu n=%lu sc=%lu dt=%lu dl=%lu dx=%lu\n",
@@ -93097,10 +93184,10 @@ index e0d31a3..f4dafe3 100644
  }
  
 diff --git a/kernel/resource.c b/kernel/resource.c
-index 0bcebff..e7cd5b2 100644
+index 19f2357..ebe7f35 100644
 --- a/kernel/resource.c
 +++ b/kernel/resource.c
-@@ -161,8 +161,18 @@ static const struct file_operations proc_iomem_operations = {
+@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
  
  static int __init ioresources_init(void)
  {
@@ -93142,7 +93229,7 @@ index eae160d..c9aa22e 100644
  #ifdef CONFIG_RT_GROUP_SCHED
  	/*
 diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
-index 607f852..486bc87 100644
+index 8d0f35d..c16360d 100644
 --- a/kernel/sched/completion.c
 +++ b/kernel/sched/completion.c
 @@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
@@ -93173,10 +93260,10 @@ index 607f852..486bc87 100644
  				     unsigned long timeout)
  {
 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index d400c82..50fca96 100644
+index 62671f5..7b3505b 100644
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -1902,7 +1902,7 @@ void set_numabalancing_state(bool enabled)
+@@ -1847,7 +1847,7 @@ void set_numabalancing_state(bool enabled)
  int sysctl_numa_balancing(struct ctl_table *table, int write,
  			 void __user *buffer, size_t *lenp, loff_t *ppos)
  {
@@ -93185,7 +93272,7 @@ index d400c82..50fca96 100644
  	int err;
  	int state = numabalancing_enabled;
  
-@@ -2352,8 +2352,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
+@@ -2297,8 +2297,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
  		next->active_mm = oldmm;
  		atomic_inc(&oldmm->mm_count);
  		enter_lazy_tlb(oldmm, next);
@@ -93197,7 +93284,7 @@ index d400c82..50fca96 100644
  
  	if (!prev->mm) {
  		prev->active_mm = NULL;
-@@ -3154,6 +3156,8 @@ int can_nice(const struct task_struct *p, const int nice)
+@@ -3109,6 +3111,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 = nice_to_rlimit(nice);
  
@@ -93206,7 +93293,7 @@ index d400c82..50fca96 100644
  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
  }
-@@ -3180,7 +3184,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -3135,7 +3139,8 @@ SYSCALL_DEFINE1(nice, int, increment)
  	nice = task_nice(current) + increment;
  
  	nice = clamp_val(nice, MIN_NICE, MAX_NICE);
@@ -93216,7 +93303,7 @@ index d400c82..50fca96 100644
  		return -EPERM;
  
  	retval = security_task_setnice(current, nice);
-@@ -3475,6 +3480,7 @@ recheck:
+@@ -3444,6 +3449,7 @@ recheck:
  			if (policy != p->policy && !rlim_rtprio)
  				return -EPERM;
  
@@ -93224,7 +93311,7 @@ index d400c82..50fca96 100644
  			/* can't increase priority */
  			if (attr->sched_priority > p->rt_priority &&
  			    attr->sched_priority > rlim_rtprio)
-@@ -4975,6 +4981,7 @@ void idle_task_exit(void)
+@@ -4931,6 +4937,7 @@ void idle_task_exit(void)
  
  	if (mm != &init_mm) {
  		switch_mm(mm, &init_mm, current);
@@ -93232,7 +93319,7 @@ index d400c82..50fca96 100644
  		finish_arch_post_lock_switch();
  	}
  	mmdrop(mm);
-@@ -5070,7 +5077,7 @@ static void migrate_tasks(unsigned int dead_cpu)
+@@ -5026,7 +5033,7 @@ static void migrate_tasks(unsigned int dead_cpu)
  
  #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
  
@@ -93241,7 +93328,7 @@ index d400c82..50fca96 100644
  	{
  		.procname	= "sched_domain",
  		.mode		= 0555,
-@@ -5087,17 +5094,17 @@ static struct ctl_table sd_ctl_root[] = {
+@@ -5043,17 +5050,17 @@ static struct ctl_table sd_ctl_root[] = {
  	{}
  };
  
@@ -93263,7 +93350,7 @@ index d400c82..50fca96 100644
  
  	/*
  	 * In the intermediate directories, both the child directory and
-@@ -5105,22 +5112,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
+@@ -5061,22 +5068,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.
  	 */
@@ -93295,7 +93382,7 @@ index d400c82..50fca96 100644
  		const char *procname, void *data, int maxlen,
  		umode_t mode, proc_handler *proc_handler,
  		bool load_idx)
-@@ -5140,7 +5150,7 @@ set_table_entry(struct ctl_table *entry,
+@@ -5096,7 +5106,7 @@ set_table_entry(struct ctl_table *entry,
  static struct ctl_table *
  sd_alloc_ctl_domain_table(struct sched_domain *sd)
  {
@@ -93304,7 +93391,7 @@ index d400c82..50fca96 100644
  
  	if (table == NULL)
  		return NULL;
-@@ -5178,9 +5188,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
+@@ -5134,9 +5144,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
  	return table;
  }
  
@@ -93316,7 +93403,7 @@ index d400c82..50fca96 100644
  	struct sched_domain *sd;
  	int domain_num = 0, i;
  	char buf[32];
-@@ -5207,11 +5217,13 @@ static struct ctl_table_header *sd_sysctl_header;
+@@ -5163,11 +5173,13 @@ static struct ctl_table_header *sd_sysctl_header;
  static void register_sched_domain_sysctl(void)
  {
  	int i, cpu_num = num_possible_cpus();
@@ -93331,7 +93418,7 @@ index d400c82..50fca96 100644
  
  	if (entry == NULL)
  		return;
-@@ -5234,8 +5246,12 @@ static void unregister_sched_domain_sysctl(void)
+@@ -5190,8 +5202,12 @@ static void unregister_sched_domain_sysctl(void)
  	if (sd_sysctl_header)
  		unregister_sysctl_table(sd_sysctl_header);
  	sd_sysctl_header = NULL;
@@ -93347,10 +93434,10 @@ index d400c82..50fca96 100644
  #else
  static void register_sched_domain_sysctl(void)
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index fe331fc..29d620e 100644
+index 241213b..6a64c91 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
-@@ -2089,7 +2089,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
+@@ -2092,7 +2092,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
  
  static void reset_ptenuma_scan(struct task_struct *p)
  {
@@ -93359,7 +93446,7 @@ index fe331fc..29d620e 100644
  	p->mm->numa_scan_offset = 0;
  }
  
-@@ -7651,7 +7651,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
+@@ -7656,7 +7656,7 @@ static void nohz_idle_balance(struct rq *this_rq, 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).
   */
@@ -93369,10 +93456,10 @@ index fe331fc..29d620e 100644
  	struct rq *this_rq = this_rq();
  	enum cpu_idle_type idle = this_rq->idle_balance ?
 diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index 9a2a45c..bb91ace 100644
+index dc0f435..ae2e085 100644
 --- a/kernel/sched/sched.h
 +++ b/kernel/sched/sched.h
-@@ -1182,7 +1182,7 @@ struct sched_class {
+@@ -1200,7 +1200,7 @@ struct sched_class {
  #ifdef CONFIG_FAIR_GROUP_SCHED
  	void (*task_move_group) (struct task_struct *p, int on_rq);
  #endif
@@ -93381,23 +93468,8 @@ index 9a2a45c..bb91ace 100644
  
  static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
  {
-diff --git a/kernel/seccomp.c b/kernel/seccomp.c
-index 4ef9687..4f44028 100644
---- a/kernel/seccomp.c
-+++ b/kernel/seccomp.c
-@@ -629,7 +629,9 @@ static u32 __seccomp_phase1_filter(int this_syscall, struct seccomp_data *sd)
- 
- 	switch (action) {
- 	case SECCOMP_RET_ERRNO:
--		/* Set the low-order 16-bits as a errno. */
-+		/* Set low-order bits as an errno, capped at MAX_ERRNO. */
-+		if (data > MAX_ERRNO)
-+			data = MAX_ERRNO;
- 		syscall_set_return_value(current, task_pt_regs(current),
- 					 -data, 0);
- 		goto skip;
 diff --git a/kernel/signal.c b/kernel/signal.c
-index 16a30529..25ad033 100644
+index a390499..ebe9a21 100644
 --- a/kernel/signal.c
 +++ b/kernel/signal.c
 @@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
@@ -93557,7 +93629,7 @@ index 40190f2..8861d40 100644
  	mutex_unlock(&smpboot_threads_lock);
  	put_online_cpus();
 diff --git a/kernel/softirq.c b/kernel/softirq.c
-index c497fcd..e8f90a9 100644
+index 479e443..66d845e1 100644
 --- a/kernel/softirq.c
 +++ b/kernel/softirq.c
 @@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
@@ -93569,7 +93641,7 @@ index c497fcd..e8f90a9 100644
  
  DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
  
-@@ -266,7 +266,7 @@ restart:
+@@ -270,7 +270,7 @@ restart:
  		kstat_incr_softirqs_this_cpu(vec_nr);
  
  		trace_softirq_entry(vec_nr);
@@ -93578,7 +93650,7 @@ index c497fcd..e8f90a9 100644
  		trace_softirq_exit(vec_nr);
  		if (unlikely(prev_count != preempt_count())) {
  			pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
-@@ -426,7 +426,7 @@ void __raise_softirq_irqoff(unsigned int nr)
+@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
  	or_softirq_pending(1UL << nr);
  }
  
@@ -93587,7 +93659,7 @@ index c497fcd..e8f90a9 100644
  {
  	softirq_vec[nr].action = action;
  }
-@@ -478,7 +478,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
+@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
  }
  EXPORT_SYMBOL(__tasklet_hi_schedule_first);
  
@@ -93596,7 +93668,7 @@ index c497fcd..e8f90a9 100644
  {
  	struct tasklet_struct *list;
  
-@@ -514,7 +514,7 @@ static void tasklet_action(struct softirq_action *a)
+@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
  	}
  }
  
@@ -93605,7 +93677,7 @@ index c497fcd..e8f90a9 100644
  {
  	struct tasklet_struct *list;
  
-@@ -745,7 +745,7 @@ static struct notifier_block cpu_nfb = {
+@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
  	.notifier_call = cpu_callback
  };
  
@@ -93615,10 +93687,10 @@ index c497fcd..e8f90a9 100644
  	.thread_should_run	= ksoftirqd_should_run,
  	.thread_fn		= run_ksoftirqd,
 diff --git a/kernel/sys.c b/kernel/sys.c
-index ea9c881..2194af5 100644
+index a03d9cd..55dbe9c 100644
 --- a/kernel/sys.c
 +++ b/kernel/sys.c
-@@ -154,6 +154,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
+@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
  		error = -EACCES;
  		goto out;
  	}
@@ -93631,7 +93703,7 @@ index ea9c881..2194af5 100644
  	no_nice = security_task_setnice(p, niceval);
  	if (no_nice) {
  		error = no_nice;
-@@ -359,6 +365,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
+@@ -365,6 +371,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
  			goto error;
  	}
  
@@ -93652,7 +93724,7 @@ index ea9c881..2194af5 100644
  	if (rgid != (gid_t) -1 ||
  	    (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
  		new->sgid = new->egid;
-@@ -394,6 +414,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -400,6 +420,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
  	old = current_cred();
  
  	retval = -EPERM;
@@ -93663,7 +93735,7 @@ index ea9c881..2194af5 100644
  	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))
-@@ -411,7 +435,7 @@ error:
+@@ -417,7 +441,7 @@ error:
  /*
   * change the user struct in a credentials set to match the new UID
   */
@@ -93672,7 +93744,7 @@ index ea9c881..2194af5 100644
  {
  	struct user_struct *new_user;
  
-@@ -491,7 +515,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
+@@ -497,7 +521,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
  			goto error;
  	}
  
@@ -93691,7 +93763,7 @@ index ea9c881..2194af5 100644
  		retval = set_user(new);
  		if (retval < 0)
  			goto error;
-@@ -541,6 +576,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -547,6 +582,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
  	old = current_cred();
  
  	retval = -EPERM;
@@ -93704,7 +93776,7 @@ index ea9c881..2194af5 100644
  	if (ns_capable(old->user_ns, CAP_SETUID)) {
  		new->suid = new->uid = kuid;
  		if (!uid_eq(kuid, old->uid)) {
-@@ -610,6 +651,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
+@@ -616,6 +657,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
  			goto error;
  	}
  
@@ -93714,7 +93786,7 @@ index ea9c881..2194af5 100644
  	if (ruid != (uid_t) -1) {
  		new->uid = kruid;
  		if (!uid_eq(kruid, old->uid)) {
-@@ -694,6 +738,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
+@@ -700,6 +744,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
  			goto error;
  	}
  
@@ -93724,7 +93796,7 @@ index ea9c881..2194af5 100644
  	if (rgid != (gid_t) -1)
  		new->gid = krgid;
  	if (egid != (gid_t) -1)
-@@ -758,12 +805,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -764,12 +811,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
  	    uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
  	    ns_capable(old->user_ns, CAP_SETUID)) {
  		if (!uid_eq(kuid, old->fsuid)) {
@@ -93741,7 +93813,7 @@ index ea9c881..2194af5 100644
  	abort_creds(new);
  	return old_fsuid;
  
-@@ -796,12 +847,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -802,12 +853,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) ||
  	    ns_capable(old->user_ns, CAP_SETGID)) {
@@ -93758,7 +93830,7 @@ index ea9c881..2194af5 100644
  	abort_creds(new);
  	return old_fsgid;
  
-@@ -1178,19 +1233,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
+@@ -1185,19 +1240,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
  		return -EFAULT;
  
  	down_read(&uts_sem);
@@ -93783,7 +93855,7 @@ index ea9c881..2194af5 100644
  				__OLD_UTS_LEN);
  	error |= __put_user(0, name->machine + __OLD_UTS_LEN);
  	up_read(&uts_sem);
-@@ -1391,6 +1446,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
+@@ -1398,6 +1453,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
  			 */
  			new_rlim->rlim_cur = 1;
  		}
@@ -93798,7 +93870,7 @@ index ea9c881..2194af5 100644
  	if (!retval) {
  		if (old_rlim)
 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 88ea2d6..88acc77 100644
+index ce410bb..cd276f0 100644
 --- a/kernel/sysctl.c
 +++ b/kernel/sysctl.c
 @@ -94,7 +94,6 @@
@@ -93955,7 +94027,7 @@ index 88ea2d6..88acc77 100644
  	},
  	{
  		.procname	= "perf_event_mlock_kb",
-@@ -1340,6 +1381,13 @@ static struct ctl_table vm_table[] = {
+@@ -1348,6 +1389,13 @@ static struct ctl_table vm_table[] = {
  		.proc_handler	= proc_dointvec_minmax,
  		.extra1		= &zero,
  	},
@@ -93969,7 +94041,7 @@ index 88ea2d6..88acc77 100644
  #else
  	{
  		.procname	= "nr_trim_pages",
-@@ -1822,6 +1870,16 @@ int proc_dostring(struct ctl_table *table, int write,
+@@ -1830,6 +1878,16 @@ int proc_dostring(struct ctl_table *table, int write,
  			       (char __user *)buffer, lenp, ppos);
  }
  
@@ -93986,7 +94058,7 @@ index 88ea2d6..88acc77 100644
  static size_t proc_skip_spaces(char **buf)
  {
  	size_t ret;
-@@ -1927,6 +1985,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
+@@ -1935,6 +1993,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
  	len = strlen(tmp);
  	if (len > *size)
  		len = *size;
@@ -93995,7 +94067,7 @@ index 88ea2d6..88acc77 100644
  	if (copy_to_user(*buf, tmp, len))
  		return -EFAULT;
  	*size -= len;
-@@ -2104,7 +2164,7 @@ int proc_dointvec(struct ctl_table *table, int write,
+@@ -2112,7 +2172,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)
  {
@@ -94004,7 +94076,7 @@ index 88ea2d6..88acc77 100644
  	unsigned long tmptaint = get_taint();
  	int err;
  
-@@ -2132,7 +2192,6 @@ static int proc_taint(struct ctl_table *table, int write,
+@@ -2140,7 +2200,6 @@ static int proc_taint(struct ctl_table *table, int write,
  	return err;
  }
  
@@ -94012,7 +94084,7 @@ index 88ea2d6..88acc77 100644
  static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
  				void __user *buffer, size_t *lenp, loff_t *ppos)
  {
-@@ -2141,7 +2200,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
+@@ -2149,7 +2208,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
  
  	return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
  }
@@ -94020,7 +94092,7 @@ index 88ea2d6..88acc77 100644
  
  struct do_proc_dointvec_minmax_conv_param {
  	int *min;
-@@ -2701,6 +2759,12 @@ int proc_dostring(struct ctl_table *table, int write,
+@@ -2709,6 +2767,12 @@ int proc_dostring(struct ctl_table *table, int write,
  	return -ENOSYS;
  }
  
@@ -94033,7 +94105,7 @@ index 88ea2d6..88acc77 100644
  int proc_dointvec(struct ctl_table *table, int write,
  		  void __user *buffer, size_t *lenp, loff_t *ppos)
  {
-@@ -2757,5 +2821,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
+@@ -2765,5 +2829,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
  EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
  EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
  EXPORT_SYMBOL(proc_dostring);
@@ -94041,7 +94113,7 @@ index 88ea2d6..88acc77 100644
  EXPORT_SYMBOL(proc_doulongvec_minmax);
  EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
-index 670fff8..a247812 100644
+index 21f82c2..c1984e5 100644
 --- a/kernel/taskstats.c
 +++ b/kernel/taskstats.c
 @@ -28,9 +28,12 @@
@@ -94057,7 +94129,7 @@ index 670fff8..a247812 100644
  /*
   * Maximum length of a cpumask that can be specified in
   * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
-@@ -576,6 +579,9 @@ err:
+@@ -567,6 +570,9 @@ err:
  
  static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
  {
@@ -94068,7 +94140,7 @@ index 670fff8..a247812 100644
  		return cmd_attr_register_cpumask(info);
  	else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
-index a7077d3..dd48a49 100644
+index 1b001ed..55ef9e4 100644
 --- a/kernel/time/alarmtimer.c
 +++ b/kernel/time/alarmtimer.c
 @@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
@@ -94081,10 +94153,10 @@ index a7077d3..dd48a49 100644
  		.clock_get	= alarm_clock_get,
  		.timer_create	= alarm_timer_create,
 diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
-index d8c724c..6b331a4 100644
+index bee0c1f..a23fe2d 100644
 --- a/kernel/time/hrtimer.c
 +++ b/kernel/time/hrtimer.c
-@@ -1399,7 +1399,7 @@ void hrtimer_peek_ahead_timers(void)
+@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
  
@@ -94094,10 +94166,10 @@ index d8c724c..6b331a4 100644
  	hrtimer_peek_ahead_timers();
  }
 diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
-index a16b678..8c5bd9d 100644
+index 0075da7..63cc872 100644
 --- a/kernel/time/posix-cpu-timers.c
 +++ b/kernel/time/posix-cpu-timers.c
-@@ -1450,14 +1450,14 @@ struct k_clock clock_posix_cpu = {
+@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
  
  static __init int init_posix_cpu_timers(void)
  {
@@ -94247,7 +94319,7 @@ index 2c85b77..6530536 100644
  		update_vsyscall_tz();
  		if (firsttime) {
 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index 6a93185..288c331 100644
+index 91db941..a371671 100644
 --- a/kernel/time/timekeeping.c
 +++ b/kernel/time/timekeeping.c
 @@ -15,6 +15,7 @@
@@ -94258,7 +94330,7 @@ index 6a93185..288c331 100644
  #include <linux/syscore_ops.h>
  #include <linux/clocksource.h>
  #include <linux/jiffies.h>
-@@ -775,6 +776,8 @@ int do_settimeofday64(const struct timespec64 *ts)
+@@ -802,6 +803,8 @@ int do_settimeofday64(const struct timespec64 *ts)
  	if (!timespec64_valid_strict(ts))
  		return -EINVAL;
  
@@ -94478,7 +94550,7 @@ index 483cecf..ac46091 100644
  
  	ret = -EIO;
 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
-index af5bffd..57664b8 100644
+index 4f22802..bd268b1 100644
 --- a/kernel/trace/ftrace.c
 +++ b/kernel/trace/ftrace.c
 @@ -2382,12 +2382,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
@@ -94531,10 +94603,10 @@ index af5bffd..57664b8 100644
  	/* make curr_ret_stack visible before we add the ret_stack */
  	smp_wmb();
 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index d2e151c..1498973 100644
+index 5040d44..d43b2b9 100644
 --- a/kernel/trace/ring_buffer.c
 +++ b/kernel/trace/ring_buffer.c
-@@ -350,9 +350,9 @@ struct buffer_data_page {
+@@ -348,9 +348,9 @@ struct buffer_data_page {
   */
  struct buffer_page {
  	struct list_head list;		/* list of buffer pages */
@@ -94546,7 +94618,7 @@ index d2e151c..1498973 100644
  	unsigned long	 real_end;	/* real end of data */
  	struct buffer_data_page *page;	/* Actual data page */
  };
-@@ -473,11 +473,11 @@ struct ring_buffer_per_cpu {
+@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
  	unsigned long			last_overrun;
  	local_t				entries_bytes;
  	local_t				entries;
@@ -94562,7 +94634,7 @@ index d2e151c..1498973 100644
  	unsigned long			read;
  	unsigned long			read_bytes;
  	u64				write_stamp;
-@@ -1047,8 +1047,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
  	 *
  	 * We add a counter to the write field to denote this.
  	 */
@@ -94573,7 +94645,7 @@ index d2e151c..1498973 100644
  
  	/*
  	 * Just make sure we have seen our old_write and synchronize
-@@ -1076,8 +1076,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
  		 * cmpxchg to only update if an interrupt did not already
  		 * do it for us. If the cmpxchg fails, we don't care.
  		 */
@@ -94584,7 +94656,7 @@ index d2e151c..1498973 100644
  
  		/*
  		 * No need to worry about races with clearing out the commit.
-@@ -1445,12 +1445,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
+@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
  
  static inline unsigned long rb_page_entries(struct buffer_page *bpage)
  {
@@ -94599,7 +94671,7 @@ index d2e151c..1498973 100644
  }
  
  static int
-@@ -1545,7 +1545,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
+@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
  			 * bytes consumed in ring buffer from here.
  			 * Increment overrun to account for the lost events.
  			 */
@@ -94608,7 +94680,7 @@ index d2e151c..1498973 100644
  			local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
  		}
  
-@@ -2107,7 +2107,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
  		 * it is our responsibility to update
  		 * the counters.
  		 */
@@ -94617,7 +94689,7 @@ index d2e151c..1498973 100644
  		local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
  
  		/*
-@@ -2257,7 +2257,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
  		if (tail == BUF_PAGE_SIZE)
  			tail_page->real_end = 0;
  
@@ -94626,7 +94698,7 @@ index d2e151c..1498973 100644
  		return;
  	}
  
-@@ -2292,7 +2292,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
  		rb_event_set_padding(event);
  
  		/* Set the write back to the previous setting */
@@ -94635,7 +94707,7 @@ index d2e151c..1498973 100644
  		return;
  	}
  
-@@ -2304,7 +2304,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
  
  	/* Set write to end of buffer */
  	length = (tail + length) - BUF_PAGE_SIZE;
@@ -94644,7 +94716,7 @@ index d2e151c..1498973 100644
  }
  
  /*
-@@ -2330,7 +2330,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
  	 * about it.
  	 */
  	if (unlikely(next_page == commit_page)) {
@@ -94653,7 +94725,7 @@ index d2e151c..1498973 100644
  		goto out_reset;
  	}
  
-@@ -2360,7 +2360,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
  			 * this is easy, just stop here.
  			 */
  			if (!(buffer->flags & RB_FL_OVERWRITE)) {
@@ -94662,7 +94734,7 @@ index d2e151c..1498973 100644
  				goto out_reset;
  			}
  
-@@ -2386,7 +2386,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
  				      cpu_buffer->tail_page) &&
  				     (cpu_buffer->commit_page ==
  				      cpu_buffer->reader_page))) {
@@ -94671,7 +94743,7 @@ index d2e151c..1498973 100644
  				goto out_reset;
  			}
  		}
-@@ -2434,7 +2434,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
  		length += RB_LEN_TIME_EXTEND;
  
  	tail_page = cpu_buffer->tail_page;
@@ -94680,7 +94752,7 @@ index d2e151c..1498973 100644
  
  	/* set write to only the index of the write */
  	write &= RB_WRITE_MASK;
-@@ -2458,7 +2458,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2456,7 +2456,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);
  
@@ -94689,7 +94761,7 @@ index d2e151c..1498973 100644
  
  	/*
  	 * If this is the first commit on the page, then update
-@@ -2491,7 +2491,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2489,7 +2489,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 =
@@ -94698,7 +94770,7 @@ index d2e151c..1498973 100644
  		unsigned long event_length = rb_event_length(event);
  		/*
  		 * This is on the tail page. It is possible that
-@@ -2501,7 +2501,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
  		 */
  		old_index += write_mask;
  		new_index += write_mask;
@@ -94707,7 +94779,7 @@ index d2e151c..1498973 100644
  		if (index == old_index) {
  			/* update counters */
  			local_sub(event_length, &cpu_buffer->entries_bytes);
-@@ -2516,7 +2516,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
  static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
  {
  	local_inc(&cpu_buffer->committing);
@@ -94716,7 +94788,7 @@ index d2e151c..1498973 100644
  }
  
  static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
-@@ -2528,7 +2528,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
  		return;
  
   again:
@@ -94725,7 +94797,7 @@ index d2e151c..1498973 100644
  	/* synchronize with interrupts */
  	barrier();
  	if (local_read(&cpu_buffer->committing) == 1)
-@@ -2544,7 +2544,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
  	 * updating of the commit page and the clearing of the
  	 * committing counter.
  	 */
@@ -94734,7 +94806,7 @@ index d2e151c..1498973 100644
  	    !local_read(&cpu_buffer->committing)) {
  		local_inc(&cpu_buffer->committing);
  		goto again;
-@@ -2574,7 +2574,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
+@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
  	barrier();
  	if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
  		local_dec(&cpu_buffer->committing);
@@ -94743,7 +94815,7 @@ index d2e151c..1498973 100644
  		return NULL;
  	}
  #endif
-@@ -2904,7 +2904,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2902,7 +2902,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
  
  	/* Do the likely case first */
  	if (likely(bpage->page == (void *)addr)) {
@@ -94752,7 +94824,7 @@ index d2e151c..1498973 100644
  		return;
  	}
  
-@@ -2916,7 +2916,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
+@@ -2914,7 +2914,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
  	start = bpage;
  	do {
  		if (bpage->page == (void *)addr) {
@@ -94761,7 +94833,7 @@ index d2e151c..1498973 100644
  			return;
  		}
  		rb_inc_page(cpu_buffer, &bpage);
-@@ -3200,7 +3200,7 @@ static inline unsigned long
+@@ -3198,7 +3198,7 @@ static inline unsigned long
  rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
  {
  	return local_read(&cpu_buffer->entries) -
@@ -94770,7 +94842,7 @@ index d2e151c..1498973 100644
  }
  
  /**
-@@ -3289,7 +3289,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
+@@ -3287,7 +3287,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
  		return 0;
  
  	cpu_buffer = buffer->buffers[cpu];
@@ -94779,7 +94851,7 @@ index d2e151c..1498973 100644
  
  	return ret;
  }
-@@ -3312,7 +3312,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
+@@ -3310,7 +3310,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
  		return 0;
  
  	cpu_buffer = buffer->buffers[cpu];
@@ -94788,7 +94860,7 @@ index d2e151c..1498973 100644
  
  	return ret;
  }
-@@ -3334,7 +3334,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
+@@ -3332,7 +3332,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
  		return 0;
  
  	cpu_buffer = buffer->buffers[cpu];
@@ -94797,7 +94869,7 @@ index d2e151c..1498973 100644
  
  	return ret;
  }
-@@ -3397,7 +3397,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
+@@ -3395,7 +3395,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];
@@ -94806,7 +94878,7 @@ index d2e151c..1498973 100644
  	}
  
  	return overruns;
-@@ -3568,8 +3568,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -3566,8 +3566,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
  	/*
  	 * Reset the reader page to size zero.
  	 */
@@ -94817,7 +94889,7 @@ index d2e151c..1498973 100644
  	local_set(&cpu_buffer->reader_page->page->commit, 0);
  	cpu_buffer->reader_page->real_end = 0;
  
-@@ -3603,7 +3603,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -3601,7 +3601,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
  	 * want to compare with the last_overrun.
  	 */
  	smp_mb();
@@ -94826,7 +94898,7 @@ index d2e151c..1498973 100644
  
  	/*
  	 * Here's the tricky part.
-@@ -4175,8 +4175,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -4173,8 +4173,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
  
  	cpu_buffer->head_page
  		= list_entry(cpu_buffer->pages, struct buffer_page, list);
@@ -94837,7 +94909,7 @@ index d2e151c..1498973 100644
  	local_set(&cpu_buffer->head_page->page->commit, 0);
  
  	cpu_buffer->head_page->read = 0;
-@@ -4186,18 +4186,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
+@@ -4184,18 +4184,18 @@ 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);
@@ -94862,7 +94934,7 @@ index d2e151c..1498973 100644
  	cpu_buffer->read = 0;
  	cpu_buffer->read_bytes = 0;
  
-@@ -4598,8 +4598,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
+@@ -4596,8 +4596,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
  		rb_init_page(bpage);
  		bpage = reader->page;
  		reader->page = *data_page;
@@ -94874,10 +94946,10 @@ index d2e151c..1498973 100644
  		*data_page = bpage;
  
 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 361a827..6a319a3 100644
+index 62c6506..5c25989 100644
 --- a/kernel/trace/trace.c
 +++ b/kernel/trace/trace.c
-@@ -3499,7 +3499,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
+@@ -3500,7 +3500,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
  	return 0;
  }
  
@@ -94887,7 +94959,7 @@ index 361a827..6a319a3 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 8de48ba..3e5b4fa 100644
+index dd8205a..1aae87a 100644
 --- a/kernel/trace/trace.h
 +++ b/kernel/trace/trace.h
 @@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
@@ -94920,7 +94992,7 @@ index 57b67b1..66082a9 100644
 +	return atomic64_inc_return_unchecked(&trace_counter);
  }
 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index b03a0ea..2df3168 100644
+index db54dda..b9e4f03 100644
 --- a/kernel/trace/trace_events.c
 +++ b/kernel/trace/trace_events.c
 @@ -1755,7 +1755,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
@@ -94932,7 +95004,7 @@ index b03a0ea..2df3168 100644
  
  /* Add an additional event_call dynamically */
 diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
-index ba47600..d0e47fa 100644
+index 2d25ad1..5bfd931 100644
 --- a/kernel/trace/trace_functions_graph.c
 +++ b/kernel/trace/trace_functions_graph.c
 @@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
@@ -94994,10 +95066,10 @@ index 7a9ba62..2e0e4a1 100644
  	}
  	entry	= ring_buffer_event_data(event);
 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index b77b9a6..82f19bd 100644
+index 692bf71..6d9a9cd 100644
 --- a/kernel/trace/trace_output.c
 +++ b/kernel/trace/trace_output.c
-@@ -707,14 +707,16 @@ int register_ftrace_event(struct trace_event *event)
+@@ -751,14 +751,16 @@ int register_ftrace_event(struct trace_event *event)
  			goto out;
  	}
  
@@ -95019,7 +95091,7 @@ index b77b9a6..82f19bd 100644
  	key = event->type & (EVENT_HASHSIZE - 1);
  
 diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
-index f8b45d8..70ff6c8 100644
+index e694c9f..6775a38 100644
 --- a/kernel/trace/trace_seq.c
 +++ b/kernel/trace/trace_seq.c
 @@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
@@ -95032,10 +95104,10 @@ index f8b45d8..70ff6c8 100644
  	if (unlikely(seq_buf_has_overflowed(&s->seq))) {
  		s->seq.len = save_len;
 diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
-index 16eddb3..758b308 100644
+index c3e4fcf..ef6cc43 100644
 --- a/kernel/trace/trace_stack.c
 +++ b/kernel/trace/trace_stack.c
-@@ -90,7 +90,7 @@ check_stack(unsigned long ip, unsigned long *stack)
+@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
  		return;
  
  	/* we do not handle interrupt stacks yet */
@@ -95045,7 +95117,7 @@ index 16eddb3..758b308 100644
  
  	local_irq_save(flags);
 diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
-index c6ee36f..78513f3 100644
+index f97f6e3..d367b48 100644
 --- a/kernel/trace/trace_syscalls.c
 +++ b/kernel/trace/trace_syscalls.c
 @@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
@@ -95133,7 +95205,7 @@ index c8eac43..4b5f08f 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 70bf118..4be3c37 100644
+index 3174bf8..3553520 100644
 --- a/kernel/watchdog.c
 +++ b/kernel/watchdog.c
 @@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
@@ -95146,10 +95218,10 @@ index 70bf118..4be3c37 100644
  	.thread_should_run	= watchdog_should_run,
  	.thread_fn		= watchdog,
 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index 82d0c8d..37f4222 100644
+index 41ff75b..5ad683a 100644
 --- a/kernel/workqueue.c
 +++ b/kernel/workqueue.c
-@@ -4565,7 +4565,7 @@ static void rebind_workers(struct worker_pool *pool)
+@@ -4564,7 +4564,7 @@ static void rebind_workers(struct worker_pool *pool)
  		WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
  		worker_flags |= WORKER_REBOUND;
  		worker_flags &= ~WORKER_UNBOUND;
@@ -95159,10 +95231,10 @@ index 82d0c8d..37f4222 100644
  
  	spin_unlock_irq(&pool->lock);
 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 5f2ce61..85a0b1b 100644
+index c5cefb3..a4241e3 100644
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
-@@ -910,7 +910,7 @@ config DEBUG_MUTEXES
+@@ -923,7 +923,7 @@ config DEBUG_MUTEXES
  
  config DEBUG_WW_MUTEX_SLOWPATH
  	bool "Wait/wound mutex debugging: Slowpath testing"
@@ -95171,7 +95243,7 @@ index 5f2ce61..85a0b1b 100644
  	select DEBUG_LOCK_ALLOC
  	select DEBUG_SPINLOCK
  	select DEBUG_MUTEXES
-@@ -927,7 +927,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
+@@ -940,7 +940,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
  
  config DEBUG_LOCK_ALLOC
  	bool "Lock debugging: detect incorrect freeing of live locks"
@@ -95180,7 +95252,7 @@ index 5f2ce61..85a0b1b 100644
  	select DEBUG_SPINLOCK
  	select DEBUG_MUTEXES
  	select LOCKDEP
-@@ -941,7 +941,7 @@ config DEBUG_LOCK_ALLOC
+@@ -954,7 +954,7 @@ config DEBUG_LOCK_ALLOC
  
  config PROVE_LOCKING
  	bool "Lock debugging: prove locking correctness"
@@ -95189,7 +95261,7 @@ index 5f2ce61..85a0b1b 100644
  	select LOCKDEP
  	select DEBUG_SPINLOCK
  	select DEBUG_MUTEXES
-@@ -992,7 +992,7 @@ config LOCKDEP
+@@ -1005,7 +1005,7 @@ config LOCKDEP
  
  config LOCK_STAT
  	bool "Lock usage statistics"
@@ -95198,7 +95270,7 @@ index 5f2ce61..85a0b1b 100644
  	select LOCKDEP
  	select DEBUG_SPINLOCK
  	select DEBUG_MUTEXES
-@@ -1453,6 +1453,7 @@ config LATENCYTOP
+@@ -1467,6 +1467,7 @@ config LATENCYTOP
  	depends on DEBUG_KERNEL
  	depends on STACKTRACE_SUPPORT
  	depends on PROC_FS
@@ -95206,7 +95278,7 @@ index 5f2ce61..85a0b1b 100644
  	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
  	select KALLSYMS
  	select KALLSYMS_ALL
-@@ -1469,7 +1470,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
+@@ -1483,7 +1484,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
@@ -95215,7 +95287,7 @@ index 5f2ce61..85a0b1b 100644
  	help
  	  Enabling this option turns a certain set of sanity checks for user
  	  copy operations into compile time failures.
-@@ -1597,7 +1598,7 @@ endmenu # runtime tests
+@@ -1614,7 +1615,7 @@ endmenu # runtime tests
  
  config PROVIDE_OHCI1394_DMA_INIT
  	bool "Remote debugging over FireWire early on boot"
@@ -95225,10 +95297,10 @@ index 5f2ce61..85a0b1b 100644
  	  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
 diff --git a/lib/Makefile b/lib/Makefile
-index 3c3b30b..ca29102 100644
+index 58f74d2..08e011f 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -55,7 +55,7 @@ obj-$(CONFIG_BTREE) += btree.o
+@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
  obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
  obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
  obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
@@ -95251,10 +95323,10 @@ index 114d1be..ab0350c 100644
  			(val << avg->factor)) >> avg->weight :
  		(val << avg->factor);
 diff --git a/lib/bitmap.c b/lib/bitmap.c
-index 324ea9e..46b1ae2 100644
+index d456f4c1..29a0308 100644
 --- a/lib/bitmap.c
 +++ b/lib/bitmap.c
-@@ -271,7 +271,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
+@@ -264,7 +264,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
  }
  EXPORT_SYMBOL(__bitmap_subset);
  
@@ -95263,7 +95335,7 @@ index 324ea9e..46b1ae2 100644
  {
  	unsigned int k, lim = bits/BITS_PER_LONG;
  	int w = 0;
-@@ -437,7 +437,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
+@@ -391,7 +391,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
  {
  	int c, old_c, totaldigits, ndigits, nchunks, nbits;
  	u32 chunk;
@@ -95272,7 +95344,7 @@ index 324ea9e..46b1ae2 100644
  
  	bitmap_zero(maskp, nmaskbits);
  
-@@ -522,7 +522,7 @@ int bitmap_parse_user(const char __user *ubuf,
+@@ -476,7 +476,7 @@ int bitmap_parse_user(const char __user *ubuf,
  {
  	if (!access_ok(VERIFY_READ, ubuf, ulen))
  		return -EFAULT;
@@ -95281,7 +95353,7 @@ index 324ea9e..46b1ae2 100644
  				ulen, 1, maskp, nmaskbits);
  
  }
-@@ -640,7 +640,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
+@@ -535,7 +535,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
  {
  	unsigned a, b;
  	int c, old_c, totaldigits;
@@ -95290,7 +95362,7 @@ index 324ea9e..46b1ae2 100644
  	int exp_digit, in_range;
  
  	totaldigits = c = 0;
-@@ -735,7 +735,7 @@ int bitmap_parselist_user(const char __user *ubuf,
+@@ -630,7 +630,7 @@ int bitmap_parselist_user(const char __user *ubuf,
  {
  	if (!access_ok(VERIFY_READ, ubuf, ulen))
  		return -EFAULT;
@@ -95656,7 +95728,7 @@ index c24c2f7..f0296f4 100644
 +}
 +EXPORT_SYMBOL(pax_list_del_rcu);
 diff --git a/lib/lockref.c b/lib/lockref.c
-index d2233de..fa1a2f6 100644
+index ecb9a66..a044fc5 100644
 --- a/lib/lockref.c
 +++ b/lib/lockref.c
 @@ -48,13 +48,13 @@
@@ -95675,94 +95747,131 @@ index d2233de..fa1a2f6 100644
  	spin_unlock(&lockref->lock);
  }
  EXPORT_SYMBOL(lockref_get);
-@@ -69,7 +69,7 @@ int lockref_get_not_zero(struct lockref *lockref)
+@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
  	int retval;
  
  	CMPXCHG_LOOP(
 -		new.count++;
+-		if (old.count <= 0)
 +		__lockref_inc(&new);
- 		if (!old.count)
++		if (__lockref_read(&old) <= 0)
  			return 0;
  	,
-@@ -79,7 +79,7 @@ int lockref_get_not_zero(struct lockref *lockref)
+ 		return 1;
+@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
+ 
  	spin_lock(&lockref->lock);
  	retval = 0;
- 	if (lockref->count) {
+-	if (lockref->count > 0) {
 -		lockref->count++;
++	if (__lockref_read(lockref) > 0) {
 +		__lockref_inc(lockref);
  		retval = 1;
  	}
  	spin_unlock(&lockref->lock);
-@@ -96,7 +96,7 @@ EXPORT_SYMBOL(lockref_get_not_zero);
+@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
  int lockref_get_or_lock(struct lockref *lockref)
  {
  	CMPXCHG_LOOP(
 -		new.count++;
+-		if (old.count <= 0)
 +		__lockref_inc(&new);
- 		if (!old.count)
++		if (__lockref_read(&old) <= 0)
  			break;
  	,
-@@ -106,7 +106,7 @@ int lockref_get_or_lock(struct lockref *lockref)
+ 		return 1;
+ 	);
+ 
  	spin_lock(&lockref->lock);
- 	if (!lockref->count)
+-	if (lockref->count <= 0)
++	if (__lockref_read(lockref) <= 0)
  		return 0;
 -	lockref->count++;
 +	__lockref_inc(lockref);
  	spin_unlock(&lockref->lock);
  	return 1;
  }
-@@ -120,7 +120,7 @@ EXPORT_SYMBOL(lockref_get_or_lock);
+@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
+ int lockref_put_return(struct lockref *lockref)
+ {
+ 	CMPXCHG_LOOP(
+-		new.count--;
+-		if (old.count <= 0)
++		__lockref_dec(&new);
++		if (__lockref_read(&old) <= 0)
+ 			return -1;
+ 	,
+-		return new.count;
++		return __lockref_read(&new);
+ 	);
+ 	return -1;
+ }
+@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
  int lockref_put_or_lock(struct lockref *lockref)
  {
  	CMPXCHG_LOOP(
 -		new.count--;
+-		if (old.count <= 1)
 +		__lockref_dec(&new);
- 		if (old.count <= 1)
++		if (__lockref_read(&old) <= 1)
  			break;
  	,
-@@ -130,7 +130,7 @@ int lockref_put_or_lock(struct lockref *lockref)
+ 		return 1;
+ 	);
+ 
  	spin_lock(&lockref->lock);
- 	if (lockref->count <= 1)
+-	if (lockref->count <= 1)
++	if (__lockref_read(lockref) <= 1)
  		return 0;
 -	lockref->count--;
 +	__lockref_dec(lockref);
  	spin_unlock(&lockref->lock);
  	return 1;
  }
-@@ -157,7 +157,7 @@ int lockref_get_not_dead(struct lockref *lockref)
+@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
+ void lockref_mark_dead(struct lockref *lockref)
+ {
+ 	assert_spin_locked(&lockref->lock);
+-	lockref->count = -128;
++	__lockref_set(lockref, -128);
+ }
+ EXPORT_SYMBOL(lockref_mark_dead);
+ 
+@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
  	int retval;
  
  	CMPXCHG_LOOP(
 -		new.count++;
+-		if (old.count < 0)
 +		__lockref_inc(&new);
- 		if ((int)old.count < 0)
++		if (__lockref_read(&old) < 0)
  			return 0;
  	,
-@@ -167,7 +167,7 @@ int lockref_get_not_dead(struct lockref *lockref)
+ 		return 1;
+@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
+ 
  	spin_lock(&lockref->lock);
  	retval = 0;
- 	if ((int) lockref->count >= 0) {
+-	if (lockref->count >= 0) {
 -		lockref->count++;
++	if (__lockref_read(lockref) >= 0) {
 +		__lockref_inc(lockref);
  		retval = 1;
  	}
  	spin_unlock(&lockref->lock);
 diff --git a/lib/nlattr.c b/lib/nlattr.c
-index 9c3e85f..0affd1b 100644
+index f5907d2..36072be 100644
 --- a/lib/nlattr.c
 +++ b/lib/nlattr.c
-@@ -279,7 +279,11 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
+@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
  {
  	int minlen = min_t(int, count, nla_len(src));
  
 +	BUG_ON(minlen < 0);
 +
  	memcpy(dest, nla_data(src), minlen);
-+	if (count > minlen)
-+		memset(dest + minlen, 0, count - minlen);
- 
- 	return minlen;
- }
+ 	if (count > minlen)
+ 		memset(dest + minlen, 0, count - minlen);
 diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
 index 6111bcb..02e816b 100644
 --- a/lib/percpu-refcount.c
@@ -95777,7 +95886,7 @@ index 6111bcb..02e816b 100644
  static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
  
 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
-index 3291a8e..346a91e 100644
+index 3d2aa27..a472f20 100644
 --- a/lib/radix-tree.c
 +++ b/lib/radix-tree.c
 @@ -67,7 +67,7 @@ struct radix_tree_preload {
@@ -95818,10 +95927,10 @@ index c16c81a..4dcbda1 100644
  
  void rb_insert_color(struct rb_node *node, struct rb_root *root)
 diff --git a/lib/show_mem.c b/lib/show_mem.c
-index 7de89f4..00d70b7 100644
+index adc98e18..0ce83c2 100644
 --- a/lib/show_mem.c
 +++ b/lib/show_mem.c
-@@ -50,6 +50,6 @@ void show_mem(unsigned int filter)
+@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
  		quicklist_total_size());
  #endif
  #ifdef CONFIG_MEMORY_FAILURE
@@ -95830,10 +95939,10 @@ index 7de89f4..00d70b7 100644
  #endif
  }
 diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
-index bb2b201..46abaf9 100644
+index e0af6ff..fcc9f15 100644
 --- a/lib/strncpy_from_user.c
 +++ b/lib/strncpy_from_user.c
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@
   */
  static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
  {
@@ -95883,7 +95992,7 @@ index 4f5b1dd..7cab418 100644
 +}
 +EXPORT_SYMBOL(copy_to_user_overflow);
 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index ec337f6..8484eb2 100644
+index b235c96..343ffc1 100644
 --- a/lib/vsprintf.c
 +++ b/lib/vsprintf.c
 @@ -16,6 +16,9 @@
@@ -95896,7 +96005,7 @@ index ec337f6..8484eb2 100644
  #include <stdarg.h>
  #include <linux/module.h>	/* for KSYM_SYMBOL_LEN */
  #include <linux/types.h>
-@@ -625,7 +628,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
+@@ -626,7 +629,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
  #ifdef CONFIG_KALLSYMS
  	if (*fmt == 'B')
  		sprint_backtrace(sym, value);
@@ -95905,7 +96014,7 @@ index ec337f6..8484eb2 100644
  		sprint_symbol(sym, value);
  	else
  		sprint_symbol_no_offset(sym, value);
-@@ -1240,7 +1243,11 @@ char *address_val(char *buf, char *end, const void *addr,
+@@ -1322,7 +1325,11 @@ char *address_val(char *buf, char *end, const void *addr,
  	return number(buf, end, num, spec);
  }
  
@@ -95917,7 +96026,7 @@ index ec337f6..8484eb2 100644
  
  /*
   * Show a '%p' thing.  A kernel extension is that the '%p' is followed
-@@ -1251,8 +1258,10 @@ int kptr_restrict __read_mostly;
+@@ -1333,8 +1340,10 @@ int kptr_restrict __read_mostly;
   *
   * - 'F' For symbolic function descriptor pointers with offset
   * - 'f' For simple symbolic function names without offset
@@ -95928,7 +96037,7 @@ index ec337f6..8484eb2 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]
-@@ -1331,12 +1340,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1417,12 +1426,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
  
  	if (!ptr && *fmt != 'K') {
  		/*
@@ -95943,7 +96052,7 @@ index ec337f6..8484eb2 100644
  	}
  
  	switch (*fmt) {
-@@ -1346,6 +1355,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1432,6 +1441,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
  		/* Fallthrough */
  	case 'S':
  	case 's':
@@ -95958,7 +96067,7 @@ index ec337f6..8484eb2 100644
  	case 'B':
  		return symbol_string(buf, end, ptr, spec, fmt);
  	case 'R':
-@@ -1403,6 +1420,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1496,6 +1513,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
  			va_end(va);
  			return buf;
  		}
@@ -95967,7 +96076,7 @@ index ec337f6..8484eb2 100644
  	case 'K':
  		/*
  		 * %pK cannot be used in IRQ context because its test
-@@ -1460,6 +1479,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -1553,6 +1572,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
  				   ((const struct file *)ptr)->f_path.dentry,
  				   spec, fmt);
  	}
@@ -95990,7 +96099,7 @@ index ec337f6..8484eb2 100644
  	spec.flags |= SMALL;
  	if (spec.field_width == -1) {
  		spec.field_width = default_width;
-@@ -2160,11 +2195,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
+@@ -2254,11 +2289,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));			\
@@ -96005,7 +96114,7 @@ index ec337f6..8484eb2 100644
  	}								\
  	args += sizeof(type);						\
  	value;								\
-@@ -2227,7 +2262,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
+@@ -2321,7 +2356,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;
@@ -96022,10 +96131,10 @@ index 0000000..7cd6065
 @@ -0,0 +1 @@
 +-grsec
 diff --git a/mm/Kconfig b/mm/Kconfig
-index 1d1ae6b..0f05885 100644
+index a03131b..1b1bafb 100644
 --- a/mm/Kconfig
 +++ b/mm/Kconfig
-@@ -341,10 +341,11 @@ config KSM
+@@ -342,10 +342,11 @@ config KSM
  	  root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
  
  config DEFAULT_MMAP_MIN_ADDR
@@ -96040,7 +96149,7 @@ index 1d1ae6b..0f05885 100644
  	  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.
-@@ -375,7 +376,7 @@ config MEMORY_FAILURE
+@@ -376,7 +377,7 @@ config MEMORY_FAILURE
  
  config HWPOISON_INJECT
  	tristate "HWPoison pages injector"
@@ -96062,7 +96171,7 @@ index 957d3da..1d34e20 100644
  	depends on !KMEMCHECK
  	select PAGE_EXTENSION
 diff --git a/mm/backing-dev.c b/mm/backing-dev.c
-index 0ae0df5..82ac56b 100644
+index 6dc4580..e031ec1 100644
 --- a/mm/backing-dev.c
 +++ b/mm/backing-dev.c
 @@ -12,7 +12,7 @@
@@ -96072,9 +96181,9 @@ index 0ae0df5..82ac56b 100644
 -static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
 +static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
  
- struct backing_dev_info default_backing_dev_info = {
- 	.name		= "default",
-@@ -525,7 +525,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
+ struct backing_dev_info noop_backing_dev_info = {
+ 	.name		= "noop",
+@@ -474,7 +474,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
  		return err;
  
  	err = bdi_register(bdi, NULL, "%.28s-%ld", name,
@@ -96084,7 +96193,7 @@ index 0ae0df5..82ac56b 100644
  		bdi_destroy(bdi);
  		return err;
 diff --git a/mm/filemap.c b/mm/filemap.c
-index 673e458..7192013 100644
+index ad72420..0a20ef2 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
 @@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
@@ -96104,24 +96213,8 @@ index 673e458..7192013 100644
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff --git a/mm/fremap.c b/mm/fremap.c
-index 2805d71..8b56e7d 100644
---- a/mm/fremap.c
-+++ b/mm/fremap.c
-@@ -180,6 +180,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
-  retry:
- 	vma = find_vma(mm, start);
- 
-+#ifdef CONFIG_PAX_SEGMEXEC
-+	if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
-+		goto out;
-+#endif
-+
- 	/*
- 	 * Make sure the vma is shared, that it supports prefaulting,
- 	 * and that the remapped range is valid and fully within
 diff --git a/mm/gup.c b/mm/gup.c
-index e29c374..66e998f 100644
+index a6e24e2..72dd2cf 100644
 --- a/mm/gup.c
 +++ b/mm/gup.c
 @@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
@@ -96200,10 +96293,10 @@ index 123bcd3..0de52ba 100644
  	set_page_address(page, (void *)vaddr);
  
 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
-index a2bfd02..2126298 100644
+index c41b2a0..100cf92 100644
 --- a/mm/hugetlb.c
 +++ b/mm/hugetlb.c
-@@ -2258,6 +2258,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
+@@ -2260,6 +2260,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
  			 struct ctl_table *table, int write,
  			 void __user *buffer, size_t *length, loff_t *ppos)
  {
@@ -96211,7 +96304,7 @@ index a2bfd02..2126298 100644
  	struct hstate *h = &default_hstate;
  	unsigned long tmp = h->max_huge_pages;
  	int ret;
-@@ -2265,9 +2266,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
+@@ -2267,9 +2268,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
  	if (!hugepages_supported())
  		return -ENOTSUPP;
  
@@ -96225,7 +96318,7 @@ index a2bfd02..2126298 100644
  	if (ret)
  		goto out;
  
-@@ -2302,6 +2304,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
+@@ -2304,6 +2306,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
  	struct hstate *h = &default_hstate;
  	unsigned long tmp;
  	int ret;
@@ -96233,7 +96326,7 @@ index a2bfd02..2126298 100644
  
  	if (!hugepages_supported())
  		return -ENOTSUPP;
-@@ -2311,9 +2314,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
+@@ -2313,9 +2316,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
  	if (write && hstate_is_gigantic(h))
  		return -EINVAL;
  
@@ -96247,7 +96340,7 @@ index a2bfd02..2126298 100644
  	if (ret)
  		goto out;
  
-@@ -2798,6 +2802,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2800,6 +2804,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
  	i_mmap_unlock_write(mapping);
  }
  
@@ -96275,7 +96368,7 @@ index a2bfd02..2126298 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
-@@ -2910,6 +2935,11 @@ retry_avoidcopy:
+@@ -2912,6 +2937,11 @@ retry_avoidcopy:
  				make_huge_pte(vma, new_page, 1));
  		page_remove_rmap(old_page);
  		hugepage_add_new_anon_rmap(new_page, vma, address);
@@ -96287,7 +96380,7 @@ index a2bfd02..2126298 100644
  		/* Make the old page be freed below */
  		new_page = old_page;
  	}
-@@ -3070,6 +3100,10 @@ retry:
+@@ -3072,6 +3102,10 @@ retry:
  				&& (vma->vm_flags & VM_SHARED)));
  	set_huge_pte_at(mm, address, ptep, new_pte);
  
@@ -96298,7 +96391,7 @@ index a2bfd02..2126298 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, ptl);
-@@ -3137,6 +3171,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3139,6 +3173,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  	struct address_space *mapping;
  	int need_wait_lock = 0;
  
@@ -96309,7 +96402,7 @@ index a2bfd02..2126298 100644
  	address &= huge_page_mask(h);
  
  	ptep = huge_pte_offset(mm, address);
-@@ -3150,6 +3188,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3152,6 +3190,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  				VM_FAULT_SET_HINDEX(hstate_index(h));
  	}
  
@@ -96337,10 +96430,10 @@ index a2bfd02..2126298 100644
  	if (!ptep)
  		return VM_FAULT_OOM;
 diff --git a/mm/internal.h b/mm/internal.h
-index efad241..57ae4ca 100644
+index a96da5b..42ebd54 100644
 --- a/mm/internal.h
 +++ b/mm/internal.h
-@@ -134,6 +134,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
+@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
  
  extern int __isolate_free_page(struct page *page, unsigned int order);
  extern void __free_pages_bootmem(struct page *page, unsigned int order);
@@ -96348,7 +96441,7 @@ index efad241..57ae4ca 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);
-@@ -387,7 +388,7 @@ extern u32 hwpoison_filter_enable;
+@@ -411,7 +412,7 @@ extern u32 hwpoison_filter_enable;
  
  extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
          unsigned long, unsigned long,
@@ -96358,10 +96451,10 @@ index efad241..57ae4ca 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 3cda50c..032ba634 100644
+index 5405aff..483406d 100644
 --- a/mm/kmemleak.c
 +++ b/mm/kmemleak.c
-@@ -364,7 +364,7 @@ static void print_unreferenced(struct seq_file *seq,
+@@ -365,7 +365,7 @@ static void print_unreferenced(struct seq_file *seq,
  
  	for (i = 0; i < object->trace_len; i++) {
  		void *ptr = (void *)object->trace[i];
@@ -96370,7 +96463,7 @@ index 3cda50c..032ba634 100644
  	}
  }
  
-@@ -1905,7 +1905,7 @@ static int __init kmemleak_late_init(void)
+@@ -1911,7 +1911,7 @@ static int __init kmemleak_late_init(void)
  		return -ENOMEM;
  	}
  
@@ -96402,7 +96495,7 @@ index d53adf9..03a24bf 100644
  	set_fs(old_fs);
  
 diff --git a/mm/madvise.c b/mm/madvise.c
-index a271adc..5e1a2b4 100644
+index d551475..8fdd7f3 100644
 --- a/mm/madvise.c
 +++ b/mm/madvise.c
 @@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
@@ -96430,7 +96523,7 @@ index a271adc..5e1a2b4 100644
  	vma->vm_flags = new_flags;
  
  out:
-@@ -274,6 +285,11 @@ static long madvise_dontneed(struct vm_area_struct *vma,
+@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
  			     struct vm_area_struct **prev,
  			     unsigned long start, unsigned long end)
  {
@@ -96442,29 +96535,23 @@ index a271adc..5e1a2b4 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,
- 		zap_page_range(vma, start, end - start, &details);
- 	} else
- 		zap_page_range(vma, start, end - start, NULL);
+ 
+ 	zap_page_range(vma, start, end - start, NULL);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	vma_m = pax_find_mirror_vma(vma);
 +	if (vma_m) {
-+		if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
-+			struct zap_details details = {
-+				.nonlinear_vma = vma_m,
-+				.last_index = ULONG_MAX,
-+			};
-+			zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, &details);
-+		} else
-+			zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
++		if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
++			return -EINVAL;
++
++		zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
 +	}
 +#endif
 +
  	return 0;
  }
  
-@@ -488,6 +519,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
+@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
  	if (end < start)
  		return error;
  
@@ -96482,7 +96569,7 @@ index a271adc..5e1a2b4 100644
  	if (end == start)
  		return error;
 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
-index 20c29dd..22bd8e2 100644
+index d487f8d..39ebbf6 100644
 --- a/mm/memory-failure.c
 +++ b/mm/memory-failure.c
 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
@@ -96503,7 +96590,7 @@ index 20c29dd..22bd8e2 100644
  #ifdef __ARCH_SI_TRAPNO
  	si.si_trapno = trapno;
  #endif
-@@ -786,7 +786,7 @@ static struct page_state {
+@@ -779,7 +779,7 @@ static struct page_state {
  	unsigned long res;
  	char *msg;
  	int (*action)(struct page *p, unsigned long pfn);
@@ -96512,7 +96599,7 @@ index 20c29dd..22bd8e2 100644
  	{ reserved,	reserved,	"reserved kernel",	me_kernel },
  	/*
  	 * free pages are specially detected outside this table:
-@@ -1094,7 +1094,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1087,7 +1087,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;
@@ -96521,7 +96608,7 @@ index 20c29dd..22bd8e2 100644
  
  	/*
  	 * We need/can do nothing about count=0 pages.
-@@ -1123,7 +1123,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1116,7 +1116,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
  			if (PageHWPoison(hpage)) {
  				if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
  				    || (p != hpage && TestSetPageHWPoison(hpage))) {
@@ -96530,7 +96617,7 @@ index 20c29dd..22bd8e2 100644
  					unlock_page(hpage);
  					return 0;
  				}
-@@ -1191,14 +1191,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
+@@ -1184,14 +1184,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
  	 */
  	if (!PageHWPoison(p)) {
  		printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
@@ -96547,7 +96634,7 @@ index 20c29dd..22bd8e2 100644
  		unlock_page(hpage);
  		put_page(hpage);
  		return 0;
-@@ -1428,7 +1428,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1421,7 +1421,7 @@ int unpoison_memory(unsigned long pfn)
  			return 0;
  		}
  		if (TestClearPageHWPoison(p))
@@ -96556,7 +96643,7 @@ index 20c29dd..22bd8e2 100644
  		pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
  		return 0;
  	}
-@@ -1442,7 +1442,7 @@ int unpoison_memory(unsigned long pfn)
+@@ -1435,7 +1435,7 @@ int unpoison_memory(unsigned long pfn)
  	 */
  	if (TestClearPageHWPoison(page)) {
  		pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
@@ -96565,7 +96652,7 @@ index 20c29dd..22bd8e2 100644
  		freeit = 1;
  		if (PageHuge(page))
  			clear_page_hwpoison_huge_page(page);
-@@ -1567,11 +1567,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
+@@ -1560,11 +1560,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
  		if (PageHuge(page)) {
  			set_page_hwpoison_huge_page(hpage);
  			dequeue_hwpoisoned_huge_page(hpage);
@@ -96579,7 +96666,7 @@ index 20c29dd..22bd8e2 100644
  		}
  	}
  	return ret;
-@@ -1610,7 +1610,7 @@ static int __soft_offline_page(struct page *page, int flags)
+@@ -1603,7 +1603,7 @@ static int __soft_offline_page(struct page *page, int flags)
  		put_page(page);
  		pr_info("soft_offline: %#lx: invalidated\n", pfn);
  		SetPageHWPoison(page);
@@ -96588,7 +96675,7 @@ index 20c29dd..22bd8e2 100644
  		return 0;
  	}
  
-@@ -1659,7 +1659,7 @@ static int __soft_offline_page(struct page *page, int flags)
+@@ -1652,7 +1652,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);
@@ -96597,7 +96684,7 @@ index 20c29dd..22bd8e2 100644
  		}
  	} else {
  		pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
-@@ -1729,11 +1729,11 @@ int soft_offline_page(struct page *page, int flags)
+@@ -1722,11 +1722,11 @@ int soft_offline_page(struct page *page, int flags)
  		if (PageHuge(page)) {
  			set_page_hwpoison_huge_page(hpage);
  			dequeue_hwpoisoned_huge_page(hpage);
@@ -96612,7 +96699,7 @@ index 20c29dd..22bd8e2 100644
  	}
  	unset_migratetype_isolate(page, MIGRATE_MOVABLE);
 diff --git a/mm/memory.c b/mm/memory.c
-index 6aa7822..3c76005 100644
+index 97839f5..4bc5530 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
 @@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
@@ -96623,16 +96710,15 @@ index 6aa7822..3c76005 100644
  	start &= PUD_MASK;
  	if (start < floor)
  		return;
-@@ -428,6 +429,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
- 	pmd = pmd_offset(pud, start);
+@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
  	pud_clear(pud);
  	pmd_free_tlb(tlb, pmd, start);
+ 	mm_dec_nr_pmds(tlb->mm);
 +#endif
-+
  }
  
  static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
-@@ -447,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -448,6 +450,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);
  
@@ -96640,7 +96726,7 @@ index 6aa7822..3c76005 100644
  	start &= PGDIR_MASK;
  	if (start < floor)
  		return;
-@@ -461,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -462,6 +465,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);
@@ -96649,7 +96735,7 @@ index 6aa7822..3c76005 100644
  }
  
  /*
-@@ -690,10 +696,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
+@@ -691,10 +696,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
  	 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
  	 */
  	if (vma->vm_ops)
@@ -96662,7 +96748,7 @@ index 6aa7822..3c76005 100644
  		       vma->vm_file->f_op->mmap);
  	dump_stack();
  	add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
-@@ -1488,6 +1494,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
+@@ -1464,6 +1469,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));
  
@@ -96673,7 +96759,7 @@ index 6aa7822..3c76005 100644
  	retval = 0;
  	pte_unmap_unlock(pte, ptl);
  	return retval;
-@@ -1532,9 +1542,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
+@@ -1508,9 +1517,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)) {
@@ -96695,7 +96781,7 @@ index 6aa7822..3c76005 100644
  	}
  	return insert_page(vma, addr, page, vma->vm_page_prot);
  }
-@@ -1617,6 +1639,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
+@@ -1593,6 +1614,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
  			unsigned long pfn)
  {
  	BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
@@ -96703,7 +96789,7 @@ index 6aa7822..3c76005 100644
  
  	if (addr < vma->vm_start || addr >= vma->vm_end)
  		return -EFAULT;
-@@ -1864,7 +1887,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
+@@ -1840,7 +1862,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
  
  	BUG_ON(pud_huge(*pud));
  
@@ -96714,7 +96800,7 @@ index 6aa7822..3c76005 100644
  	if (!pmd)
  		return -ENOMEM;
  	do {
-@@ -1884,7 +1909,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
+@@ -1860,7 +1884,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
  	unsigned long next;
  	int err;
  
@@ -96725,7 +96811,7 @@ index 6aa7822..3c76005 100644
  	if (!pud)
  		return -ENOMEM;
  	do {
-@@ -2006,6 +2033,186 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
+@@ -1982,6 +2008,185 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
  	return ret;
  }
  
@@ -96740,7 +96826,6 @@ index 6aa7822..3c76005 100644
 +	entry = *pte;
 +	if (!pte_present(entry)) {
 +		if (!pte_none(entry)) {
-+			BUG_ON(pte_file(entry));
 +			free_swap_and_cache(pte_to_swp_entry(entry));
 +			pte_clear_not_present_full(mm, address, pte, 0);
 +		}
@@ -96912,7 +96997,7 @@ index 6aa7822..3c76005 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
-@@ -2212,6 +2419,12 @@ gotten:
+@@ -2172,6 +2377,12 @@ gotten:
  	 */
  	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
  	if (likely(pte_same(*page_table, orig_pte))) {
@@ -96925,7 +97010,7 @@ index 6aa7822..3c76005 100644
  		if (old_page) {
  			if (!PageAnon(old_page)) {
  				dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2265,6 +2478,10 @@ gotten:
+@@ -2225,6 +2436,10 @@ gotten:
  			page_remove_rmap(old_page);
  		}
  
@@ -96936,7 +97021,7 @@ index 6aa7822..3c76005 100644
  		/* Free the old page.. */
  		new_page = old_page;
  		ret |= VM_FAULT_WRITE;
-@@ -2539,6 +2756,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2483,6 +2698,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);
@@ -96948,7 +97033,7 @@ index 6aa7822..3c76005 100644
  	unlock_page(page);
  	if (page != swapcache) {
  		/*
-@@ -2562,6 +2784,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2506,6 +2726,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);
@@ -96960,7 +97045,7 @@ index 6aa7822..3c76005 100644
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  out:
-@@ -2581,40 +2808,6 @@ out_release:
+@@ -2525,40 +2750,6 @@ out_release:
  }
  
  /*
@@ -97001,7 +97086,7 @@ index 6aa7822..3c76005 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.
-@@ -2624,27 +2817,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2568,27 +2759,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
  		unsigned int flags)
  {
  	struct mem_cgroup *memcg;
@@ -97034,7 +97119,7 @@ index 6aa7822..3c76005 100644
  	if (unlikely(anon_vma_prepare(vma)))
  		goto oom;
  	page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -2668,6 +2857,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2612,6 +2799,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
  	if (!pte_none(*page_table))
  		goto release;
  
@@ -97046,7 +97131,7 @@ index 6aa7822..3c76005 100644
  	inc_mm_counter_fast(mm, MM_ANONPAGES);
  	page_add_new_anon_rmap(page, vma, address);
  	mem_cgroup_commit_charge(page, memcg, false);
-@@ -2677,6 +2871,12 @@ setpte:
+@@ -2621,6 +2813,12 @@ setpte:
  
  	/* No need to invalidate - it was non-present before */
  	update_mmu_cache(vma, address, page_table);
@@ -97059,7 +97144,7 @@ index 6aa7822..3c76005 100644
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  	return 0;
-@@ -2907,6 +3107,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2853,6 +3051,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  		return ret;
  	}
  	do_set_pte(vma, address, fault_page, pte, false, false);
@@ -97071,8 +97156,8 @@ index 6aa7822..3c76005 100644
  	unlock_page(fault_page);
  unlock_out:
  	pte_unmap_unlock(pte, ptl);
-@@ -2949,7 +3154,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
- 		page_cache_release(fault_page);
+@@ -2904,7 +3107,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+ 		}
  		goto uncharge_out;
  	}
 +
@@ -97090,7 +97175,7 @@ index 6aa7822..3c76005 100644
  	mem_cgroup_commit_charge(new_page, memcg, false);
  	lru_cache_add_active_or_unevictable(new_page, vma);
  	pte_unmap_unlock(pte, ptl);
-@@ -2999,6 +3215,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2962,6 +3176,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  		return ret;
  	}
  	do_set_pte(vma, address, fault_page, pte, true, false);
@@ -97102,7 +97187,7 @@ index 6aa7822..3c76005 100644
  	pte_unmap_unlock(pte, ptl);
  
  	if (set_page_dirty(fault_page))
-@@ -3255,6 +3476,12 @@ static int handle_pte_fault(struct mm_struct *mm,
+@@ -3185,6 +3404,12 @@ static int handle_pte_fault(struct mm_struct *mm,
  		if (flags & FAULT_FLAG_WRITE)
  			flush_tlb_fix_spurious_fault(vma, address);
  	}
@@ -97115,7 +97200,7 @@ index 6aa7822..3c76005 100644
  unlock:
  	pte_unmap_unlock(pte, ptl);
  	return 0;
-@@ -3274,9 +3501,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3204,9 +3429,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
  	pmd_t *pmd;
  	pte_t *pte;
  
@@ -97157,7 +97242,7 @@ index 6aa7822..3c76005 100644
  	pgd = pgd_offset(mm, address);
  	pud = pud_alloc(mm, pgd, address);
  	if (!pud)
-@@ -3411,6 +3670,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
+@@ -3341,6 +3598,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
  	spin_unlock(&mm->page_table_lock);
  	return 0;
  }
@@ -97181,7 +97266,7 @@ index 6aa7822..3c76005 100644
  #endif /* __PAGETABLE_PUD_FOLDED */
  
  #ifndef __PAGETABLE_PMD_FOLDED
-@@ -3441,6 +3717,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
+@@ -3373,6 +3647,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
  	spin_unlock(&mm->page_table_lock);
  	return 0;
  }
@@ -97196,15 +97281,17 @@ index 6aa7822..3c76005 100644
 +
 +	spin_lock(&mm->page_table_lock);
 +#ifndef __ARCH_HAS_4LEVEL_HACK
-+	if (pud_present(*pud))		/* Another has populated it */
-+		pmd_free(mm, new);
-+	else
++	if (!pud_present(*pud)) {
++		mm_inc_nr_pmds(mm);
 +		pud_populate_kernel(mm, pud, new);
-+#else
-+	if (pgd_present(*pud))		/* Another has populated it */
++	} else	/* Another has populated it */
 +		pmd_free(mm, new);
-+	else
++#else
++	if (!pgd_present(*pud)) {
++		mm_inc_nr_pmds(mm);
 +		pgd_populate_kernel(mm, pud, new);
++	} else /* Another has populated it */
++		pmd_free(mm, new);
 +#endif /* __ARCH_HAS_4LEVEL_HACK */
 +	spin_unlock(&mm->page_table_lock);
 +	return 0;
@@ -97212,7 +97299,7 @@ index 6aa7822..3c76005 100644
  #endif /* __PAGETABLE_PMD_FOLDED */
  
  static int __follow_pte(struct mm_struct *mm, unsigned long address,
-@@ -3550,8 +3850,8 @@ out:
+@@ -3482,8 +3782,8 @@ out:
  	return ret;
  }
  
@@ -97223,7 +97310,7 @@ index 6aa7822..3c76005 100644
  {
  	resource_size_t phys_addr;
  	unsigned long prot = 0;
-@@ -3577,8 +3877,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
+@@ -3509,8 +3809,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.
   */
@@ -97234,7 +97321,7 @@ index 6aa7822..3c76005 100644
  {
  	struct vm_area_struct *vma;
  	void *old_buf = buf;
-@@ -3586,7 +3886,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -3518,7 +3818,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) {
@@ -97243,7 +97330,7 @@ index 6aa7822..3c76005 100644
  		void *maddr;
  		struct page *page = NULL;
  
-@@ -3647,8 +3947,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -3579,8 +3879,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
   *
   * The caller must hold a reference on @mm.
   */
@@ -97254,7 +97341,7 @@ index 6aa7822..3c76005 100644
  {
  	return __access_remote_vm(NULL, mm, addr, buf, len, write);
  }
-@@ -3658,11 +3958,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
+@@ -3590,11 +3890,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
   */
@@ -97270,10 +97357,10 @@ index 6aa7822..3c76005 100644
  	mm = get_task_mm(tsk);
  	if (!mm)
 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
-index 0e0961b..c9143b9 100644
+index 4721046..6ae2056 100644
 --- a/mm/mempolicy.c
 +++ b/mm/mempolicy.c
-@@ -744,6 +744,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
  	unsigned long vmstart;
  	unsigned long vmend;
  
@@ -97284,7 +97371,7 @@ index 0e0961b..c9143b9 100644
  	vma = find_vma(mm, start);
  	if (!vma || vma->vm_start > start)
  		return -EFAULT;
-@@ -787,6 +791,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
  		err = vma_replace_policy(vma, new_pol);
  		if (err)
  			goto out;
@@ -97301,7 +97388,7 @@ index 0e0961b..c9143b9 100644
  	}
  
   out:
-@@ -1201,6 +1215,17 @@ static long do_mbind(unsigned long start, unsigned long len,
+@@ -1160,6 +1174,17 @@ static long do_mbind(unsigned long start, unsigned long len,
  
  	if (end < start)
  		return -EINVAL;
@@ -97319,7 +97406,7 @@ index 0e0961b..c9143b9 100644
  	if (end == start)
  		return 0;
  
-@@ -1426,8 +1451,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+@@ -1385,8 +1410,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) &&
@@ -97329,7 +97416,7 @@ index 0e0961b..c9143b9 100644
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out_put;
-@@ -1458,6 +1482,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+@@ -1417,6 +1441,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
  		goto out;
  	}
  
@@ -97346,10 +97433,10 @@ index 0e0961b..c9143b9 100644
  		capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
  
 diff --git a/mm/migrate.c b/mm/migrate.c
-index be6d1ed..d778cc1 100644
+index 85e0426..be49beb 100644
 --- a/mm/migrate.c
 +++ b/mm/migrate.c
-@@ -1504,8 +1504,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
+@@ -1472,8 +1472,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) &&
@@ -97360,7 +97447,7 @@ index be6d1ed..d778cc1 100644
  		err = -EPERM;
  		goto out;
 diff --git a/mm/mlock.c b/mm/mlock.c
-index 73cf098..ab547c7 100644
+index 8a54cd2..92f1747 100644
 --- a/mm/mlock.c
 +++ b/mm/mlock.c
 @@ -14,6 +14,7 @@
@@ -97434,8 +97521,21 @@ index 73cf098..ab547c7 100644
  	if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
  	    capable(CAP_IPC_LOCK))
  		ret = do_mlockall(flags);
+diff --git a/mm/mm_init.c b/mm/mm_init.c
+index 5f420f7..dd42fb1b 100644
+--- a/mm/mm_init.c
++++ b/mm/mm_init.c
+@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
+ 	return NOTIFY_OK;
+ }
+ 
+-static struct notifier_block compute_batch_nb __meminitdata = {
++static struct notifier_block compute_batch_nb __meminitconst = {
+ 	.notifier_call = mm_compute_batch_notifier,
+ 	.priority = IPC_CALLBACK_PRI, /* use lowest priority */
+ };
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 0bc66f1..2bfa432 100644
+index 9ec50a3..0476e2d 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -41,6 +41,7 @@
@@ -97500,7 +97600,7 @@ index 0bc66f1..2bfa432 100644
  /*
   * Make sure vm_committed_as in one cacheline and not cacheline shared with
   * other variables. It can be updated by several CPUs frequently.
-@@ -274,6 +295,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
  	struct vm_area_struct *next = vma->vm_next;
  
  	might_sleep();
@@ -97508,7 +97608,7 @@ index 0bc66f1..2bfa432 100644
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file)
-@@ -287,6 +309,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
+@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
  
  SYSCALL_DEFINE1(brk, unsigned long, brk)
  {
@@ -97516,7 +97616,7 @@ index 0bc66f1..2bfa432 100644
  	unsigned long retval;
  	unsigned long newbrk, oldbrk;
  	struct mm_struct *mm = current->mm;
-@@ -317,7 +340,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
  	 * segment grow beyond its set limit the in case where the limit is
  	 * not page aligned -Ram Gupta
  	 */
@@ -97531,7 +97631,7 @@ index 0bc66f1..2bfa432 100644
  			      mm->end_data, mm->start_data))
  		goto out;
  
-@@ -976,6 +1005,12 @@ static int
+@@ -967,6 +996,12 @@ static int
  can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
  	struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
  {
@@ -97544,7 +97644,7 @@ index 0bc66f1..2bfa432 100644
  	if (is_mergeable_vma(vma, file, vm_flags) &&
  	    is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
  		if (vma->vm_pgoff == vm_pgoff)
-@@ -995,6 +1030,12 @@ static int
+@@ -986,6 +1021,12 @@ static int
  can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
  	struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
  {
@@ -97557,7 +97657,7 @@ index 0bc66f1..2bfa432 100644
  	if (is_mergeable_vma(vma, file, vm_flags) &&
  	    is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
  		pgoff_t vm_pglen;
-@@ -1044,6 +1085,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  	struct vm_area_struct *area, *next;
  	int err;
  
@@ -97571,7 +97671,7 @@ index 0bc66f1..2bfa432 100644
  	/*
  	 * We later require that vma->vm_flags == vm_flags,
  	 * so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -1059,6 +1107,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  	if (next && next->vm_end == end)		/* cases 6, 7, 8 */
  		next = next->vm_next;
  
@@ -97587,7 +97687,7 @@ index 0bc66f1..2bfa432 100644
  	/*
  	 * Can it merge with the predecessor?
  	 */
-@@ -1078,9 +1135,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  							/* cases 1, 6 */
  			err = vma_adjust(prev, prev->vm_start,
  				next->vm_end, prev->vm_pgoff, NULL);
@@ -97613,7 +97713,7 @@ index 0bc66f1..2bfa432 100644
  		if (err)
  			return NULL;
  		khugepaged_enter_vma_merge(prev, vm_flags);
-@@ -1094,12 +1166,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
  			mpol_equal(policy, vma_policy(next)) &&
  			can_vma_merge_before(next, vm_flags,
  					anon_vma, file, pgoff+pglen)) {
@@ -97643,7 +97743,7 @@ index 0bc66f1..2bfa432 100644
  		if (err)
  			return NULL;
  		khugepaged_enter_vma_merge(area, vm_flags);
-@@ -1208,8 +1295,10 @@ none:
+@@ -1199,8 +1286,10 @@ none:
  void vm_stat_account(struct mm_struct *mm, unsigned long flags,
  						struct file *file, long pages)
  {
@@ -97656,7 +97756,7 @@ index 0bc66f1..2bfa432 100644
  
  	mm->total_vm += pages;
  
-@@ -1217,7 +1306,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
+@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
  		mm->shared_vm += pages;
  		if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
  			mm->exec_vm += pages;
@@ -97665,7 +97765,7 @@ index 0bc66f1..2bfa432 100644
  		mm->stack_vm += pages;
  }
  #endif /* CONFIG_PROC_FS */
-@@ -1247,6 +1336,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
+@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
  		locked += mm->locked_vm;
  		lock_limit = rlimit(RLIMIT_MEMLOCK);
  		lock_limit >>= PAGE_SHIFT;
@@ -97673,7 +97773,7 @@ index 0bc66f1..2bfa432 100644
  		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
  			return -EAGAIN;
  	}
-@@ -1273,7 +1363,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1264,7 +1354,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.)
  	 */
@@ -97682,7 +97782,7 @@ index 0bc66f1..2bfa432 100644
  		if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
  			prot |= PROT_EXEC;
  
-@@ -1299,7 +1389,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1290,7 +1380,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.
  	 */
@@ -97691,7 +97791,7 @@ index 0bc66f1..2bfa432 100644
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1310,6 +1400,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1301,6 +1391,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;
  
@@ -97735,7 +97835,7 @@ index 0bc66f1..2bfa432 100644
  	if (flags & MAP_LOCKED)
  		if (!can_do_mlock())
  			return -EPERM;
-@@ -1397,6 +1524,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
  			vm_flags |= VM_NORESERVE;
  	}
  
@@ -97745,7 +97845,7 @@ index 0bc66f1..2bfa432 100644
  	addr = mmap_region(file, addr, len, vm_flags, pgoff);
  	if (!IS_ERR_VALUE(addr) &&
  	    ((vm_flags & VM_LOCKED) ||
-@@ -1490,7 +1620,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
+@@ -1481,7 +1611,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 */
@@ -97754,7 +97854,7 @@ index 0bc66f1..2bfa432 100644
  		return 0;
  
  	/* The backer wishes to know when pages are first written to? */
-@@ -1541,7 +1671,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  	struct rb_node **rb_link, *rb_parent;
  	unsigned long charged = 0;
  
@@ -97777,7 +97877,7 @@ index 0bc66f1..2bfa432 100644
  	if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
  		unsigned long nr_pages;
  
-@@ -1560,11 +1705,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1551,11 +1696,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  
  	/* Clear old maps */
  	error = -ENOMEM;
@@ -97790,7 +97890,7 @@ index 0bc66f1..2bfa432 100644
  	}
  
  	/*
-@@ -1595,6 +1739,16 @@ munmap_back:
+@@ -1586,6 +1730,16 @@ munmap_back:
  		goto unacct_error;
  	}
  
@@ -97807,7 +97907,7 @@ index 0bc66f1..2bfa432 100644
  	vma->vm_mm = mm;
  	vma->vm_start = addr;
  	vma->vm_end = addr + len;
-@@ -1625,6 +1779,13 @@ munmap_back:
+@@ -1616,6 +1770,13 @@ munmap_back:
  		if (error)
  			goto unmap_and_free_vma;
  
@@ -97821,7 +97921,7 @@ index 0bc66f1..2bfa432 100644
  		/* Can addr have changed??
  		 *
  		 * Answer: Yes, several device drivers can do it in their
-@@ -1643,6 +1804,12 @@ munmap_back:
+@@ -1634,6 +1795,12 @@ munmap_back:
  	}
  
  	vma_link(mm, vma, prev, rb_link, rb_parent);
@@ -97834,7 +97934,7 @@ index 0bc66f1..2bfa432 100644
  	/* Once vma denies write, undo our temporary denial count */
  	if (file) {
  		if (vm_flags & VM_SHARED)
-@@ -1655,6 +1822,7 @@ out:
+@@ -1646,6 +1813,7 @@ out:
  	perf_event_mmap(vma);
  
  	vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
@@ -97842,7 +97942,7 @@ index 0bc66f1..2bfa432 100644
  	if (vm_flags & VM_LOCKED) {
  		if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
  					vma == get_gate_vma(current->mm)))
-@@ -1692,6 +1860,12 @@ allow_write_and_free_vma:
+@@ -1683,6 +1851,12 @@ allow_write_and_free_vma:
  	if (vm_flags & VM_DENYWRITE)
  		allow_write_access(file);
  free_vma:
@@ -97855,7 +97955,7 @@ index 0bc66f1..2bfa432 100644
  	kmem_cache_free(vm_area_cachep, vma);
  unacct_error:
  	if (charged)
-@@ -1699,7 +1873,63 @@ unacct_error:
+@@ -1690,7 +1864,63 @@ unacct_error:
  	return error;
  }
  
@@ -97920,7 +98020,7 @@ index 0bc66f1..2bfa432 100644
  {
  	/*
  	 * We implement the search by looking for an rbtree node that
-@@ -1747,11 +1977,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
+@@ -1738,11 +1968,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
  			}
  		}
  
@@ -97951,7 +98051,7 @@ index 0bc66f1..2bfa432 100644
  		if (gap_end >= low_limit && gap_end - gap_start >= length)
  			goto found;
  
-@@ -1801,7 +2049,7 @@ found:
+@@ -1792,7 +2040,7 @@ found:
  	return gap_start;
  }
  
@@ -97960,7 +98060,7 @@ index 0bc66f1..2bfa432 100644
  {
  	struct mm_struct *mm = current->mm;
  	struct vm_area_struct *vma;
-@@ -1855,6 +2103,24 @@ check_current:
+@@ -1846,6 +2094,24 @@ check_current:
  		gap_end = vma->vm_start;
  		if (gap_end < low_limit)
  			return -ENOMEM;
@@ -97985,7 +98085,7 @@ index 0bc66f1..2bfa432 100644
  		if (gap_start <= high_limit && gap_end - gap_start >= length)
  			goto found;
  
-@@ -1918,6 +2184,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1909,6 +2175,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;
@@ -97993,7 +98093,7 @@ index 0bc66f1..2bfa432 100644
  
  	if (len > TASK_SIZE - mmap_min_addr)
  		return -ENOMEM;
-@@ -1925,11 +2192,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1916,11 +2183,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -98010,7 +98110,7 @@ index 0bc66f1..2bfa432 100644
  			return addr;
  	}
  
-@@ -1938,6 +2209,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1929,6 +2200,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
  	info.low_limit = mm->mmap_base;
  	info.high_limit = TASK_SIZE;
  	info.align_mask = 0;
@@ -98018,7 +98118,7 @@ index 0bc66f1..2bfa432 100644
  	return vm_unmapped_area(&info);
  }
  #endif
-@@ -1956,6 +2228,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1947,6 +2219,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;
@@ -98026,7 +98126,7 @@ index 0bc66f1..2bfa432 100644
  
  	/* requested length too big for entire address space */
  	if (len > TASK_SIZE - mmap_min_addr)
-@@ -1964,12 +2237,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1955,12 +2228,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -98044,7 +98144,7 @@ index 0bc66f1..2bfa432 100644
  			return addr;
  	}
  
-@@ -1978,6 +2255,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1969,6 +2246,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;
@@ -98052,7 +98152,7 @@ index 0bc66f1..2bfa432 100644
  	addr = vm_unmapped_area(&info);
  
  	/*
-@@ -1990,6 +2268,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1981,6 +2259,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;
@@ -98065,7 +98165,7 @@ index 0bc66f1..2bfa432 100644
  		info.high_limit = TASK_SIZE;
  		addr = vm_unmapped_area(&info);
  	}
-@@ -2090,6 +2374,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
+@@ -2081,6 +2365,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
  	return vma;
  }
  
@@ -98094,7 +98194,7 @@ index 0bc66f1..2bfa432 100644
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -2107,8 +2413,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -2098,8 +2404,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
  
  	/* Stack limit test */
  	actual_size = size;
@@ -98104,7 +98204,7 @@ index 0bc66f1..2bfa432 100644
  	if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
  		return -ENOMEM;
  
-@@ -2119,6 +2424,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -2110,6 +2415,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;
@@ -98112,7 +98212,7 @@ index 0bc66f1..2bfa432 100644
  		if (locked > limit && !capable(CAP_IPC_LOCK))
  			return -ENOMEM;
  	}
-@@ -2148,37 +2454,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -2139,37 +2445,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.
   */
@@ -98170,7 +98270,7 @@ index 0bc66f1..2bfa432 100644
  		unsigned long size, grow;
  
  		size = address - vma->vm_start;
-@@ -2213,6 +2530,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
+@@ -2204,6 +2521,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
  			}
  		}
  	}
@@ -98179,7 +98279,7 @@ index 0bc66f1..2bfa432 100644
  	vma_unlock_anon_vma(vma);
  	khugepaged_enter_vma_merge(vma, vma->vm_flags);
  	validate_mm(vma->vm_mm);
-@@ -2227,6 +2546,8 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2218,6 +2537,8 @@ int expand_downwards(struct vm_area_struct *vma,
  				   unsigned long address)
  {
  	int error;
@@ -98188,7 +98288,7 @@ index 0bc66f1..2bfa432 100644
  
  	/*
  	 * We must make sure the anon_vma is allocated
-@@ -2240,6 +2561,15 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2231,6 +2552,15 @@ int expand_downwards(struct vm_area_struct *vma,
  	if (error)
  		return error;
  
@@ -98204,7 +98304,7 @@ index 0bc66f1..2bfa432 100644
  	vma_lock_anon_vma(vma);
  
  	/*
-@@ -2249,9 +2579,17 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2240,9 +2570,17 @@ int expand_downwards(struct vm_area_struct *vma,
  	 */
  
  	/* Somebody else might have raced and expanded it already */
@@ -98223,7 +98323,7 @@ index 0bc66f1..2bfa432 100644
  		size = vma->vm_end - address;
  		grow = (vma->vm_start - address) >> PAGE_SHIFT;
  
-@@ -2276,13 +2614,27 @@ int expand_downwards(struct vm_area_struct *vma,
+@@ -2267,13 +2605,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);
@@ -98251,7 +98351,7 @@ index 0bc66f1..2bfa432 100644
  	khugepaged_enter_vma_merge(vma, vma->vm_flags);
  	validate_mm(vma->vm_mm);
  	return error;
-@@ -2382,6 +2734,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -2373,6 +2725,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
  	do {
  		long nrpages = vma_pages(vma);
  
@@ -98265,7 +98365,7 @@ index 0bc66f1..2bfa432 100644
  		if (vma->vm_flags & VM_ACCOUNT)
  			nr_accounted += nrpages;
  		vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
-@@ -2426,6 +2785,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2417,6 +2776,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 {
@@ -98282,7 +98382,7 @@ index 0bc66f1..2bfa432 100644
  		vma_rb_erase(vma, &mm->mm_rb);
  		mm->map_count--;
  		tail_vma = vma;
-@@ -2453,14 +2822,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2444,14 +2813,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  	struct vm_area_struct *new;
  	int err = -ENOMEM;
  
@@ -98316,7 +98416,7 @@ index 0bc66f1..2bfa432 100644
  	/* most fields are the same, copy all, and then fixup */
  	*new = *vma;
  
-@@ -2473,6 +2861,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2464,6 +2852,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  		new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
  	}
  
@@ -98339,7 +98439,7 @@ index 0bc66f1..2bfa432 100644
  	err = vma_dup_policy(vma, new);
  	if (err)
  		goto out_free_vma;
-@@ -2493,6 +2897,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2484,6 +2888,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);
  
@@ -98378,7 +98478,7 @@ index 0bc66f1..2bfa432 100644
  	/* Success. */
  	if (!err)
  		return 0;
-@@ -2502,10 +2938,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2493,10 +2929,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);
@@ -98398,7 +98498,7 @@ index 0bc66f1..2bfa432 100644
  	kmem_cache_free(vm_area_cachep, new);
   out_err:
  	return err;
-@@ -2518,6 +2962,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2509,6 +2953,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)
  {
@@ -98414,7 +98514,7 @@ index 0bc66f1..2bfa432 100644
  	if (mm->map_count >= sysctl_max_map_count)
  		return -ENOMEM;
  
-@@ -2529,11 +2982,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2520,11 +2973,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
   * work.  This now handles partial unmappings.
   * Jeremy Fitzhardinge <jeremy@goop.org>
   */
@@ -98445,7 +98545,7 @@ index 0bc66f1..2bfa432 100644
  	if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
  		return -EINVAL;
  
-@@ -2611,6 +3083,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
+@@ -2602,6 +3074,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);
  
@@ -98454,7 +98554,7 @@ index 0bc66f1..2bfa432 100644
  	return 0;
  }
  
-@@ -2619,6 +3093,13 @@ int vm_munmap(unsigned long start, size_t len)
+@@ -2610,6 +3084,13 @@ int vm_munmap(unsigned long start, size_t len)
  	int ret;
  	struct mm_struct *mm = current->mm;
  
@@ -98468,8 +98568,20 @@ index 0bc66f1..2bfa432 100644
  	down_write(&mm->mmap_sem);
  	ret = do_munmap(mm, start, len);
  	up_write(&mm->mmap_sem);
-@@ -2632,16 +3113,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
- 	return vm_munmap(addr, len);
+@@ -2656,6 +3137,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+ 	down_write(&mm->mmap_sem);
+ 	vma = find_vma(mm, start);
+ 
++#ifdef CONFIG_PAX_SEGMEXEC
++	if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
++		goto out;
++#endif
++
+ 	if (!vma || !(vma->vm_flags & VM_SHARED))
+ 		goto out;
+ 
+@@ -2692,16 +3178,6 @@ out:
+ 	return ret;
  }
  
 -static inline void verify_mm_writelocked(struct mm_struct *mm)
@@ -98485,7 +98597,7 @@ index 0bc66f1..2bfa432 100644
  /*
   *  this is really a simplified "do_mmap".  it only handles
   *  anonymous maps.  eventually we may be able to do some
-@@ -2655,6 +3126,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2715,6 +3191,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;
@@ -98493,7 +98605,7 @@ index 0bc66f1..2bfa432 100644
  
  	len = PAGE_ALIGN(len);
  	if (!len)
-@@ -2662,10 +3134,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2722,10 +3199,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
  
  	flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
  
@@ -98518,7 +98630,7 @@ index 0bc66f1..2bfa432 100644
  	error = mlock_future_check(mm, mm->def_flags, len);
  	if (error)
  		return error;
-@@ -2679,21 +3165,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2739,21 +3230,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
  	/*
  	 * Clear old maps.  this also does some error checking for us
  	 */
@@ -98543,7 +98655,7 @@ index 0bc66f1..2bfa432 100644
  		return -ENOMEM;
  
  	/* Can we just expand an old private anonymous mapping? */
-@@ -2707,7 +3192,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2767,7 +3257,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
  	 */
  	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
  	if (!vma) {
@@ -98552,7 +98664,7 @@ index 0bc66f1..2bfa432 100644
  		return -ENOMEM;
  	}
  
-@@ -2721,10 +3206,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2781,10 +3271,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);
@@ -98566,7 +98678,7 @@ index 0bc66f1..2bfa432 100644
  	return addr;
  }
  
-@@ -2786,6 +3272,7 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2846,6 +3337,7 @@ void exit_mmap(struct mm_struct *mm)
  	while (vma) {
  		if (vma->vm_flags & VM_ACCOUNT)
  			nr_accounted += vma_pages(vma);
@@ -98574,7 +98686,7 @@ index 0bc66f1..2bfa432 100644
  		vma = remove_vma(vma);
  	}
  	vm_unacct_memory(nr_accounted);
-@@ -2803,6 +3290,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -2860,6 +3352,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;
  
@@ -98588,7 +98700,7 @@ index 0bc66f1..2bfa432 100644
  	/*
  	 * The vm_pgoff of a purely anonymous vma should be irrelevant
  	 * until its first write fault, when page's anon_vma and index
-@@ -2826,7 +3320,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -2883,7 +3382,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;
  
@@ -98610,7 +98722,7 @@ index 0bc66f1..2bfa432 100644
  	return 0;
  }
  
-@@ -2845,6 +3353,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2902,6 +3415,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;
  
@@ -98619,7 +98731,7 @@ index 0bc66f1..2bfa432 100644
  	/*
  	 * If anonymous vma has not yet been faulted, update new pgoff
  	 * to match new location, to increase its chance of merging.
-@@ -2909,6 +3419,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2966,6 +3481,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
  	return NULL;
  }
  
@@ -98659,7 +98771,7 @@ index 0bc66f1..2bfa432 100644
  /*
   * Return true if the calling process may expand its vm space by the passed
   * number of pages
-@@ -2920,6 +3463,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
+@@ -2977,6 +3525,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
  
  	lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
  
@@ -98667,7 +98779,7 @@ index 0bc66f1..2bfa432 100644
  	if (cur + npages > lim)
  		return 0;
  	return 1;
-@@ -3002,6 +3546,22 @@ static struct vm_area_struct *__install_special_mapping(
+@@ -3059,6 +3608,22 @@ static struct vm_area_struct *__install_special_mapping(
  	vma->vm_start = addr;
  	vma->vm_end = addr + len;
  
@@ -98691,7 +98803,7 @@ index 0bc66f1..2bfa432 100644
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
 diff --git a/mm/mprotect.c b/mm/mprotect.c
-index ace9345..63320dc 100644
+index 8858483..8145fa5 100644
 --- a/mm/mprotect.c
 +++ b/mm/mprotect.c
 @@ -24,10 +24,18 @@
@@ -98713,7 +98825,7 @@ index ace9345..63320dc 100644
  
  /*
   * For a prot_numa update we only hold mmap_sem for read so there is a
-@@ -251,6 +259,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
+@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
  	return pages;
  }
  
@@ -98762,7 +98874,7 @@ index ace9345..63320dc 100644
  int
  mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	unsigned long start, unsigned long end, unsigned long newflags)
-@@ -263,11 +313,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	int error;
  	int dirty_accountable = 0;
  
@@ -98792,7 +98904,7 @@ index ace9345..63320dc 100644
  	/*
  	 * If we make a private mapping writable we increase our commit;
  	 * but (without finer accounting) cannot reduce our commit if we
-@@ -284,6 +352,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  		}
  	}
  
@@ -98835,7 +98947,7 @@ index ace9345..63320dc 100644
  	/*
  	 * First try to merge with previous and/or next vma.
  	 */
-@@ -314,7 +418,19 @@ success:
+@@ -315,7 +419,19 @@ success:
  	 * vm_flags and vm_page_prot are protected by the mmap_sem
  	 * held in write mode.
  	 */
@@ -98855,7 +98967,7 @@ index ace9345..63320dc 100644
  	dirty_accountable = vma_wants_writenotify(vma);
  	vma_set_page_prot(vma);
  
-@@ -350,6 +466,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  	end = start + len;
  	if (end <= start)
  		return -ENOMEM;
@@ -98873,7 +98985,7 @@ index ace9345..63320dc 100644
  	if (!arch_validate_prot(prot))
  		return -EINVAL;
  
-@@ -357,7 +484,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  	/*
  	 * Does the application expect PROT_READ to imply PROT_EXEC:
  	 */
@@ -98882,7 +98994,7 @@ index ace9345..63320dc 100644
  		prot |= PROT_EXEC;
  
  	vm_flags = calc_vm_prot_bits(prot);
-@@ -389,6 +516,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  	if (start > vma->vm_start)
  		prev = vma;
  
@@ -98894,7 +99006,7 @@ index ace9345..63320dc 100644
  	for (nstart = start ; ; ) {
  		unsigned long newflags;
  
-@@ -399,6 +531,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -400,6 +532,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)) {
@@ -98909,7 +99021,7 @@ index ace9345..63320dc 100644
  			error = -EACCES;
  			goto out;
  		}
-@@ -413,6 +553,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
  		error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
  		if (error)
  			goto out;
@@ -98920,10 +99032,10 @@ index ace9345..63320dc 100644
  
  		if (nstart < prev->vm_end)
 diff --git a/mm/mremap.c b/mm/mremap.c
-index 17fa018..6f7892b 100644
+index 2dc44b1..caa1819 100644
 --- a/mm/mremap.c
 +++ b/mm/mremap.c
-@@ -144,6 +144,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
+@@ -142,6 +142,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);
@@ -98936,7 +99048,7 @@ index 17fa018..6f7892b 100644
  		pte = move_soft_dirty_pte(pte);
  		set_pte_at(mm, new_addr, new_pte, pte);
  	}
-@@ -346,6 +352,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
+@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
  	if (is_vm_hugetlb_page(vma))
  		goto Einval;
  
@@ -98948,7 +99060,7 @@ index 17fa018..6f7892b 100644
  	/* We can't remap across vm area boundaries */
  	if (old_len > vma->vm_end - addr)
  		goto Efault;
-@@ -401,20 +412,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
+@@ -405,20 +416,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;
@@ -98979,7 +99091,7 @@ index 17fa018..6f7892b 100644
  		goto out;
  
  	ret = do_munmap(mm, new_addr, new_len);
-@@ -483,6 +499,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -487,6 +503,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
  	unsigned long ret = -EINVAL;
  	unsigned long charged = 0;
  	bool locked = false;
@@ -98987,7 +99099,7 @@ index 17fa018..6f7892b 100644
  
  	if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
  		return ret;
-@@ -504,6 +521,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -508,6 +525,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
  	if (!new_len)
  		return ret;
  
@@ -99005,7 +99117,7 @@ index 17fa018..6f7892b 100644
  	down_write(&current->mm->mmap_sem);
  
  	if (flags & MREMAP_FIXED) {
-@@ -554,6 +582,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -558,6 +586,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
  				new_addr = addr;
  			}
  			ret = addr;
@@ -99013,7 +99125,7 @@ index 17fa018..6f7892b 100644
  			goto out;
  		}
  	}
-@@ -577,7 +606,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
+@@ -581,7 +610,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
  			goto out;
  		}
  
@@ -99027,10 +99139,10 @@ index 17fa018..6f7892b 100644
  out:
  	if (ret & ~PAGE_MASK)
 diff --git a/mm/nommu.c b/mm/nommu.c
-index ae5baae..cbb2ed5 100644
+index 3fba2dc..fdad748 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
-@@ -71,7 +71,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
+@@ -72,7 +72,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 */
@@ -99038,7 +99150,7 @@ index ae5baae..cbb2ed5 100644
  
  atomic_long_t mmap_pages_allocated;
  
-@@ -858,15 +857,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
  EXPORT_SYMBOL(find_vma);
  
  /*
@@ -99054,7 +99166,7 @@ index ae5baae..cbb2ed5 100644
   * expand a stack to a given address
   * - not supported under NOMMU conditions
   */
-@@ -1560,6 +1550,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -1585,6 +1575,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;
@@ -99062,9 +99174,9 @@ index ae5baae..cbb2ed5 100644
  	*region = *vma->vm_region;
  	new->vm_region = region;
  
-@@ -1990,8 +1981,8 @@ int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
+@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
  }
- EXPORT_SYMBOL(generic_file_remap_pages);
+ EXPORT_SYMBOL(filemap_map_pages);
  
 -static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
 -		unsigned long addr, void *buf, int len, int write)
@@ -99073,7 +99185,7 @@ index ae5baae..cbb2ed5 100644
  {
  	struct vm_area_struct *vma;
  
-@@ -2032,8 +2023,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
+@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
   *
   * The caller must hold a reference on @mm.
   */
@@ -99084,7 +99196,7 @@ index ae5baae..cbb2ed5 100644
  {
  	return __access_remote_vm(NULL, mm, addr, buf, len, write);
  }
-@@ -2042,7 +2033,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
+@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
   * Access another process' address space.
   * - source/target buffer must be kernel space
   */
@@ -99094,7 +99206,7 @@ index ae5baae..cbb2ed5 100644
  	struct mm_struct *mm;
  
 diff --git a/mm/page-writeback.c b/mm/page-writeback.c
-index f24d4c9..77820e3 100644
+index 644bcb6..444a2c4 100644
 --- a/mm/page-writeback.c
 +++ b/mm/page-writeback.c
 @@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
@@ -99107,10 +99219,10 @@ index f24d4c9..77820e3 100644
  					unsigned long bg_thresh,
  					unsigned long dirty,
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 8bbef06..a8d1989 100644
+index 40e2942..0eb29a2 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -60,6 +60,7 @@
+@@ -61,6 +61,7 @@
  #include <linux/hugetlb.h>
  #include <linux/sched/rt.h>
  #include <linux/page_owner.h>
@@ -99118,7 +99230,7 @@ index 8bbef06..a8d1989 100644
  
  #include <asm/sections.h>
  #include <asm/tlbflush.h>
-@@ -358,7 +359,7 @@ out:
+@@ -357,7 +358,7 @@ out:
   * This usage means that zero-order pages may not be compound.
   */
  
@@ -99127,7 +99239,7 @@ index 8bbef06..a8d1989 100644
  {
  	__free_pages_ok(page, compound_order(page));
  }
-@@ -511,7 +512,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
+@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
  		__mod_zone_freepage_state(zone, (1 << order), migratetype);
  }
  #else
@@ -99136,18 +99248,18 @@ index 8bbef06..a8d1989 100644
  static inline void set_page_guard(struct zone *zone, struct page *page,
  				unsigned int order, int migratetype) {}
  static inline void clear_page_guard(struct zone *zone, struct page *page,
-@@ -802,6 +803,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
- 	int i;
- 	int bad = 0;
+@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+ 	bool compound = PageCompound(page);
+ 	int i, bad = 0;
  
 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
 +	unsigned long index = 1UL << order;
 +#endif
 +
  	VM_BUG_ON_PAGE(PageTail(page), page);
- 	VM_BUG_ON_PAGE(PageHead(page) && compound_order(page) != order, page);
+ 	VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
  
-@@ -823,6 +828,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
  		debug_check_no_obj_freed(page_address(page),
  					   PAGE_SIZE << order);
  	}
@@ -99160,7 +99272,7 @@ index 8bbef06..a8d1989 100644
  	arch_free_page(page, order);
  	kernel_map_pages(page, 1 << order, 0);
  
-@@ -846,6 +857,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
+@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
  	local_irq_restore(flags);
  }
  
@@ -99181,7 +99293,7 @@ index 8bbef06..a8d1989 100644
  void __init __free_pages_bootmem(struct page *page, unsigned int order)
  {
  	unsigned int nr_pages = 1 << order;
-@@ -861,6 +886,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
+@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
  	__ClearPageReserved(p);
  	set_page_count(p, 0);
  
@@ -99201,9 +99313,9 @@ index 8bbef06..a8d1989 100644
  	page_zone(page)->managed_pages += nr_pages;
  	set_page_refcounted(page);
  	__free_pages(page, order);
-@@ -986,8 +1024,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags)
- 	arch_alloc_page(page, order);
+@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
  	kernel_map_pages(page, 1 << order, 1);
+ 	kasan_alloc_pages(page, order);
  
 +#ifndef CONFIG_PAX_MEMORY_SANITIZE
  	if (gfp_flags & __GFP_ZERO)
@@ -99212,7 +99324,7 @@ index 8bbef06..a8d1989 100644
  
  	if (order && (gfp_flags & __GFP_COMP))
  		prep_compound_page(page, order);
-@@ -1700,7 +1740,7 @@ again:
+@@ -1699,7 +1739,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
  	}
  
  	__mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
@@ -99221,7 +99333,7 @@ index 8bbef06..a8d1989 100644
  	    !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
  		set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
  
-@@ -2021,7 +2061,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
+@@ -2018,7 +2058,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
  	do {
  		mod_zone_page_state(zone, NR_ALLOC_BATCH,
  			high_wmark_pages(zone) - low_wmark_pages(zone) -
@@ -99230,7 +99342,7 @@ index 8bbef06..a8d1989 100644
  		clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
  	} while (zone++ != preferred_zone);
  }
-@@ -5781,7 +5821,7 @@ static void __setup_per_zone_wmarks(void)
+@@ -5738,7 +5778,7 @@ static void __setup_per_zone_wmarks(void)
  
  		__mod_zone_page_state(zone, NR_ALLOC_BATCH,
  			high_wmark_pages(zone) - low_wmark_pages(zone) -
@@ -99240,7 +99352,7 @@ index 8bbef06..a8d1989 100644
  		setup_zone_migrate_reserve(zone);
  		spin_unlock_irqrestore(&zone->lock, flags);
 diff --git a/mm/percpu.c b/mm/percpu.c
-index d39e2f4..de5f4b4 100644
+index 73c97a5..508ee25 100644
 --- a/mm/percpu.c
 +++ b/mm/percpu.c
 @@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
@@ -99253,7 +99365,7 @@ index d39e2f4..de5f4b4 100644
  
  static const int *pcpu_unit_map __read_mostly;		/* cpu -> unit */
 diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
-index 5077afc..846c9ef 100644
+index b159769..d07037f 100644
 --- a/mm/process_vm_access.c
 +++ b/mm/process_vm_access.c
 @@ -13,6 +13,7 @@
@@ -99264,7 +99376,7 @@ index 5077afc..846c9ef 100644
  #include <linux/ptrace.h>
  #include <linux/slab.h>
  #include <linux/syscalls.h>
-@@ -157,19 +158,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
+@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
  	ssize_t iov_len;
  	size_t total_len = iov_iter_count(iter);
  
@@ -99291,7 +99403,7 @@ index 5077afc..846c9ef 100644
  	}
  
  	if (nr_pages == 0)
-@@ -197,6 +198,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
+@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
  		goto free_proc_pages;
  	}
  
@@ -99304,7 +99416,7 @@ index 5077afc..846c9ef 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 ecb444a..0ff9eb3 100644
+index c161a14..8a069bb 100644
 --- a/mm/rmap.c
 +++ b/mm/rmap.c
 @@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
@@ -99408,7 +99520,7 @@ index ecb444a..0ff9eb3 100644
  
  /*
 diff --git a/mm/shmem.c b/mm/shmem.c
-index 993e6ba..a962ba3 100644
+index cf2d0ca..ec06b8b 100644
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
 @@ -33,7 +33,7 @@
@@ -99429,7 +99541,7 @@ index 993e6ba..a962ba3 100644
  
  /*
   * shmem_fallocate communicates with shmem_fault or shmem_writepage via
-@@ -2558,6 +2558,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
+@@ -2555,6 +2555,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[] = {
@@ -99441,7 +99553,7 @@ index 993e6ba..a962ba3 100644
  		{ XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
  		{ XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
  	};
-@@ -2613,6 +2618,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
+@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
  	if (err)
  		return err;
  
@@ -99457,7 +99569,7 @@ index 993e6ba..a962ba3 100644
  	return simple_xattr_set(&info->xattrs, name, value, size, flags);
  }
  
-@@ -2996,8 +3010,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
+@@ -2993,8 +3007,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 */
@@ -99468,7 +99580,7 @@ index 993e6ba..a962ba3 100644
  		return -ENOMEM;
  
 diff --git a/mm/slab.c b/mm/slab.c
-index 65b5dcb..d53d866 100644
+index c4b89ea..20990be 100644
 --- a/mm/slab.c
 +++ b/mm/slab.c
 @@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
@@ -99571,7 +99683,7 @@ index 65b5dcb..d53d866 100644
  	local_irq_save(flags);
  	kfree_debugcheck(objp);
  	c = virt_to_cache(objp);
-@@ -3984,14 +4003,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
+@@ -3981,14 +4000,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
  	}
  	/* cpu stats */
  	{
@@ -99598,7 +99710,7 @@ index 65b5dcb..d53d866 100644
  #endif
  }
  
-@@ -4199,13 +4226,69 @@ static const struct file_operations proc_slabstats_operations = {
+@@ -4196,13 +4223,69 @@ static const struct file_operations proc_slabstats_operations = {
  static int __init slab_proc_init(void)
  {
  #ifdef CONFIG_DEBUG_SLAB_LEAK
@@ -99670,7 +99782,7 @@ index 65b5dcb..d53d866 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 1cf40054..10ad563 100644
+index 4c3ac12..7b2e470 100644
 --- a/mm/slab.h
 +++ b/mm/slab.h
 @@ -22,7 +22,7 @@ struct kmem_cache {
@@ -99703,7 +99815,7 @@ index 1cf40054..10ad563 100644
  unsigned long calculate_alignment(unsigned long flags,
  		unsigned long align, unsigned long size);
  
-@@ -116,7 +130,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
+@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
  
  /* Legal flag mask for kmem_cache_create(), for various configurations */
  #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
@@ -99713,7 +99825,7 @@ index 1cf40054..10ad563 100644
  
  #if defined(CONFIG_DEBUG_SLAB)
  #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
-@@ -300,6 +315,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
+@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
  		return s;
  
  	page = virt_to_head_page(x);
@@ -99724,7 +99836,7 @@ index 1cf40054..10ad563 100644
  	if (slab_equal_or_root(cachep, s))
  		return cachep;
 diff --git a/mm/slab_common.c b/mm/slab_common.c
-index e03dd6f..c475838 100644
+index 999bb34..9843aea 100644
 --- a/mm/slab_common.c
 +++ b/mm/slab_common.c
 @@ -25,11 +25,35 @@
@@ -99773,7 +99885,7 @@ index e03dd6f..c475838 100644
  
  static int __init setup_slab_nomerge(char *str)
  {
-@@ -218,7 +242,7 @@ int slab_unmergeable(struct kmem_cache *s)
+@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
  	/*
  	 * We may have set a slab to be unmergeable during bootstrap.
  	 */
@@ -99782,7 +99894,7 @@ index e03dd6f..c475838 100644
  		return 1;
  
  	return 0;
-@@ -322,7 +346,7 @@ do_kmem_cache_create(char *name, size_t object_size, size_t size, size_t align,
+@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
  	if (err)
  		goto out_free_cache;
  
@@ -99805,7 +99917,16 @@ index e03dd6f..c475838 100644
  	s = __kmem_cache_alias(name, size, align, flags, ctor);
  	if (s)
  		goto out_unlock;
-@@ -505,8 +536,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
+@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
+ 		rcu_barrier();
+ 
+ 	list_for_each_entry_safe(s, s2, release, list) {
+-#ifdef SLAB_SUPPORTS_SYSFS
++#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
+ 		sysfs_slab_remove(s);
+ #else
+ 		slab_kmem_cache_release(s);
+@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
  
  	mutex_lock(&slab_mutex);
  
@@ -99814,17 +99935,8 @@ index e03dd6f..c475838 100644
 +	if (!atomic_dec_and_test(&s->refcount))
  		goto out_unlock;
  
- 	if (memcg_cleanup_cache_params(s) != 0)
-@@ -526,7 +556,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
- 		rcu_barrier();
- 
- 	memcg_free_cache_params(s);
--#ifdef SLAB_SUPPORTS_SYSFS
-+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
- 	sysfs_slab_remove(s);
- #else
- 	slab_kmem_cache_release(s);
-@@ -582,7 +612,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
+ 	for_each_memcg_cache_safe(c, c2, s) {
+@@ -691,7 +721,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);
  
@@ -99833,7 +99945,7 @@ index e03dd6f..c475838 100644
  }
  
  struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
-@@ -595,7 +625,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
+@@ -704,7 +734,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);
@@ -99842,7 +99954,7 @@ index e03dd6f..c475838 100644
  	return s;
  }
  
-@@ -607,6 +637,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
+@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
  EXPORT_SYMBOL(kmalloc_dma_caches);
  #endif
  
@@ -99854,7 +99966,7 @@ index e03dd6f..c475838 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
-@@ -671,6 +706,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
+@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
  		return kmalloc_dma_caches[index];
  
  #endif
@@ -99868,7 +99980,7 @@ index e03dd6f..c475838 100644
  	return kmalloc_caches[index];
  }
  
-@@ -727,7 +769,7 @@ void __init create_kmalloc_caches(unsigned long flags)
+@@ -836,7 +878,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,
@@ -99877,7 +99989,7 @@ index e03dd6f..c475838 100644
  		}
  
  		/*
-@@ -736,10 +778,10 @@ void __init create_kmalloc_caches(unsigned long flags)
+@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
  		 * earlier power of two caches
  		 */
  		if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
@@ -99890,7 +100002,7 @@ index e03dd6f..c475838 100644
  	}
  
  	/* Kmalloc array is now usable */
-@@ -772,6 +814,23 @@ void __init create_kmalloc_caches(unsigned long flags)
+@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
  		}
  	}
  #endif
@@ -99914,7 +100026,7 @@ index e03dd6f..c475838 100644
  }
  #endif /* !CONFIG_SLOB */
  
-@@ -830,6 +889,9 @@ static void print_slabinfo_header(struct seq_file *m)
+@@ -940,6 +999,9 @@ static 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>");
@@ -99924,7 +100036,7 @@ index e03dd6f..c475838 100644
  #endif
  	seq_putc(m, '\n');
  }
-@@ -964,7 +1026,7 @@ static int __init slab_proc_init(void)
+@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
  module_init(slab_proc_init);
  #endif /* CONFIG_SLABINFO */
  
@@ -99934,7 +100046,7 @@ index e03dd6f..c475838 100644
  {
  	void *ret;
 diff --git a/mm/slob.c b/mm/slob.c
-index 96a8620..46b3f12 100644
+index 94a7fed..cf3fb1a 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)
@@ -100338,10 +100450,10 @@ index 96a8620..46b3f12 100644
  EXPORT_SYMBOL(kmem_cache_free);
  
 diff --git a/mm/slub.c b/mm/slub.c
-index fe376fe..2f5757c 100644
+index 82c4737..55c316a 100644
 --- a/mm/slub.c
 +++ b/mm/slub.c
-@@ -197,7 +197,7 @@ struct track {
+@@ -198,7 +198,7 @@ struct track {
  
  enum track_item { TRACK_ALLOC, TRACK_FREE };
  
@@ -100350,7 +100462,7 @@ index fe376fe..2f5757c 100644
  static int sysfs_slab_add(struct kmem_cache *);
  static int sysfs_slab_alias(struct kmem_cache *, const char *);
  static void memcg_propagate_slab_attrs(struct kmem_cache *s);
-@@ -535,7 +535,7 @@ static void print_track(const char *s, struct track *t)
+@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
  	if (!t->addr)
  		return;
  
@@ -100359,7 +100471,7 @@ index fe376fe..2f5757c 100644
  	       s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
  #ifdef CONFIG_STACKTRACE
  	{
-@@ -2652,6 +2652,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
+@@ -2709,6 +2709,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
  
  	slab_free_hook(s, x);
  
@@ -100374,7 +100486,7 @@ index fe376fe..2f5757c 100644
  redo:
  	/*
  	 * Determine the currently cpus per cpu slab.
-@@ -2989,6 +2997,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
+@@ -3050,6 +3058,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
  	s->inuse = size;
  
  	if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
@@ -100384,7 +100496,7 @@ index fe376fe..2f5757c 100644
  		s->ctor)) {
  		/*
  		 * Relocate free pointer after the object if it is not
-@@ -3243,7 +3254,7 @@ static int __init setup_slub_min_objects(char *str)
+@@ -3304,7 +3315,7 @@ static int __init setup_slub_min_objects(char *str)
  
  __setup("slub_min_objects=", setup_slub_min_objects);
  
@@ -100393,7 +100505,7 @@ index fe376fe..2f5757c 100644
  {
  	struct kmem_cache *s;
  	void *ret;
-@@ -3279,7 +3290,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
+@@ -3342,7 +3353,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
  	return ptr;
  }
  
@@ -100402,9 +100514,9 @@ index fe376fe..2f5757c 100644
  {
  	struct kmem_cache *s;
  	void *ret;
-@@ -3308,6 +3319,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
- EXPORT_SYMBOL(__kmalloc_node);
- #endif
+@@ -3390,6 +3401,59 @@ static size_t __ksize(const void *object)
+ 	return slab_ksize(page->slab_cache);
+ }
  
 +bool is_usercopy_object(const void *ptr)
 +{
@@ -100461,8 +100573,8 @@ index fe376fe..2f5757c 100644
 +
  size_t ksize(const void *object)
  {
- 	struct page *page;
-@@ -3336,6 +3400,7 @@ void kfree(const void *x)
+ 	size_t size = __ksize(object);
+@@ -3410,6 +3474,7 @@ void kfree(const void *x)
  	if (unlikely(ZERO_OR_NULL_PTR(x)))
  		return;
  
@@ -100470,16 +100582,16 @@ index fe376fe..2f5757c 100644
  	page = virt_to_head_page(x);
  	if (unlikely(!PageSlab(page))) {
  		BUG_ON(!PageCompound(page));
-@@ -3631,7 +3696,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
- 		int i;
- 		struct kmem_cache *c;
+@@ -3726,7 +3791,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
  
+ 	s = find_mergeable(size, align, flags, name, ctor);
+ 	if (s) {
 -		s->refcount++;
 +		atomic_inc(&s->refcount);
  
  		/*
  		 * Adjust the object sizes so that we clear
-@@ -3650,7 +3715,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
+@@ -3742,7 +3807,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
  		}
  
  		if (sysfs_slab_alias(s, name)) {
@@ -100488,7 +100600,7 @@ index fe376fe..2f5757c 100644
  			s = NULL;
  		}
  	}
-@@ -3767,7 +3832,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
+@@ -3859,7 +3924,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
  }
  #endif
  
@@ -100497,7 +100609,7 @@ index fe376fe..2f5757c 100644
  static int count_inuse(struct page *page)
  {
  	return page->inuse;
-@@ -4048,7 +4113,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
+@@ -4140,7 +4205,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
  		len += sprintf(buf + len, "%7ld ", l->count);
  
  		if (l->addr)
@@ -100509,7 +100621,7 @@ index fe376fe..2f5757c 100644
  		else
  			len += sprintf(buf + len, "<not-available>");
  
-@@ -4150,12 +4219,12 @@ static void __init resiliency_test(void)
+@@ -4238,12 +4307,12 @@ static void __init resiliency_test(void)
  	validate_slab_cache(kmalloc_caches[9]);
  }
  #else
@@ -100524,7 +100636,7 @@ index fe376fe..2f5757c 100644
  enum slab_stat_type {
  	SL_ALL,			/* All slabs */
  	SL_PARTIAL,		/* Only partially allocated slabs */
-@@ -4392,13 +4461,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
+@@ -4480,13 +4549,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
  {
  	if (!s->ctor)
  		return 0;
@@ -100543,7 +100655,7 @@ index fe376fe..2f5757c 100644
  }
  SLAB_ATTR_RO(aliases);
  
-@@ -4486,6 +4559,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
+@@ -4574,6 +4647,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
  SLAB_ATTR_RO(cache_dma);
  #endif
  
@@ -100566,7 +100678,7 @@ index fe376fe..2f5757c 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));
-@@ -4541,7 +4630,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
+@@ -4629,7 +4718,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
  	 * as well as cause other issues like converting a mergeable
  	 * cache into an umergeable one.
  	 */
@@ -100575,7 +100687,7 @@ index fe376fe..2f5757c 100644
  		return -EINVAL;
  
  	s->flags &= ~SLAB_TRACE;
-@@ -4661,7 +4750,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
+@@ -4749,7 +4838,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
  static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
  							size_t length)
  {
@@ -100584,7 +100696,7 @@ index fe376fe..2f5757c 100644
  		return -EINVAL;
  
  	s->flags &= ~SLAB_FAILSLAB;
-@@ -4831,6 +4920,12 @@ static struct attribute *slab_attrs[] = {
+@@ -4916,6 +5005,12 @@ static struct attribute *slab_attrs[] = {
  #ifdef CONFIG_ZONE_DMA
  	&cache_dma_attr.attr,
  #endif
@@ -100597,7 +100709,7 @@ index fe376fe..2f5757c 100644
  #ifdef CONFIG_NUMA
  	&remote_node_defrag_ratio_attr.attr,
  #endif
-@@ -5075,6 +5170,7 @@ static char *create_unique_id(struct kmem_cache *s)
+@@ -5157,6 +5252,7 @@ static char *create_unique_id(struct kmem_cache *s)
  	return name;
  }
  
@@ -100605,7 +100717,7 @@ index fe376fe..2f5757c 100644
  static int sysfs_slab_add(struct kmem_cache *s)
  {
  	int err;
-@@ -5148,6 +5244,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
+@@ -5230,6 +5326,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
  	kobject_del(&s->kobj);
  	kobject_put(&s->kobj);
  }
@@ -100613,7 +100725,7 @@ index fe376fe..2f5757c 100644
  
  /*
   * Need to buffer aliases during bootup until sysfs becomes
-@@ -5161,6 +5258,7 @@ struct saved_alias {
+@@ -5243,6 +5340,7 @@ struct saved_alias {
  
  static struct saved_alias *alias_list;
  
@@ -100621,7 +100733,7 @@ index fe376fe..2f5757c 100644
  static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
  {
  	struct saved_alias *al;
-@@ -5183,6 +5281,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
+@@ -5265,6 +5363,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
  	alias_list = al;
  	return 0;
  }
@@ -100665,7 +100777,7 @@ index d1b48b6..6e8590e 100644
  		}
  	}
 diff --git a/mm/swap.c b/mm/swap.c
-index 8a12b33..7068e78 100644
+index cd3a5e6..40c0c8f 100644
 --- a/mm/swap.c
 +++ b/mm/swap.c
 @@ -31,6 +31,7 @@
@@ -100737,10 +100849,10 @@ index 63f55cc..31874e6 100644
  
  	if (S_ISREG(inode->i_mode))
 diff --git a/mm/util.c b/mm/util.c
-index fec39d4..3e60325 100644
+index 3981ae9..28b585b 100644
 --- a/mm/util.c
 +++ b/mm/util.c
-@@ -195,6 +195,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
+@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
  	mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -100753,7 +100865,7 @@ index fec39d4..3e60325 100644
  	mm->get_unmapped_area = arch_get_unmapped_area;
  }
  #endif
-@@ -371,6 +377,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
+@@ -403,6 +409,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
  	if (!mm->arg_end)
  		goto out_mm;	/* Shh! No looking before we're done */
  
@@ -100764,7 +100876,7 @@ index fec39d4..3e60325 100644
  
  	if (len > buflen)
 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index 39c3388..7d976d4 100644
+index 49abccf..7bd1931 100644
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
 @@ -39,20 +39,65 @@ struct vfree_deferred {
@@ -100792,28 +100904,29 @@ index 39c3388..7d976d4 100644
  
 -static void free_work(struct work_struct *w)
 +static void vfree_work(struct work_struct *w)
-+{
-+	struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
-+	struct llist_node *llnode = llist_del_all(&p->list);
-+	while (llnode) {
-+		void *x = llnode;
-+		llnode = llist_next(llnode);
-+		__vunmap(x, 1);
-+	}
-+}
-+
-+static void vunmap_work(struct work_struct *w)
  {
  	struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
  	struct llist_node *llnode = llist_del_all(&p->list);
  	while (llnode) {
- 		void *p = llnode;
+-		void *p = llnode;
++		void *x = llnode;
  		llnode = llist_next(llnode);
 -		__vunmap(p, 1);
-+		__vunmap(p, 0);
++		__vunmap(x, 1);
  	}
  }
  
++static void vunmap_work(struct work_struct *w)
++{
++	struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
++	struct llist_node *llnode = llist_del_all(&p->list);
++	while (llnode) {
++		void *x = llnode;
++		llnode = llist_next(llnode);
++		__vunmap(x, 0);
++	}
++}
++
 +#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
 +static void unmap_work(struct work_struct *w)
 +{
@@ -100990,7 +101103,7 @@ index 39c3388..7d976d4 100644
  	if (flags & VM_IOREMAP)
  		align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
  
-@@ -1511,13 +1616,37 @@ EXPORT_SYMBOL(vfree);
+@@ -1510,13 +1615,36 @@ EXPORT_SYMBOL(vfree);
   */
  void vunmap(const void *addr)
  {
@@ -100999,7 +101112,6 @@ index 39c3388..7d976d4 100644
 -	if (addr)
 +	if (!addr)
 +		return;
-+
 +	if (unlikely(in_interrupt())) {
 +		struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
 +		if (llist_add((struct llist_node *)addr, &p->list))
@@ -101031,7 +101143,7 @@ index 39c3388..7d976d4 100644
  /**
   *	vmap  -  map an array of pages into virtually contiguous space
   *	@pages:		array of page pointers
-@@ -1538,6 +1667,11 @@ void *vmap(struct page **pages, unsigned int count,
+@@ -1537,6 +1665,11 @@ void *vmap(struct page **pages, unsigned int count,
  	if (count > totalram_pages)
  		return NULL;
  
@@ -101043,21 +101155,22 @@ index 39c3388..7d976d4 100644
  	area = get_vm_area_caller((count << PAGE_SHIFT), flags,
  					__builtin_return_address(0));
  	if (!area)
-@@ -1640,6 +1774,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
+@@ -1641,6 +1774,14 @@ 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_UNINITIALIZED | VM_KERNEXEC,
-+					  VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
-+	else
++	if (!(pgprot_val(prot) & _PAGE_NX)) {
++		vm_flags |= VM_KERNEXEC;
++		start = VMALLOC_START;
++		end = VMALLOC_END;
++	}
 +#endif
 +
- 	area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED,
- 				  start, end, node, gfp_mask, caller);
+ 	area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
+ 				vm_flags, start, end, node, gfp_mask, caller);
  	if (!area)
-@@ -1816,10 +1957,9 @@ EXPORT_SYMBOL(vzalloc_node);
+@@ -1817,10 +1958,9 @@ EXPORT_SYMBOL(vzalloc_node);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -101069,7 +101182,7 @@ index 39c3388..7d976d4 100644
  			      NUMA_NO_NODE, __builtin_return_address(0));
  }
  
-@@ -2126,6 +2266,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
+@@ -2127,6 +2267,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
  {
  	struct vm_struct *area;
  
@@ -101078,7 +101191,7 @@ index 39c3388..7d976d4 100644
  	size = PAGE_ALIGN(size);
  
  	if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
-@@ -2608,7 +2750,11 @@ static int s_show(struct seq_file *m, void *p)
+@@ -2609,7 +2751,11 @@ static int s_show(struct seq_file *m, void *p)
  		v->addr, v->addr + v->size, v->size);
  
  	if (v->caller)
@@ -101091,10 +101204,10 @@ index 39c3388..7d976d4 100644
  	if (v->nr_pages)
  		seq_printf(m, " pages=%d", v->nr_pages);
 diff --git a/mm/vmstat.c b/mm/vmstat.c
-index cdac773..7dd324e 100644
+index 4f5cd97..9fb715a 100644
 --- a/mm/vmstat.c
 +++ b/mm/vmstat.c
-@@ -24,6 +24,7 @@
+@@ -27,6 +27,7 @@
  #include <linux/mm_inline.h>
  #include <linux/page_ext.h>
  #include <linux/page_owner.h>
@@ -101102,7 +101215,7 @@ index cdac773..7dd324e 100644
  
  #include "internal.h"
  
-@@ -83,7 +84,7 @@ void vm_events_fold_cpu(int cpu)
+@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
   */
@@ -101111,7 +101224,7 @@ index cdac773..7dd324e 100644
  EXPORT_SYMBOL(vm_stat);
  
  #ifdef CONFIG_SMP
-@@ -435,7 +436,7 @@ static int fold_diff(int *diff)
+@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
  
  	for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
  		if (diff[i]) {
@@ -101120,7 +101233,7 @@ index cdac773..7dd324e 100644
  			changes++;
  	}
  	return changes;
-@@ -473,7 +474,7 @@ static int refresh_cpu_vm_stats(void)
+@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
  			v = this_cpu_xchg(p->vm_stat_diff[i], 0);
  			if (v) {
  
@@ -101129,7 +101242,7 @@ index cdac773..7dd324e 100644
  				global_diff[i] += v;
  #ifdef CONFIG_NUMA
  				/* 3 seconds idle till flush */
-@@ -537,7 +538,7 @@ void cpu_vm_stats_fold(int cpu)
+@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
  
  				v = p->vm_stat_diff[i];
  				p->vm_stat_diff[i] = 0;
@@ -101138,7 +101251,7 @@ index cdac773..7dd324e 100644
  				global_diff[i] += v;
  			}
  	}
-@@ -557,8 +558,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
+@@ -560,8 +561,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;
@@ -101149,7 +101262,7 @@ index cdac773..7dd324e 100644
  		}
  }
  #endif
-@@ -1291,10 +1292,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
+@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
  	stat_items_size += sizeof(struct vm_event_state);
  #endif
  
@@ -101173,7 +101286,7 @@ index cdac773..7dd324e 100644
  	for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
  		v[i] = global_page_state(i);
  	v += NR_VM_ZONE_STAT_ITEMS;
-@@ -1526,10 +1539,16 @@ static int __init setup_vmstat(void)
+@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
  	cpu_notifier_register_done();
  #endif
  #ifdef CONFIG_PROC_FS
@@ -101218,11 +101331,11 @@ index 64c6bed..b79a5de 100644
  
  			vn = net_generic(net, vlan_net_id);
 diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
-index 8ac8a5c..991defc 100644
+index c92b52f..006c052 100644
 --- a/net/8021q/vlan_netlink.c
 +++ b/net/8021q/vlan_netlink.c
-@@ -238,7 +238,7 @@ nla_put_failure:
- 	return -EMSGSIZE;
+@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
+ 	return dev_net(real_dev);
  }
  
 -struct rtnl_link_ops vlan_link_ops __read_mostly = {
@@ -101488,10 +101601,10 @@ index 919a5ce..cc6b444 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 1e80539..676c37a 100644
+index 00e00e0..710fcd2 100644
 --- a/net/batman-adv/bat_iv_ogm.c
 +++ b/net/batman-adv/bat_iv_ogm.c
-@@ -313,7 +313,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
+@@ -312,7 +312,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));
@@ -101500,7 +101613,7 @@ index 1e80539..676c37a 100644
  
  	hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
  	ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
-@@ -918,9 +918,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
+@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
  	batadv_ogm_packet->tvlv_len = htons(tvlv_len);
  
  	/* change sequence number to network order */
@@ -101512,7 +101625,7 @@ index 1e80539..676c37a 100644
  
  	batadv_iv_ogm_slide_own_bcast_window(hard_iface);
  
-@@ -1597,7 +1597,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
+@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
  		return;
  
  	/* could be changed by schedule_own_packet() */
@@ -101522,10 +101635,10 @@ index 1e80539..676c37a 100644
  	if (ogm_packet->flags & BATADV_DIRECTLINK)
  		has_directlink_flag = true;
 diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
-index 00f9e14..e1c7203 100644
+index 3d1dcaa..4699f4e 100644
 --- a/net/batman-adv/fragmentation.c
 +++ b/net/batman-adv/fragmentation.c
-@@ -450,7 +450,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
+@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
  	frag_header.packet_type = BATADV_UNICAST_FRAG;
  	frag_header.version = BATADV_COMPAT_VERSION;
  	frag_header.ttl = BATADV_TTL;
@@ -101535,10 +101648,10 @@ index 00f9e14..e1c7203 100644
  	frag_header.no = 0;
  	frag_header.total_size = htons(skb->len);
 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index 5467955..75ad4e3 100644
+index 5ec31d7..e371631 100644
 --- a/net/batman-adv/soft-interface.c
 +++ b/net/batman-adv/soft-interface.c
-@@ -296,7 +296,7 @@ send:
+@@ -295,7 +295,7 @@ send:
  				primary_if->net_dev->dev_addr);
  
  		/* set broadcast sequence number */
@@ -101547,7 +101660,7 @@ index 5467955..75ad4e3 100644
  		bcast_packet->seqno = htonl(seqno);
  
  		batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
-@@ -761,7 +761,7 @@ static int batadv_softif_init_late(struct net_device *dev)
+@@ -760,7 +760,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);
@@ -101556,7 +101669,7 @@ index 5467955..75ad4e3 100644
  	atomic_set(&bat_priv->tt.vn, 0);
  	atomic_set(&bat_priv->tt.local_changes, 0);
  	atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
-@@ -775,7 +775,7 @@ static int batadv_softif_init_late(struct net_device *dev)
+@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
  
  	/* randomize initial seqno to avoid collision */
  	get_random_bytes(&random_seqno, sizeof(random_seqno));
@@ -101565,7 +101678,7 @@ index 5467955..75ad4e3 100644
  
  	bat_priv->primary_if = NULL;
  	bat_priv->num_ifaces = 0;
-@@ -983,7 +983,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
+@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
  	return 0;
  }
  
@@ -101575,7 +101688,7 @@ index 5467955..75ad4e3 100644
  	.priv_size	= sizeof(struct batadv_priv),
  	.setup		= batadv_softif_init_early,
 diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
-index 8854c05..ee5d5497 100644
+index 9398c3f..0e79657 100644
 --- a/net/batman-adv/types.h
 +++ b/net/batman-adv/types.h
 @@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
@@ -101587,7 +101700,7 @@ index 8854c05..ee5d5497 100644
  };
  
  /**
-@@ -768,7 +768,7 @@ struct batadv_priv {
+@@ -766,7 +766,7 @@ struct batadv_priv {
  	atomic_t bonding;
  	atomic_t fragmentation;
  	atomic_t packet_size_max;
@@ -101596,7 +101709,7 @@ index 8854c05..ee5d5497 100644
  #ifdef CONFIG_BATMAN_ADV_BLA
  	atomic_t bridge_loop_avoidance;
  #endif
-@@ -787,7 +787,7 @@ struct batadv_priv {
+@@ -785,7 +785,7 @@ struct batadv_priv {
  #endif
  	uint32_t isolation_mark;
  	uint32_t isolation_mark_mask;
@@ -101606,10 +101719,10 @@ index 8854c05..ee5d5497 100644
  	atomic_t batman_queue_left;
  	char num_ifaces;
 diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
-index 2c245fd..dccf543 100644
+index 1d65c5b..43e55fd 100644
 --- a/net/bluetooth/hci_sock.c
 +++ b/net/bluetooth/hci_sock.c
-@@ -1067,7 +1067,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -1042,7 +1042,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
  			uf.event_mask[1] = *((u32 *) f->event_mask + 1);
  		}
  
@@ -101619,10 +101732,10 @@ index 2c245fd..dccf543 100644
  			err = -EFAULT;
  			break;
 diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
-index d04dc00..d25d576 100644
+index 6ba33f9..4afc26f 100644
 --- a/net/bluetooth/l2cap_core.c
 +++ b/net/bluetooth/l2cap_core.c
-@@ -3524,8 +3524,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
+@@ -3534,8 +3534,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
  			break;
  
  		case L2CAP_CONF_RFC:
@@ -101636,10 +101749,10 @@ index d04dc00..d25d576 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 f65caf4..c07110c 100644
+index 60694f0..32623ed 100644
 --- a/net/bluetooth/l2cap_sock.c
 +++ b/net/bluetooth/l2cap_sock.c
-@@ -634,7 +634,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
+@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
  	struct sock *sk = sock->sk;
  	struct l2cap_chan *chan = l2cap_pi(sk)->chan;
  	struct l2cap_options opts;
@@ -101649,7 +101762,7 @@ index f65caf4..c07110c 100644
  	u32 opt;
  
  	BT_DBG("sk %p", sk);
-@@ -661,7 +662,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
+@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
  		opts.max_tx   = chan->max_tx;
  		opts.txwin_size = chan->tx_win;
  
@@ -101658,7 +101771,7 @@ index f65caf4..c07110c 100644
  		if (copy_from_user((char *) &opts, optval, len)) {
  			err = -EFAULT;
  			break;
-@@ -748,7 +749,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
  	struct bt_security sec;
  	struct bt_power pwr;
  	struct l2cap_conn *conn;
@@ -101668,7 +101781,7 @@ index f65caf4..c07110c 100644
  	u32 opt;
  
  	BT_DBG("sk %p", sk);
-@@ -772,7 +774,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
  
  		sec.level = BT_SECURITY_LOW;
  
@@ -101677,7 +101790,7 @@ index f65caf4..c07110c 100644
  		if (copy_from_user((char *) &sec, optval, len)) {
  			err = -EFAULT;
  			break;
-@@ -868,7 +870,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
+@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
  
  		pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
  
@@ -101687,10 +101800,10 @@ index f65caf4..c07110c 100644
  			err = -EFAULT;
  			break;
 diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
-index 2348176..b9b6cf2 100644
+index 3c6d2c8..6afc970 100644
 --- a/net/bluetooth/rfcomm/sock.c
 +++ b/net/bluetooth/rfcomm/sock.c
-@@ -687,7 +687,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
+@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
  	struct sock *sk = sock->sk;
  	struct bt_security sec;
  	int err = 0;
@@ -101699,7 +101812,7 @@ index 2348176..b9b6cf2 100644
  	u32 opt;
  
  	BT_DBG("sk %p", sk);
-@@ -709,7 +709,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
+@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
  
  		sec.level = BT_SECURITY_LOW;
  
@@ -101730,24 +101843,11 @@ index 8e385a0..a5bdd8e 100644
  
  	tty_port_close(&dev->port, tty, filp);
  }
-diff --git a/net/bridge/br.c b/net/bridge/br.c
-index 44425af..4ee730e 100644
---- a/net/bridge/br.c
-+++ b/net/bridge/br.c
-@@ -147,6 +147,8 @@ static int __init br_init(void)
- {
- 	int err;
- 
-+	BUILD_BUG_ON(sizeof(struct br_input_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb));
-+
- 	err = stp_proto_register(&br_stp_proto);
- 	if (err < 0) {
- 		pr_err("bridge: can't register sap for STP\n");
 diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
-index 9f5eb55..45ab9c5 100644
+index 4fbcea0..69a6786 100644
 --- a/net/bridge/br_netlink.c
 +++ b/net/bridge/br_netlink.c
-@@ -566,7 +566,7 @@ static struct rtnl_af_ops br_af_ops = {
+@@ -726,7 +726,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
  	.get_link_af_size	= br_get_link_af_size,
  };
  
@@ -101757,7 +101857,7 @@ index 9f5eb55..45ab9c5 100644
  	.priv_size		= sizeof(struct net_bridge),
  	.setup			= br_dev_setup,
 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
-index d9a8c05..8dadc6c6 100644
+index 91180a7..1301daa 100644
 --- a/net/bridge/netfilter/ebtables.c
 +++ b/net/bridge/netfilter/ebtables.c
 @@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
@@ -101870,7 +101970,7 @@ index ee9ffd9..dfdf3d4 100644
  }
  
 diff --git a/net/can/gw.c b/net/can/gw.c
-index 295f62e..0c3b09e 100644
+index a6f448e..5902171 100644
 --- a/net/can/gw.c
 +++ b/net/can/gw.c
 @@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
@@ -101881,7 +101981,7 @@ index 295f62e..0c3b09e 100644
  
  static struct kmem_cache *cgw_cache __read_mostly;
  
-@@ -947,6 +946,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
  	return err;
  }
  
@@ -101892,7 +101992,7 @@ index 295f62e..0c3b09e 100644
  static __init int cgw_module_init(void)
  {
  	/* sanitize given module parameter */
-@@ -962,7 +965,6 @@ static __init int cgw_module_init(void)
+@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
  		return -ENOMEM;
  
  	/* set notifier */
@@ -101914,7 +102014,7 @@ index 1a19b98..df2b4ec 100644
  	if (!can_dir) {
  		printk(KERN_INFO "can: failed to create /proc/net/can . "
 diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
-index 74d30ec..25df678 100644
+index a9f4ae4..ee19b92 100644
 --- a/net/ceph/messenger.c
 +++ b/net/ceph/messenger.c
 @@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
@@ -102058,10 +102158,10 @@ index df493d6..1145766 100644
  
  	return err;
 diff --git a/net/core/dev.c b/net/core/dev.c
-index 5dd905c..a95d262 100644
+index 45109b7..6b58f14a 100644
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -1680,14 +1680,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
+@@ -1681,14 +1681,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)) {
@@ -102078,7 +102178,7 @@ index 5dd905c..a95d262 100644
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -2960,7 +2960,7 @@ recursion_alert:
+@@ -2987,7 +2987,7 @@ recursion_alert:
  drop:
  	rcu_read_unlock_bh();
  
@@ -102087,7 +102187,7 @@ index 5dd905c..a95d262 100644
  	kfree_skb_list(skb);
  	return rc;
  out:
-@@ -3303,7 +3303,7 @@ enqueue:
+@@ -3336,7 +3336,7 @@ enqueue:
  
  	local_irq_restore(flags);
  
@@ -102096,7 +102196,7 @@ index 5dd905c..a95d262 100644
  	kfree_skb(skb);
  	return NET_RX_DROP;
  }
-@@ -3380,7 +3380,7 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -3413,7 +3413,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
  
@@ -102105,7 +102205,7 @@ index 5dd905c..a95d262 100644
  {
  	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
  
-@@ -3713,7 +3713,7 @@ ncls:
+@@ -3751,7 +3751,7 @@ ncls:
  			ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
  	} else {
  drop:
@@ -102114,7 +102214,7 @@ index 5dd905c..a95d262 100644
  		kfree_skb(skb);
  		/* Jamal, now you will not able to escape explaining
  		 * me how you were going to use this. :-)
-@@ -4601,7 +4601,7 @@ out_unlock:
+@@ -4640,7 +4640,7 @@ out_unlock:
  	return work;
  }
  
@@ -102123,7 +102223,7 @@ index 5dd905c..a95d262 100644
  {
  	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
  	unsigned long time_limit = jiffies + 2;
-@@ -6612,8 +6612,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
+@@ -6676,8 +6676,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
  	} else {
  		netdev_stats_to_stats64(storage, &dev->stats);
  	}
@@ -102154,12 +102254,12 @@ index b94b1d2..da3ed7c 100644
  EXPORT_SYMBOL(dev_load);
  
 diff --git a/net/core/filter.c b/net/core/filter.c
-index ec9baea..dd6195d 100644
+index f6bdc2b..76eba8e 100644
 --- a/net/core/filter.c
 +++ b/net/core/filter.c
 @@ -533,7 +533,11 @@ do_pass:
  
- 		/* Unkown instruction. */
+ 		/* Unknown instruction. */
  		default:
 -			goto err;
 +			WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
@@ -102220,10 +102320,10 @@ index 1033725..340f65d 100644
  			fle->object = flo;
  		else
 diff --git a/net/core/neighbour.c b/net/core/neighbour.c
-index 8d614c9..55752ea 100644
+index 70fe9e1..926784c 100644
 --- a/net/core/neighbour.c
 +++ b/net/core/neighbour.c
-@@ -2802,7 +2802,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
+@@ -2806,7 +2806,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
  			   void __user *buffer, size_t *lenp, loff_t *ppos)
  {
  	int size, ret;
@@ -102232,7 +102332,7 @@ index 8d614c9..55752ea 100644
  
  	tmp.extra1 = &zero;
  	tmp.extra2 = &unres_qlen_max;
-@@ -2864,7 +2864,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
+@@ -2868,7 +2868,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
  					   void __user *buffer,
  					   size_t *lenp, loff_t *ppos)
  {
@@ -102293,7 +102393,7 @@ index 2bf8329..2eb1423 100644
  
  	return 0;
 diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
-index 9993412..2a4672b 100644
+index f2aa73b..0d1a1ea 100644
 --- a/net/core/net-sysfs.c
 +++ b/net/core/net-sysfs.c
 @@ -279,7 +279,7 @@ static ssize_t carrier_changes_show(struct device *dev,
@@ -102306,10 +102406,10 @@ index 9993412..2a4672b 100644
  static DEVICE_ATTR_RO(carrier_changes);
  
 diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
-index ce780c7..6d296b3 100644
+index 70d3450..eb7c528 100644
 --- a/net/core/net_namespace.c
 +++ b/net/core/net_namespace.c
-@@ -448,7 +448,7 @@ static int __register_pernet_operations(struct list_head *list,
+@@ -663,7 +663,7 @@ static int __register_pernet_operations(struct list_head *list,
  	int error;
  	LIST_HEAD(net_exit_list);
  
@@ -102318,7 +102418,7 @@ index ce780c7..6d296b3 100644
  	if (ops->init || (ops->id && ops->size)) {
  		for_each_net(net) {
  			error = ops_init(ops, net);
-@@ -461,7 +461,7 @@ static int __register_pernet_operations(struct list_head *list,
+@@ -676,7 +676,7 @@ static int __register_pernet_operations(struct list_head *list,
  
  out_undo:
  	/* If I have an error cleanup all namespaces I initialized */
@@ -102327,7 +102427,7 @@ index ce780c7..6d296b3 100644
  	ops_exit_list(ops, &net_exit_list);
  	ops_free_list(ops, &net_exit_list);
  	return error;
-@@ -472,7 +472,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
+@@ -687,7 +687,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
  	struct net *net;
  	LIST_HEAD(net_exit_list);
  
@@ -102336,7 +102436,7 @@ index ce780c7..6d296b3 100644
  	for_each_net(net)
  		list_add_tail(&net->exit_list, &net_exit_list);
  	ops_exit_list(ops, &net_exit_list);
-@@ -606,7 +606,7 @@ int register_pernet_device(struct pernet_operations *ops)
+@@ -821,7 +821,7 @@ int register_pernet_device(struct pernet_operations *ops)
  	mutex_lock(&net_mutex);
  	error = register_pernet_operations(&pernet_list, ops);
  	if (!error && (first_device == &pernet_list))
@@ -102346,7 +102446,7 @@ index ce780c7..6d296b3 100644
  	return error;
  }
 diff --git a/net/core/netpoll.c b/net/core/netpoll.c
-index e0ad5d1..04fa7f7 100644
+index c126a87..10ad89d 100644
 --- a/net/core/netpoll.c
 +++ b/net/core/netpoll.c
 @@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
@@ -102368,7 +102468,7 @@ index e0ad5d1..04fa7f7 100644
  		iph->ttl      = 64;
  		iph->protocol = IPPROTO_UDP;
 diff --git a/net/core/pktgen.c b/net/core/pktgen.c
-index 352d183..1bddfaf 100644
+index 508155b..fad080f 100644
 --- a/net/core/pktgen.c
 +++ b/net/core/pktgen.c
 @@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
@@ -102381,10 +102481,10 @@ index 352d183..1bddfaf 100644
  		pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
  		return -ENODEV;
 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
-index 76ec6c5..9cfb81c 100644
+index 7ebed55..378bf34 100644
 --- a/net/core/rtnetlink.c
 +++ b/net/core/rtnetlink.c
-@@ -60,7 +60,7 @@ struct rtnl_link {
+@@ -61,7 +61,7 @@ struct rtnl_link {
  	rtnl_doit_func		doit;
  	rtnl_dumpit_func	dumpit;
  	rtnl_calcit_func 	calcit;
@@ -102393,7 +102493,7 @@ index 76ec6c5..9cfb81c 100644
  
  static DEFINE_MUTEX(rtnl_mutex);
  
-@@ -306,10 +306,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
+@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
  	 * to use the ops for creating device. So do not
  	 * fill up dellink as well. That disables rtnl_dellink.
  	 */
@@ -102410,7 +102510,7 @@ index 76ec6c5..9cfb81c 100644
  	return 0;
  }
  EXPORT_SYMBOL_GPL(__rtnl_link_register);
-@@ -356,7 +359,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
+@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
  	for_each_net(net) {
  		__rtnl_kill_links(net, ops);
  	}
@@ -102419,7 +102519,7 @@ index 76ec6c5..9cfb81c 100644
  }
  EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
  
-@@ -1035,7 +1038,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
+@@ -1047,7 +1050,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
  	    (dev->ifalias &&
  	     nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
  	    nla_put_u32(skb, IFLA_CARRIER_CHANGES,
@@ -102428,17 +102528,6 @@ index 76ec6c5..9cfb81c 100644
  		goto nla_put_failure;
  
  	if (1) {
-@@ -2094,6 +2097,10 @@ replay:
- 		if (IS_ERR(dest_net))
- 			return PTR_ERR(dest_net);
- 
-+		err = -EPERM;
-+		if (!netlink_ns_capable(skb, dest_net->user_ns, CAP_NET_ADMIN))
-+			goto out;
-+
- 		dev = rtnl_create_link(dest_net, ifname, name_assign_type, ops, tb);
- 		if (IS_ERR(dev)) {
- 			err = PTR_ERR(dev);
 diff --git a/net/core/scm.c b/net/core/scm.c
 index 3b6899b..cf36238 100644
 --- a/net/core/scm.c
@@ -102480,10 +102569,10 @@ index 3b6899b..cf36238 100644
  	{
  		struct socket *sock;
 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 39c444c..361c354 100644
+index 98d45fe..4f9608f 100644
 --- a/net/core/skbuff.c
 +++ b/net/core/skbuff.c
-@@ -2123,7 +2123,7 @@ EXPORT_SYMBOL(__skb_checksum);
+@@ -2121,7 +2121,7 @@ EXPORT_SYMBOL(__skb_checksum);
  __wsum skb_checksum(const struct sk_buff *skb, int offset,
  		    int len, __wsum csum)
  {
@@ -102492,7 +102581,7 @@ index 39c444c..361c354 100644
  		.update  = csum_partial_ext,
  		.combine = csum_block_add_ext,
  	};
-@@ -3363,12 +3363,14 @@ void __init skb_init(void)
+@@ -3361,12 +3361,14 @@ void __init skb_init(void)
  	skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
  					      sizeof(struct sk_buff),
  					      0,
@@ -102510,10 +102599,10 @@ index 39c444c..361c354 100644
  }
  
 diff --git a/net/core/sock.c b/net/core/sock.c
-index a91f99f..603a20c 100644
+index 71e3e5f..ab90920 100644
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -441,7 +441,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -443,7 +443,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) {
@@ -102522,7 +102611,7 @@ index a91f99f..603a20c 100644
  		trace_sock_rcvqueue_full(sk, skb);
  		return -ENOMEM;
  	}
-@@ -451,7 +451,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -453,7 +453,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
  		return err;
  
  	if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
@@ -102531,7 +102620,7 @@ index a91f99f..603a20c 100644
  		return -ENOBUFS;
  	}
  
-@@ -464,7 +464,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -466,7 +466,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
  	skb_dst_force(skb);
  
  	spin_lock_irqsave(&list->lock, flags);
@@ -102540,7 +102629,7 @@ index a91f99f..603a20c 100644
  	__skb_queue_tail(list, skb);
  	spin_unlock_irqrestore(&list->lock, flags);
  
-@@ -484,7 +484,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -486,7 +486,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
  	skb->dev = NULL;
  
  	if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
@@ -102549,7 +102638,7 @@ index a91f99f..603a20c 100644
  		goto discard_and_relse;
  	}
  	if (nested)
-@@ -502,7 +502,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -504,7 +504,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);
@@ -102558,7 +102647,7 @@ index a91f99f..603a20c 100644
  		goto discard_and_relse;
  	}
  
-@@ -907,6 +907,7 @@ set_rcvbuf:
+@@ -910,6 +910,7 @@ set_rcvbuf:
  		}
  		break;
  
@@ -102566,7 +102655,7 @@ index a91f99f..603a20c 100644
  	case SO_ATTACH_BPF:
  		ret = -EINVAL;
  		if (optlen == sizeof(u32)) {
-@@ -919,7 +920,7 @@ set_rcvbuf:
+@@ -922,7 +923,7 @@ set_rcvbuf:
  			ret = sk_attach_bpf(ufd, sk);
  		}
  		break;
@@ -102575,7 +102664,7 @@ index a91f99f..603a20c 100644
  	case SO_DETACH_FILTER:
  		ret = sk_detach_filter(sk);
  		break;
-@@ -1023,12 +1024,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -1026,12 +1027,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
  		struct timeval tm;
  	} v;
  
@@ -102591,7 +102680,7 @@ index a91f99f..603a20c 100644
  		return -EINVAL;
  
  	memset(&v, 0, sizeof(v));
-@@ -1166,11 +1167,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -1169,11 +1170,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
  
  	case SO_PEERNAME:
  	{
@@ -102605,7 +102694,7 @@ index a91f99f..603a20c 100644
  			return -EINVAL;
  		if (copy_to_user(optval, address, len))
  			return -EFAULT;
-@@ -1255,7 +1256,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -1258,7 +1259,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
  
  	if (len > lv)
  		len = lv;
@@ -102614,7 +102703,7 @@ index a91f99f..603a20c 100644
  		return -EFAULT;
  lenout:
  	if (put_user(len, optlen))
-@@ -2368,7 +2369,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
+@@ -2375,7 +2376,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
  	 */
  	smp_wmb();
  	atomic_set(&sk->sk_refcnt, 1);
@@ -102623,7 +102712,7 @@ index a91f99f..603a20c 100644
  }
  EXPORT_SYMBOL(sock_init_data);
  
-@@ -2496,6 +2497,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
+@@ -2503,6 +2504,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)
  {
@@ -102631,7 +102720,7 @@ index a91f99f..603a20c 100644
  	struct sock_exterr_skb *serr;
  	struct sk_buff *skb;
  	int copied, err;
-@@ -2517,7 +2519,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
+@@ -2524,7 +2526,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
  	sock_recv_timestamp(msg, sk, skb);
  
  	serr = SKB_EXT_ERR(skb);
@@ -102704,7 +102793,7 @@ index ad704c7..ca48aff 100644
  }
  EXPORT_SYMBOL_GPL(sock_diag_unregister);
 diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
-index bbb1d5a..754e2e5 100644
+index 8ce351f..2c388f7 100644
 --- a/net/core/sysctl_net_core.c
 +++ b/net/core/sysctl_net_core.c
 @@ -36,7 +36,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
@@ -102743,7 +102832,7 @@ index bbb1d5a..754e2e5 100644
  	{
  		.procname	= "bpf_jit_enable",
  		.data		= &bpf_jit_enable,
-@@ -402,13 +402,12 @@ static struct ctl_table netns_core_table[] = {
+@@ -411,13 +411,12 @@ static struct ctl_table netns_core_table[] = {
  
  static __net_init int sysctl_core_net_init(struct net *net)
  {
@@ -102759,7 +102848,7 @@ index bbb1d5a..754e2e5 100644
  		if (tbl == NULL)
  			goto err_dup;
  
-@@ -418,17 +417,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
+@@ -427,17 +426,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
  		if (net->user_ns != &init_user_ns) {
  			tbl[0].procname = NULL;
  		}
@@ -102781,7 +102870,7 @@ index bbb1d5a..754e2e5 100644
  err_dup:
  	return -ENOMEM;
  }
-@@ -443,7 +441,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
+@@ -452,7 +450,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
  	kfree(tbl);
  }
  
@@ -102803,7 +102892,7 @@ index 8102286..a0c2755 100644
  
  static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
 diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
-index 4400da7..3429972 100644
+index b2c26b0..41f803e 100644
 --- a/net/decnet/dn_dev.c
 +++ b/net/decnet/dn_dev.c
 @@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
@@ -102850,11 +102939,11 @@ index a2c7e4c..3dc9f67 100644
  	.kind		= "hsr",
  	.maxtype	= IFLA_HSR_MAX,
  	.policy		= hsr_policy,
-diff --git a/net/ieee802154/6lowpan_rtnl.c b/net/ieee802154/6lowpan_rtnl.c
-index 27eaa65..7083217 100644
---- a/net/ieee802154/6lowpan_rtnl.c
-+++ b/net/ieee802154/6lowpan_rtnl.c
-@@ -642,7 +642,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
+diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
+index 055fbb7..c0dbe60 100644
+--- a/net/ieee802154/6lowpan/core.c
++++ b/net/ieee802154/6lowpan/core.c
+@@ -217,7 +217,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
  	dev_put(real_dev);
  }
  
@@ -102863,10 +102952,10 @@ index 27eaa65..7083217 100644
  	.kind		= "lowpan",
  	.priv_size	= sizeof(struct lowpan_dev_info),
  	.setup		= lowpan_setup,
-diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
-index 9d980ed..7d01e12 100644
---- a/net/ieee802154/reassembly.c
-+++ b/net/ieee802154/reassembly.c
+diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
+index f46e4d1..30231f1 100644
+--- a/net/ieee802154/6lowpan/reassembly.c
++++ b/net/ieee802154/6lowpan/reassembly.c
 @@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
  
  static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
@@ -102908,10 +102997,10 @@ index 9d980ed..7d01e12 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
-index a44773c..a6ae415 100644
+index d2e49ba..f78e8aa 100644
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c
-@@ -1392,7 +1392,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
+@@ -1390,7 +1390,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
  		return ip_recv_error(sk, msg, len, addr_len);
  #if IS_ENABLED(CONFIG_IPV6)
  	if (sk->sk_family == AF_INET6)
@@ -102921,7 +103010,7 @@ index a44773c..a6ae415 100644
  	return -EINVAL;
  }
 diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
-index 214882e..ec032f6 100644
+index 3a8985c..9d2a870 100644
 --- a/net/ipv4/devinet.c
 +++ b/net/ipv4/devinet.c
 @@ -69,7 +69,8 @@
@@ -102944,7 +103033,7 @@ index 214882e..ec032f6 100644
  		[IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
  		[IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
  		[IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
-@@ -1548,7 +1550,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
+@@ -1549,7 +1551,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();
@@ -102953,7 +103042,7 @@ index 214882e..ec032f6 100644
  			  net->dev_base_seq;
  		hlist_for_each_entry_rcu(dev, head, index_hlist) {
  			if (idx < s_idx)
-@@ -1866,7 +1868,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
+@@ -1868,7 +1870,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
  		idx = 0;
  		head = &net->dev_index_head[h];
  		rcu_read_lock();
@@ -102962,7 +103051,7 @@ index 214882e..ec032f6 100644
  			  net->dev_base_seq;
  		hlist_for_each_entry_rcu(dev, head, index_hlist) {
  			if (idx < s_idx)
-@@ -2101,7 +2103,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
+@@ -2103,7 +2105,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)
  
@@ -102971,7 +103060,7 @@ index 214882e..ec032f6 100644
  	struct ctl_table_header *sysctl_header;
  	struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
  } devinet_sysctl = {
-@@ -2233,7 +2235,7 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2235,7 +2237,7 @@ static __net_init int devinet_init_net(struct net *net)
  	int err;
  	struct ipv4_devconf *all, *dflt;
  #ifdef CONFIG_SYSCTL
@@ -102980,7 +103069,7 @@ index 214882e..ec032f6 100644
  	struct ctl_table_header *forw_hdr;
  #endif
  
-@@ -2251,7 +2253,7 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2253,7 +2255,7 @@ static __net_init int devinet_init_net(struct net *net)
  			goto err_alloc_dflt;
  
  #ifdef CONFIG_SYSCTL
@@ -102989,7 +103078,7 @@ index 214882e..ec032f6 100644
  		if (tbl == NULL)
  			goto err_alloc_ctl;
  
-@@ -2271,7 +2273,10 @@ static __net_init int devinet_init_net(struct net *net)
+@@ -2273,7 +2275,10 @@ static __net_init int devinet_init_net(struct net *net)
  		goto err_reg_dflt;
  
  	err = -ENOMEM;
@@ -103001,7 +103090,7 @@ index 214882e..ec032f6 100644
  	if (forw_hdr == NULL)
  		goto err_reg_ctl;
  	net->ipv4.forw_hdr = forw_hdr;
-@@ -2287,8 +2292,7 @@ err_reg_ctl:
+@@ -2289,8 +2294,7 @@ err_reg_ctl:
  err_reg_dflt:
  	__devinet_sysctl_unregister(all);
  err_reg_all:
@@ -103012,10 +103101,10 @@ index 214882e..ec032f6 100644
  #endif
  	if (dflt != &ipv4_devconf_dflt)
 diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
-index 23104a3..9f5570b 100644
+index 23b9b3e..60cf0c4 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,
+@@ -1020,12 +1020,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
  		fib_sync_up(dev);
  #endif
@@ -103030,7 +103119,7 @@ index 23104a3..9f5570b 100644
  		if (ifa->ifa_dev->ifa_list == NULL) {
  			/* Last address was deleted from this interface.
  			 * Disable IP.
-@@ -1060,7 +1060,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
+@@ -1063,7 +1063,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
  		fib_sync_up(dev);
  #endif
@@ -103040,10 +103129,10 @@ index 23104a3..9f5570b 100644
  		break;
  	case NETDEV_DOWN:
 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
-index f99f41b..1879da9 100644
+index 1e2090e..351a724 100644
 --- a/net/ipv4/fib_semantics.c
 +++ b/net/ipv4/fib_semantics.c
-@@ -770,7 +770,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
+@@ -753,7 +753,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);
@@ -103053,10 +103142,10 @@ index f99f41b..1879da9 100644
  	return nh->nh_saddr;
  }
 diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
-index b986298..7e726da 100644
+index ff069f6..335e752 100644
 --- a/net/ipv4/fou.c
 +++ b/net/ipv4/fou.c
-@@ -765,12 +765,12 @@ EXPORT_SYMBOL(gue_build_header);
+@@ -771,12 +771,12 @@ EXPORT_SYMBOL(gue_build_header);
  
  #ifdef CONFIG_NET_FOU_IP_TUNNELS
  
@@ -103166,7 +103255,7 @@ index 145a50c..5dd8cc5 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
-index 4f4bf5b..2c936fe 100644
+index 6207275f..00323a2 100644
 --- a/net/ipv4/ip_gre.c
 +++ b/net/ipv4/ip_gre.c
 @@ -115,7 +115,7 @@ static bool log_ecn_error = true;
@@ -103178,7 +103267,7 @@ index 4f4bf5b..2c936fe 100644
  static int ipgre_tunnel_init(struct net_device *dev);
  
  static int ipgre_net_id __read_mostly;
-@@ -816,7 +816,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
+@@ -817,7 +817,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
  	[IFLA_GRE_ENCAP_DPORT]	= { .type = NLA_U16 },
  };
  
@@ -103187,8 +103276,8 @@ index 4f4bf5b..2c936fe 100644
  	.kind		= "gre",
  	.maxtype	= IFLA_GRE_MAX,
  	.policy		= ipgre_policy,
-@@ -830,7 +830,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
- 	.fill_info	= ipgre_fill_info,
+@@ -832,7 +832,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
+ 	.get_link_net	= ip_tunnel_get_link_net,
  };
  
 -static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
@@ -103222,10 +103311,10 @@ index 3d4da2c..40f9c29 100644
  						  ICMP_PROT_UNREACH, 0);
  				}
 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
-index 6b85adb..cd7e5d3 100644
+index 5cd9927..8610b9f 100644
 --- a/net/ipv4/ip_sockglue.c
 +++ b/net/ipv4/ip_sockglue.c
-@@ -1193,7 +1193,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
+@@ -1254,7 +1254,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
  		len = min_t(unsigned int, len, opt->optlen);
  		if (put_user(len, optlen))
  			return -EFAULT;
@@ -103235,7 +103324,7 @@ index 6b85adb..cd7e5d3 100644
  			return -EFAULT;
  		return 0;
  	}
-@@ -1324,7 +1325,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
+@@ -1388,7 +1389,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
  		if (sk->sk_type != SOCK_STREAM)
  			return -ENOPROTOOPT;
  
@@ -103245,7 +103334,7 @@ index 6b85adb..cd7e5d3 100644
  		msg.msg_flags = flags;
  
 diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
-index 1a7e979..fd05aa4 100644
+index 94efe14..1453fcc 100644
 --- a/net/ipv4/ip_vti.c
 +++ b/net/ipv4/ip_vti.c
 @@ -45,7 +45,7 @@
@@ -103267,7 +103356,7 @@ index 1a7e979..fd05aa4 100644
  	.maxtype	= IFLA_VTI_MAX,
  	.policy		= vti_policy,
 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
-index 7fa18bc..bea16af 100644
+index b26376e..fc3d733 100644
 --- a/net/ipv4/ipconfig.c
 +++ b/net/ipv4/ipconfig.c
 @@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
@@ -103298,7 +103387,7 @@ index 7fa18bc..bea16af 100644
  	return res;
  }
 diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
-index 40403114..c35c647 100644
+index 915d215..48d1db7 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");
@@ -103369,7 +103458,7 @@ index f95b6f9..2ee2097 100644
  
  	case ARPT_SO_GET_ENTRIES:
 diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
-index 99e810f..3711b81 100644
+index cf5e82f..75a20f5 100644
 --- a/net/ipv4/netfilter/ip_tables.c
 +++ b/net/ipv4/netfilter/ip_tables.c
 @@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
@@ -103431,7 +103520,7 @@ index e90f83a..3e6acca 100644
  		pr_err("Unable to proc dir entry\n");
  		return -ENOMEM;
 diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
-index 0ae28f5..bacfcd5 100644
+index 208d543..ab6c0ba 100644
 --- a/net/ipv4/ping.c
 +++ b/net/ipv4/ping.c
 @@ -59,7 +59,7 @@ struct ping_table {
@@ -103478,7 +103567,7 @@ index 0ae28f5..bacfcd5 100644
  						   info, (u8 *)icmph);
  #endif
  		}
-@@ -919,10 +920,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+@@ -918,10 +919,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
  		}
  
  		if (inet6_sk(sk)->rxopt.all)
@@ -103491,7 +103580,7 @@ index 0ae28f5..bacfcd5 100644
  		else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
  			ip_cmsg_recv(msg, skb);
  #endif
-@@ -1117,7 +1118,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
+@@ -1116,7 +1117,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,
@@ -103501,7 +103590,7 @@ index 0ae28f5..bacfcd5 100644
  
  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 0bb68df..59405fc 100644
+index f027a70..2e64edc 100644
 --- a/net/ipv4/raw.c
 +++ b/net/ipv4/raw.c
 @@ -324,7 +324,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
@@ -103513,7 +103602,7 @@ index 0bb68df..59405fc 100644
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -774,16 +774,20 @@ static int raw_init(struct sock *sk)
+@@ -773,16 +773,20 @@ static int raw_init(struct sock *sk)
  
  static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
  {
@@ -103535,7 +103624,7 @@ index 0bb68df..59405fc 100644
  
  	if (get_user(len, optlen))
  		goto out;
-@@ -793,8 +797,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
+@@ -792,8 +796,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;
@@ -103546,7 +103635,7 @@ index 0bb68df..59405fc 100644
  		goto out;
  	ret = 0;
  out:	return ret;
-@@ -1023,7 +1027,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
+@@ -1022,7 +1026,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),
@@ -103556,7 +103645,7 @@ index 0bb68df..59405fc 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 52e1f2b..e736cb4 100644
+index ad50643..53b7b44 100644
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
 @@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
@@ -103609,7 +103698,7 @@ index 52e1f2b..e736cb4 100644
  }
  EXPORT_SYMBOL(ip_idents_reserve);
  
-@@ -2628,34 +2628,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
+@@ -2642,34 +2642,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
  		.maxlen		= sizeof(int),
  		.mode		= 0200,
  		.proc_handler	= ipv4_sysctl_rtcache_flush,
@@ -103652,7 +103741,7 @@ index 52e1f2b..e736cb4 100644
  err_dup:
  	return -ENOMEM;
  }
-@@ -2678,8 +2678,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
+@@ -2692,8 +2692,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
  
  static __net_init int rt_genid_init(struct net *net)
  {
@@ -103663,9 +103752,9 @@ index 52e1f2b..e736cb4 100644
  	get_random_bytes(&net->ipv4.dev_addr_genid,
  			 sizeof(net->ipv4.dev_addr_genid));
  	return 0;
-@@ -2722,11 +2722,7 @@ int __init ip_rt_init(void)
- {
+@@ -2737,11 +2737,7 @@ int __init ip_rt_init(void)
  	int rc = 0;
+ 	int cpu;
  
 -	ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
 -	if (!ip_idents)
@@ -103674,10 +103763,10 @@ index 52e1f2b..e736cb4 100644
 -	prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
 +	prandom_bytes(ip_idents, sizeof(ip_idents));
  
- #ifdef CONFIG_IP_ROUTE_CLASSID
- 	ip_rt_acct = __alloc_percpu(256 * sizeof(struct ip_rt_acct), __alignof__(struct ip_rt_acct));
+ 	for_each_possible_cpu(cpu) {
+ 		struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
 diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
-index e0ee384..e2688d9 100644
+index d151539..5f5e247 100644
 --- a/net/ipv4/sysctl_net_ipv4.c
 +++ b/net/ipv4/sysctl_net_ipv4.c
 @@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
@@ -103734,7 +103823,7 @@ index e0ee384..e2688d9 100644
  	struct tcp_fastopen_context *ctxt;
  	int ret;
  	u32  user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
-@@ -881,13 +881,12 @@ static struct ctl_table ipv4_net_table[] = {
+@@ -888,13 +888,12 @@ static struct ctl_table ipv4_net_table[] = {
  
  static __net_init int ipv4_sysctl_init_net(struct net *net)
  {
@@ -103750,7 +103839,7 @@ index e0ee384..e2688d9 100644
  		if (table == NULL)
  			goto err_alloc;
  
-@@ -896,7 +895,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
+@@ -903,7 +902,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
  			table[i].data += (void *)net - (void *)&init_net;
  	}
  
@@ -103763,7 +103852,7 @@ index e0ee384..e2688d9 100644
  		goto err_reg;
  
 diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
-index 3075723..aa6f6e5 100644
+index 995a225..e1e9183 100644
 --- a/net/ipv4/tcp.c
 +++ b/net/ipv4/tcp.c
 @@ -520,8 +520,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
@@ -103779,10 +103868,10 @@ index 3075723..aa6f6e5 100644
  					mask |= POLLOUT | POLLWRNORM;
  			}
 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index 08ccca6..28e7ce6 100644
+index f501ac04..0c5a1b2 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -766,7 +766,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
+@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
  	 * without any lock. We want to make sure compiler wont store
  	 * intermediate values in this location.
  	 */
@@ -103791,7 +103880,7 @@ index 08ccca6..28e7ce6 100644
  						sk->sk_max_pacing_rate);
  }
  
-@@ -4529,7 +4529,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
+@@ -4541,7 +4541,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
   * simplifies code)
   */
  static void
@@ -103800,7 +103889,7 @@ index 08ccca6..28e7ce6 100644
  	     struct sk_buff *head, struct sk_buff *tail,
  	     u32 start, u32 end)
  {
-@@ -4787,6 +4787,8 @@ static void tcp_check_space(struct sock *sk)
+@@ -4799,6 +4799,8 @@ static void tcp_check_space(struct sock *sk)
  {
  	if (sock_flag(sk, SOCK_QUEUE_SHRUNK)) {
  		sock_reset_flag(sk, SOCK_QUEUE_SHRUNK);
@@ -103809,7 +103898,7 @@ index 08ccca6..28e7ce6 100644
  		if (sk->sk_socket &&
  		    test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
  			tcp_new_space(sk);
-@@ -5507,6 +5509,7 @@ discard:
+@@ -5525,6 +5527,7 @@ discard:
  	    tcp_paws_reject(&tp->rx_opt, 0))
  		goto discard_and_undo;
  
@@ -103817,7 +103906,7 @@ index 08ccca6..28e7ce6 100644
  	if (th->syn) {
  		/* We see SYN without ACK. It is attempt of
  		 * simultaneous connect with crossed SYNs.
-@@ -5557,6 +5560,7 @@ discard:
+@@ -5575,6 +5578,7 @@ discard:
  		goto discard;
  #endif
  	}
@@ -103825,7 +103914,7 @@ index 08ccca6..28e7ce6 100644
  	/* "fifth, if neither of the SYN or RST bits is set then
  	 * drop the segment and return."
  	 */
-@@ -5603,7 +5607,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
+@@ -5621,7 +5625,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
  			goto discard;
  
  		if (th->syn) {
@@ -103835,7 +103924,7 @@ index 08ccca6..28e7ce6 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 982347e..aba8ca8 100644
+index f1756ee..8908cb0 100644
 --- a/net/ipv4/tcp_ipv4.c
 +++ b/net/ipv4/tcp_ipv4.c
 @@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
@@ -103849,7 +103938,7 @@ index 982347e..aba8ca8 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);
-@@ -1473,6 +1477,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1475,6 +1479,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
  	return 0;
  
  reset:
@@ -103859,7 +103948,7 @@ index 982347e..aba8ca8 100644
  	tcp_v4_send_reset(rsk, skb);
  discard:
  	kfree_skb(skb);
-@@ -1637,12 +1644,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1639,12 +1646,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);
@@ -103882,7 +103971,7 @@ index 982347e..aba8ca8 100644
  
  	if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
  		NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1698,6 +1712,10 @@ csum_error:
+@@ -1700,6 +1714,10 @@ csum_error:
  bad_packet:
  		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
  	} else {
@@ -103894,7 +103983,7 @@ index 982347e..aba8ca8 100644
  	}
  
 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
-index 63d2680..2db9d6b 100644
+index dd11ac7..c0872da 100644
 --- a/net/ipv4/tcp_minisocks.c
 +++ b/net/ipv4/tcp_minisocks.c
 @@ -27,6 +27,10 @@
@@ -103908,7 +103997,7 @@ index 63d2680..2db9d6b 100644
  int sysctl_tcp_syncookies __read_mostly = 1;
  EXPORT_SYMBOL(sysctl_tcp_syncookies);
  
-@@ -739,7 +743,10 @@ embryonic_reset:
+@@ -785,7 +789,10 @@ embryonic_reset:
  		 * avoid becoming vulnerable to outside attack aiming at
  		 * resetting legit local connections.
  		 */
@@ -103934,7 +104023,7 @@ index ebf5ff5..4d1ff32 100644
  		cnt += width;
  	}
 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
-index 1829c7f..c0b3d52 100644
+index 0732b78..a82bdc6 100644
 --- a/net/ipv4/tcp_timer.c
 +++ b/net/ipv4/tcp_timer.c
 @@ -22,6 +22,10 @@
@@ -103948,7 +104037,7 @@ index 1829c7f..c0b3d52 100644
  int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
  int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
  int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
-@@ -191,6 +195,13 @@ static int tcp_write_timeout(struct sock *sk)
+@@ -194,6 +198,13 @@ static int tcp_write_timeout(struct sock *sk)
  		}
  	}
  
@@ -103963,7 +104052,7 @@ index 1829c7f..c0b3d52 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 13b4dcf..b866a2a 100644
+index 97ef1f8b..e446c33 100644
 --- a/net/ipv4/udp.c
 +++ b/net/ipv4/udp.c
 @@ -87,6 +87,7 @@
@@ -104134,7 +104223,7 @@ index 6156f68..d6ab46d 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
-index dac9419..534fa31 100644
+index b603002..0de5c88 100644
 --- a/net/ipv6/addrconf.c
 +++ b/net/ipv6/addrconf.c
 @@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
@@ -104146,7 +104235,7 @@ index dac9419..534fa31 100644
  	.autoconf		= 1,
  	.force_mld_version	= 0,
  	.mldv1_unsolicited_report_interval = 10 * HZ,
-@@ -208,7 +208,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
+@@ -209,7 +209,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
  	.hop_limit		= IPV6_DEFAULT_HOPLIMIT,
  	.mtu6			= IPV6_MIN_MTU,
  	.accept_ra		= 1,
@@ -104155,7 +104244,7 @@ index dac9419..534fa31 100644
  	.autoconf		= 1,
  	.force_mld_version	= 0,
  	.mldv1_unsolicited_report_interval = 10 * HZ,
-@@ -604,7 +604,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
+@@ -607,7 +607,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
  		idx = 0;
  		head = &net->dev_index_head[h];
  		rcu_read_lock();
@@ -104164,7 +104253,7 @@ index dac9419..534fa31 100644
  			  net->dev_base_seq;
  		hlist_for_each_entry_rcu(dev, head, index_hlist) {
  			if (idx < s_idx)
-@@ -2420,7 +2420,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
+@@ -2438,7 +2438,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
  		p.iph.ihl = 5;
  		p.iph.protocol = IPPROTO_IPV6;
  		p.iph.ttl = 64;
@@ -104173,7 +104262,7 @@ index dac9419..534fa31 100644
  
  		if (ops->ndo_do_ioctl) {
  			mm_segment_t oldfs = get_fs();
-@@ -3569,16 +3569,23 @@ static const struct file_operations if6_fops = {
+@@ -3587,16 +3587,23 @@ static const struct file_operations if6_fops = {
  	.release	= seq_release_net,
  };
  
@@ -104198,7 +104287,7 @@ index dac9419..534fa31 100644
  }
  
  static struct pernet_operations if6_proc_net_ops = {
-@@ -4194,7 +4201,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
+@@ -4215,7 +4222,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();
@@ -104207,7 +104296,7 @@ index dac9419..534fa31 100644
  	for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
  		idx = 0;
  		head = &net->dev_index_head[h];
-@@ -4840,7 +4847,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
+@@ -4864,7 +4871,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
  		rt_genid_bump_ipv6(net);
  		break;
  	}
@@ -104216,7 +104305,7 @@ index dac9419..534fa31 100644
  }
  
  static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
-@@ -4860,7 +4867,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
+@@ -4884,7 +4891,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
  	int *valp = ctl->data;
  	int val = *valp;
  	loff_t pos = *ppos;
@@ -104225,7 +104314,16 @@ index dac9419..534fa31 100644
  	int ret;
  
  	/*
-@@ -4945,7 +4952,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
+@@ -4909,7 +4916,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
+ {
+ 	struct inet6_dev *idev = ctl->extra1;
+ 	int min_mtu = IPV6_MIN_MTU;
+-	struct ctl_table lctl;
++	ctl_table_no_const lctl;
+ 
+ 	lctl = *ctl;
+ 	lctl.extra1 = &min_mtu;
+@@ -4984,7 +4991,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
  	int *valp = ctl->data;
  	int val = *valp;
  	loff_t pos = *ppos;
@@ -104248,10 +104346,10 @@ index e8c4400..a4cd5da 100644
  	err = ipv6_init_mibs(net);
  	if (err)
 diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
-index 49f5e73..ae02d54 100644
+index ace8dac..bd6942d 100644
 --- a/net/ipv6/datagram.c
 +++ b/net/ipv6/datagram.c
-@@ -941,5 +941,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
+@@ -957,5 +957,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,
@@ -104259,7 +104357,7 @@ index 49f5e73..ae02d54 100644
 +		   atomic_read_unchecked(&sp->sk_drops));
  }
 diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
-index d674152..fb5a01d 100644
+index a5e9519..16b7412 100644
 --- a/net/ipv6/icmp.c
 +++ b/net/ipv6/icmp.c
 @@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
@@ -104272,7 +104370,7 @@ index d674152..fb5a01d 100644
  	table = kmemdup(ipv6_icmp_table_template,
  			sizeof(ipv6_icmp_table_template),
 diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
-index f1c6d5e..faabef6 100644
+index 263ef41..88c7be8 100644
 --- a/net/ipv6/ip6_fib.c
 +++ b/net/ipv6/ip6_fib.c
 @@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
@@ -104288,7 +104386,7 @@ index f1c6d5e..faabef6 100644
  	return new;
  }
 diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
-index 01ccc28..66861c7 100644
+index bc28b7d..a08feea 100644
 --- a/net/ipv6/ip6_gre.c
 +++ b/net/ipv6/ip6_gre.c
 @@ -71,8 +71,8 @@ struct ip6gre_net {
@@ -104320,8 +104418,8 @@ index 01ccc28..66861c7 100644
  	.kind		= "ip6gre",
  	.maxtype	= IFLA_GRE_MAX,
  	.policy		= ip6gre_policy,
-@@ -1664,7 +1664,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
- 	.fill_info	= ip6gre_fill_info,
+@@ -1665,7 +1665,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
+ 	.get_link_net	= ip6_tnl_get_link_net,
  };
  
 -static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
@@ -104330,7 +104428,7 @@ index 01ccc28..66861c7 100644
  	.maxtype	= IFLA_GRE_MAX,
  	.policy		= ip6gre_policy,
 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
-index 92b3da5..77837b8 100644
+index ddd94ec..b7cfefb 100644
 --- a/net/ipv6/ip6_tunnel.c
 +++ b/net/ipv6/ip6_tunnel.c
 @@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
@@ -104342,7 +104440,7 @@ index 92b3da5..77837b8 100644
  
  static int ip6_tnl_net_id __read_mostly;
  struct ip6_tnl_net {
-@@ -1771,7 +1771,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
+@@ -1780,7 +1780,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
  	[IFLA_IPTUN_PROTO]		= { .type = NLA_U8 },
  };
  
@@ -104352,7 +104450,7 @@ index 92b3da5..77837b8 100644
  	.maxtype	= IFLA_IPTUN_MAX,
  	.policy		= ip6_tnl_policy,
 diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
-index ace10d0..97a8b49 100644
+index 5fb9e21..92bf04b 100644
 --- a/net/ipv6/ip6_vti.c
 +++ b/net/ipv6/ip6_vti.c
 @@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
@@ -104374,7 +104472,7 @@ index ace10d0..97a8b49 100644
  	.maxtype	= IFLA_VTI_MAX,
  	.policy		= vti6_policy,
 diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
-index 66980d8d..8aef0d1 100644
+index 8d766d9..dcdfea7 100644
 --- a/net/ipv6/ipv6_sockglue.c
 +++ b/net/ipv6/ipv6_sockglue.c
 @@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
@@ -104387,7 +104485,7 @@ index 66980d8d..8aef0d1 100644
  		msg.msg_flags = flags;
  
 diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
-index e080fbb..412b3cf 100644
+index bb00c6f..16c90d7 100644
 --- a/net/ipv6/netfilter/ip6_tables.c
 +++ b/net/ipv6/netfilter/ip6_tables.c
 @@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
@@ -104478,10 +104576,10 @@ index 6f187c8..34b367f 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
-index fe7e3e4..47aba96 100644
+index a2dfff6..1e52e6d 100644
 --- a/net/ipv6/ping.c
 +++ b/net/ipv6/ping.c
-@@ -242,6 +242,24 @@ static struct pernet_operations ping_v6_net_ops = {
+@@ -241,6 +241,24 @@ static struct pernet_operations ping_v6_net_ops = {
  };
  #endif
  
@@ -104506,7 +104604,7 @@ index fe7e3e4..47aba96 100644
  int __init pingv6_init(void)
  {
  #ifdef CONFIG_PROC_FS
-@@ -249,13 +267,7 @@ int __init pingv6_init(void)
+@@ -248,13 +266,7 @@ int __init pingv6_init(void)
  	if (ret)
  		return ret;
  #endif
@@ -104521,7 +104619,7 @@ index fe7e3e4..47aba96 100644
  	return inet6_register_protosw(&pingv6_protosw);
  }
  
-@@ -264,14 +276,9 @@ int __init pingv6_init(void)
+@@ -263,14 +275,9 @@ int __init pingv6_init(void)
   */
  void pingv6_exit(void)
  {
@@ -104551,7 +104649,7 @@ index 679253d0..70b653c 100644
  		goto proc_dev_snmp6_fail;
  	return 0;
 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
-index ee25631..3c3ac5d 100644
+index dae7f1a..783b20d 100644
 --- a/net/ipv6/raw.c
 +++ b/net/ipv6/raw.c
 @@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
@@ -104585,12 +104683,12 @@ index ee25631..3c3ac5d 100644
  	return err;
  }
  
--static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
-+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
+-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
++static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
  			struct flowi6 *fl6, struct dst_entry **dstp,
  			unsigned int flags)
  {
-@@ -916,12 +916,15 @@ do_confirm:
+@@ -915,12 +915,15 @@ do_confirm:
  static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
  			       char __user *optval, int optlen)
  {
@@ -104607,7 +104705,7 @@ index ee25631..3c3ac5d 100644
  		return 0;
  	default:
  		return -ENOPROTOOPT;
-@@ -934,6 +937,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
+@@ -933,6 +936,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
  			       char __user *optval, int __user *optlen)
  {
  	int len;
@@ -104615,7 +104713,7 @@ index ee25631..3c3ac5d 100644
  
  	switch (optname) {
  	case ICMPV6_FILTER:
-@@ -945,7 +949,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
+@@ -944,7 +948,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
  			len = sizeof(struct icmp6_filter);
  		if (put_user(len, optlen))
  			return -EFAULT;
@@ -104668,10 +104766,10 @@ index d7d70e6..bd5e9fc 100644
  	return -ENOMEM;
  }
 diff --git a/net/ipv6/route.c b/net/ipv6/route.c
-index 1528d84..f393960 100644
+index 4688bd4..584453d 100644
 --- a/net/ipv6/route.c
 +++ b/net/ipv6/route.c
-@@ -2978,7 +2978,7 @@ struct ctl_table ipv6_route_table_template[] = {
+@@ -3029,7 +3029,7 @@ struct ctl_table ipv6_route_table_template[] = {
  
  struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
  {
@@ -104681,7 +104779,7 @@ index 1528d84..f393960 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 cdbfe5a..e13eb31 100644
+index e4cbd57..02b1aaa 100644
 --- a/net/ipv6/sit.c
 +++ b/net/ipv6/sit.c
 @@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
@@ -104716,7 +104814,7 @@ index c5c10fa..2577d51 100644
  	struct ctl_table *ipv6_icmp_table;
  	int err;
 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index b899793..b783604 100644
+index 1f5e622..8387d90 100644
 --- a/net/ipv6/tcp_ipv6.c
 +++ b/net/ipv6/tcp_ipv6.c
 @@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
@@ -104730,7 +104828,7 @@ index b899793..b783604 100644
  static void tcp_v6_hash(struct sock *sk)
  {
  	if (sk->sk_state != TCP_CLOSE) {
-@@ -1343,6 +1347,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1345,6 +1349,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
  	return 0;
  
  reset:
@@ -104740,7 +104838,7 @@ index b899793..b783604 100644
  	tcp_v6_send_reset(sk, skb);
  discard:
  	if (opt_skb)
-@@ -1452,12 +1459,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
+@@ -1454,12 +1461,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
  
  	sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
  				inet6_iif(skb));
@@ -104763,7 +104861,7 @@ index b899793..b783604 100644
  
  	if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
  		NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1508,6 +1523,10 @@ csum_error:
+@@ -1510,6 +1525,10 @@ csum_error:
  bad_packet:
  		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
  	} else {
@@ -104775,7 +104873,7 @@ index b899793..b783604 100644
  	}
  
 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
-index 189dc4a..458bec0 100644
+index d048d46..bf141c3 100644
 --- a/net/ipv6/udp.c
 +++ b/net/ipv6/udp.c
 @@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
@@ -104827,10 +104925,10 @@ index 189dc4a..458bec0 100644
  
  	kfree_skb(skb);
 diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
-index 48bf5a0..691985a 100644
+index 8d2d01b4..313511e 100644
 --- a/net/ipv6/xfrm6_policy.c
 +++ b/net/ipv6/xfrm6_policy.c
-@@ -223,11 +223,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
+@@ -224,11 +224,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
  	}
  }
  
@@ -104844,7 +104942,7 @@ index 48bf5a0..691985a 100644
  	return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
  }
  
-@@ -340,19 +340,19 @@ static struct ctl_table xfrm6_policy_table[] = {
+@@ -341,19 +341,19 @@ static struct ctl_table xfrm6_policy_table[] = {
  
  static int __net_init xfrm6_net_init(struct net *net)
  {
@@ -104869,7 +104967,7 @@ index 48bf5a0..691985a 100644
  	if (!hdr)
  		goto err_reg;
  
-@@ -360,8 +360,7 @@ static int __net_init xfrm6_net_init(struct net *net)
+@@ -361,8 +361,7 @@ static int __net_init xfrm6_net_init(struct net *net)
  	return 0;
  
  err_reg:
@@ -104893,7 +104991,7 @@ index c1d247e..9e5949d 100644
  	if (!ipx_proc_dir)
  		goto out;
 diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
-index 4efe486..dee966e 100644
+index 683346d..cb0e12d 100644
 --- a/net/irda/ircomm/ircomm_tty.c
 +++ b/net/irda/ircomm/ircomm_tty.c
 @@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
@@ -104980,7 +105078,7 @@ index b9ac598..f88cc56 100644
  		return;
  
 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
-index 2e9953b..ed06350 100644
+index 53d9311..cbaf99f 100644
 --- a/net/iucv/af_iucv.c
 +++ b/net/iucv/af_iucv.c
 @@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
@@ -105142,10 +105240,10 @@ index 1a3c7e0..80f8b0c 100644
  		goto out;
  
 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index e75d5c5..429fc95 100644
+index dd4ff36..3462997 100644
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
-@@ -543,7 +543,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
+@@ -581,7 +581,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
  			ret = ieee80211_vif_use_channel(sdata, chandef,
  					IEEE80211_CHANCTX_EXCLUSIVE);
  		}
@@ -105154,7 +105252,7 @@ index e75d5c5..429fc95 100644
  		local->_oper_chandef = *chandef;
  		ieee80211_hw_config(local, 0);
  	}
-@@ -3416,7 +3416,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
+@@ -3468,7 +3468,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
  		else
  			local->probe_req_reg--;
  
@@ -105163,7 +105261,7 @@ index e75d5c5..429fc95 100644
  			break;
  
  		ieee80211_queue_work(&local->hw, &local->reconfig_filter);
-@@ -3551,8 +3551,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
+@@ -3603,8 +3603,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
  	if (chanctx_conf) {
  		*chandef = sdata->vif.bss_conf.chandef;
  		ret = 0;
@@ -105175,7 +105273,7 @@ index e75d5c5..429fc95 100644
  		if (local->use_chanctx)
  			*chandef = local->monitor_chandef;
 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
-index fa7568c..74c815c 100644
+index 8d53d65..a4ac794 100644
 --- a/net/mac80211/ieee80211_i.h
 +++ b/net/mac80211/ieee80211_i.h
 @@ -29,6 +29,7 @@
@@ -105186,7 +105284,7 @@ index fa7568c..74c815c 100644
  #include "key.h"
  #include "sta_info.h"
  #include "debug.h"
-@@ -1125,7 +1126,7 @@ struct ieee80211_local {
+@@ -1126,7 +1127,7 @@ struct ieee80211_local {
  	/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
  	spinlock_t queue_stop_reason_lock;
  
@@ -105196,10 +105294,10 @@ index fa7568c..74c815c 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 4173553..e3b5a3f 100644
+index 81a2751..c06a026 100644
 --- a/net/mac80211/iface.c
 +++ b/net/mac80211/iface.c
-@@ -543,7 +543,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -544,7 +544,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
  		break;
  	}
  
@@ -105208,7 +105306,7 @@ index 4173553..e3b5a3f 100644
  		res = drv_start(local);
  		if (res)
  			goto err_del_bss;
-@@ -590,7 +590,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -591,7 +591,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
  			res = drv_add_interface(local, sdata);
  			if (res)
  				goto err_stop;
@@ -105217,7 +105315,7 @@ index 4173553..e3b5a3f 100644
  			res = ieee80211_add_virtual_monitor(local);
  			if (res)
  				goto err_stop;
-@@ -700,7 +700,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -701,7 +701,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
  		atomic_inc(&local->iff_promiscs);
  
  	if (coming_up)
@@ -105226,7 +105324,7 @@ index 4173553..e3b5a3f 100644
  
  	if (hw_reconf_flags)
  		ieee80211_hw_config(local, hw_reconf_flags);
-@@ -738,7 +738,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
+@@ -739,7 +739,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
   err_del_interface:
  	drv_remove_interface(local, sdata);
   err_stop:
@@ -105235,7 +105333,7 @@ index 4173553..e3b5a3f 100644
  		drv_stop(local);
   err_del_bss:
  	sdata->bss = NULL;
-@@ -906,7 +906,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -907,7 +907,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
  	}
  
  	if (going_down)
@@ -105244,7 +105342,7 @@ index 4173553..e3b5a3f 100644
  
  	switch (sdata->vif.type) {
  	case NL80211_IFTYPE_AP_VLAN:
-@@ -968,7 +968,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -969,7 +969,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
  	}
  	spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
  
@@ -105253,7 +105351,7 @@ index 4173553..e3b5a3f 100644
  		ieee80211_clear_tx_pending(local);
  
  	/*
-@@ -1011,7 +1011,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -1012,7 +1012,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
  	if (cancel_scan)
  		flush_delayed_work(&local->scan_work);
  
@@ -105262,7 +105360,7 @@ index 4173553..e3b5a3f 100644
  		ieee80211_stop_device(local);
  
  		/* no reconfiguring after stop! */
-@@ -1022,7 +1022,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -1023,7 +1023,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
  	ieee80211_configure_filter(local);
  	ieee80211_hw_config(local, hw_reconf_flags);
  
@@ -105272,7 +105370,7 @@ index 4173553..e3b5a3f 100644
  }
  
 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
-index 6ab99da..f9502d4 100644
+index 5e09d35..e2fdbe2 100644
 --- a/net/mac80211/main.c
 +++ b/net/mac80211/main.c
 @@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
@@ -105285,7 +105383,7 @@ index 6ab99da..f9502d4 100644
  		/*
  		 * Goal:
 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
-index 4a95fe3..0bfd713 100644
+index ca405b6..6cc8bee 100644
 --- a/net/mac80211/pm.c
 +++ b/net/mac80211/pm.c
 @@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
@@ -105329,19 +105427,19 @@ index d53355b..21f583a 100644
  
  	if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
-index 1ce38e7..77267ad 100644
+index 747bdcf..eb2b981 100644
 --- a/net/mac80211/util.c
 +++ b/net/mac80211/util.c
-@@ -1757,7 +1757,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
- 	}
- #endif
- 	/* everything else happens only if HW was up & running */
+@@ -1741,7 +1741,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+ 	bool sched_scan_stopped = false;
+ 
+ 	/* nothing to do if HW shouldn't run */
 -	if (!local->open_count)
 +	if (!local_read(&local->open_count))
  		goto wake_up;
  
- 	/*
-@@ -1987,7 +1987,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+ #ifdef CONFIG_PM
+@@ -1993,7 +1993,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
  	local->in_reconfig = false;
  	barrier();
  
@@ -105350,6 +105448,24 @@ index 1ce38e7..77267ad 100644
  		ieee80211_add_virtual_monitor(local);
  
  	/*
+@@ -2048,7 +2048,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+ 	 * If this is for hw restart things are still running.
+ 	 * We may want to change that later, however.
+ 	 */
+-	if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
++	if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
+ 		drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
+ 
+ 	if (!local->suspended)
+@@ -2072,7 +2072,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
+ 		flush_delayed_work(&local->scan_work);
+ 	}
+ 
+-	if (local->open_count && !reconfig_due_to_wowlan)
++	if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
+ 		drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
+ 
+ 	list_for_each_entry(sdata, &local->interfaces, list) {
 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
 index b02660f..c0f791c 100644
 --- a/net/netfilter/Kconfig
@@ -105450,7 +105566,7 @@ index b87ca32..76c7799 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 fdcda8b..dbc1979 100644
+index ed99448..3ba6cad 100644
 --- a/net/netfilter/ipvs/ip_vs_ctl.c
 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
 @@ -799,7 +799,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
@@ -105498,7 +105614,7 @@ index fdcda8b..dbc1979 100644
  			entry.weight = atomic_read(&dest->weight);
  			entry.u_threshold = dest->u_threshold;
  			entry.l_threshold = dest->l_threshold;
-@@ -3039,7 +3039,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
+@@ -3040,7 +3040,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,
@@ -105507,7 +105623,7 @@ index fdcda8b..dbc1979 100644
  			 IP_VS_CONN_F_FWD_MASK)) ||
  	    nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
  			atomic_read(&dest->weight)) ||
-@@ -3672,7 +3672,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
+@@ -3675,7 +3675,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
  {
  	int idx;
  	struct netns_ipvs *ipvs = net_ipvs(net);
@@ -105609,10 +105725,10 @@ index a4b5e2a..13b1de3 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 46d1b26..b7f3b76 100644
+index 13fad86..18c984c 100644
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -1734,6 +1734,10 @@ void nf_conntrack_init_end(void)
+@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
  #define DYING_NULLS_VAL		((1<<30)+1)
  #define TEMPLATE_NULLS_VAL	((1<<30)+2)
  
@@ -105623,7 +105739,7 @@ index 46d1b26..b7f3b76 100644
  int nf_conntrack_init_net(struct net *net)
  {
  	int ret = -ENOMEM;
-@@ -1759,7 +1763,11 @@ int nf_conntrack_init_net(struct net *net)
+@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
  	if (!net->ct.stat)
  		goto err_pcpu_lists;
  
@@ -105701,10 +105817,10 @@ index 7a394df..bd91a8a 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 43c926c..a5731d8 100644
+index 675d12c..b36e825 100644
 --- a/net/netfilter/nf_log.c
 +++ b/net/netfilter/nf_log.c
-@@ -362,7 +362,7 @@ static const struct file_operations nflog_file_ops = {
+@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
  
  #ifdef CONFIG_SYSCTL
  static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
@@ -105713,7 +105829,7 @@ index 43c926c..a5731d8 100644
  
  static int nf_log_proc_dostring(struct ctl_table *table, int write,
  			 void __user *buffer, size_t *lenp, loff_t *ppos)
-@@ -393,13 +393,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
+@@ -417,13 +417,15 @@ 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 {
@@ -105777,10 +105893,10 @@ index 11d85b3..7fcc420 100644
  
  	if (data_len) {
 diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
-index b636486..9898807 100644
+index 65f3e2b..2e9d6a0 100644
 --- a/net/netfilter/nft_compat.c
 +++ b/net/netfilter/nft_compat.c
-@@ -274,14 +274,7 @@ static void nft_match_eval(const struct nft_expr *expr,
+@@ -317,14 +317,7 @@ static void nft_match_eval(const struct nft_expr *expr,
  		return;
  	}
  
@@ -105872,10 +105988,10 @@ index 1786968..1ec6dac 100644
  		remove_proc_entry("ipt_hashlimit", net->proc_net);
  		return -ENOMEM;
 diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
-index a9faae8..1ea30e0 100644
+index 45e1b30..a764f94 100644
 --- a/net/netfilter/xt_recent.c
 +++ b/net/netfilter/xt_recent.c
-@@ -615,7 +615,7 @@ static int __net_init recent_proc_net_init(struct net *net)
+@@ -642,7 +642,7 @@ static int __net_init recent_proc_net_init(struct net *net)
  {
  	struct recent_net *recent_net = recent_pernet(net);
  
@@ -105919,10 +106035,10 @@ index 11de55e..f25e448 100644
  	return 0;
  }
 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
-index 75532ef..7a461cd 100644
+index 05919bf..fcb6be3 100644
 --- a/net/netlink/af_netlink.c
 +++ b/net/netlink/af_netlink.c
-@@ -273,7 +273,7 @@ static void netlink_overrun(struct sock *sk)
+@@ -260,7 +260,7 @@ static void netlink_overrun(struct sock *sk)
  			sk->sk_error_report(sk);
  		}
  	}
@@ -105931,7 +106047,7 @@ index 75532ef..7a461cd 100644
  }
  
  static void netlink_rcv_wake(struct sock *sk)
-@@ -3007,7 +3007,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
+@@ -3004,7 +3004,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
  			   sk_wmem_alloc_get(s),
  			   nlk->cb_running,
  			   atomic_read(&s->sk_refcnt),
@@ -105954,7 +106070,7 @@ index 6a55f71..e88c937 100644
  };
  
 diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c
-index 296cc24..0f4115d 100644
+index 067a3ff..9ecc05c 100644
 --- a/net/openvswitch/vport.c
 +++ b/net/openvswitch/vport.c
 @@ -303,10 +303,10 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
@@ -105972,7 +106088,7 @@ index 296cc24..0f4115d 100644
  
  	for_each_possible_cpu(i) {
  		const struct pcpu_sw_netstats *percpu_stats;
-@@ -537,19 +537,19 @@ static void ovs_vport_record_error(struct vport *vport,
+@@ -538,19 +538,19 @@ static void ovs_vport_record_error(struct vport *vport,
  {
  	switch (err_type) {
  	case VPORT_E_RX_DROPPED:
@@ -105997,7 +106113,7 @@ index 296cc24..0f4115d 100644
  	}
  
 diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
-index 8a057d7..b5710c8 100644
+index bc85331..0d3dce0 100644
 --- a/net/openvswitch/vport.h
 +++ b/net/openvswitch/vport.h
 @@ -71,10 +71,10 @@ int ovs_vport_get_egress_tun_info(struct vport *vport, struct sk_buff *skb,
@@ -106016,7 +106132,7 @@ index 8a057d7..b5710c8 100644
  /**
   * struct vport_portids - array of netlink portids of a vport.
 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 9cfe2e1..1b7caf8 100644
+index f8db706..2b4631e 100644
 --- a/net/packet/af_packet.c
 +++ b/net/packet/af_packet.c
 @@ -269,7 +269,7 @@ static int packet_direct_xmit(struct sk_buff *skb)
@@ -106028,7 +106144,7 @@ index 9cfe2e1..1b7caf8 100644
  	kfree_skb(skb);
  	return NET_XMIT_DROP;
  }
-@@ -1839,7 +1839,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+@@ -1847,7 +1847,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++;
@@ -106037,7 +106153,7 @@ index 9cfe2e1..1b7caf8 100644
  	__skb_queue_tail(&sk->sk_receive_queue, skb);
  	spin_unlock(&sk->sk_receive_queue.lock);
  	sk->sk_data_ready(sk);
-@@ -1848,7 +1848,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+@@ -1856,7 +1856,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++;
@@ -106046,7 +106162,7 @@ index 9cfe2e1..1b7caf8 100644
  	spin_unlock(&sk->sk_receive_queue.lock);
  
  drop_n_restore:
-@@ -3485,7 +3485,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -3499,7 +3499,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
  	case PACKET_HDRLEN:
  		if (len > sizeof(int))
  			len = sizeof(int);
@@ -106055,7 +106171,7 @@ index 9cfe2e1..1b7caf8 100644
  			return -EFAULT;
  		switch (val) {
  		case TPACKET_V1:
-@@ -3531,7 +3531,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -3545,7 +3545,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
  		len = lv;
  	if (put_user(len, optlen))
  		return -EFAULT;
@@ -106122,7 +106238,7 @@ index c02a8c4..3c5b600 100644
  		.maxlen = sizeof(range),
  		.mode = table->mode,
 diff --git a/net/rds/cong.c b/net/rds/cong.c
-index e5b65ac..f3b6fb7 100644
+index e6144b8..4f9fda6 100644
 --- a/net/rds/cong.c
 +++ b/net/rds/cong.c
 @@ -78,7 +78,7 @@
@@ -106134,7 +106250,7 @@ index e5b65ac..f3b6fb7 100644
  
  /*
   * Congestion monitoring
-@@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
+@@ -247,7 +247,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
  	rdsdebug("waking map %p for %pI4\n",
  	  map, &map->m_addr);
  	rds_stats_inc(s_cong_update_received);
@@ -106143,7 +106259,7 @@ index e5b65ac..f3b6fb7 100644
  	if (waitqueue_active(&map->m_waitq))
  		wake_up(&map->m_waitq);
  	if (waitqueue_active(&rds_poll_waitq))
-@@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
+@@ -273,7 +273,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
  
  int rds_cong_updated_since(unsigned long *recent)
  {
@@ -106226,7 +106342,7 @@ index cbe6674..dc9eb89 100644
  	spinlock_t		i_ack_lock;	/* protect i_ack_next */
  	u64			i_ack_next;	/* next ACK to send */
 diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
-index a91e1db..cf3053f 100644
+index a6c2bea..e520995 100644
 --- a/net/rds/iw_cm.c
 +++ b/net/rds/iw_cm.c
 @@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
@@ -106400,10 +106516,10 @@ index 7b16704..9628ec6 100644
  /* count of skbs currently in use */
  atomic_t rxrpc_n_skbs;
 diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
-index c6be17a..2a6200a 100644
+index e0547f5..a171f7a 100644
 --- a/net/rxrpc/ar-ack.c
 +++ b/net/rxrpc/ar-ack.c
-@@ -223,7 +223,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
+@@ -224,7 +224,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
  
  	_enter("{%d,%d,%d,%d},",
  	       call->acks_hard, call->acks_unacked,
@@ -106411,8 +106527,8 @@ index c6be17a..2a6200a 100644
 +	       atomic_read_unchecked(&call->sequence),
  	       CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
  
- 	stop = 0;
-@@ -247,7 +247,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
+ 	stop = false;
+@@ -248,7 +248,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
  
  			/* each Tx packet has a new serial number */
  			sp->hdr.serial =
@@ -106421,7 +106537,7 @@ index c6be17a..2a6200a 100644
  
  			hdr = (struct rxrpc_header *) txb->head;
  			hdr->serial = sp->hdr.serial;
-@@ -451,7 +451,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
+@@ -452,7 +452,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
   */
  static void rxrpc_clear_tx_window(struct rxrpc_call *call)
  {
@@ -106430,7 +106546,7 @@ index c6be17a..2a6200a 100644
  }
  
  /*
-@@ -677,7 +677,7 @@ process_further:
+@@ -678,7 +678,7 @@ process_further:
  
  		latest = ntohl(sp->hdr.serial);
  		hard = ntohl(ack.firstPacket);
@@ -106439,7 +106555,7 @@ index c6be17a..2a6200a 100644
  
  		_proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
  		       latest,
-@@ -1209,7 +1209,7 @@ void rxrpc_process_call(struct work_struct *work)
+@@ -1210,7 +1210,7 @@ void rxrpc_process_call(struct work_struct *work)
  	goto maybe_reschedule;
  
  send_ACK_with_skew:
@@ -106448,7 +106564,7 @@ index c6be17a..2a6200a 100644
  			    ntohl(ack.serial));
  send_ACK:
  	mtu = call->conn->trans->peer->if_mtu;
-@@ -1221,7 +1221,7 @@ send_ACK:
+@@ -1222,7 +1222,7 @@ send_ACK:
  	ackinfo.rxMTU	= htonl(rxrpc_rx_mtu);
  	ackinfo.jumbo_max = htonl(rxrpc_rx_jumbo_max);
  
@@ -106457,7 +106573,7 @@ index c6be17a..2a6200a 100644
  	_proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
  	       ntohl(hdr.serial),
  	       ntohs(ack.maxSkew),
-@@ -1239,7 +1239,7 @@ send_ACK:
+@@ -1240,7 +1240,7 @@ send_ACK:
  send_message:
  	_debug("send message");
  
@@ -106568,10 +106684,10 @@ index 87f7135..74d3703 100644
  	}
  
 diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
-index e1a9373..a67f207 100644
+index 8331c95..401bf22 100644
 --- a/net/rxrpc/ar-output.c
 +++ b/net/rxrpc/ar-output.c
-@@ -680,14 +680,14 @@ static int rxrpc_send_data(struct kiocb *iocb,
+@@ -655,14 +655,14 @@ static int rxrpc_send_data(struct kiocb *iocb,
  					memset(skb_put(skb, pad), 0, pad);
  			}
  
@@ -106892,7 +107008,7 @@ index 2e9ada1..40f425d 100644
  
  	table = kmemdup(sctp_net_table, sizeof(sctp_net_table), GFP_KERNEL);
 diff --git a/net/socket.c b/net/socket.c
-index d50e7ca..c33fa46 100644
+index 245330c..919e2a7 100644
 --- a/net/socket.c
 +++ b/net/socket.c
 @@ -89,6 +89,7 @@
@@ -106929,7 +107045,7 @@ index d50e7ca..c33fa46 100644
  
  static struct file_system_type sock_fs_type = {
  	.name =		"sockfs",
-@@ -1235,6 +1237,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+@@ -1172,6 +1174,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
  		return -EAFNOSUPPORT;
  	if (type < 0 || type >= SOCK_MAX)
  		return -EINVAL;
@@ -106938,7 +107054,7 @@ index d50e7ca..c33fa46 100644
  
  	/* Compatibility.
  
-@@ -1255,6 +1259,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+@@ -1192,6 +1196,20 @@ int __sock_create(struct net *net, int family, int type, int protocol,
  	if (err)
  		return err;
  
@@ -106959,7 +107075,7 @@ index d50e7ca..c33fa46 100644
  	/*
  	 *	Allocate the socket and allow the family to set things up. if
  	 *	the protocol is 0, the family is instructed to select an appropriate
-@@ -1506,6 +1524,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1443,6 +1461,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) {
@@ -106974,7 +107090,7 @@ index d50e7ca..c33fa46 100644
  			err = security_socket_bind(sock,
  						   (struct sockaddr *)&address,
  						   addrlen);
-@@ -1514,6 +1540,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1451,6 +1477,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
  						      (struct sockaddr *)
  						      &address, addrlen);
  		}
@@ -106982,7 +107098,7 @@ index d50e7ca..c33fa46 100644
  		fput_light(sock->file, fput_needed);
  	}
  	return err;
-@@ -1537,10 +1564,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
+@@ -1474,10 +1501,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
  		if ((unsigned int)backlog > somaxconn)
  			backlog = somaxconn;
  
@@ -107003,7 +107119,7 @@ index d50e7ca..c33fa46 100644
  		fput_light(sock->file, fput_needed);
  	}
  	return err;
-@@ -1584,6 +1621,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1521,6 +1558,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
  	newsock->type = sock->type;
  	newsock->ops = sock->ops;
  
@@ -107022,7 +107138,7 @@ index d50e7ca..c33fa46 100644
  	/*
  	 * We don't need try_module_get here, as the listening socket (sock)
  	 * has the protocol module (sock->ops->owner) held.
-@@ -1629,6 +1678,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1566,6 +1615,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
  	fd_install(newfd, newfile);
  	err = newfd;
  
@@ -107031,7 +107147,7 @@ index d50e7ca..c33fa46 100644
  out_put:
  	fput_light(sock->file, fput_needed);
  out:
-@@ -1661,6 +1712,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1598,6 +1649,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
  		int, addrlen)
  {
  	struct socket *sock;
@@ -107039,7 +107155,7 @@ index d50e7ca..c33fa46 100644
  	struct sockaddr_storage address;
  	int err, fput_needed;
  
-@@ -1671,6 +1723,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1608,6 +1660,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
  	if (err < 0)
  		goto out_put;
  
@@ -107057,7 +107173,7 @@ index d50e7ca..c33fa46 100644
  	err =
  	    security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
  	if (err)
-@@ -1752,6 +1815,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
+@@ -1689,6 +1752,8 @@ SYSCALL_DEFINE3(getpeername, int, fd, struct sockaddr __user *, usockaddr,
   *	the protocol.
   */
  
@@ -107066,7 +107182,7 @@ index d50e7ca..c33fa46 100644
  SYSCALL_DEFINE6(sendto, int, fd, void __user *, buff, size_t, len,
  		unsigned int, flags, struct sockaddr __user *, addr,
  		int, addr_len)
-@@ -1819,7 +1884,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
+@@ -1756,7 +1821,7 @@ SYSCALL_DEFINE6(recvfrom, int, fd, void __user *, ubuf, size_t, size,
  	struct socket *sock;
  	struct iovec iov;
  	struct msghdr msg;
@@ -107075,7 +107191,7 @@ index d50e7ca..c33fa46 100644
  	int err, err2;
  	int fput_needed;
  
-@@ -2069,7 +2134,7 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg,
+@@ -2006,7 +2071,7 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg,
  		 * checking falls down on this.
  		 */
  		if (copy_from_user(ctl_buf,
@@ -107084,7 +107200,7 @@ index d50e7ca..c33fa46 100644
  				   ctl_len))
  			goto out_freectl;
  		msg_sys->msg_control = ctl_buf;
-@@ -2220,7 +2285,7 @@ static int ___sys_recvmsg(struct socket *sock, struct user_msghdr __user *msg,
+@@ -2157,7 +2222,7 @@ static int ___sys_recvmsg(struct socket *sock, struct user_msghdr __user *msg,
  	ssize_t err;
  
  	/* kernel mode address */
@@ -107093,7 +107209,7 @@ index d50e7ca..c33fa46 100644
  
  	/* user mode address pointers */
  	struct sockaddr __user *uaddr;
-@@ -2866,7 +2931,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
+@@ -2803,7 +2868,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
  	ifr = compat_alloc_user_space(buf_size);
  	rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
  
@@ -107102,7 +107218,7 @@ index d50e7ca..c33fa46 100644
  		return -EFAULT;
  
  	if (put_user(convert_in ? rxnfc : compat_ptr(data),
-@@ -2977,7 +3042,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
+@@ -2914,7 +2979,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
  		old_fs = get_fs();
  		set_fs(KERNEL_DS);
  		err = dev_ioctl(net, cmd,
@@ -107111,7 +107227,7 @@ index d50e7ca..c33fa46 100644
  		set_fs(old_fs);
  
  		return err;
-@@ -3070,7 +3135,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
+@@ -3007,7 +3072,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
  
  	old_fs = get_fs();
  	set_fs(KERNEL_DS);
@@ -107120,7 +107236,7 @@ index d50e7ca..c33fa46 100644
  	set_fs(old_fs);
  
  	if (cmd == SIOCGIFMAP && !err) {
-@@ -3154,7 +3219,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
+@@ -3091,7 +3156,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);
@@ -107129,7 +107245,7 @@ index d50e7ca..c33fa46 100644
  			devname[15] = 0;
  		} else
  			r4.rt_dev = NULL;
-@@ -3381,8 +3446,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
+@@ -3318,8 +3383,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
  	int __user *uoptlen;
  	int err;
  
@@ -107140,7 +107256,7 @@ index d50e7ca..c33fa46 100644
  
  	set_fs(KERNEL_DS);
  	if (level == SOL_SOCKET)
-@@ -3402,7 +3467,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
+@@ -3339,7 +3404,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
  	char __user *uoptval;
  	int err;
  
@@ -107150,10 +107266,10 @@ index d50e7ca..c33fa46 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 224a82f..7a42b51 100644
+index 1095be9..815d777 100644
 --- a/net/sunrpc/auth_gss/svcauth_gss.c
 +++ b/net/sunrpc/auth_gss/svcauth_gss.c
-@@ -1140,7 +1140,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
+@@ -1142,7 +1142,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
  				uint64_t *handle)
  {
  	struct rsc rsci, *rscp = NULL;
@@ -107162,7 +107278,7 @@ index 224a82f..7a42b51 100644
  	long long ctxh;
  	struct gss_api_mech *gm = NULL;
  	time_t expiry;
-@@ -1151,7 +1151,7 @@ static int gss_proxy_save_rsc(struct cache_detail *cd,
+@@ -1153,7 +1153,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 */
@@ -107185,7 +107301,7 @@ index 5199bb1..567a54c 100644
  		goto out_nomem;
  	cd->u.procfs.channel_ent = NULL;
 diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
-index 86e6cc5..f79a7f5 100644
+index e6ce151..ba1cf85 100644
 --- a/net/sunrpc/clnt.c
 +++ b/net/sunrpc/clnt.c
 @@ -1436,7 +1436,9 @@ call_start(struct rpc_task *task)
@@ -107200,7 +107316,7 @@ index 86e6cc5..f79a7f5 100644
  	task->tk_action = call_reserve;
  }
 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
-index d20f232..ec9cd28 100644
+index b91fd9c..00fe5b1 100644
 --- a/net/sunrpc/sched.c
 +++ b/net/sunrpc/sched.c
 @@ -261,9 +261,9 @@ static int rpc_wait_bit_killable(struct wait_bit_key *key)
@@ -107216,10 +107332,10 @@ index d20f232..ec9cd28 100644
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
 diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
-index 9711a15..fb0eb4d 100644
+index 2ecb994..5afb49f 100644
 --- a/net/sunrpc/stats.c
 +++ b/net/sunrpc/stats.c
-@@ -278,7 +278,7 @@ int rpc_proc_init(struct net *net)
+@@ -290,7 +290,7 @@ int rpc_proc_init(struct net *net)
  
  	dprintk("RPC:       registering /proc/net/rpc\n");
  	sn = net_generic(net, sunrpc_net_id);
@@ -107229,7 +107345,7 @@ index 9711a15..fb0eb4d 100644
  		return -ENOMEM;
  
 diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
-index 91eaef1..08434d4 100644
+index 78974e4..1e0d1a5 100644
 --- a/net/sunrpc/svc.c
 +++ b/net/sunrpc/svc.c
 @@ -1169,7 +1169,9 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
@@ -107377,10 +107493,10 @@ index c1b6270..05089c1 100644
  		.proc_handler	= read_reset_stat,
  	},
 diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-index e011027..9d3c4e1 100644
+index f9f13a3..d155c71 100644
 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-@@ -220,7 +220,7 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
+@@ -209,7 +209,7 @@ int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
  	*page_no = pg_no;
  	*page_offset = pg_off;
  	ret = read;
@@ -107389,7 +107505,7 @@ index e011027..9d3c4e1 100644
  	return ret;
   err:
  	svc_rdma_unmap_dma(ctxt);
-@@ -356,7 +356,7 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
+@@ -345,7 +345,7 @@ int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
  	*page_no = pg_no;
  	*page_offset = pg_off;
  	ret = read;
@@ -107398,7 +107514,7 @@ index e011027..9d3c4e1 100644
  	return ret;
   err:
  	svc_rdma_unmap_dma(ctxt);
-@@ -540,7 +540,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
+@@ -599,7 +599,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
  				  dto_q);
  		list_del_init(&ctxt->dto_q);
  	} else {
@@ -107407,20 +107523,20 @@ index e011027..9d3c4e1 100644
  		clear_bit(XPT_DATA, &xprt->xpt_flags);
  		ctxt = NULL;
  	}
-@@ -559,7 +559,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
+@@ -617,7 +617,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
+ 	}
  	dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
  		ctxt, rdma_xprt, rqstp, ctxt->wc_status);
- 	BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
 -	atomic_inc(&rdma_stat_recv);
 +	atomic_inc_unchecked(&rdma_stat_recv);
  
  	/* Build up the XDR from the receive buffers. */
  	rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
 diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
-index 9f1b506..2e0b321 100644
+index 7de33d1a..7f10241 100644
 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
-@@ -208,7 +208,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
+@@ -218,7 +218,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
  	write_wr.wr.rdma.remote_addr = to;
  
  	/* Post It */
@@ -107430,10 +107546,10 @@ index 9f1b506..2e0b321 100644
  		goto err;
  	return write_len - bc;
 diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-index 4e61880..1f0d963 100644
+index f609c1c..abd491f 100644
 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-@@ -295,7 +295,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -294,7 +294,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
  		return;
  
  	ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
@@ -107442,7 +107558,7 @@ index 4e61880..1f0d963 100644
  
  	while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
  		ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
-@@ -317,7 +317,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -316,7 +316,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
  	}
  
  	if (ctxt)
@@ -107451,7 +107567,7 @@ index 4e61880..1f0d963 100644
  
  	set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
  	/*
-@@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -395,7 +395,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
  		return;
  
  	ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
@@ -107460,7 +107576,7 @@ index 4e61880..1f0d963 100644
  	while ((ret = ib_poll_cq(cq, ARRAY_SIZE(wc_a), wc_a)) > 0) {
  		int i;
  
-@@ -420,7 +420,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -423,7 +423,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
  	}
  
  	if (ctxt)
@@ -107469,7 +107585,7 @@ index 4e61880..1f0d963 100644
  }
  
  static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
-@@ -1264,7 +1264,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
+@@ -1275,7 +1275,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
  		spin_lock_bh(&xprt->sc_lock);
  		if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
  			spin_unlock_bh(&xprt->sc_lock);
@@ -107491,11 +107607,52 @@ index e7000be..e3b0ba7 100644
  	    uid_eq(root_uid, current_euid())) {
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
+diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
+index ce9121e..fd1fcce 100644
+--- a/net/tipc/netlink_compat.c
++++ b/net/tipc/netlink_compat.c
+@@ -64,12 +64,12 @@ struct tipc_nl_compat_cmd_dump {
+ 	int (*header)(struct tipc_nl_compat_msg *);
+ 	int (*dumpit)(struct sk_buff *, struct netlink_callback *);
+ 	int (*format)(struct tipc_nl_compat_msg *msg, struct nlattr **attrs);
+-};
++} __no_const;
+ 
+ struct tipc_nl_compat_cmd_doit {
+ 	int (*doit)(struct sk_buff *skb, struct genl_info *info);
+ 	int (*transcode)(struct sk_buff *skb, struct tipc_nl_compat_msg *msg);
+-};
++} __no_const;
+ 
+ static int tipc_skb_tailroom(struct sk_buff *skb)
+ {
+@@ -746,7 +746,10 @@ static int tipc_nl_compat_publ_dump(struct tipc_nl_compat_msg *msg, u32 sock)
+ 	void *hdr;
+ 	struct nlattr *nest;
+ 	struct sk_buff *args;
+-	struct tipc_nl_compat_cmd_dump dump;
++	static struct tipc_nl_compat_cmd_dump dump = {
++		.dumpit = tipc_nl_publ_dump,
++		.format = __tipc_nl_compat_publ_dump,
++	};
+ 
+ 	args = nlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
+ 	if (!args)
+@@ -769,9 +772,6 @@ static int tipc_nl_compat_publ_dump(struct tipc_nl_compat_msg *msg, u32 sock)
+ 	nla_nest_end(args, nest);
+ 	genlmsg_end(args, hdr);
+ 
+-	dump.dumpit = tipc_nl_publ_dump;
+-	dump.format = __tipc_nl_compat_publ_dump;
+-
+ 	err = __tipc_nl_compat_dumpit(&dump, msg, args);
+ 
+ 	kfree_skb(args);
 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
-index 0344206..bff8abf 100644
+index 72c339e..a93593a 100644
 --- a/net/tipc/subscr.c
 +++ b/net/tipc/subscr.c
-@@ -96,7 +96,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
+@@ -70,7 +70,7 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
  	struct tipc_subscriber *subscriber = sub->subscriber;
  	struct kvec msg_sect;
  
@@ -107505,7 +107662,7 @@ index 0344206..bff8abf 100644
  	sub->evt.event = htohl(event, sub->swap);
  	sub->evt.found_lower = htohl(found_lower, sub->swap);
 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
-index 8e1b102..20af1b2 100644
+index 526b6ed..ec20275 100644
 --- a/net/unix/af_unix.c
 +++ b/net/unix/af_unix.c
 @@ -791,6 +791,12 @@ static struct sock *unix_find_other(struct net *net,
@@ -107554,7 +107711,7 @@ index 8e1b102..20af1b2 100644
  	done_path_create(&path, dentry);
  	return err;
  }
-@@ -2248,11 +2267,14 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock,
+@@ -2233,11 +2252,14 @@ static unsigned int unix_dgram_poll(struct file *file, struct socket *sock,
  	writable = unix_writable(sk);
  	other = unix_peer_get(sk);
  	if (other) {
@@ -107571,7 +107728,7 @@ index 8e1b102..20af1b2 100644
  		sock_put(other);
  	}
  
-@@ -2349,9 +2371,13 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2334,9 +2356,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 {
@@ -107586,7 +107743,7 @@ index 8e1b102..20af1b2 100644
  
  		seq_printf(seq, "%pK: %08X %08X %08X %04X %02X %5lu",
  			s,
-@@ -2376,10 +2402,29 @@ static int unix_seq_show(struct seq_file *seq, void *v)
+@@ -2361,10 +2387,29 @@ static int unix_seq_show(struct seq_file *seq, void *v)
  				seq_putc(seq, '@');
  				i++;
  			}
@@ -107775,7 +107932,7 @@ index 0917f04..f4e3d8c 100644
  
  	if (!proc_create("x25/route", S_IRUGO, init_net.proc_net,
 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index cee479b..0ea3567 100644
+index 638af06..7d9daad 100644
 --- a/net/xfrm/xfrm_policy.c
 +++ b/net/xfrm/xfrm_policy.c
 @@ -331,7 +331,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
@@ -107975,10 +108132,10 @@ index 05a6e3d..6716ec9 100644
  	__xfrm_sysctl_init(net);
  
 diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
-index edd2794..73c7db9 100644
+index d3437b8..6c3becb 100644
 --- a/scripts/Kbuild.include
 +++ b/scripts/Kbuild.include
-@@ -144,7 +144,7 @@ cc-ifversion = $(shell [ $(call cc-version, $(CC)) $(1) $(2) ] && echo $(3))
+@@ -142,7 +142,7 @@ cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
  # cc-ldoption
  # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
  cc-ldoption = $(call try-run,\
@@ -107988,7 +108145,7 @@ index edd2794..73c7db9 100644
  # ld-option
  # Usage: LDFLAGS += $(call ld-option, -X)
 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
-index 649ce68..f6bc05c 100644
+index 01df30a..b687dbf 100644
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
 @@ -60,7 +60,7 @@ endif
@@ -108001,7 +108158,7 @@ index 649ce68..f6bc05c 100644
  endif
  
 diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
-index 627f8cb..dbe0bca 100644
+index 55c96cb..e4e88ab 100644
 --- a/scripts/Makefile.clean
 +++ b/scripts/Makefile.clean
 @@ -38,7 +38,8 @@ subdir-ymn	:= $(addprefix $(obj)/,$(subdir-ymn))
@@ -108421,20 +108578,20 @@ index 944418d..15291e4 100644
  			filename, strerror(errno));
  		goto out;
 diff --git a/scripts/module-common.lds b/scripts/module-common.lds
-index 0865b3e..7235dd4 100644
+index 73a2c7d..df11b31 100644
 --- a/scripts/module-common.lds
 +++ b/scripts/module-common.lds
 @@ -6,6 +6,10 @@
  SECTIONS {
  	/DISCARD/ : { *(.discard) }
  
-+	.rodata : {
++	.rodata			0: {
 +		*(.rodata) *(.rodata.*)
 +		*(.data..read_only)
 +	}
- 	__ksymtab		: { *(SORT(___ksymtab+*)) }
- 	__ksymtab_gpl		: { *(SORT(___ksymtab_gpl+*)) }
- 	__ksymtab_unused	: { *(SORT(___ksymtab_unused+*)) }
+ 	__ksymtab		0 : { *(SORT(___ksymtab+*)) }
+ 	__ksymtab_gpl		0 : { *(SORT(___ksymtab_gpl+*)) }
+ 	__ksymtab_unused	0 : { *(SORT(___ksymtab_unused+*)) }
 diff --git a/scripts/package/Makefile b/scripts/package/Makefile
 index 99ca6e7..3a1a1a1 100644
 --- a/scripts/package/Makefile
@@ -108449,10 +108606,10 @@ index 99ca6e7..3a1a1a1 100644
  	rm -f $(objtree)/.scmversion
  	$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 5972624..4028795 100755
+index 88dbf23..d1b4291 100755
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
-@@ -293,6 +293,7 @@ fi
+@@ -304,6 +304,7 @@ fi
  (cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> "$objtree/debian/hdrsrcfiles"
  (cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> "$objtree/debian/hdrsrcfiles"
  (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f) >> "$objtree/debian/hdrobjfiles"
@@ -109594,7 +109751,7 @@ index fdaa50c..2761dcb 100644
  		old_dentry->d_inode->i_uid,
  		old_dentry->d_inode->i_mode
 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index 65ca451..ad6f22d 100644
+index 107db88..185f3a0 100644
 --- a/security/apparmor/lsm.c
 +++ b/security/apparmor/lsm.c
 @@ -186,7 +186,7 @@ static int common_perm_dir_dentry(int op, struct path *dir,
@@ -109636,7 +109793,7 @@ index 65ca451..ad6f22d 100644
  
  	.ptrace_access_check =		apparmor_ptrace_access_check,
 diff --git a/security/commoncap.c b/security/commoncap.c
-index 2915d85..970753f 100644
+index f66713b..b69aa8e 100644
 --- a/security/commoncap.c
 +++ b/security/commoncap.c
 @@ -427,6 +427,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
@@ -109672,7 +109829,7 @@ index 2915d85..970753f 100644
  /*
   * Attempt to get the on-exec apply capability sets for an executable file from
   * its xattrs and, if present, apply them to the proposed credentials being
-@@ -595,6 +621,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
+@@ -591,6 +617,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
  	const struct cred *cred = current_cred();
  	kuid_t root_uid = make_kuid(cred->user_ns, 0);
  
@@ -109865,18 +110022,6 @@ index 4743d71..170a185 100644
  err:
  	if (iov != iovstack)
  		kfree(iov);
-diff --git a/security/keys/request_key.c b/security/keys/request_key.c
-index 0c7aea4..486ef6f 100644
---- a/security/keys/request_key.c
-+++ b/security/keys/request_key.c
-@@ -414,6 +414,7 @@ link_check_failed:
- 
- link_prealloc_failed:
- 	mutex_unlock(&user->cons_lock);
-+	key_put(key);
- 	kleave(" = %d [prelink]", ret);
- 	return ret;
- 
 diff --git a/security/min_addr.c b/security/min_addr.c
 index f728728..6457a0c 100644
 --- a/security/min_addr.c
@@ -109898,7 +110043,7 @@ index f728728..6457a0c 100644
  
  /*
 diff --git a/security/security.c b/security/security.c
-index 18b35c6..c9fbc92 100644
+index e81d5bb..b9c5111 100644
 --- a/security/security.c
 +++ b/security/security.c
 @@ -33,8 +33,8 @@
@@ -109925,7 +110070,7 @@ index 18b35c6..c9fbc92 100644
  static int __init choose_lsm(char *str)
  {
 diff --git a/security/selinux/avc.c b/security/selinux/avc.c
-index a18f1fa..c9b9fc4 100644
+index afcc0ae..71f0525 100644
 --- a/security/selinux/avc.c
 +++ b/security/selinux/avc.c
 @@ -59,7 +59,7 @@ struct avc_node {
@@ -109956,10 +110101,10 @@ index a18f1fa..c9b9fc4 100644
  		lock = &avc_cache.slots_lock[hvalue];
  
 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 6da7532..f0b1882 100644
+index 4d1a541..4d87c9b 100644
 --- a/security/selinux/hooks.c
 +++ b/security/selinux/hooks.c
-@@ -5807,7 +5807,8 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
+@@ -5862,7 +5862,8 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
  
  #endif
  
@@ -109968,8 +110113,8 @@ index 6da7532..f0b1882 100644
 + 	.name =				"selinux",
  	.name =				"selinux",
  
- 	.ptrace_access_check =		selinux_ptrace_access_check,
-@@ -6148,6 +6149,9 @@ static void selinux_nf_ip_exit(void)
+ 	.binder_set_context_mgr =	selinux_binder_set_context_mgr,
+@@ -6208,6 +6209,9 @@ static void selinux_nf_ip_exit(void)
  #ifdef CONFIG_SECURITY_SELINUX_DISABLE
  static int selinux_disabled;
  
@@ -109979,7 +110124,7 @@ index 6da7532..f0b1882 100644
  int selinux_disable(void)
  {
  	if (ss_initialized) {
-@@ -6165,7 +6169,9 @@ int selinux_disable(void)
+@@ -6225,7 +6229,9 @@ int selinux_disable(void)
  	selinux_disabled = 1;
  	selinux_enabled = 0;
  
@@ -110004,10 +110149,10 @@ index 1450f85..a91e0bc 100644
  	}
  	rtnl_unlock();
 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index a717877..0747450 100644
+index c934311..ac64d68 100644
 --- a/security/smack/smack_lsm.c
 +++ b/security/smack/smack_lsm.c
-@@ -4082,7 +4082,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
+@@ -4187,7 +4187,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
  	return 0;
  }
  
@@ -110017,7 +110162,7 @@ index a717877..0747450 100644
  
  	.ptrace_access_check =		smack_ptrace_access_check,
 diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
-index 4003907..13a2b55 100644
+index c151a18..14ba19a 100644
 --- a/security/tomoyo/file.c
 +++ b/security/tomoyo/file.c
 @@ -692,7 +692,7 @@ int tomoyo_path_number_perm(const u8 type, struct path *path,
@@ -110287,7 +110432,7 @@ index ffd2025..df062c9 100644
  /* PCM3052 register definitions */
  
 diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
-index ada69d7..5f65386 100644
+index 80423a4c..270c3d0 100644
 --- a/sound/core/oss/pcm_oss.c
 +++ b/sound/core/oss/pcm_oss.c
 @@ -1190,10 +1190,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
@@ -110375,10 +110520,10 @@ index 2d957ba..fda022c 100644
  	if (err < 0)
  		return err;
 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
-index 64d9863..969034b 100644
+index 279e24f..24aafe5 100644
 --- a/sound/core/pcm_native.c
 +++ b/sound/core/pcm_native.c
-@@ -2956,11 +2956,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
+@@ -2969,11 +2969,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,
@@ -110448,10 +110593,10 @@ index 0631bda..d0dcd49 100644
  		dev->driver_data = NULL;
  		ops->num_init_devices--;
 diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
-index a1fd77a..69cd659 100644
+index 68fec77..97fb643 100644
 --- a/sound/core/seq/seq_midi.c
 +++ b/sound/core/seq/seq_midi.c
-@@ -462,8 +462,8 @@ snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)
+@@ -461,8 +461,8 @@ snd_seq_midisynth_unregister_port(struct snd_seq_device *dev)
  static int __init alsa_seq_midi_init(void)
  {
  	static struct snd_seq_dev_ops ops = {
@@ -110463,7 +110608,7 @@ index a1fd77a..69cd659 100644
  	memset(&synths, 0, sizeof(synths));
  	snd_seq_autoload_lock();
 diff --git a/sound/core/sound.c b/sound/core/sound.c
-index f133306..3ec0dab 100644
+index 185cec0..a95a1a9 100644
 --- a/sound/core/sound.c
 +++ b/sound/core/sound.c
 @@ -86,7 +86,7 @@ static void snd_request_other(int minor)
@@ -110536,10 +110681,10 @@ index 2a008a9..a1efb3f 100644
  	return 0;
  }
 diff --git a/sound/drivers/opl3/opl3_seq.c b/sound/drivers/opl3/opl3_seq.c
-index 6839953..7a0f4b9 100644
+index a9f618e..c5a7208 100644
 --- a/sound/drivers/opl3/opl3_seq.c
 +++ b/sound/drivers/opl3/opl3_seq.c
-@@ -281,8 +281,8 @@ static int __init alsa_opl3_seq_init(void)
+@@ -279,8 +279,8 @@ static int __init alsa_opl3_seq_init(void)
  {
  	static struct snd_seq_dev_ops ops =
  	{
@@ -110551,7 +110696,7 @@ index 6839953..7a0f4b9 100644
  
  	return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_OPL3, &ops,
 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
-index b953fb4..1999c01 100644
+index 3b0ee42..8423ad6 100644
 --- a/sound/drivers/opl4/opl4_lib.c
 +++ b/sound/drivers/opl4/opl4_lib.c
 @@ -29,7 +29,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
@@ -110600,7 +110745,7 @@ index 464385a..46ab3f6 100644
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
 diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
-index 911341b..bd18b63 100644
+index 5cc356d..d65e68ff 100644
 --- a/sound/firewire/amdtp.c
 +++ b/sound/firewire/amdtp.c
 @@ -573,7 +573,7 @@ static void update_pcm_pointers(struct amdtp_stream *s,
@@ -110721,10 +110866,10 @@ index 2dba848..c682aef 100644
  	wait_event(scs->idle_wait, scs->output_idle);
  
 diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c
-index 95b39be..42f142c 100644
+index 72332df..82ec6a2 100644
 --- a/sound/isa/sb/emu8000_synth.c
 +++ b/sound/isa/sb/emu8000_synth.c
-@@ -119,8 +119,8 @@ static int __init alsa_emu8000_init(void)
+@@ -118,8 +118,8 @@ static int __init alsa_emu8000_init(void)
  {
  	
  	static struct snd_seq_dev_ops ops = {
@@ -110749,7 +110894,7 @@ index 048439a..3be9f6f 100644
  					   userbuf+useroffs + p,
  					   locallen))
 diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
-index a33e8ce..2262303 100644
+index 213a416..aeab5c9 100644
 --- a/sound/oss/swarm_cs4297a.c
 +++ b/sound/oss/swarm_cs4297a.c
 @@ -2623,7 +2623,6 @@ static int __init cs4297a_init(void)
@@ -110815,7 +110960,7 @@ index 2fe86d2..8f1cd08 100644
  		set_fs(fs);
  	} else if (kctl->vd[0].access & SNDRV_CTL_ELEM_ACCESS_TLV_READ)
 diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
-index 4631a23..001ae57 100644
+index 149d4cb..7784769 100644
 --- a/sound/pci/ymfpci/ymfpci.h
 +++ b/sound/pci/ymfpci/ymfpci.h
 @@ -358,7 +358,7 @@ struct snd_ymfpci {
@@ -110828,7 +110973,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 81c916a..516f0bf 100644
+index 4c26076..a13f370 100644
 --- a/sound/pci/ymfpci/ymfpci_main.c
 +++ b/sound/pci/ymfpci/ymfpci_main.c
 @@ -204,8 +204,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
@@ -110862,7 +111007,7 @@ index 81c916a..516f0bf 100644
  			wake_up(&chip->interrupt_sleep);
  		}
  	}
-@@ -2423,7 +2423,7 @@ int snd_ymfpci_create(struct snd_card *card,
+@@ -2384,7 +2384,7 @@ int snd_ymfpci_create(struct snd_card *card,
  	spin_lock_init(&chip->reg_lock);
  	spin_lock_init(&chip->voice_lock);
  	init_waitqueue_head(&chip->interrupt_sleep);
@@ -110888,6 +111033,19 @@ index 08d7259..0336224 100644
  
  	snd_ac97_rst_cfg = cfg;
  	return 0;
+diff --git a/sound/soc/xtensa/xtfpga-i2s.c b/sound/soc/xtensa/xtfpga-i2s.c
+index 1cfb19e..6e5731a 100644
+--- a/sound/soc/xtensa/xtfpga-i2s.c
++++ b/sound/soc/xtensa/xtfpga-i2s.c
+@@ -437,7 +437,7 @@ static int xtfpga_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
+ 	case SNDRV_PCM_TRIGGER_START:
+ 	case SNDRV_PCM_TRIGGER_RESUME:
+ 	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+-		ACCESS_ONCE(i2s->tx_ptr) = 0;
++		ACCESS_ONCE_RW(i2s->tx_ptr) = 0;
+ 		rcu_assign_pointer(i2s->tx_substream, substream);
+ 		xtfpga_pcm_refill_fifo(i2s);
+ 		break;
 diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
 index 7778b8e..3d619fc 100644
 --- a/sound/synth/emux/emux_seq.c
@@ -110913,6 +111071,155 @@ index 7778b8e..3d619fc 100644
  };
  
  
+diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
+index 81b7da8..bb2676f 100644
+--- a/sound/usb/line6/driver.c
++++ b/sound/usb/line6/driver.c
+@@ -307,7 +307,7 @@ int line6_read_data(struct usb_line6 *line6, unsigned address, void *data,
+ {
+ 	struct usb_device *usbdev = line6->usbdev;
+ 	int ret;
+-	unsigned char len;
++	unsigned char *plen;
+ 	unsigned count;
+ 
+ 	if (address > 0xffff || datalen > 0xff)
+@@ -324,6 +324,10 @@ int line6_read_data(struct usb_line6 *line6, unsigned address, void *data,
+ 		return ret;
+ 	}
+ 
++	plen = kmalloc(1, GFP_KERNEL);
++	if (plen == NULL)
++		return -ENOMEM;
++
+ 	/* Wait for data length. We'll get 0xff until length arrives. */
+ 	for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) {
+ 		mdelay(LINE6_READ_WRITE_STATUS_DELAY);
+@@ -331,30 +335,35 @@ int line6_read_data(struct usb_line6 *line6, unsigned address, void *data,
+ 		ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
+ 				      USB_TYPE_VENDOR | USB_RECIP_DEVICE |
+ 				      USB_DIR_IN,
+-				      0x0012, 0x0000, &len, 1,
++				      0x0012, 0x0000, plen, 1,
+ 				      LINE6_TIMEOUT * HZ);
+ 		if (ret < 0) {
+ 			dev_err(line6->ifcdev,
+ 				"receive length failed (error %d)\n", ret);
++			kfree(plen);
+ 			return ret;
+ 		}
+ 
+-		if (len != 0xff)
++		if (*plen != 0xff)
+ 			break;
+ 	}
+ 
+-	if (len == 0xff) {
++	if (*plen == 0xff) {
+ 		dev_err(line6->ifcdev, "read failed after %d retries\n",
+ 			count);
++		kfree(plen);
+ 		return -EIO;
+-	} else if (len != datalen) {
++	} else if (*plen != datalen) {
+ 		/* should be equal or something went wrong */
+ 		dev_err(line6->ifcdev,
+ 			"length mismatch (expected %d, got %d)\n",
+-			(int)datalen, (int)len);
++			(int)datalen, (int)*plen);
++		kfree(plen);
+ 		return -EIO;
+ 	}
+ 
++	kfree(plen);
++
+ 	/* receive the result: */
+ 	ret = usb_control_msg(usbdev, usb_rcvctrlpipe(usbdev, 0), 0x67,
+ 			      USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
+@@ -378,7 +387,7 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data,
+ {
+ 	struct usb_device *usbdev = line6->usbdev;
+ 	int ret;
+-	unsigned char status;
++	unsigned char *status;
+ 	int count;
+ 
+ 	if (address > 0xffff || datalen > 0xffff)
+@@ -395,6 +404,10 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data,
+ 		return ret;
+ 	}
+ 
++	status = kmalloc(1, GFP_KERNEL);
++	if (status == NULL)
++		return -ENOMEM;
++
+ 	for (count = 0; count < LINE6_READ_WRITE_MAX_RETRIES; count++) {
+ 		mdelay(LINE6_READ_WRITE_STATUS_DELAY);
+ 
+@@ -403,27 +416,32 @@ int line6_write_data(struct usb_line6 *line6, unsigned address, void *data,
+ 				      USB_TYPE_VENDOR | USB_RECIP_DEVICE |
+ 				      USB_DIR_IN,
+ 				      0x0012, 0x0000,
+-				      &status, 1, LINE6_TIMEOUT * HZ);
++				      status, 1, LINE6_TIMEOUT * HZ);
+ 
+ 		if (ret < 0) {
+ 			dev_err(line6->ifcdev,
+ 				"receiving status failed (error %d)\n", ret);
++			kfree(status);
+ 			return ret;
+ 		}
+ 
+-		if (status != 0xff)
++		if (*status != 0xff)
+ 			break;
+ 	}
+ 
+-	if (status == 0xff) {
++	if (*status == 0xff) {
+ 		dev_err(line6->ifcdev, "write failed after %d retries\n",
+ 			count);
++		kfree(status);
+ 		return -EIO;
+-	} else if (status != 0) {
++	} else if (*status != 0) {
+ 		dev_err(line6->ifcdev, "write failed (error %d)\n", ret);
++		kfree(status);
+ 		return -EIO;
+ 	}
+ 
++	kfree(status);
++
+ 	return 0;
+ }
+ EXPORT_SYMBOL_GPL(line6_write_data);
+diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
+index 6d4c50c..aa658c8 100644
+--- a/sound/usb/line6/toneport.c
++++ b/sound/usb/line6/toneport.c
+@@ -367,13 +367,19 @@ static bool toneport_has_source_select(struct usb_line6_toneport *toneport)
+ */
+ static void toneport_setup(struct usb_line6_toneport *toneport)
+ {
+-	int ticks;
++	int *ticks;
+ 	struct usb_line6 *line6 = &toneport->line6;
+ 	struct usb_device *usbdev = line6->usbdev;
+ 
++	ticks = kmalloc(sizeof(int), GFP_KERNEL);
++	if (ticks == NULL)
++		return;
++
+ 	/* sync time on device with host: */
+-	ticks = (int)get_seconds();
+-	line6_write_data(line6, 0x80c6, &ticks, 4);
++	*ticks = (int)get_seconds();
++	line6_write_data(line6, 0x80c6, ticks, sizeof(int));
++
++	kfree(ticks);
+ 
+ 	/* enable device: */
+ 	toneport_send_cmd(usbdev, 0x0301, 0x0000);
 diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
 new file mode 100644
 index 0000000..de92ed9
@@ -117328,10 +117635,10 @@ index 0000000..b8e7188
 +}
 diff --git a/tools/gcc/size_overflow_plugin/size_overflow_hash.data b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
 new file mode 100644
-index 0000000..e3e2614
+index 0000000..a0b019b
 --- /dev/null
 +++ b/tools/gcc/size_overflow_plugin/size_overflow_hash.data
-@@ -0,0 +1,27716 @@
+@@ -0,0 +1,28039 @@
 +intel_fake_agp_alloc_by_type_1 intel_fake_agp_alloc_by_type 1 1 NULL nohasharray
 +iwl_set_tx_power_1 iwl_set_tx_power 0 1 &intel_fake_agp_alloc_by_type_1
 +ocfs2_get_refcount_tree_3 ocfs2_get_refcount_tree 0 3 NULL
@@ -117360,7 +117667,9 @@ index 0000000..e3e2614
 +__skb_to_sgvec_72 __skb_to_sgvec 0 72 NULL
 +_nfs41_test_stateid_76 _nfs41_test_stateid 0 76 NULL
 +gadget_strings_product_store_78 gadget_strings_product_store 0-3 78 NULL
-+uwb_dev_LQE_show_86 uwb_dev_LQE_show 0 86 NULL
++ocfs2_remove_btree_range_81 ocfs2_remove_btree_range 0 81 NULL
++uwb_dev_LQE_show_86 uwb_dev_LQE_show 0 86 NULL nohasharray
++write_file_tpc_86 write_file_tpc 3 86 &uwb_dev_LQE_show_86
 +snd_korg1212_copy_to_92 snd_korg1212_copy_to 6 92 NULL
 +load_msg_95 load_msg 2 95 NULL
 +bnx2_reset_chip_101 bnx2_reset_chip 0 101 NULL
@@ -117436,6 +117745,7 @@ index 0000000..e3e2614
 +sctp_make_control_300 sctp_make_control 4 300 &grgpio_to_irq_300
 +pin_configs_show_303 pin_configs_show 0 303 NULL
 +SYSC_connect_304 SYSC_connect 3 304 NULL
++tipc_skb_tailroom_305 tipc_skb_tailroom 0 305 NULL
 +syslog_print_307 syslog_print 2-0 307 NULL
 +iscsi_stat_instance_show_attr_nodes_309 iscsi_stat_instance_show_attr_nodes 0 309 NULL
 +platform_device_add_data_310 platform_device_add_data 0-3 310 NULL
@@ -117571,7 +117881,8 @@ index 0000000..e3e2614
 +fan_set_level_safe_602 fan_set_level_safe 0 602 NULL
 +iscsi_stat_sess_err_attr_show_603 iscsi_stat_sess_err_attr_show 0 603 NULL
 +ni_gpct_device_construct_610 ni_gpct_device_construct 5 610 NULL
-+show_speed_scan_613 show_speed_scan 0 613 NULL
++show_speed_scan_613 show_speed_scan 0 613 NULL nohasharray
++enic_dma_map_check_613 enic_dma_map_check 2 613 &show_speed_scan_613
 +pmcraid_show_drv_version_614 pmcraid_show_drv_version 0 614 NULL
 +fuse_request_alloc_nofs_617 fuse_request_alloc_nofs 1 617 NULL
 +ptlrpc_lprocfs_nrs_seq_write_621 ptlrpc_lprocfs_nrs_seq_write 3 621 NULL
@@ -117960,6 +118271,7 @@ index 0000000..e3e2614
 +khugepaged_max_ptes_none_show_1514 khugepaged_max_ptes_none_show 0 1514 NULL
 +smack_netlabel_1516 smack_netlabel 0 1516 NULL
 +tomoyo_round2_1518 tomoyo_round2 0 1518 NULL
++bluetooth_store_1522 bluetooth_store 4 1522 NULL
 +wm831x_alive_ldo_get_status_1525 wm831x_alive_ldo_get_status 0 1525 NULL
 +ieee80211_get_regs_len_1527 ieee80211_get_regs_len 0 1527 NULL
 +alloc_perm_bits_1532 alloc_perm_bits 2 1532 NULL
@@ -118268,7 +118580,8 @@ index 0000000..e3e2614
 +fsp_attr_set_pagereg_2313 fsp_attr_set_pagereg 0-4 2313 &adfs_dir_update_2313
 +page_alloc_cpu_notify_2317 page_alloc_cpu_notify 0 2317 NULL
 +hfsplus_find_init_2318 hfsplus_find_init 0 2318 NULL nohasharray
-+picolcd_fb_write_2318 picolcd_fb_write 3 2318 &hfsplus_find_init_2318
++picolcd_fb_write_2318 picolcd_fb_write 3 2318 &hfsplus_find_init_2318 nohasharray
++alloc_btrfs_bio_2318 alloc_btrfs_bio 2-1 2318 &picolcd_fb_write_2318
 +store_temp_st_2321 store_temp_st 0-4 2321 NULL
 +gart_map_page_2325 gart_map_page 4-3-0 2325 NULL
 +fuse_write_begin_2326 fuse_write_begin 0 2326 NULL
@@ -118320,6 +118633,7 @@ index 0000000..e3e2614
 +ioremap_nocache_2439 ioremap_nocache 2-1 2439 NULL nohasharray
 +__uncore_filter_tid_show_2439 __uncore_filter_tid_show 0 2439 &ioremap_nocache_2439
 +eir_get_length_2441 eir_get_length 0-2 2441 NULL
++tpm_transmit_cmd_2442 tpm_transmit_cmd 0-3 2442 NULL
 +max1027_set_trigger_state_2443 max1027_set_trigger_state 0 2443 NULL
 +niu_tx_channel_lpage_init_2444 niu_tx_channel_lpage_init 0 2444 NULL
 +qib_reset_device_2446 qib_reset_device 0 2446 NULL
@@ -118473,7 +118787,8 @@ index 0000000..e3e2614
 +__next_cpu_2782 __next_cpu 1-0 2782 NULL
 +nfs4_do_create_2787 nfs4_do_create 0 2787 NULL
 +device_add_attrs_2789 device_add_attrs 0 2789 NULL
-+write_2792 write 0 2792 NULL
++write_2792 write 0 2792 NULL nohasharray
++nvkm_devinit_create__2792 nvkm_devinit_create_ 4 2792 &write_2792
 +rocker_dma_ring_bufs_alloc_2795 rocker_dma_ring_bufs_alloc 4-0 2795 NULL
 +_ctl_BRM_status_show_2797 _ctl_BRM_status_show 0 2797 NULL
 +sound_read_2798 sound_read 0-3 2798 NULL nohasharray
@@ -118587,7 +118902,8 @@ index 0000000..e3e2614
 +show_otp0en_3036 show_otp0en 0 3036 NULL
 +lpfc_idiag_mbxacc_write_3038 lpfc_idiag_mbxacc_write 3-0 3038 NULL nohasharray
 +iwl_dbgfs_sleep_level_override_read_3038 iwl_dbgfs_sleep_level_override_read 3-0 3038 &lpfc_idiag_mbxacc_write_3038
-+get_max_acpi_id_3039 get_max_acpi_id 0 3039 NULL
++get_max_acpi_id_3039 get_max_acpi_id 0 3039 NULL nohasharray
++cyapa_do_i2c_pip_cmd_irq_sync_3039 cyapa_do_i2c_pip_cmd_irq_sync 3 3039 &get_max_acpi_id_3039
 +snd_hwdep_read_3040 snd_hwdep_read 0-3 3040 NULL
 +nr_free_buffer_pages_3044 nr_free_buffer_pages 0 3044 NULL
 +instance_pe_count_show_3046 instance_pe_count_show 0 3046 NULL nohasharray
@@ -118663,8 +118979,7 @@ index 0000000..e3e2614
 +patch_via_hdmi_3183 patch_via_hdmi 0 3183 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
-+alloc_context_3194 alloc_context 1 3194 NULL nohasharray
-+ep_aio_read_3194 ep_aio_read 3 3194 &alloc_context_3194
++alloc_context_3194 alloc_context 1 3194 NULL
 +dma_init_coherent_memory_3197 dma_init_coherent_memory 1-3 3197 NULL
 +shmem_pread_slow_3198 shmem_pread_slow 2-3 3198 NULL nohasharray
 +udp_sendpage_3198 udp_sendpage 4 3198 &shmem_pread_slow_3198
@@ -118697,6 +119012,7 @@ index 0000000..e3e2614
 +macb_open_3240 macb_open 0 3240 NULL
 +key_key_read_3241 key_key_read 3-0 3241 NULL
 +base_sock_bind_3245 base_sock_bind 0 3245 NULL
++page_counter_memparse_3253 page_counter_memparse 0 3253 NULL
 +check_vendor_extension_3254 check_vendor_extension 1 3254 NULL nohasharray
 +peak_usb_ndo_open_3254 peak_usb_ndo_open 0 3254 &check_vendor_extension_3254
 +mei_amthif_write_3256 mei_amthif_write 0 3256 NULL
@@ -118718,7 +119034,9 @@ index 0000000..e3e2614
 +patch_stac92hd73xx_3296 patch_stac92hd73xx 0 3296 &ieee80211_if_write_beacon_loss_3296
 +memory_get_cur_bandwidth_3298 memory_get_cur_bandwidth 0 3298 NULL
 +x1205_get_atrim_3299 x1205_get_atrim 0 3299 NULL
-+__set_extent_bit_3305 __set_extent_bit 0 3305 NULL
++ip6_ufo_append_data_3302 ip6_ufo_append_data 8-7-6 3302 NULL
++__set_extent_bit_3305 __set_extent_bit 0 3305 NULL nohasharray
++spidev_compat_ioc_message_3305 spidev_compat_ioc_message 2 3305 &__set_extent_bit_3305
 +sriov_configure_3307 sriov_configure 0-2 3307 NULL
 +minix_write_begin_3311 minix_write_begin 0 3311 NULL nohasharray
 +arvo_sysfs_write_3311 arvo_sysfs_write 0-6 3311 &minix_write_begin_3311
@@ -118812,6 +119130,7 @@ index 0000000..e3e2614
 +comp_tx_3493 comp_tx 0 3493 NULL
 +prepare_3495 prepare 0 3495 NULL
 +xfrm_migrate_msgsize_3496 xfrm_migrate_msgsize 0-1 3496 NULL
++configure_3498 configure 0 3498 NULL
 +iscsi_stat_instance_attr_store_3501 iscsi_stat_instance_attr_store 0 3501 NULL
 +sys_size_show_3507 sys_size_show 0 3507 NULL
 +ad_sd_buffer_postdisable_3510 ad_sd_buffer_postdisable 0 3510 NULL
@@ -119011,6 +119330,7 @@ index 0000000..e3e2614
 +drm_fb_helper_set_par_3913 drm_fb_helper_set_par 0 3913 NULL
 +SyS_move_pages_3920 SyS_move_pages 2 3920 NULL
 +ds2780_set_sense_register_3927 ds2780_set_sense_register 0 3927 NULL
++klp_disable_func_3928 klp_disable_func 0 3928 NULL
 +iwl_load_ucode_wait_alive_3936 iwl_load_ucode_wait_alive 0 3936 NULL
 +show_allow_ext_sg_3938 show_allow_ext_sg 0 3938 NULL
 +__vfs_read_3942 __vfs_read 0-3 3942 NULL
@@ -119120,7 +119440,8 @@ index 0000000..e3e2614
 +bus_powerup_4164 bus_powerup 0 4164 &radeon_show_one_edid_4164
 +get_alua_req_4166 get_alua_req 3 4166 NULL
 +blk_dropped_read_4168 blk_dropped_read 3 4168 NULL
-+mci_size_mb_show_4171 mci_size_mb_show 0 4171 NULL
++mci_size_mb_show_4171 mci_size_mb_show 0 4171 NULL nohasharray
++skb_add_data_4171 skb_add_data 3 4171 &mci_size_mb_show_4171
 +manufacturer_show_4172 manufacturer_show 0 4172 NULL
 +show_4173 show 0 4173 NULL
 +read_file_bool_4180 read_file_bool 3-0 4180 NULL nohasharray
@@ -119304,7 +119625,8 @@ index 0000000..e3e2614
 +bch_alloc_4593 bch_alloc 1 4593 NULL
 +ocfs2_refcount_lock_4595 ocfs2_refcount_lock 0 4595 NULL
 +generic_removexattr_4597 generic_removexattr 0 4597 NULL
-+fuse_copy_one_4602 fuse_copy_one 0 4602 NULL
++fuse_copy_one_4602 fuse_copy_one 0 4602 NULL nohasharray
++ath10k_dbg_sta_write_delba_4602 ath10k_dbg_sta_write_delba 3 4602 &fuse_copy_one_4602
 +pm8001_ctl_iop_log_show_4614 pm8001_ctl_iop_log_show 0 4614 NULL nohasharray
 +device_store_int_4614 device_store_int 0-4 4614 &pm8001_ctl_iop_log_show_4614
 +xfs_bmap_add_attrfork_4617 xfs_bmap_add_attrfork 0 4617 NULL
@@ -119610,6 +119932,7 @@ index 0000000..e3e2614
 +nvkm_ioctl_5338 nvkm_ioctl 0 5338 NULL
 +__uncore_occ_edge_show_5340 __uncore_occ_edge_show 0 5340 NULL
 +uinput_ioctl_5342 uinput_ioctl 2 5342 NULL
++spidev_get_ioc_message_5344 spidev_get_ioc_message 1 5344 NULL
 +ad714x_i2c_read_5345 ad714x_i2c_read 4 5345 NULL
 +policy_store_5346 policy_store 0-4 5346 NULL
 +iio_sysfs_trig_remove_5348 iio_sysfs_trig_remove 0-4 5348 NULL
@@ -119645,7 +119968,8 @@ index 0000000..e3e2614
 +cifs_setattr_5417 cifs_setattr 0 5417 NULL
 +sbp_tpg_attrib_show_max_reconnect_timeout_5421 sbp_tpg_attrib_show_max_reconnect_timeout 0 5421 NULL nohasharray
 +xfs_bmap_add_attrfork_local_5421 xfs_bmap_add_attrfork_local 0 5421 &sbp_tpg_attrib_show_max_reconnect_timeout_5421
-+show_output_5423 show_output 0 5423 NULL
++show_output_5423 show_output 0 5423 NULL nohasharray
++ftrace_set_hash_5423 ftrace_set_hash 0 5423 &show_output_5423
 +thin_provisioning_show_5428 thin_provisioning_show 0 5428 NULL
 +dev_attr_show_5429 dev_attr_show 0 5429 NULL
 +mxt_check_firmware_format_5432 mxt_check_firmware_format 0 5432 NULL
@@ -119703,6 +120027,7 @@ index 0000000..e3e2614
 +spidev_message_5518 spidev_message 3 5518 NULL
 +show_port_state_5521 show_port_state 0 5521 NULL nohasharray
 +uuid_parse_5521 uuid_parse 0 5521 &show_port_state_5521
++tipc_link_xmit_5522 tipc_link_xmit 0 5522 NULL
 +show_license_5524 show_license 0 5524 NULL
 +pm_qos_remote_wakeup_show_5526 pm_qos_remote_wakeup_show 0 5526 NULL
 +sdev_show_queue_depth_5527 sdev_show_queue_depth 0 5527 NULL
@@ -119800,6 +120125,7 @@ index 0000000..e3e2614
 +lx_pipe_wait_for_state_5761 lx_pipe_wait_for_state 0 5761 NULL nohasharray
 +truncate_data_block_5761 truncate_data_block 0 5761 &lx_pipe_wait_for_state_5761
 +packet_xmit_5762 packet_xmit 0 5762 NULL
++skb_add_data_nocache_5763 skb_add_data_nocache 4-0 5763 NULL
 +lpfc_serialnum_show_5767 lpfc_serialnum_show 0 5767 NULL
 +start_5768 start 0 5768 NULL
 +sock_alloc_send_pskb_5769 sock_alloc_send_pskb 2 5769 NULL
@@ -119850,6 +120176,7 @@ index 0000000..e3e2614
 +lprocfs_fid_width_seq_write_5889 lprocfs_fid_width_seq_write 3 5889 NULL
 +new_sync_read_5891 new_sync_read 0-3 5891 NULL
 +rmd320_final_5897 rmd320_final 0 5897 NULL
++cyapa_do_i2c_pip_cmd_polling_5900 cyapa_do_i2c_pip_cmd_polling 3 5900 NULL
 +twl4030_pwmled_enable_5901 twl4030_pwmled_enable 0 5901 NULL
 +_rtl92cu_init_mac_5902 _rtl92cu_init_mac 0 5902 NULL
 +store_fan_time_5903 store_fan_time 0-4 5903 NULL
@@ -119897,6 +120224,7 @@ index 0000000..e3e2614
 +cifs_user_writev_5982 cifs_user_writev 0 5982 NULL
 +ib_send_cm_req_5987 ib_send_cm_req 0 5987 NULL
 +tps80031_vbus_is_enabled_5998 tps80031_vbus_is_enabled 0 5998 NULL
++dax_truncate_page_6001 dax_truncate_page 0 6001 NULL
 +mt9v022_s_crop_6011 mt9v022_s_crop 0 6011 NULL
 +numa_node_store_6013 numa_node_store 0-4 6013 NULL
 +phys_port_id_show_6014 phys_port_id_show 0 6014 NULL
@@ -120099,6 +120427,7 @@ index 0000000..e3e2614
 +brcmf_fil_iovar_data_set_6523 brcmf_fil_iovar_data_set 0 6523 NULL
 +sha1_mb_export_6524 sha1_mb_export 0 6524 NULL
 +_ctl_fwfault_debug_show_6531 _ctl_fwfault_debug_show 0 6531 NULL
++ocfs2_commit_truncate_6532 ocfs2_commit_truncate 0 6532 NULL
 +ufs_truncate_6535 ufs_truncate 0 6535 NULL
 +i40e_vsi_request_irq_6536 i40e_vsi_request_irq 0 6536 NULL
 +snd_timer_dev_register_6542 snd_timer_dev_register 0 6542 NULL
@@ -120121,6 +120450,7 @@ index 0000000..e3e2614
 +SyS_semtimedop_6563 SyS_semtimedop 3 6563 &adp8860_bl_l3_dark_max_store_6563
 +rt2x00mac_start_6564 rt2x00mac_start 0 6564 NULL
 +smsc75xx_phy_initialize_6568 smsc75xx_phy_initialize 0 6568 NULL
++rng_recvmsg_6569 rng_recvmsg 4 6569 NULL
 +xfs_iozero_6573 xfs_iozero 0-3-2 6573 NULL
 +i2c_smbus_write_byte_6574 i2c_smbus_write_byte 0 6574 NULL
 +max8997_rtc_set_alarm_6577 max8997_rtc_set_alarm 0 6577 NULL
@@ -120339,6 +120669,7 @@ index 0000000..e3e2614
 +ld_usb_write_7022 ld_usb_write 3-0 7022 NULL
 +get_performance_level_7023 get_performance_level 0 7023 NULL nohasharray
 +c2_pseudo_up_7023 c2_pseudo_up 0 7023 &get_performance_level_7023
++raid56_parity_recover_7024 raid56_parity_recover 0-4 7024 NULL
 +uwb_rc_mac_addr_store_7027 uwb_rc_mac_addr_store 0-4 7027 NULL
 +snd_pcm_do_resume_7028 snd_pcm_do_resume 0 7028 NULL
 +reserved_show_7029 reserved_show 0 7029 NULL nohasharray
@@ -120401,6 +120732,7 @@ index 0000000..e3e2614
 +pscsi_show_configfs_dev_params_7152 pscsi_show_configfs_dev_params 0 7152 NULL
 +sky2_get_eeprom_len_7154 sky2_get_eeprom_len 0 7154 NULL
 +set_lcd_level_7155 set_lcd_level 0 7155 NULL
++max732x_gpio_to_irq_7160 max732x_gpio_to_irq 2 7160 NULL
 +fnic_reset_7163 fnic_reset 0 7163 NULL
 +r8a66597_enable_7164 r8a66597_enable 0 7164 NULL
 +show_counter_rx_icrc_errs_7167 show_counter_rx_icrc_errs 0 7167 NULL
@@ -120463,6 +120795,7 @@ index 0000000..e3e2614
 +security_inode_need_killpriv_7322 security_inode_need_killpriv 0 7322 NULL
 +wait_on_sync_kiocb_7327 wait_on_sync_kiocb 0 7327 NULL
 +queue_discard_max_show_7328 queue_discard_max_show 0 7328 NULL
++vxlan_gro_remcsum_7332 vxlan_gro_remcsum 5-4-2 7332 NULL
 +do_md_stop_7335 do_md_stop 0 7335 NULL
 +show_fnode_ipaddress_7338 show_fnode_ipaddress 0 7338 NULL
 +ov772x_set_params_7342 ov772x_set_params 0 7342 NULL
@@ -120497,11 +120830,13 @@ index 0000000..e3e2614
 +rds_blckcnt_7435 rds_blckcnt 0 7435 NULL
 +cxacru_sysfs_store_adsl_state_7437 cxacru_sysfs_store_adsl_state 0-4 7437 NULL
 +SendReceiveNoRsp_7438 SendReceiveNoRsp 0 7438 NULL
-+romfs_dev_read_7439 romfs_dev_read 0 7439 NULL
++romfs_dev_read_7439 romfs_dev_read 0 7439 NULL nohasharray
++t4_memory_rw_7439 t4_memory_rw 0 7439 &romfs_dev_read_7439
 +store_7441 store 0 7441 NULL
 +bq2415x_get_termination_current_7443 bq2415x_get_termination_current 0 7443 NULL
 +acpi_ex_create_processor_7444 acpi_ex_create_processor 0 7444 NULL
 +show_mask_7446 show_mask 0 7446 NULL
++scsi_format_extd_sense_7447 scsi_format_extd_sense 2 7447 NULL
 +ip_options_get_alloc_7448 ip_options_get_alloc 1 7448 NULL nohasharray
 +acpi_ex_create_region_7448 acpi_ex_create_region 0 7448 &ip_options_get_alloc_7448 nohasharray
 +pci_map_page_7448 pci_map_page 0-3 7448 &acpi_ex_create_region_7448
@@ -120534,7 +120869,8 @@ index 0000000..e3e2614
 +tg3_writephy_7522 tg3_writephy 0 7522 &xfs_fs_statfs_7522
 +qlcnic_napi_add_7526 qlcnic_napi_add 0 7526 NULL
 +debug_dma_map_page_7528 debug_dma_map_page 6 7528 NULL
-+show_prot_capabilities_7532 show_prot_capabilities 0 7532 NULL
++show_prot_capabilities_7532 show_prot_capabilities 0 7532 NULL nohasharray
++crypt_alloc_buffer_7532 crypt_alloc_buffer 2 7532 &show_prot_capabilities_7532
 +vfio_device_fops_write_7537 vfio_device_fops_write 0-3 7537 NULL
 +virtnet_open_7538 virtnet_open 0 7538 NULL
 +target_core_hba_show_attr_hba_info_7539 target_core_hba_show_attr_hba_info 0 7539 NULL
@@ -120632,6 +120968,7 @@ index 0000000..e3e2614
 +lustre_packed_msg_size_7792 lustre_packed_msg_size 0 7792 &diva_os_copy_from_user_7792
 +__uncore_wrap_mode_show_7796 __uncore_wrap_mode_show 0 7796 NULL
 +pcxhr_pll_freq_register_7798 pcxhr_pll_freq_register 0 7798 NULL
++kasan_module_alloc_7800 kasan_module_alloc 2 7800 NULL
 +get_link_af_size_7802 get_link_af_size 0 7802 NULL
 +ecm_opts_qmult_show_7809 ecm_opts_qmult_show 0 7809 NULL
 +s2250_s_ctrl_7810 s2250_s_ctrl 0 7810 NULL nohasharray
@@ -120680,7 +121017,8 @@ index 0000000..e3e2614
 +f_hidg_write_7932 f_hidg_write 3 7932 NULL
 +iwl_dbgfs_bt_force_ant_write_7937 iwl_dbgfs_bt_force_ant_write 0-3 7937 NULL
 +ata_scsi_park_show_7938 ata_scsi_park_show 0 7938 NULL nohasharray
-+qla24xx_vport_create_7938 qla24xx_vport_create 0 7938 &ata_scsi_park_show_7938
++qla24xx_vport_create_7938 qla24xx_vport_create 0 7938 &ata_scsi_park_show_7938 nohasharray
++ftrace_hash_move_7938 ftrace_hash_move 0 7938 &qla24xx_vport_create_7938
 +ali1563_block_7941 ali1563_block 0 7941 NULL nohasharray
 +do_set_rxtrig_7941 do_set_rxtrig 0 7941 &ali1563_block_7941
 +wl1271_cmd_ext_radio_parms_7942 wl1271_cmd_ext_radio_parms 0 7942 NULL
@@ -120832,7 +121170,8 @@ index 0000000..e3e2614
 +init_cdev_8274 init_cdev 1 8274 NULL
 +blk_cpu_notify_8275 blk_cpu_notify 0 8275 NULL
 +rproc_recovery_write_8281 rproc_recovery_write 3-0 8281 NULL
-+write_file_dummy_8282 write_file_dummy 0-3 8282 NULL
++write_file_dummy_8282 write_file_dummy 0-3 8282 NULL nohasharray
++wlan_store_8282 wlan_store 4 8282 &write_file_dummy_8282
 +tcp_listen_for_all_8285 tcp_listen_for_all 0 8285 NULL
 +mlx5_core_create_mkey_8290 mlx5_core_create_mkey 0 8290 NULL
 +rtl92d_download_fw_8295 rtl92d_download_fw 0 8295 NULL
@@ -120844,7 +121183,8 @@ index 0000000..e3e2614
 +ipwireless_send_packet_8328 ipwireless_send_packet 4 8328 NULL
 +niu_set_tcam_key_8334 niu_set_tcam_key 0 8334 NULL
 +skein256_init_8337 skein256_init 0 8337 NULL
-+vsock_stream_setsockopt_8338 vsock_stream_setsockopt 0 8338 NULL
++vsock_stream_setsockopt_8338 vsock_stream_setsockopt 0 8338 NULL nohasharray
++ip6_make_skb_8338 ip6_make_skb 4-5 8338 &vsock_stream_setsockopt_8338
 +bond_option_primary_set_8343 bond_option_primary_set 0 8343 NULL
 +tracing_entries_read_8345 tracing_entries_read 3 8345 NULL
 +sel_make_policycap_8346 sel_make_policycap 0 8346 NULL
@@ -120928,6 +121268,7 @@ index 0000000..e3e2614
 +snd_malloc_sgbuf_pages_8532 snd_malloc_sgbuf_pages 2 8532 NULL nohasharray
 +pnp_resource_len_8532 pnp_resource_len 0 8532 &snd_malloc_sgbuf_pages_8532
 +alloc_pg_vec_8533 alloc_pg_vec 2 8533 NULL
++ath10k_htt_rx_ring_fill_n_8535 ath10k_htt_rx_ring_fill_n 0 8535 NULL
 +lvs_rh_clear_port_feature_8537 lvs_rh_clear_port_feature 0 8537 NULL
 +de_alloc_rings_8538 de_alloc_rings 0 8538 NULL
 +bh1770_lux_result_show_8541 bh1770_lux_result_show 0 8541 NULL nohasharray
@@ -121015,7 +121356,8 @@ index 0000000..e3e2614
 +compound_order_8750 compound_order 0 8750 NULL nohasharray
 +strict_blocks_to_sectors_8750 strict_blocks_to_sectors 0 8750 &compound_order_8750
 +cfg80211_inform_bss_width_8754 cfg80211_inform_bss_width 10 8754 NULL nohasharray
-+firmware_show_8754 firmware_show 0 8754 &cfg80211_inform_bss_width_8754
++firmware_show_8754 firmware_show 0 8754 &cfg80211_inform_bss_width_8754 nohasharray
++ocfs2_find_path_8754 ocfs2_find_path 0 8754 &firmware_show_8754
 +read_uscorr_8755 read_uscorr 0 8755 NULL
 +xfs_attr_shortform_getvalue_8760 xfs_attr_shortform_getvalue 0 8760 NULL
 +yurex_write_8761 yurex_write 3-0 8761 NULL nohasharray
@@ -121264,7 +121606,8 @@ index 0000000..e3e2614
 +show_fan_stop_time_9276 show_fan_stop_time 0 9276 NULL
 +show_indirect_byte_9278 show_indirect_byte 0 9278 NULL nohasharray
 +open_9278 open 0 9278 &show_indirect_byte_9278
-+ipoib_change_mtu_9279 ipoib_change_mtu 0 9279 NULL
++ipoib_change_mtu_9279 ipoib_change_mtu 0 9279 NULL nohasharray
++pnfs_generic_commit_pagelist_9279 pnfs_generic_commit_pagelist 0 9279 &ipoib_change_mtu_9279
 +i2c_algo_dp_aux_transaction_9282 i2c_algo_dp_aux_transaction 0 9282 NULL
 +show_9287 show 0 9287 NULL
 +vmci_qpair_dequev_9288 vmci_qpair_dequev 0-3 9288 NULL nohasharray
@@ -121292,6 +121635,7 @@ index 0000000..e3e2614
 +brcmf_sdiod_recv_buf_9336 brcmf_sdiod_recv_buf 3 9336 &acerhdf_get_trip_type_9336
 +nvme_trans_fmt_get_parm_header_9340 nvme_trans_fmt_get_parm_header 2 9340 NULL nohasharray
 +b43_pcmcia_suspend_9340 b43_pcmcia_suspend 0 9340 &nvme_trans_fmt_get_parm_header_9340
++ocfs2_orphan_for_truncate_9342 ocfs2_orphan_for_truncate 0 9342 NULL
 +get_pipes_num_9343 get_pipes_num 0 9343 NULL
 +esd_usb2_send_msg_9348 esd_usb2_send_msg 0 9348 NULL
 +smi_data_buf_realloc_9360 smi_data_buf_realloc 0 9360 NULL
@@ -121376,6 +121720,7 @@ index 0000000..e3e2614
 +match_format_9516 match_format 0 9516 &disk_events_show_9516
 +do_strip_9517 do_strip 0 9517 NULL
 +target_core_alua_tg_pt_gp_show_attr_preferred_9519 target_core_alua_tg_pt_gp_show_attr_preferred 0 9519 NULL
++iwl_dbgfs_fw_dbg_conf_read_9522 iwl_dbgfs_fw_dbg_conf_read 3 9522 NULL
 +roccat_common2_sysfs_read_keys_macro_9524 roccat_common2_sysfs_read_keys_macro 0-5-6 9524 NULL
 +log_buf_len_show_9525 log_buf_len_show 0 9525 NULL
 +ll_max_read_ahead_whole_mb_seq_write_9528 ll_max_read_ahead_whole_mb_seq_write 3 9528 NULL
@@ -121536,7 +121881,8 @@ index 0000000..e3e2614
 +bm_register_write_9893 bm_register_write 3-0 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 5 9895 NULL
-+aac_show_vendor_9903 aac_show_vendor 0 9903 NULL
++aac_show_vendor_9903 aac_show_vendor 0 9903 NULL nohasharray
++sf1_write_9903 sf1_write 0 9903 &aac_show_vendor_9903
 +write_9907 write 0-3 9907 NULL
 +compat_sys_ipc_9912 compat_sys_ipc 3 9912 NULL
 +sr_write_cmd_async_9921 sr_write_cmd_async 5 9921 NULL
@@ -121671,7 +122017,8 @@ index 0000000..e3e2614
 +lpfc_link_state_store_10215 lpfc_link_state_store 0-4 10215 NULL
 +__nf_nat_alloc_null_binding_10216 __nf_nat_alloc_null_binding 0 10216 NULL
 +wl12xx_spi_raw_write_10217 wl12xx_spi_raw_write 0 10217 NULL
-+ihex_validate_fw_10218 ihex_validate_fw 0 10218 NULL
++ihex_validate_fw_10218 ihex_validate_fw 0 10218 NULL nohasharray
++register_ftrace_function_10218 register_ftrace_function 0 10218 &ihex_validate_fw_10218
 +xfs_attr_rmtval_copyout_10222 xfs_attr_rmtval_copyout 0 10222 NULL
 +fsync_10223 fsync 0 10223 NULL
 +keene_cmd_main_10225 keene_cmd_main 0 10225 NULL nohasharray
@@ -121821,6 +122168,7 @@ index 0000000..e3e2614
 +acpi_ds_create_bank_field_10598 acpi_ds_create_bank_field 0 10598 NULL
 +em28xx_i2c_send_bytes_10601 em28xx_i2c_send_bytes 0-4 10601 NULL
 +supply_map_read_file_10608 supply_map_read_file 3-0 10608 NULL
++nvkm_xtensa_create__10615 nvkm_xtensa_create_ 8 10615 NULL
 +usb_8dev_cmd_open_10617 usb_8dev_cmd_open 0 10617 NULL nohasharray
 +vxge_hw_vpath_mac_addr_add_10617 vxge_hw_vpath_mac_addr_add 0 10617 &usb_8dev_cmd_open_10617
 +ima_show_htable_violations_10619 ima_show_htable_violations 3-0 10619 NULL nohasharray
@@ -122096,6 +122444,7 @@ index 0000000..e3e2614
 +iscsi_stat_tgt_attr_attr_show_11320 iscsi_stat_tgt_attr_attr_show 0 11320 &kovaplus_sysfs_read_profilex_settings_11320
 +tiadc_buffer_postdisable_11321 tiadc_buffer_postdisable 0 11321 NULL nohasharray
 +__pfn_to_mfn_11321 __pfn_to_mfn 0 11321 &tiadc_buffer_postdisable_11321
++iwl_dbgfs_ss_force_read_11323 iwl_dbgfs_ss_force_read 3 11323 NULL
 +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
@@ -122123,6 +122472,7 @@ index 0000000..e3e2614
 +xfs_bmap_add_attrfork_btree_11375 xfs_bmap_add_attrfork_btree 0 11375 NULL
 +lpfc_poll_tmo_show_11377 lpfc_poll_tmo_show 0 11377 NULL
 +amd_rng_data_read_11378 amd_rng_data_read 0 11378 NULL
++__spi_queued_transfer_11379 __spi_queued_transfer 0 11379 NULL
 +rtl2832_sdr_alloc_stream_bufs_11380 rtl2832_sdr_alloc_stream_bufs 0 11380 NULL
 +tcf_register_action_11381 tcf_register_action 2 11381 NULL
 +ext_prop_type_store_11385 ext_prop_type_store 0-3 11385 NULL
@@ -122366,7 +122716,8 @@ index 0000000..e3e2614
 +pc87413_notify_sys_11917 pc87413_notify_sys 0 11917 NULL
 +_rbd_dev_v2_snap_features_11922 _rbd_dev_v2_snap_features 0 11922 NULL
 +fs_devrw_entry_11924 fs_devrw_entry 3-0 11924 NULL
-+bitmap_remap_11929 bitmap_remap 5 11929 NULL
++bitmap_remap_11929 bitmap_remap 5 11929 NULL nohasharray
++SMBNTencrypt_11929 SMBNTencrypt 0 11929 &bitmap_remap_11929
 +show_limit_11932 show_limit 0 11932 NULL
 +nf_nat_ipv6_local_fn_11937 nf_nat_ipv6_local_fn 0 11937 NULL nohasharray
 +max1027_debugfs_reg_access_11937 max1027_debugfs_reg_access 0 11937 &nf_nat_ipv6_local_fn_11937
@@ -122425,7 +122776,8 @@ index 0000000..e3e2614
 +tg3_test_msi_12057 tg3_test_msi 0 12057 NULL
 +mt9m111_s_ctrl_12060 mt9m111_s_ctrl 0 12060 NULL
 +brcmf_config_wowl_pattern_12061 brcmf_config_wowl_pattern 4 12061 NULL
-+il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3-0 12064 NULL
++il4965_ucode_tx_stats_read_12064 il4965_ucode_tx_stats_read 3-0 12064 NULL nohasharray
++ath10k_dbg_sta_write_aggr_mode_12064 ath10k_dbg_sta_write_aggr_mode 3 12064 &il4965_ucode_tx_stats_read_12064
 +dvb_dmxdev_buffer_write_12065 dvb_dmxdev_buffer_write 3 12065 NULL
 +srp_new_cm_id_12069 srp_new_cm_id 0 12069 NULL
 +wl12xx_acx_config_ps_12073 wl12xx_acx_config_ps 0 12073 NULL
@@ -122454,7 +122806,8 @@ index 0000000..e3e2614
 +ntc_show_temp_12118 ntc_show_temp 0 12118 &f_gpio_mod_12118
 +da9052_gpio_direction_output_12120 da9052_gpio_direction_output 0 12120 NULL
 +lpfc_task_mgmt_tmo_store_12122 lpfc_task_mgmt_tmo_store 0-4 12122 NULL
-+alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL
++alloc_bulk_urbs_generic_12127 alloc_bulk_urbs_generic 5 12127 NULL nohasharray
++__i915_wait_request_12127 __i915_wait_request 0 12127 &alloc_bulk_urbs_generic_12127
 +set_powered_12129 set_powered 4 12129 NULL
 +ramoops_init_prz_12134 ramoops_init_prz 5 12134 NULL
 +xfs_handle_to_dentry_12135 xfs_handle_to_dentry 3 12135 NULL
@@ -122468,6 +122821,7 @@ index 0000000..e3e2614
 +goldfish_fb_check_var_12147 goldfish_fb_check_var 0 12147 &zoran_read_12147
 +btmrvl_sdio_host_to_card_12152 btmrvl_sdio_host_to_card 3 12152 NULL nohasharray
 +bond_option_arp_interval_set_12152 bond_option_arp_interval_set 0 12152 &btmrvl_sdio_host_to_card_12152
++__bt_get_word_12153 __bt_get_word 2 12153 NULL
 +vmbus_open_12154 vmbus_open 3-2 12154 NULL
 +suspend_lo_show_12159 suspend_lo_show 0 12159 NULL
 +ds1374_read_rtc_12161 ds1374_read_rtc 0 12161 NULL
@@ -122537,6 +122891,7 @@ index 0000000..e3e2614
 +il_dbgfs_nvm_read_12288 il_dbgfs_nvm_read 3-0 12288 NULL nohasharray
 +show_sas_phy_enable_12288 show_sas_phy_enable 0 12288 &il_dbgfs_nvm_read_12288 nohasharray
 +tcm_loop_wwn_show_attr_version_12288 tcm_loop_wwn_show_attr_version 0 12288 &show_sas_phy_enable_12288
++i915_gem_object_pin_view_12293 i915_gem_object_pin_view 0 12293 NULL
 +ds3232_set_alarm_12294 ds3232_set_alarm 0 12294 NULL
 +mb862xx_i2c_read_12299 mb862xx_i2c_read 0 12299 NULL
 +adfs_f_sync_12305 adfs_f_sync 0 12305 NULL
@@ -122598,6 +122953,7 @@ index 0000000..e3e2614
 +hwcache_align_show_12442 hwcache_align_show 0 12442 NULL
 +iscsi_stat_login_show_attr_inst_12452 iscsi_stat_login_show_attr_inst 0 12452 NULL
 +e1000e_get_sset_count_12456 e1000e_get_sset_count 0 12456 NULL
++nvkm_engine_create__12458 nvkm_engine_create_ 7 12458 NULL
 +deadline_read_expire_store_12459 deadline_read_expire_store 0-3 12459 NULL
 +skb_do_copy_data_nocache_12465 skb_do_copy_data_nocache 5-0 12465 NULL
 +rbd_dev_v2_header_info_12466 rbd_dev_v2_header_info 0 12466 NULL
@@ -122754,6 +123110,7 @@ index 0000000..e3e2614
 +e1000_setup_all_tx_resources_12786 e1000_setup_all_tx_resources 0 12786 NULL
 +ath6kl_wmi_cmd_send_xtnd_12787 ath6kl_wmi_cmd_send_xtnd 0 12787 NULL
 +bnx2x_set_mac_one_12791 bnx2x_set_mac_one 0 12791 NULL
++be_cmd_vlan_config_12799 be_cmd_vlan_config 0 12799 NULL
 +sysfs_ctlreg_read_12803 sysfs_ctlreg_read 0-5-6 12803 NULL
 +netdev_get_regs_len_12807 netdev_get_regs_len 0 12807 NULL
 +show_spi_transport_period_helper_12808 show_spi_transport_period_helper 0 12808 NULL
@@ -122819,7 +123176,8 @@ index 0000000..e3e2614
 +SYSC_sendfile_12936 SYSC_sendfile 4 12936 NULL
 +nvme_npages_12938 nvme_npages 0-1 12938 NULL nohasharray
 +ican3_sysfs_show_term_12938 ican3_sysfs_show_term 0 12938 &nvme_npages_12938
-+target_core_alua_tg_pt_gp_show_attr_alua_support_offline_12939 target_core_alua_tg_pt_gp_show_attr_alua_support_offline 0 12939 NULL
++target_core_alua_tg_pt_gp_show_attr_alua_support_offline_12939 target_core_alua_tg_pt_gp_show_attr_alua_support_offline 0 12939 NULL nohasharray
++wil_write_back_12939 wil_write_back 3 12939 &target_core_alua_tg_pt_gp_show_attr_alua_support_offline_12939
 +sdev_show_scsi_level_12941 sdev_show_scsi_level 0 12941 NULL
 +register_memory_12944 register_memory 0 12944 NULL
 +do_inode_permission_12946 do_inode_permission 0 12946 NULL
@@ -122834,7 +123192,9 @@ index 0000000..e3e2614
 +snd_seq_prioq_cell_in_12965 snd_seq_prioq_cell_in 0 12965 &lpfc_link_speed_show_12965
 +start_khugepaged_12971 start_khugepaged 0 12971 NULL
 +iwl_mvm_read_external_nvm_12975 iwl_mvm_read_external_nvm 0 12975 NULL
++klp_enable_object_12977 klp_enable_object 0 12977 NULL
 +broadsheet_setup_plls_12983 broadsheet_setup_plls 0 12983 NULL
++_iwl_dbgfs_ss_force_write_12984 _iwl_dbgfs_ss_force_write 3 12984 NULL
 +adfs_statfs_12986 adfs_statfs 0 12986 NULL
 +sk_peek_offset_12991 sk_peek_offset 0 12991 NULL
 +host_lock_show_12993 host_lock_show 0 12993 NULL
@@ -122872,6 +123232,7 @@ index 0000000..e3e2614
 +ppp_asynctty_read_13062 ppp_asynctty_read 0 13062 NULL
 +adv7175_s_fmt_13066 adv7175_s_fmt 0 13066 NULL
 +adis_read_reg_16_13072 adis_read_reg_16 0 13072 NULL
++read_file_tpc_13073 read_file_tpc 3 13073 NULL
 +nf_nat_ipv4_fn_13074 nf_nat_ipv4_fn 0 13074 NULL
 +raid5_store_skip_copy_13075 raid5_store_skip_copy 0-3 13075 NULL nohasharray
 +bnx2fc_fcoe_reset_13075 bnx2fc_fcoe_reset 0 13075 &raid5_store_skip_copy_13075
@@ -122941,6 +123302,7 @@ index 0000000..e3e2614
 +get_unaligned_le64_13219 get_unaligned_le64 0 13219 NULL
 +svm_msrpm_offset_13220 svm_msrpm_offset 0-1 13220 NULL
 +set_vrm_13222 set_vrm 0-4 13222 NULL
++dax_clear_blocks_13223 dax_clear_blocks 3 13223 NULL
 +fnic_trace_ctrl_write_13229 fnic_trace_ctrl_write 3-0 13229 NULL
 +arcmsr_sysfs_iop_message_clear_13239 arcmsr_sysfs_iop_message_clear 0-6-5 13239 NULL
 +_iwl_dbgfs_disable_power_off_write_13243 _iwl_dbgfs_disable_power_off_write 3-0 13243 NULL
@@ -123117,6 +123479,7 @@ index 0000000..e3e2614
 +decode_lanman_negprot_rsp_13636 decode_lanman_negprot_rsp 0 13636 NULL nohasharray
 +__qbuf_userptr_13636 __qbuf_userptr 0 13636 &decode_lanman_negprot_rsp_13636 nohasharray
 +adt7310_spi_write_word_13636 adt7310_spi_write_word 0 13636 &__qbuf_userptr_13636
++mlx4_comm_cmd_13637 mlx4_comm_cmd 0 13637 NULL
 +vprbrd_i2c_addr_13639 vprbrd_i2c_addr 0 13639 NULL nohasharray
 +via_gpio_dir_input_13639 via_gpio_dir_input 0 13639 &vprbrd_i2c_addr_13639
 +ltc4222_show_bool_13640 ltc4222_show_bool 0 13640 NULL
@@ -123138,6 +123501,7 @@ index 0000000..e3e2614
 +show_fnode_discovery_logout_13684 show_fnode_discovery_logout 0 13684 NULL nohasharray
 +wl1271_acx_init_rx_interrupt_13684 wl1271_acx_init_rx_interrupt 0 13684 &show_fnode_discovery_logout_13684
 +devcd_data_write_13685 devcd_data_write 0-6-5 13685 NULL
++wil_read_back_13687 wil_read_back 3 13687 NULL
 +max8997_bulk_read_13688 max8997_bulk_read 0 13688 NULL nohasharray
 +fuse_copy_pages_13688 fuse_copy_pages 0 13688 &max8997_bulk_read_13688
 +check_intr_schedule_13691 check_intr_schedule 0 13691 NULL nohasharray
@@ -123244,7 +123608,8 @@ index 0000000..e3e2614
 +lpfc_idiag_queacc_read_13950 lpfc_idiag_queacc_read 3-0 13950 NULL nohasharray
 +pagecache_write_end_13950 pagecache_write_end 0-5 13950 &lpfc_idiag_queacc_read_13950
 +aa_path_name_13951 aa_path_name 0 13951 NULL nohasharray
-+serial_in_13951 serial_in 0 13951 &aa_path_name_13951
++serial_in_13951 serial_in 0 13951 &aa_path_name_13951 nohasharray
++ath10k_read_nf_cal_period_13951 ath10k_read_nf_cal_period 3 13951 &serial_in_13951
 +osc_grant_shrink_interval_seq_write_13952 osc_grant_shrink_interval_seq_write 3 13952 NULL
 +hsr_dev_change_mtu_13954 hsr_dev_change_mtu 0 13954 NULL
 +audit_caps_13958 audit_caps 3-0 13958 NULL
@@ -123349,7 +123714,8 @@ index 0000000..e3e2614
 +do_write_inode_14162 do_write_inode 0 14162 NULL
 +simple_dvb_set_params_14166 simple_dvb_set_params 0 14166 NULL
 +ccp_alloc_ksb_14167 ccp_alloc_ksb 2 14167 NULL
-+print_input_mask_14168 print_input_mask 0-3 14168 NULL
++print_input_mask_14168 print_input_mask 0-3 14168 NULL nohasharray
++ledd_store_14168 ledd_store 4 14168 &print_input_mask_14168
 +ov9650_set_exposure_14176 ov9650_set_exposure 0 14176 NULL nohasharray
 +ixgbevf_write_mbx_vf_14176 ixgbevf_write_mbx_vf 0 14176 &ov9650_set_exposure_14176
 +uhid_dev_input_14180 uhid_dev_input 0 14180 NULL
@@ -123371,6 +123737,7 @@ index 0000000..e3e2614
 +alloc_async_14208 alloc_async 1 14208 &mv88e6352_get_temp_limit_14208
 +fscache_read_or_alloc_page_14210 fscache_read_or_alloc_page 0 14210 NULL
 +store_temp_min_14217 store_temp_min 0-4 14217 NULL
++__nvme_alloc_iod_14218 __nvme_alloc_iod 1-2 14218 NULL
 +ath6kl_regread_write_14220 ath6kl_regread_write 3-0 14220 NULL nohasharray
 +sst_stream_start_14220 sst_stream_start 0 14220 &ath6kl_regread_write_14220
 +sys_kexec_load_14222 sys_kexec_load 2 14222 NULL
@@ -123382,7 +123749,8 @@ index 0000000..e3e2614
 +show_fc_host_maxframe_size_14237 show_fc_host_maxframe_size 0 14237 NULL
 +usbhsh_endpoint_attach_14238 usbhsh_endpoint_attach 0 14238 NULL
 +de_get_regs_len_14241 de_get_regs_len 0 14241 NULL
-+dma_declare_coherent_memory_14244 dma_declare_coherent_memory 2-4 14244 NULL
++dma_declare_coherent_memory_14244 dma_declare_coherent_memory 2-4 14244 NULL nohasharray
++__tipc_link_xmit_14244 __tipc_link_xmit 0 14244 &dma_declare_coherent_memory_14244
 +iscsi_tpg_param_store_AuthMethod_14245 iscsi_tpg_param_store_AuthMethod 0-3 14245 NULL
 +btrfs_token_file_extent_ram_bytes_14247 btrfs_token_file_extent_ram_bytes 0 14247 NULL nohasharray
 +__dwc3_gadget_kick_transfer_14247 __dwc3_gadget_kick_transfer 0 14247 &btrfs_token_file_extent_ram_bytes_14247
@@ -123424,11 +123792,11 @@ index 0000000..e3e2614
 +dvb_usbv2_generic_write_14335 dvb_usbv2_generic_write 0 14335 NULL nohasharray
 +rtpm_usagecount_show_14335 rtpm_usagecount_show 0 14335 &dvb_usbv2_generic_write_14335
 +ch341_get_status_14337 ch341_get_status 0 14337 NULL
++nvkm_mc_create__14338 nvkm_mc_create_ 4 14338 NULL
 +reshape_direction_store_14340 reshape_direction_store 0-3 14340 NULL
 +sbp_tpg_show_enable_14341 sbp_tpg_show_enable 0 14341 NULL
 +reset_protection_store_14344 reset_protection_store 0-4 14344 NULL
 +p9_client_zc_rpc_14345 p9_client_zc_rpc 7 14345 NULL
-+ep_aio_rwtail_14347 ep_aio_rwtail 6 14347 NULL
 +writepages_14348 writepages 0 14348 NULL
 +bnx2_request_uncached_firmware_14349 bnx2_request_uncached_firmware 0 14349 NULL nohasharray
 +alloc_tx_struct_14349 alloc_tx_struct 1 14349 &bnx2_request_uncached_firmware_14349
@@ -123451,6 +123819,7 @@ index 0000000..e3e2614
 +mptscsih_version_mpi_show_14381 mptscsih_version_mpi_show 0 14381 &acpi_get_override_irq_14381
 +ext3_write_begin_14384 ext3_write_begin 0 14384 NULL
 +srp_tmo_valid_14386 srp_tmo_valid 0 14386 NULL
++walk_page_range_14389 walk_page_range 0 14389 NULL
 +ath6kl_regdump_read_14393 ath6kl_regdump_read 3-0 14393 NULL
 +smk_write_onlycap_14400 smk_write_onlycap 3-0 14400 NULL
 +kernel_module_request_14403 kernel_module_request 0 14403 NULL
@@ -123520,6 +123889,7 @@ index 0000000..e3e2614
 +max8997_rtc_start_alarm_14545 max8997_rtc_start_alarm 0 14545 &getxattr_14545
 +l2cap_send_cmd_14548 l2cap_send_cmd 4 14548 NULL
 +picolcd_debug_eeprom_read_14549 picolcd_debug_eeprom_read 3-0 14549 NULL
++t4_wait_op_done_val_14550 t4_wait_op_done_val 0 14550 NULL
 +em28xx_i2c_check_for_device_14556 em28xx_i2c_check_for_device 0 14556 NULL
 +edt_ft5x06_setting_store_14557 edt_ft5x06_setting_store 0-4 14557 NULL nohasharray
 +xfs_fs_log_dummy_14557 xfs_fs_log_dummy 0 14557 &edt_ft5x06_setting_store_14557
@@ -123549,7 +123919,8 @@ index 0000000..e3e2614
 +vmci_transport_send_read_14617 vmci_transport_send_read 0 14617 NULL
 +ems_usb_start_14619 ems_usb_start 0 14619 NULL
 +sb1000_start_get_set_command_14626 sb1000_start_get_set_command 0 14626 NULL nohasharray
-+__intel_ring_prepare_14626 __intel_ring_prepare 0 14626 &sb1000_start_get_set_command_14626
++__intel_ring_prepare_14626 __intel_ring_prepare 0 14626 &sb1000_start_get_set_command_14626 nohasharray
++logical_ring_flush_all_caches_14626 logical_ring_flush_all_caches 0 14626 &__intel_ring_prepare_14626
 +show_temphyst_14627 show_temphyst 0 14627 NULL
 +xen_swiotlb_free_coherent_14630 xen_swiotlb_free_coherent 4 14630 NULL
 +async_syndrome_val_14633 async_syndrome_val 2 14633 NULL
@@ -123576,7 +123947,8 @@ index 0000000..e3e2614
 +mfd_add_hotplug_devices_14680 mfd_add_hotplug_devices 3 14680 NULL nohasharray
 +pipeline_enc_tx_stat_fifo_int_read_14680 pipeline_enc_tx_stat_fifo_int_read 3-0 14680 &mfd_add_hotplug_devices_14680 nohasharray
 +gpio_keys_show_disabled_keys_14680 gpio_keys_show_disabled_keys 0 14680 &pipeline_enc_tx_stat_fifo_int_read_14680
-+tcp_v6_init_sock_14681 tcp_v6_init_sock 0 14681 NULL
++tcp_v6_init_sock_14681 tcp_v6_init_sock 0 14681 NULL nohasharray
++nvkm_namedb_create__14681 nvkm_namedb_create_ 7 14681 &tcp_v6_init_sock_14681
 +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
 +find_shared_port_14689 find_shared_port 0 14689 NULL
@@ -123756,6 +124128,7 @@ index 0000000..e3e2614
 +copy_version_to_user_15087 copy_version_to_user 0 15087 NULL nohasharray
 +xfrm_dev_event_15087 xfrm_dev_event 0 15087 &copy_version_to_user_15087
 +xfs_btree_insrec_15090 xfs_btree_insrec 0 15090 NULL
++show_ppi_operations_15091 show_ppi_operations 0 15091 NULL
 +btrfs_readpage_15094 btrfs_readpage 0 15094 NULL
 +bond_option_downdelay_set_15095 bond_option_downdelay_set 0 15095 NULL
 +ath10k_pci_hif_tx_sg_15096 ath10k_pci_hif_tx_sg 0 15096 NULL
@@ -123794,6 +124167,7 @@ index 0000000..e3e2614
 +iscsi_create_endpoint_15193 iscsi_create_endpoint 1 15193 NULL nohasharray
 +radeonfb_check_var_15193 radeonfb_check_var 0 15193 &iscsi_create_endpoint_15193
 +pci200_open_15194 pci200_open 0 15194 NULL
++blk_queue_init_tags_15200 blk_queue_init_tags 2 15200 NULL
 +async_show_15209 async_show 0 15209 NULL
 +command_setflickerctrl_15210 command_setflickerctrl 0 15210 NULL
 +get_name_to_buffer_15211 get_name_to_buffer 0 15211 NULL
@@ -123959,6 +124333,7 @@ index 0000000..e3e2614
 +adt7x10_show_alarm_15602 adt7x10_show_alarm 0 15602 NULL
 +nes_store_flash_cmd_15603 nes_store_flash_cmd 0-3 15603 NULL
 +x1205_get_datetime_15608 x1205_get_datetime 0 15608 NULL
++sx150x_install_irq_chip_15609 sx150x_install_irq_chip 3 15609 NULL
 +i40evf_request_traffic_irqs_15610 i40evf_request_traffic_irqs 0 15610 NULL
 +wusb_chid_show_15613 wusb_chid_show 0 15613 NULL nohasharray
 +sdev_show_rev_15613 sdev_show_rev 0 15613 &wusb_chid_show_15613
@@ -124068,6 +124443,7 @@ index 0000000..e3e2614
 +send_tx_power_15914 send_tx_power 0 15914 NULL
 +alc_build_controls_15918 alc_build_controls 0 15918 NULL
 +hid_hw_power_15921 hid_hw_power 0 15921 NULL
++bio_copy_kern_15925 bio_copy_kern 3 15925 NULL
 +erst_exec_store_var1_15933 erst_exec_store_var1 0 15933 NULL
 +wm5100_gpio_direction_in_15934 wm5100_gpio_direction_in 0 15934 NULL
 +tda18218_wr_regs_15935 tda18218_wr_regs 0 15935 NULL
@@ -124110,7 +124486,8 @@ index 0000000..e3e2614
 +il3945_tx_reset_16042 il3945_tx_reset 0 16042 NULL
 +iscsi_stat_instance_show_attr_fail_rem_name_16045 iscsi_stat_instance_show_attr_fail_rem_name 0 16045 NULL
 +show_virtual_16047 show_virtual 0 16047 NULL
-+hidp_send_message_16052 hidp_send_message 0-6 16052 NULL
++hidp_send_message_16052 hidp_send_message 0-6 16052 NULL nohasharray
++blk_init_tags_16052 blk_init_tags 1 16052 &hidp_send_message_16052
 +dccp_recvmsg_16056 dccp_recvmsg 0-4 16056 NULL
 +read_file_spectral_period_16057 read_file_spectral_period 3-0 16057 NULL
 +SYSC_kexec_file_load_16058 SYSC_kexec_file_load 3 16058 NULL nohasharray
@@ -124296,6 +124673,7 @@ index 0000000..e3e2614
 +do_uevent_16445 do_uevent 0 16445 NULL
 +security_sb_statfs_16448 security_sb_statfs 0 16448 NULL
 +calculate_inocache_hashsize_16449 calculate_inocache_hashsize 0-1 16449 NULL
++sf1_read_16451 sf1_read 0 16451 NULL
 +blk_mq_sysfs_completed_show_16454 blk_mq_sysfs_completed_show 0 16454 NULL nohasharray
 +atm_init_aal0_16454 atm_init_aal0 0 16454 &blk_mq_sysfs_completed_show_16454
 +netlink_change_ngroups_16457 netlink_change_ngroups 2 16457 NULL
@@ -124488,11 +124866,13 @@ index 0000000..e3e2614
 +riic_xfer_16947 riic_xfer 0-3 16947 NULL
 +bq2415x_set_battery_regulation_voltage_16953 bq2415x_set_battery_regulation_voltage 0 16953 NULL nohasharray
 +pm_freeze_timeout_store_16953 pm_freeze_timeout_store 0-4 16953 &bq2415x_set_battery_regulation_voltage_16953
++ftrace_match_addr_16959 ftrace_match_addr 0 16959 NULL
 +parse_hints_16960 parse_hints 0 16960 NULL
 +svcxdr_dupstr_16963 svcxdr_dupstr 3 16963 NULL nohasharray
 +max8660_write_16963 max8660_write 0 16963 &svcxdr_dupstr_16963
 +usbdux_firmware_upload_16966 usbdux_firmware_upload 3 16966 NULL
 +keyctl_instantiate_key_iov_16969 keyctl_instantiate_key_iov 3 16969 NULL
++__nfs_revalidate_mapping_16971 __nfs_revalidate_mapping 0 16971 NULL
 +lid_show_16974 lid_show 0 16974 NULL nohasharray
 +roccat_common2_sysfs_read_stored_lights_16974 roccat_common2_sysfs_read_stored_lights 0-5-6 16974 &lid_show_16974
 +htu21_show_temperature_16981 htu21_show_temperature 0 16981 NULL
@@ -124605,6 +124985,7 @@ index 0000000..e3e2614
 +metadata_show_17234 metadata_show 0 17234 NULL
 +show_hddtemp_17237 show_hddtemp 0 17237 NULL
 +store_fatal_error_17242 store_fatal_error 0-4 17242 NULL
++mlx4_enable_sriov_17247 mlx4_enable_sriov 3-4 17247 NULL
 +odev_attr_store_17252 odev_attr_store 0-4 17252 NULL
 +r3964_read_17257 r3964_read 0 17257 NULL
 +lprocfs_read_frac_helper_17261 lprocfs_read_frac_helper 0 17261 NULL
@@ -124644,6 +125025,7 @@ index 0000000..e3e2614
 +ixgbe_poll_for_ack_17316 ixgbe_poll_for_ack 0 17316 NULL
 +mt9m111_reg_clear_17321 mt9m111_reg_clear 0 17321 NULL
 +protection_type_show_17322 protection_type_show 0 17322 NULL
++snd_register_device_17323 snd_register_device 0 17323 NULL
 +rocker_flow_tbl_do_17325 rocker_flow_tbl_do 0 17325 NULL nohasharray
 +ata_host_alloc_pinfo_17325 ata_host_alloc_pinfo 3 17325 &rocker_flow_tbl_do_17325
 +vol_attribute_show_17328 vol_attribute_show 0 17328 NULL nohasharray
@@ -124752,6 +125134,7 @@ index 0000000..e3e2614
 +xen_release_pud_17595 xen_release_pud 1 17595 &neigh_hash_alloc_17595
 +rts51x_write_mem_17598 rts51x_write_mem 4 17598 NULL
 +da9055_rtc_enable_alarm_17599 da9055_rtc_enable_alarm 0 17599 NULL
++nvkm_gpio_create__17601 nvkm_gpio_create_ 4 17601 NULL
 +wm8994_gpio_to_irq_17604 wm8994_gpio_to_irq 2 17604 NULL
 +osst_execute_17607 osst_execute 7-6 17607 NULL nohasharray
 +svc_export_parse_17607 svc_export_parse 0 17607 &osst_execute_17607
@@ -124928,6 +125311,7 @@ index 0000000..e3e2614
 +il_send_cmd_async_17972 il_send_cmd_async 0 17972 &acpi_ex_check_object_type_17972
 +wm831x_gp_ldo_get_status_17977 wm831x_gp_ldo_get_status 0 17977 NULL
 +iwlagn_disconn_pan_17978 iwlagn_disconn_pan 0 17978 NULL
++rtl2830_bulk_write_17980 rtl2830_bulk_write 2-4 17980 NULL
 +show_fc_host_optionrom_version_17983 show_fc_host_optionrom_version 0 17983 NULL
 +br_nf_local_in_17986 br_nf_local_in 0 17986 NULL nohasharray
 +dwc3_gadget_set_ep_config_17986 dwc3_gadget_set_ep_config 0 17986 &br_nf_local_in_17986
@@ -125004,6 +125388,7 @@ index 0000000..e3e2614
 +set_in_18115 set_in 0-4 18115 NULL
 +dfs_file_read_18116 dfs_file_read 3-0 18116 NULL
 +svc_getnl_18120 svc_getnl 0 18120 NULL
++ath10k_htt_rx_ring_refill_18122 ath10k_htt_rx_ring_refill 0 18122 NULL
 +p9_client_wstat_18130 p9_client_wstat 0 18130 NULL
 +xfs_zero_eof_18134 xfs_zero_eof 0-3-2 18134 NULL nohasharray
 +lapbeth_open_18134 lapbeth_open 0 18134 &xfs_zero_eof_18134
@@ -125334,6 +125719,7 @@ index 0000000..e3e2614
 +lola_set_sample_rate_18888 lola_set_sample_rate 0 18888 NULL
 +chip_name_store_18889 chip_name_store 0-4 18889 NULL
 +imx074_cropcap_18891 imx074_cropcap 0 18891 NULL
++comedi_isadma_alloc_18893 comedi_isadma_alloc 2 18893 NULL
 +max77802_rtc_stop_alarm_18896 max77802_rtc_stop_alarm 0 18896 NULL
 +rj54n1_set_rect_18898 rj54n1_set_rect 0 18898 NULL
 +devm_mdiobus_alloc_size_18902 devm_mdiobus_alloc_size 2 18902 NULL nohasharray
@@ -125418,6 +125804,7 @@ index 0000000..e3e2614
 +show_sched7_19083 show_sched7 0 19083 NULL
 +abx500_get_register_interruptible_19084 abx500_get_register_interruptible 0 19084 NULL
 +write_19086 write 0 19086 NULL
++clk_core_set_rate_nolock_19089 clk_core_set_rate_nolock 0 19089 NULL
 +sys_process_vm_readv_19090 sys_process_vm_readv 3-5 19090 NULL nohasharray
 +brcmf_usbdev_qinit_19090 brcmf_usbdev_qinit 2 19090 &sys_process_vm_readv_19090
 +fw_flash_update_req_19092 fw_flash_update_req 0 19092 NULL
@@ -125505,6 +125892,7 @@ index 0000000..e3e2614
 +io_mapping_map_wc_19284 io_mapping_map_wc 2 19284 &md5_export_19284
 +batadv_tt_save_orig_buffer_19288 batadv_tt_save_orig_buffer 4 19288 NULL
 +snd_rawmidi_dev_register_19290 snd_rawmidi_dev_register 0 19290 NULL
++raw_send_hdrinc_19292 raw_send_hdrinc 4 19292 NULL
 +show_in_max1_19293 show_in_max1 0 19293 NULL
 +virtnet_change_mtu_19294 virtnet_change_mtu 0 19294 NULL
 +patch_simple_hdmi_19296 patch_simple_hdmi 0 19296 NULL
@@ -125720,7 +126108,8 @@ index 0000000..e3e2614
 +check_acpi_ids_19802 check_acpi_ids 0 19802 NULL
 +memory_isolate_notify_19808 memory_isolate_notify 0 19808 NULL
 +store_thermal_cruise_19810 store_thermal_cruise 0-4 19810 NULL
-+ext2_setsize_19812 ext2_setsize 0 19812 NULL
++ext2_setsize_19812 ext2_setsize 0 19812 NULL nohasharray
++nci_hci_set_param_19812 nci_hci_set_param 5 19812 &ext2_setsize_19812
 +m2p_19814 m2p 1 19814 NULL
 +fsa9480_show_manualsw_19815 fsa9480_show_manualsw 0 19815 NULL
 +ath10k_write_htt_max_amsdu_ampdu_19820 ath10k_write_htt_max_amsdu_ampdu 3-0 19820 NULL
@@ -125818,7 +126207,8 @@ index 0000000..e3e2614
 +ocfs2_xattr_security_set_20032 ocfs2_xattr_security_set 0 20032 &radeon_hwmon_show_temp_20032
 +platform_suspend_prepare_20036 platform_suspend_prepare 0 20036 NULL
 +read_tape_20037 read_tape 0 20037 NULL
-+cxacru_sysfs_show_upstream_attenuation_20040 cxacru_sysfs_show_upstream_attenuation 0 20040 NULL
++cxacru_sysfs_show_upstream_attenuation_20040 cxacru_sysfs_show_upstream_attenuation 0 20040 NULL nohasharray
++nvkm_disp_create__20040 nvkm_disp_create_ 4-7 20040 &cxacru_sysfs_show_upstream_attenuation_20040
 +mwl8k_init_txqs_20042 mwl8k_init_txqs 0 20042 NULL
 +cmdline_show_20044 cmdline_show 0 20044 NULL
 +mt_show_quirks_20045 mt_show_quirks 0 20045 NULL
@@ -125834,7 +126224,8 @@ index 0000000..e3e2614
 +l2tp_ip6_getname_20071 l2tp_ip6_getname 0 20071 NULL
 +target_message_20072 target_message 2 20072 NULL
 +rawv6_sendmsg_20080 rawv6_sendmsg 4-0 20080 NULL nohasharray
-+init_chip_reset_20080 init_chip_reset 0 20080 &rawv6_sendmsg_20080
++init_chip_reset_20080 init_chip_reset 0 20080 &rawv6_sendmsg_20080 nohasharray
++ieee802154_check_concurrent_iface_20080 ieee802154_check_concurrent_iface 0 20080 &init_chip_reset_20080
 +fuse_conn_limit_read_20084 fuse_conn_limit_read 3-0 20084 NULL
 +aat2870_reg_write_file_20086 aat2870_reg_write_file 3-0 20086 NULL
 +reiserfs_dir_fsync_20088 reiserfs_dir_fsync 0 20088 NULL
@@ -125878,6 +126269,7 @@ index 0000000..e3e2614
 +wep_addr_key_count_read_20174 wep_addr_key_count_read 3-0 20174 NULL
 +kstrtou8_20177 kstrtou8 0 20177 NULL
 +i2c_send_byte_20180 i2c_send_byte 0 20180 NULL
++ieee802154_check_mac_settings_20182 ieee802154_check_mac_settings 0 20182 NULL
 +acpi_ds_load2_end_op_20185 acpi_ds_load2_end_op 0 20185 NULL nohasharray
 +atm_init_aal5_20185 atm_init_aal5 0 20185 &acpi_ds_load2_end_op_20185
 +ax25_hard_header_20187 ax25_hard_header 0 20187 NULL nohasharray
@@ -125989,6 +126381,7 @@ index 0000000..e3e2614
 +cx231xx_i2c_check_for_device_20416 cx231xx_i2c_check_for_device 0 20416 NULL
 +eeprom_store_20424 eeprom_store 0-4 20424 NULL
 +igb_setup_rx_resources_20425 igb_setup_rx_resources 0 20425 NULL
++add_hash_entry_20427 add_hash_entry 0 20427 NULL
 +igbvf_setup_tx_resources_20428 igbvf_setup_tx_resources 0 20428 NULL
 +anysee_ctrl_msg_20430 anysee_ctrl_msg 0 20430 NULL
 +find_skb_20431 find_skb 2 20431 NULL
@@ -126014,6 +126407,7 @@ index 0000000..e3e2614
 +adt7x10_write_byte_20476 adt7x10_write_byte 0 20476 &btrfs_get_32_20476
 +show_scan_age_20477 show_scan_age 0 20477 NULL nohasharray
 +start_service_discovery_20477 start_service_discovery 4 20477 &show_scan_age_20477
++memcg_update_list_lru_20486 memcg_update_list_lru 3-0 20486 NULL
 +vxge_open_20497 vxge_open 0 20497 NULL
 +i7core_inject_enable_store_20501 i7core_inject_enable_store 0-4 20501 NULL
 +elan_sysfs_read_iap_ver_20502 elan_sysfs_read_iap_ver 0 20502 NULL
@@ -126298,6 +126692,7 @@ index 0000000..e3e2614
 +target_fabric_nacl_param_attr_store_21126 target_fabric_nacl_param_attr_store 0 21126 &show_21126
 +i2400m_rx_trace_21127 i2400m_rx_trace 3 21127 NULL
 +st_gyro_buffer_postenable_21128 st_gyro_buffer_postenable 0 21128 NULL
++iwl_dbgfs_uapsd_misbehaving_read_21129 iwl_dbgfs_uapsd_misbehaving_read 3 21129 NULL
 +snd_nm256_capture_trigger_21135 snd_nm256_capture_trigger 0 21135 NULL
 +ubifs_write_iter_21137 ubifs_write_iter 0 21137 NULL
 +target_core_dev_pr_show_attr_res_pr_generation_21138 target_core_dev_pr_show_attr_res_pr_generation 0 21138 NULL
@@ -126311,7 +126706,9 @@ index 0000000..e3e2614
 +alloc_pg_vec_21159 alloc_pg_vec 3 21159 NULL
 +tg3_load_firmware_cpu_21170 tg3_load_firmware_cpu 0 21170 NULL
 +mei_dbgfs_read_active_21172 mei_dbgfs_read_active 3-0 21172 NULL nohasharray
-+show_therm_max_21172 show_therm_max 0 21172 &mei_dbgfs_read_active_21172
++show_therm_max_21172 show_therm_max 0 21172 &mei_dbgfs_read_active_21172 nohasharray
++t4_init_clip_tbl_21172 t4_init_clip_tbl 1-2 21172 &show_therm_max_21172
++vmci_qpair_enquev_21176 vmci_qpair_enquev 0-3 21176 NULL
 +hfsplus_writepage_21177 hfsplus_writepage 0 21177 NULL
 +bioset_create_nobvec_21180 bioset_create_nobvec 1 21180 NULL nohasharray
 +kone_sysfs_read_settings_21180 kone_sysfs_read_settings 0-5-6 21180 &bioset_create_nobvec_21180
@@ -126339,6 +126736,7 @@ index 0000000..e3e2614
 +svc_bind_21244 svc_bind 0 21244 NULL nohasharray
 +gpio_keys_attr_store_helper_21244 gpio_keys_attr_store_helper 0 21244 &svc_bind_21244
 +target_core_dev_store_21245 target_core_dev_store 0-4 21245 NULL
++use_debug_keys_read_21251 use_debug_keys_read 3 21251 NULL
 +nes_store_nonidx_addr_21252 nes_store_nonidx_addr 0-3 21252 NULL
 +wp_retry_size_21260 wp_retry_size 0 21260 NULL nohasharray
 +pre_snapshot_21260 pre_snapshot 0 21260 &wp_retry_size_21260
@@ -126389,6 +126787,7 @@ index 0000000..e3e2614
 +store_associate_remote_21366 store_associate_remote 0-4 21366 NULL
 +pin_request_21370 pin_request 0 21370 NULL
 +alloc_orinocodev_21371 alloc_orinocodev 1 21371 NULL
++ath10k_wmi_tlv_op_gen_vdev_sta_uapsd_21375 ath10k_wmi_tlv_op_gen_vdev_sta_uapsd 5 21375 NULL
 +split_leaf_21378 split_leaf 0 21378 NULL nohasharray
 +smsc911x_open_21378 smsc911x_open 0 21378 &split_leaf_21378
 +SYSC_rt_sigpending_21379 SYSC_rt_sigpending 2 21379 NULL
@@ -126449,6 +126848,7 @@ index 0000000..e3e2614
 +set_postcode_21490 set_postcode 0-4 21490 NULL
 +security_list_21491 security_list 0-5 21491 NULL
 +ads7846_read12_ser_21501 ads7846_read12_ser 0 21501 NULL
++force_bredr_smp_write_21502 force_bredr_smp_write 3 21502 NULL
 +mmc_alloc_sg_21504 mmc_alloc_sg 1 21504 NULL
 +show_beep_mask_21507 show_beep_mask 0 21507 NULL nohasharray
 +ieee80211_tdls_prep_mgmt_packet_21507 ieee80211_tdls_prep_mgmt_packet 10 21507 &show_beep_mask_21507
@@ -126459,7 +126859,8 @@ index 0000000..e3e2614
 +cpia2_set_gpio_21520 cpia2_set_gpio 0 21520 NULL
 +show_rd_req_21521 show_rd_req 0 21521 NULL
 +nilfs_readpage_21524 nilfs_readpage 0 21524 NULL
-+isdn_net_header_21527 isdn_net_header 0 21527 NULL
++isdn_net_header_21527 isdn_net_header 0 21527 NULL nohasharray
++skb_do_copy_data_nocache_21527 skb_do_copy_data_nocache 5-0 21527 &isdn_net_header_21527
 +wm831x_aldo_get_mode_21530 wm831x_aldo_get_mode 0 21530 NULL
 +il_dbgfs_stations_read_21532 il_dbgfs_stations_read 3-0 21532 NULL
 +f2fs_read_data_page_21533 f2fs_read_data_page 0 21533 NULL
@@ -126546,6 +126947,7 @@ index 0000000..e3e2614
 +ipv6_confirm_21743 ipv6_confirm 0 21743 NULL
 +at91_open_21744 at91_open 0 21744 NULL nohasharray
 +__nf_nat_mangle_tcp_packet_21744 __nf_nat_mangle_tcp_packet 6-8 21744 &at91_open_21744
++__scsi_format_command_21749 __scsi_format_command 2 21749 NULL
 +set_sticky_21752 set_sticky 0-4 21752 NULL
 +mthca_alloc_init_21754 mthca_alloc_init 2 21754 NULL
 +l2down_create_21755 l2down_create 4 21755 NULL
@@ -126658,7 +127060,8 @@ index 0000000..e3e2614
 +pm_show_wakelocks_21986 pm_show_wakelocks 0 21986 &xen_bind_pirq_msi_to_irq_21986
 +ath5k_hw_rf5112_channel_21993 ath5k_hw_rf5112_channel 0 21993 NULL
 +w1_f2d_readblock_21994 w1_f2d_readblock 3 21994 NULL
-+proc_sched_autogroup_set_nice_21995 proc_sched_autogroup_set_nice 0 21995 NULL
++proc_sched_autogroup_set_nice_21995 proc_sched_autogroup_set_nice 0 21995 NULL nohasharray
++ocfs2_del_inode_from_orphan_21995 ocfs2_del_inode_from_orphan 0 21995 &proc_sched_autogroup_set_nice_21995
 +compat_rw_copy_check_uvector_22001 compat_rw_copy_check_uvector 3-0 22001 NULL nohasharray
 +rxpipe_descr_host_int_trig_rx_data_read_22001 rxpipe_descr_host_int_trig_rx_data_read 3-0 22001 &compat_rw_copy_check_uvector_22001
 +osst_linux_media_version_show_22002 osst_linux_media_version_show 0 22002 NULL
@@ -126777,7 +127180,8 @@ index 0000000..e3e2614
 +ath10k_push_board_ext_data_22243 ath10k_push_board_ext_data 0 22243 NULL nohasharray
 +fsnotify_parent_22243 fsnotify_parent 0 22243 &ath10k_push_board_ext_data_22243
 +prepare_to_wait_event_22247 prepare_to_wait_event 0 22247 NULL
-+capability_id_show_22253 capability_id_show 0 22253 NULL
++capability_id_show_22253 capability_id_show 0 22253 NULL nohasharray
++security_setxattr_22253 security_setxattr 4 22253 &capability_id_show_22253
 +compat_process_vm_rw_22254 compat_process_vm_rw 3-5 22254 NULL
 +show_fc_rport_maxframe_size_22260 show_fc_rport_maxframe_size 0 22260 NULL
 +ping_common_sendmsg_22261 ping_common_sendmsg 5 22261 NULL
@@ -126854,6 +127258,7 @@ index 0000000..e3e2614
 +isci_show_id_22428 isci_show_id 0 22428 NULL nohasharray
 +erst_exec_set_src_address_base_22428 erst_exec_set_src_address_base 0 22428 &isci_show_id_22428
 +__set_enter_print_fmt_22431 __set_enter_print_fmt 0 22431 NULL
++iov_iter_get_pages_22440 iov_iter_get_pages 0-4-3 22440 NULL
 +xenfb_check_var_22441 xenfb_check_var 0 22441 NULL
 +rtl2832_sdr_start_streaming_22446 rtl2832_sdr_start_streaming 0 22446 NULL
 +show_sas_phy_phy_identifier_22447 show_sas_phy_phy_identifier 0 22447 NULL
@@ -126873,7 +127278,8 @@ index 0000000..e3e2614
 +rfcomm_send_test_22491 rfcomm_send_test 4 22491 &lm3642_torch_pin_store_22491
 +put_chars_22498 put_chars 3 22498 NULL
 +mp_find_ioapic_pin_22499 mp_find_ioapic_pin 0-2 22499 NULL nohasharray
-+edac_device_ctl_log_ue_store_22499 edac_device_ctl_log_ue_store 0-3 22499 &mp_find_ioapic_pin_22499
++edac_device_ctl_log_ue_store_22499 edac_device_ctl_log_ue_store 0-3 22499 &mp_find_ioapic_pin_22499 nohasharray
++st21nfca_hci_se_io_22499 st21nfca_hci_se_io 4 22499 &edac_device_ctl_log_ue_store_22499
 +ad5398_read_reg_22504 ad5398_read_reg 0 22504 NULL
 +mutex_lock_interruptible_22505 mutex_lock_interruptible 0 22505 NULL nohasharray
 +asd_version_show_22505 asd_version_show 0 22505 &mutex_lock_interruptible_22505
@@ -126955,7 +127361,8 @@ index 0000000..e3e2614
 +alloc_libipw_22708 alloc_libipw 1 22708 NULL
 +show_iface_enabled_22711 show_iface_enabled 0 22711 NULL
 +read_iter_zero_22715 read_iter_zero 0 22715 NULL
-+m2p_remove_override_22717 m2p_remove_override 3 22717 NULL
++m2p_remove_override_22717 m2p_remove_override 3 22717 NULL nohasharray
++memcg_update_list_lru_node_22717 memcg_update_list_lru_node 3 22717 &m2p_remove_override_22717
 +qlcnic_83xx_lockless_flash_read32_22721 qlcnic_83xx_lockless_flash_read32 0 22721 NULL nohasharray
 +ecryptfs_write_metadata_to_contents_22721 ecryptfs_write_metadata_to_contents 3 22721 &qlcnic_83xx_lockless_flash_read32_22721
 +mxuport_send_ctrl_urb_22723 mxuport_send_ctrl_urb 0 22723 NULL
@@ -127005,7 +127412,8 @@ index 0000000..e3e2614
 +comm_addr_list_read_22819 comm_addr_list_read 0 22819 NULL
 +init_after_reset_22823 init_after_reset 0 22823 NULL
 +show_fbstate_22824 show_fbstate 0 22824 NULL
-+ghash_init_22826 ghash_init 0 22826 NULL
++ghash_init_22826 ghash_init 0 22826 NULL nohasharray
++nfs_initiate_commit_22826 nfs_initiate_commit 0 22826 &ghash_init_22826
 +max8998_ldo_is_enabled_22833 max8998_ldo_is_enabled 0 22833 NULL
 +afs_permission_22835 afs_permission 0 22835 NULL
 +mb862xxfb_show_dispregs_22838 mb862xxfb_show_dispregs 0 22838 NULL
@@ -127057,6 +127465,7 @@ index 0000000..e3e2614
 +max8925_write_device_22937 max8925_write_device 3-0 22937 NULL nohasharray
 +show_alert_led_22937 show_alert_led 0 22937 &max8925_write_device_22937
 +wil_rx_refill_22940 wil_rx_refill 0 22940 NULL
++bio_copy_to_iter_22942 bio_copy_to_iter 0 22942 NULL
 +nfs4_get_security_label_22946 nfs4_get_security_label 0 22946 NULL
 +pcpu_mem_zalloc_22948 pcpu_mem_zalloc 1 22948 NULL
 +i2c_bit_xfer_22953 i2c_bit_xfer 0-3 22953 NULL
@@ -127156,7 +127565,8 @@ index 0000000..e3e2614
 +id_show_23121 id_show 0 23121 NULL
 +drm_mode_create_tv_properties_23122 drm_mode_create_tv_properties 2 23122 NULL
 +vx_pcm_prepare_23123 vx_pcm_prepare 0 23123 NULL
-+vsc824x_add_skew_23126 vsc824x_add_skew 0 23126 NULL
++vsc824x_add_skew_23126 vsc824x_add_skew 0 23126 NULL nohasharray
++read_file_wow_23126 read_file_wow 3 23126 &vsc824x_add_skew_23126
 +do_generic_request_23130 do_generic_request 0 23130 NULL
 +fib_inetaddr_event_23134 fib_inetaddr_event 0 23134 NULL
 +ext3_listxattr_23137 ext3_listxattr 0-3 23137 NULL
@@ -127166,6 +127576,7 @@ index 0000000..e3e2614
 +ca91cx42_master_set_23146 ca91cx42_master_set 4 23146 NULL
 +asus_hwmon_temp1_23150 asus_hwmon_temp1 0 23150 NULL
 +parse_tunables_write_23152 parse_tunables_write 0 23152 NULL
++_iwl_dbgfs_fw_dbg_collect_write_23153 _iwl_dbgfs_fw_dbg_collect_write 3 23153 NULL
 +handle_event_23156 handle_event 0 23156 NULL
 +wm831x_set_bits_23158 wm831x_set_bits 0 23158 NULL
 +read_file_ani_23161 read_file_ani 3-0 23161 NULL
@@ -127184,7 +127595,8 @@ index 0000000..e3e2614
 +fix_unclean_leb_23188 fix_unclean_leb 3 23188 NULL nohasharray
 +comm_nodeid_read_23188 comm_nodeid_read 0 23188 &fix_unclean_leb_23188
 +mpi_alloc_limb_space_23190 mpi_alloc_limb_space 1 23190 NULL
-+saa7706h_s_ctrl_23192 saa7706h_s_ctrl 0 23192 NULL
++saa7706h_s_ctrl_23192 saa7706h_s_ctrl 0 23192 NULL nohasharray
++remove_ftrace_list_ops_23192 remove_ftrace_list_ops 0 23192 &saa7706h_s_ctrl_23192
 +__audit_sockaddr_23194 __audit_sockaddr 0 23194 NULL
 +max16065_show_input_23199 max16065_show_input 0 23199 NULL nohasharray
 +show_ipv6_iface_router_adv_link_mtu_23199 show_ipv6_iface_router_adv_link_mtu 0 23199 &max16065_show_input_23199
@@ -127221,6 +127633,7 @@ index 0000000..e3e2614
 +intel_map_sg_23265 intel_map_sg 0-3 23265 &sctp_recvmsg_23265
 +alg_bind_23268 alg_bind 0 23268 NULL
 +lan87xx_read_status_23278 lan87xx_read_status 0 23278 NULL
++remove_ftrace_ops_23280 remove_ftrace_ops 0 23280 NULL
 +uwb_dev_addr_print_23282 uwb_dev_addr_print 2 23282 NULL
 +snd_compress_dev_register_23283 snd_compress_dev_register 0 23283 NULL nohasharray
 +venus_readlink_23283 venus_readlink 0 23283 &snd_compress_dev_register_23283 nohasharray
@@ -127263,6 +127676,7 @@ index 0000000..e3e2614
 +regulator_is_enabled_regmap_23365 regulator_is_enabled_regmap 0 23365 NULL
 +fscache_fsdef_netfs_get_key_23368 fscache_fsdef_netfs_get_key 0 23368 NULL
 +fd_setup_write_same_buf_23369 fd_setup_write_same_buf 3 23369 NULL
++rawv6_send_hdrinc_23370 rawv6_send_hdrinc 3 23370 NULL
 +bonding_sysfs_store_option_23382 bonding_sysfs_store_option 0-4 23382 NULL
 +fc0011_writereg_23383 fc0011_writereg 0 23383 NULL
 +of_parse_phandle_with_args_23389 of_parse_phandle_with_args 0 23389 NULL
@@ -127380,6 +127794,7 @@ index 0000000..e3e2614
 +setup_ctxt_23653 setup_ctxt 0 23653 NULL
 +wlcore_identify_fw_23654 wlcore_identify_fw 0 23654 NULL
 +sh_irda_open_23659 sh_irda_open 0 23659 NULL
++__klp_disable_patch_23660 __klp_disable_patch 0 23660 NULL
 +idVendor_show_23662 idVendor_show 0 23662 NULL
 +ocfs2_cluster_stack_store_23663 ocfs2_cluster_stack_store 0-4 23663 NULL
 +dmi_entry_attr_show_23669 dmi_entry_attr_show 0 23669 NULL nohasharray
@@ -127419,7 +127834,8 @@ index 0000000..e3e2614
 +inode_getattr_23729 inode_getattr 0 23729 NULL nohasharray
 +wsm_set_uapsd_info_23729 wsm_set_uapsd_info 0 23729 &inode_getattr_23729
 +quota_warn_period_store_23730 quota_warn_period_store 3-0 23730 NULL
-+iscsi_stat_tgt_attr_show_attr_fail_intr_addr_type_23731 iscsi_stat_tgt_attr_show_attr_fail_intr_addr_type 0 23731 NULL
++iscsi_stat_tgt_attr_show_attr_fail_intr_addr_type_23731 iscsi_stat_tgt_attr_show_attr_fail_intr_addr_type 0 23731 NULL nohasharray
++gps_store_23731 gps_store 4 23731 &iscsi_stat_tgt_attr_show_attr_fail_intr_addr_type_23731
 +get_pwm_mode_23733 get_pwm_mode 0 23733 NULL
 +apparmor_setprocattr_23734 apparmor_setprocattr 0-4 23734 NULL
 +xadc_update_adc_reg_23740 xadc_update_adc_reg 0 23740 NULL
@@ -127436,6 +127852,7 @@ index 0000000..e3e2614
 +__kfifo_max_r_23768 __kfifo_max_r 0-1-2 23768 NULL nohasharray
 +ath10k_reg_value_write_23768 ath10k_reg_value_write 3-0 23768 &__kfifo_max_r_23768
 +ath5k_attr_show_cck_weak_signal_detection_23769 ath5k_attr_show_cck_weak_signal_detection 0 23769 NULL
++ssp_debug_mode_read_23772 ssp_debug_mode_read 3 23772 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
 +gt_max_freq_mhz_store_23783 gt_max_freq_mhz_store 0-4 23783 NULL
@@ -127443,7 +127860,8 @@ index 0000000..e3e2614
 +autosleep_show_23790 autosleep_show 0 23790 &twl6040_bitclk_prepare_23790
 +adp5520_bl_daylight_max_show_23794 adp5520_bl_daylight_max_show 0 23794 NULL nohasharray
 +iscsi_tpg_param_show_OFMarker_23794 iscsi_tpg_param_show_OFMarker 0 23794 &adp5520_bl_daylight_max_show_23794
-+map_write_23795 map_write 3-0 23795 NULL
++map_write_23795 map_write 3-0 23795 NULL nohasharray
++ocfs2_try_remove_refcount_tree_23795 ocfs2_try_remove_refcount_tree 0 23795 &map_write_23795
 +diva_alloc_dma_map_23798 diva_alloc_dma_map 2 23798 NULL
 +ov9740_reg_read_23800 ov9740_reg_read 0 23800 NULL nohasharray
 +edid_store_23800 edid_store 0-6-5 23800 &ov9740_reg_read_23800
@@ -127481,7 +127899,8 @@ index 0000000..e3e2614
 +__bond_opt_set_23855 __bond_opt_set 0 23855 NULL
 +__key_link_begin_23856 __key_link_begin 0 23856 NULL
 +ocfs2_xattr_get_clusters_23857 ocfs2_xattr_get_clusters 0 23857 NULL nohasharray
-+show_iface_chap_auth_23857 show_iface_chap_auth 0 23857 &ocfs2_xattr_get_clusters_23857
++show_iface_chap_auth_23857 show_iface_chap_auth 0 23857 &ocfs2_xattr_get_clusters_23857 nohasharray
++ath10k_core_create_23857 ath10k_core_create 1 23857 &show_iface_chap_auth_23857
 +nfs4_call_sync_23858 nfs4_call_sync 0 23858 NULL
 +mv88e6352_phy_page_write_23862 mv88e6352_phy_page_write 0 23862 NULL
 +device_event_23864 device_event 0 23864 NULL
@@ -127594,6 +128013,7 @@ index 0000000..e3e2614
 +hv_ringbuffer_write_24114 hv_ringbuffer_write 0 24114 NULL
 +show_fcstat_error_frames_24115 show_fcstat_error_frames 0 24115 NULL
 +iwlagn_set_pan_params_24118 iwlagn_set_pan_params 0 24118 NULL
++pci_iomap_range_24122 pci_iomap_range 3-4 24122 NULL
 +show_session_param_ISCSI_PARAM_BOOT_ROOT_24126 show_session_param_ISCSI_PARAM_BOOT_ROOT 0 24126 NULL
 +mwifiex_open_24130 mwifiex_open 0 24130 NULL
 +piix4_transaction_24131 piix4_transaction 0 24131 NULL
@@ -127858,6 +128278,7 @@ index 0000000..e3e2614
 +pps_show_24748 pps_show 0 24748 NULL
 +commit_rxon_24749 commit_rxon 0 24749 NULL nohasharray
 +get_dma_residue_24749 get_dma_residue 0 24749 &commit_rxon_24749
++rdma_read_chunk_lcl_24753 rdma_read_chunk_lcl 7 24753 NULL
 +kgdb_hex2mem_24755 kgdb_hex2mem 3 24755 NULL
 +ddp_device_event_24756 ddp_device_event 0 24756 NULL
 +get_temp_max_hyst_24757 get_temp_max_hyst 0 24757 NULL
@@ -128005,7 +128426,8 @@ index 0000000..e3e2614
 +iwl_dbgfs_tx_flush_write_25091 iwl_dbgfs_tx_flush_write 0-3 25091 NULL
 +alb_set_mac_address_25093 alb_set_mac_address 0 25093 NULL
 +pci_bus_set_aer_ops_25095 pci_bus_set_aer_ops 0 25095 NULL
-+ath5k_attr_show_ani_mode_25098 ath5k_attr_show_ani_mode 0 25098 NULL
++ath5k_attr_show_ani_mode_25098 ath5k_attr_show_ani_mode 0 25098 NULL nohasharray
++nvkm_instmem_create__25098 nvkm_instmem_create_ 4 25098 &ath5k_attr_show_ani_mode_25098
 +wm831x_aldo_get_status_25102 wm831x_aldo_get_status 0 25102 NULL
 +statfs_25104 statfs 0 25104 NULL nohasharray
 +action_store_25104 action_store 0-3 25104 &statfs_25104
@@ -128072,6 +128494,7 @@ index 0000000..e3e2614
 +ivtv_firmware_restart_25248 ivtv_firmware_restart 0 25248 NULL
 +t4vf_read_rss_vi_config_25254 t4vf_read_rss_vi_config 0 25254 NULL
 +stripe_status_25259 stripe_status 5 25259 NULL
++line6_probe_25262 line6_probe 6 25262 NULL
 +mmc_power_restore_host_25263 mmc_power_restore_host 0 25263 NULL
 +xen_pcpu_up_25265 xen_pcpu_up 0 25265 NULL
 +snd_pcm_start_25273 snd_pcm_start 0 25273 NULL nohasharray
@@ -128212,6 +128635,7 @@ index 0000000..e3e2614
 +integrity_verify_store_25553 integrity_verify_store 0-3 25553 &compat_sys_sendfile64_25553
 +ht_print_chan_25556 ht_print_chan 0-4-3 25556 NULL nohasharray
 +sidtab_insert_25556 sidtab_insert 0 25556 &ht_print_chan_25556
++get_dst_timing_25557 get_dst_timing 0 25557 NULL
 +is_a_peripheral_show_25558 is_a_peripheral_show 0 25558 NULL
 +read_dscorr_25560 read_dscorr 0 25560 NULL
 +reload_for_cpu_25563 reload_for_cpu 0 25563 NULL
@@ -128416,7 +128840,8 @@ index 0000000..e3e2614
 +show_fnode_local_port_26070 show_fnode_local_port 0 26070 NULL nohasharray
 +gfs2_attr_show_26070 gfs2_attr_show 0 26070 &show_fnode_local_port_26070 nohasharray
 +enable_26070 enable 0 26070 &gfs2_attr_show_26070
-+exofs_write_begin_export_26071 exofs_write_begin_export 0 26071 NULL
++exofs_write_begin_export_26071 exofs_write_begin_export 0 26071 NULL nohasharray
++memcg_update_all_list_lrus_26071 memcg_update_all_list_lrus 1-0 26071 &exofs_write_begin_export_26071
 +da903x_disable_26077 da903x_disable 0 26077 NULL nohasharray
 +arvo_sysfs_write_button_26077 arvo_sysfs_write_button 0-6-5 26077 &da903x_disable_26077
 +ext2_xattr_trusted_set_26089 ext2_xattr_trusted_set 0 26089 NULL nohasharray
@@ -128467,6 +128892,7 @@ index 0000000..e3e2614
 +netxen_nic_attach_26177 netxen_nic_attach 0 26177 NULL
 +pcf2123_rtc_read_time_26180 pcf2123_rtc_read_time 0 26180 NULL nohasharray
 +show_low_kb_26180 show_low_kb 0 26180 &pcf2123_rtc_read_time_26180
++walk_hugetlb_range_26181 walk_hugetlb_range 0 26181 NULL
 +edac_pci_instance_show_26187 edac_pci_instance_show 0 26187 NULL nohasharray
 +order_store_26187 order_store 0-3 26187 &edac_pci_instance_show_26187
 +fuse_reverse_inval_entry_26193 fuse_reverse_inval_entry 0 26193 NULL
@@ -128490,6 +128916,7 @@ index 0000000..e3e2614
 +nilfs_btree_propagate_26218 nilfs_btree_propagate 0 26218 NULL
 +rx_crc_errors_show_26219 rx_crc_errors_show 0 26219 NULL nohasharray
 +rtl92c_download_fw_26219 rtl92c_download_fw 0 26219 &rx_crc_errors_show_26219
++ovs_flow_cmd_msg_size_26223 ovs_flow_cmd_msg_size 0 26223 NULL
 +teql_master_open_26224 teql_master_open 0 26224 NULL
 +mwifiex_regrdwr_write_26225 mwifiex_regrdwr_write 3-0 26225 NULL nohasharray
 +g2d_buf_prepare_26225 g2d_buf_prepare 0 26225 &mwifiex_regrdwr_write_26225 nohasharray
@@ -128521,6 +128948,7 @@ index 0000000..e3e2614
 +recursive_scan_26296 recursive_scan 0 26296 &adp8860_bl_l2_office_max_show_26296 nohasharray
 +_rtl92cu_init_power_on_26296 _rtl92cu_init_power_on 0 26296 &recursive_scan_26296
 +dbg_write_26301 dbg_write 0-3 26301 NULL
++clk_core_prepare_26302 clk_core_prepare 0 26302 NULL
 +clear_fw_stats_write_26303 clear_fw_stats_write 0-3 26303 NULL
 +show_text_leaf_26305 show_text_leaf 0 26305 NULL
 +ext2_find_goal_26306 ext2_find_goal 0 26306 NULL
@@ -128528,6 +128956,7 @@ index 0000000..e3e2614
 +pax_get_random_long_26309 pax_get_random_long 0 26309 &snd_pcm_plug_client_channels_buf_26309
 +c2_change_mtu_26311 c2_change_mtu 0 26311 NULL
 +target_fabric_port_attr_store_26314 target_fabric_port_attr_store 0 26314 NULL
++ath10k_dbg_sta_write_addba_resp_26317 ath10k_dbg_sta_write_addba_resp 3 26317 NULL
 +pwr_wake_on_host_read_26321 pwr_wake_on_host_read 3-0 26321 NULL
 +show_temp_26323 show_temp 0 26323 NULL
 +check_can_nocow_26336 check_can_nocow 2 26336 NULL
@@ -128579,7 +129008,8 @@ index 0000000..e3e2614
 +asd_show_update_bios_26430 asd_show_update_bios 0 26430 NULL
 +ip_route_me_harder_26436 ip_route_me_harder 0 26436 NULL
 +pagemap_read_26441 pagemap_read 3-0 26441 NULL
-+hfs_inode_setattr_26448 hfs_inode_setattr 0 26448 NULL
++hfs_inode_setattr_26448 hfs_inode_setattr 0 26448 NULL nohasharray
++add_device_26448 add_device 4 26448 &hfs_inode_setattr_26448
 +disk_discard_alignment_show_26449 disk_discard_alignment_show 0 26449 NULL
 +set_temp_auto_temp_off_26450 set_temp_auto_temp_off 0-4 26450 NULL
 +prism2_open_26452 prism2_open 0 26452 NULL
@@ -128739,7 +129169,8 @@ index 0000000..e3e2614
 +select_sec_26799 select_sec 0 26799 NULL
 +show_mem_gpio_reg_26800 show_mem_gpio_reg 0 26800 NULL
 +wsm_buf_reserve_26801 wsm_buf_reserve 2 26801 NULL
-+shdma_prep_dma_cyclic_26808 shdma_prep_dma_cyclic 4-3 26808 NULL
++shdma_prep_dma_cyclic_26808 shdma_prep_dma_cyclic 4-3 26808 NULL nohasharray
++rtl2832_bulk_write_26808 rtl2832_bulk_write 2-4 26808 &shdma_prep_dma_cyclic_26808
 +rbd_remove_single_major_26811 rbd_remove_single_major 3-0 26811 NULL
 +cipso_v4_genopt_26812 cipso_v4_genopt 0 26812 NULL
 +dmar_pci_bus_notifier_26815 dmar_pci_bus_notifier 0 26815 NULL
@@ -128767,6 +129198,7 @@ index 0000000..e3e2614
 +netxen_nic_hw_read_wx_128M_26858 netxen_nic_hw_read_wx_128M 2 26858 NULL
 +notify_send_post_enqueue_26861 notify_send_post_enqueue 0 26861 NULL
 +uevent_store_26862 uevent_store 0-3 26862 NULL
++netlink_insert_26863 netlink_insert 0 26863 NULL
 +xhci_queue_isoc_tx_26864 xhci_queue_isoc_tx 0 26864 NULL
 +tipc_conn_sendmsg_26867 tipc_conn_sendmsg 5 26867 NULL
 +asymmetric_key_preparse_26871 asymmetric_key_preparse 0 26871 NULL nohasharray
@@ -128879,7 +129311,6 @@ index 0000000..e3e2614
 +ecx_transmit_led_message_27139 ecx_transmit_led_message 0-3 27139 &bch_cache_set_internal_show_27139
 +netstat_show_27140 netstat_show 0 27140 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-0 27143 NULL nohasharray
 +show_counter_tx_data_pkts_27143 show_counter_tx_data_pkts 0 27143 &btmrvl_hscfgcmd_write_27143
 +tcm_qla2xxx_tpg_show_enable_27147 tcm_qla2xxx_tpg_show_enable 0 27147 NULL
@@ -128916,7 +129347,8 @@ index 0000000..e3e2614
 +dbAllocAG_27228 dbAllocAG 0 27228 NULL
 +rxrpc_request_key_27235 rxrpc_request_key 3-0 27235 NULL
 +o2nm_node_ipv4_port_read_27236 o2nm_node_ipv4_port_read 0 27236 NULL
-+ov7660_s_ctrl_27239 ov7660_s_ctrl 0 27239 NULL
++ov7660_s_ctrl_27239 ov7660_s_ctrl 0 27239 NULL nohasharray
++fbtft_gamma_parse_str_27239 fbtft_gamma_parse_str 4 27239 &ov7660_s_ctrl_27239
 +store_dev_name_27240 store_dev_name 0 27240 NULL
 +cfq_back_seek_max_show_27243 cfq_back_seek_max_show 0 27243 NULL
 +msecs_to_jiffies_27246 msecs_to_jiffies 0 27246 NULL
@@ -128924,6 +129356,7 @@ index 0000000..e3e2614
 +_ore_add_parity_unit_27253 _ore_add_parity_unit 0 27253 NULL
 +__conn_send_command_27255 __conn_send_command 4-6 27255 NULL
 +lpphy_b2063_tune_27256 lpphy_b2063_tune 0 27256 NULL
++mlx4_cmd_reset_flow_27259 mlx4_cmd_reset_flow 0-4 27259 NULL
 +ath10k_write_simulate_radar_27260 ath10k_write_simulate_radar 0-3 27260 NULL nohasharray
 +cfpkt_add_trail_27260 cfpkt_add_trail 3 27260 &ath10k_write_simulate_radar_27260
 +nlmsg_new_27263 nlmsg_new 1 27263 NULL
@@ -129012,6 +129445,7 @@ index 0000000..e3e2614
 +deadline_writes_starved_show_27447 deadline_writes_starved_show 0 27447 &lx_pipe_stop_27447
 +xfs_btree_lookup_get_block_27448 xfs_btree_lookup_get_block 0 27448 NULL nohasharray
 +hfsplus_create_attributes_file_27448 hfsplus_create_attributes_file 0 27448 &xfs_btree_lookup_get_block_27448
++i915_wait_request_27449 i915_wait_request 0 27449 NULL
 +cdc_ncm_store_tx_max_27458 cdc_ncm_store_tx_max 0-4 27458 NULL
 +nes_show_nonidx_addr_27463 nes_show_nonidx_addr 0 27463 NULL nohasharray
 +show_link_rate_27463 show_link_rate 0 27463 &nes_show_nonidx_addr_27463
@@ -129194,6 +129628,7 @@ index 0000000..e3e2614
 +bm_find_next_27929 bm_find_next 2 27929 NULL
 +adjust_tp_27930 adjust_tp 0 27930 NULL nohasharray
 +set_b_bus_req_27930 set_b_bus_req 0-4 27930 &adjust_tp_27930
++ocfs2_add_inode_to_orphan_27932 ocfs2_add_inode_to_orphan 0 27932 NULL
 +get_alarm_27933 get_alarm 0 27933 NULL
 +can_attach_27934 can_attach 0 27934 NULL
 +usbhsh_data_stage_packet_push_27936 usbhsh_data_stage_packet_push 0 27936 NULL
@@ -129348,6 +129783,7 @@ index 0000000..e3e2614
 +dma_map_sg_attrs_28289 dma_map_sg_attrs 0-3 28289 NULL
 +SyS_ppoll_28290 SyS_ppoll 2 28290 NULL
 +acpi_ut_copy_epackage_to_ipackage_28291 acpi_ut_copy_epackage_to_ipackage 0 28291 NULL
++wil_addba_tx_cid_28292 wil_addba_tx_cid 3 28292 NULL
 +w1_f23_write_28294 w1_f23_write 3 28294 NULL
 +si476x_core_cmd_fm_acf_status_28298 si476x_core_cmd_fm_acf_status 0 28298 NULL
 +ad_sigma_delta_set_mode_28299 ad_sigma_delta_set_mode 0 28299 NULL
@@ -129423,6 +129859,7 @@ index 0000000..e3e2614
 +decrypt_28436 decrypt 0 28436 &mpage_readpages_28436
 +direction_show_28442 direction_show 0 28442 NULL
 +snd_ensoniq_playback2_prepare_28444 snd_ensoniq_playback2_prepare 0 28444 NULL
++testmode_write_28445 testmode_write 3 28445 NULL
 +xfs_rtfind_back_28450 xfs_rtfind_back 0 28450 NULL
 +set_fan_min_28453 set_fan_min 0-4 28453 NULL
 +lookup_last_28455 lookup_last 0 28455 NULL
@@ -129499,7 +129936,8 @@ index 0000000..e3e2614
 +gfs2_fsync_28613 gfs2_fsync 0 28613 NULL nohasharray
 +d_l1_down_proc_write_28613 d_l1_down_proc_write 0-3 28613 &gfs2_fsync_28613
 +iwlagn_disable_pan_28614 iwlagn_disable_pan 0 28614 NULL
-+wq_cpumask_show_28617 wq_cpumask_show 0 28617 NULL
++wq_cpumask_show_28617 wq_cpumask_show 0 28617 NULL nohasharray
++rpcrdma_alloc_regbuf_28617 rpcrdma_alloc_regbuf 2 28617 &wq_cpumask_show_28617
 +mp_override_legacy_irq_28618 mp_override_legacy_irq 4 28618 NULL
 +snd_nm256_capture_copy_28622 snd_nm256_capture_copy 5 28622 NULL nohasharray
 +tsc2005_selftest_show_28622 tsc2005_selftest_show 0 28622 &snd_nm256_capture_copy_28622
@@ -129544,6 +129982,7 @@ index 0000000..e3e2614
 +show_vid_reg_28709 show_vid_reg 0 28709 &power_28709 nohasharray
 +zd_ep_regs_out_msg_28709 zd_ep_regs_out_msg 0 28709 &show_vid_reg_28709
 +carl9170_set_freq_cal_data_28713 carl9170_set_freq_cal_data 0 28713 NULL
++update_memcg_params_28716 update_memcg_params 2-0 28716 NULL
 +tcp_cgroup_write_28723 tcp_cgroup_write 0-3 28723 NULL
 +ip6_pkt_discard_out_28724 ip6_pkt_discard_out 0 28724 NULL
 +spi_sync_locked_28726 spi_sync_locked 0 28726 NULL
@@ -129576,6 +130015,7 @@ index 0000000..e3e2614
 +sel_write_member_28800 sel_write_member 3 28800 NULL
 +show_28801 show 0 28801 NULL
 +update_28806 update 0 28806 NULL
++i915_get_vma_pages_28808 i915_get_vma_pages 0 28808 NULL
 +mv_ep_queue_28810 mv_ep_queue 0 28810 NULL
 +set_lbt_28811 set_lbt 0 28811 NULL
 +udp_packet_28817 udp_packet 0 28817 NULL
@@ -129634,7 +130074,8 @@ index 0000000..e3e2614
 +icmp_packet_28950 icmp_packet 0 28950 NULL
 +affs_intl_hash_dentry_28953 affs_intl_hash_dentry 0 28953 NULL
 +cas_get_regs_len_28954 cas_get_regs_len 0 28954 NULL
-+ext3_xattr_trusted_get_28960 ext3_xattr_trusted_get 0 28960 NULL
++ext3_xattr_trusted_get_28960 ext3_xattr_trusted_get 0 28960 NULL nohasharray
++__klp_enable_patch_28960 __klp_enable_patch 0 28960 &ext3_xattr_trusted_get_28960
 +btrfs_trim_block_group_28963 btrfs_trim_block_group 3-4 28963 NULL
 +ext4_unfreeze_28966 ext4_unfreeze 0 28966 NULL
 +adxl34x_disable_show_28969 adxl34x_disable_show 0 28969 NULL nohasharray
@@ -129745,6 +130186,7 @@ index 0000000..e3e2614
 +dummy_systimer_start_29176 dummy_systimer_start 0 29176 NULL
 +context_struct_to_string_29181 context_struct_to_string 0 29181 NULL nohasharray
 +target_core_dev_pr_show_attr_res_aptpl_metadata_29181 target_core_dev_pr_show_attr_res_aptpl_metadata 0 29181 &context_struct_to_string_29181
++sun4i_get_temp_29193 sun4i_get_temp 0 29193 NULL
 +get_trip_type_29198 get_trip_type 0 29198 NULL nohasharray
 +show_ata_dev_class_29198 show_ata_dev_class 0 29198 &get_trip_type_29198 nohasharray
 +l1oip_law_to_4bit_29198 l1oip_law_to_4bit 0 29198 &show_ata_dev_class_29198
@@ -129831,7 +130273,8 @@ index 0000000..e3e2614
 +show_fnode_entry_enable_29415 show_fnode_entry_enable 0 29415 NULL
 +class_id_show_29416 class_id_show 0 29416 NULL nohasharray
 +csio_show_num_reg_rnodes_29416 csio_show_num_reg_rnodes 0 29416 &class_id_show_29416
-+softing_fct_cmd_29419 softing_fct_cmd 0 29419 NULL
++softing_fct_cmd_29419 softing_fct_cmd 0 29419 NULL nohasharray
++i915_gem_check_olr_29419 i915_gem_check_olr 0 29419 &softing_fct_cmd_29419
 +cgroup_update_dfl_csses_29420 cgroup_update_dfl_csses 0 29420 NULL
 +sfi_acpi_table_show_29425 sfi_acpi_table_show 6 29425 NULL
 +security_task_setscheduler_29432 security_task_setscheduler 0 29432 NULL
@@ -129910,7 +130353,8 @@ index 0000000..e3e2614
 +iwl_dbgfs_missed_beacon_write_29586 iwl_dbgfs_missed_beacon_write 3-0 29586 NULL
 +snd_device_new_29588 snd_device_new 0 29588 NULL nohasharray
 +radeon_set_dpm_state_29588 radeon_set_dpm_state 0-4 29588 &snd_device_new_29588
-+pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 0-4 29589 NULL
++pvr2_hdw_report_unlocked_29589 pvr2_hdw_report_unlocked 0-4 29589 NULL nohasharray
++mwifiex_histogram_read_29589 mwifiex_histogram_read 3 29589 &pvr2_hdw_report_unlocked_29589
 +mt9t112_cropcap_29595 mt9t112_cropcap 0 29595 NULL
 +sierra_submit_rx_urbs_29599 sierra_submit_rx_urbs 0 29599 NULL nohasharray
 +dio_set_defer_completion_29599 dio_set_defer_completion 0 29599 &sierra_submit_rx_urbs_29599
@@ -129933,7 +130377,8 @@ index 0000000..e3e2614
 +spi_write_29631 spi_write 0 29631 NULL
 +ext4_xattr_trusted_get_29632 ext4_xattr_trusted_get 0 29632 NULL
 +read_null_29633 read_null 0-3 29633 NULL nohasharray
-+iscsi_disc_show_password_29633 iscsi_disc_show_password 0 29633 &read_null_29633
++iscsi_disc_show_password_29633 iscsi_disc_show_password 0 29633 &read_null_29633 nohasharray
++ssp_create_msg_29633 ssp_create_msg 2 29633 &iscsi_disc_show_password_29633
 +tx_frag_cache_hit_read_29639 tx_frag_cache_hit_read 3-0 29639 NULL
 +ivtv_firmware_init_29641 ivtv_firmware_init 0 29641 NULL
 +md5_init_29643 md5_init 0 29643 NULL
@@ -130032,7 +130477,8 @@ index 0000000..e3e2614
 +write_file_bool_bmps_29870 write_file_bool_bmps 3-0 29870 NULL nohasharray
 +extract_icmp6_fields_29870 extract_icmp6_fields 2 29870 &write_file_bool_bmps_29870
 +ipv6_setsockopt_29871 ipv6_setsockopt 5-0 29871 NULL nohasharray
-+itd_submit_29871 itd_submit 0 29871 &ipv6_setsockopt_29871
++itd_submit_29871 itd_submit 0 29871 &ipv6_setsockopt_29871 nohasharray
++ath10k_mac_vif_recalc_ps_poll_count_29871 ath10k_mac_vif_recalc_ps_poll_count 0 29871 &itd_submit_29871
 +dma_map_xdr_29874 dma_map_xdr 0-3 29874 NULL
 +show_engine3_mode_29876 show_engine3_mode 0 29876 NULL
 +setup_29880 setup 0 29880 NULL
@@ -130079,6 +130525,7 @@ index 0000000..e3e2614
 +iwl_mvm_send_add_bcast_sta_29987 iwl_mvm_send_add_bcast_sta 0 29987 NULL
 +hotkey_tablet_mode_show_29990 hotkey_tablet_mode_show 0 29990 NULL
 +TSS_sha1_29994 TSS_sha1 0 29994 NULL
++strncpy_from_user_29999 strncpy_from_user 0 29999 NULL
 +apds990x_prox_show_30000 apds990x_prox_show 0 30000 NULL
 +cpia2_v4l_read_30004 cpia2_v4l_read 0-3 30004 NULL
 +memcpy_to_msg_30012 memcpy_to_msg 0-3 30012 NULL
@@ -130106,6 +130553,7 @@ index 0000000..e3e2614
 +adp8870_bl_l3_office_dim_store_30079 adp8870_bl_l3_office_dim_store 4-0 30079 NULL
 +ext4_writepages_30088 ext4_writepages 0 30088 NULL nohasharray
 +ath5k_hw_setup_rx_desc_30088 ath5k_hw_setup_rx_desc 0 30088 &ext4_writepages_30088
++tipc_sk_rcv_30090 tipc_sk_rcv 0 30090 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
@@ -130521,6 +130969,7 @@ index 0000000..e3e2614
 +igb_setup_tx_resources_31011 igb_setup_tx_resources 0 31011 NULL
 +lbs_host_sleep_read_31013 lbs_host_sleep_read 3-0 31013 NULL nohasharray
 +validate_and_copy_buf_31013 validate_and_copy_buf 0 31013 &lbs_host_sleep_read_31013
++__unregister_ftrace_function_31020 __unregister_ftrace_function 0 31020 NULL
 +ima_eventsig_init_31022 ima_eventsig_init 5 31022 NULL
 +snd_usb_init_pitch_31023 snd_usb_init_pitch 0 31023 NULL
 +btrfs_space_info_show_bytes_may_use_31024 btrfs_space_info_show_bytes_may_use 0 31024 NULL nohasharray
@@ -130740,7 +131189,9 @@ index 0000000..e3e2614
 +phy_attach_direct_31556 phy_attach_direct 0 31556 NULL
 +vendor_name_show_31559 vendor_name_show 0 31559 NULL nohasharray
 +_aac_reset_adapter_31559 _aac_reset_adapter 0 31559 &vendor_name_show_31559
++ath10k_mac_vif_disable_keepalive_31563 ath10k_mac_vif_disable_keepalive 0 31563 NULL
 +thermal_cooling_device_cur_state_store_31564 thermal_cooling_device_cur_state_store 0-4 31564 NULL
++klp_enable_func_31565 klp_enable_func 0 31565 NULL
 +show_temp_min_alarm_31566 show_temp_min_alarm 0 31566 NULL
 +tda18271_read_regs_31567 tda18271_read_regs 0 31567 NULL nohasharray
 +cp2112_set_usb_config_31567 cp2112_set_usb_config 0 31567 &tda18271_read_regs_31567
@@ -130846,6 +131297,7 @@ index 0000000..e3e2614
 +ip1xx_reset_31799 ip1xx_reset 0 31799 NULL
 +get_count_order_31800 get_count_order 0 31800 NULL
 +ecryptfs_send_message_locked_31801 ecryptfs_send_message_locked 2 31801 NULL
++fbtft_fb_write_31802 fbtft_fb_write 3 31802 NULL
 +isr_rx_procs_read_31804 isr_rx_procs_read 3-0 31804 NULL nohasharray
 +sc92031_open_31804 sc92031_open 0 31804 &isr_rx_procs_read_31804
 +data_write_31805 data_write 3-0 31805 NULL
@@ -130890,6 +131342,7 @@ index 0000000..e3e2614
 +usbtv_setup_capture_31897 usbtv_setup_capture 0 31897 &opera1_i2c_xfer_31897
 +ddb_output_write_31902 ddb_output_write 3-0 31902 NULL nohasharray
 +carl9170_set_qos_31902 carl9170_set_qos 0 31902 &ddb_output_write_31902
++xfs_break_layouts_31905 xfs_break_layouts 0 31905 NULL
 +xattr_permission_31907 xattr_permission 0 31907 NULL
 +xfs_da3_blk_unlink_31908 xfs_da3_blk_unlink 0 31908 NULL nohasharray
 +bch_read_string_list_31908 bch_read_string_list 0 31908 &xfs_da3_blk_unlink_31908
@@ -130961,6 +131414,7 @@ index 0000000..e3e2614
 +mt9t112_set_params_32045 mt9t112_set_params 0 32045 &vmw_cursor_update_dmabuf_32045
 +sys_sched_setaffinity_32046 sys_sched_setaffinity 2 32046 NULL
 +mc44s803_writereg_32053 mc44s803_writereg 0 32053 NULL
++do_strncpy_from_user_32059 do_strncpy_from_user 0 32059 NULL
 +dnet_open_32060 dnet_open 0 32060 NULL
 +SYSC_llistxattr_32061 SYSC_llistxattr 3 32061 NULL
 +flush_buffer_32063 flush_buffer 0 32063 NULL
@@ -130994,7 +131448,8 @@ index 0000000..e3e2614
 +disk_status_32120 disk_status 4-0 32120 NULL
 +adfs_hash_32125 adfs_hash 0 32125 NULL
 +rx8025_write_regs_32130 rx8025_write_regs 0 32130 NULL
-+kobject_add_internal_32133 kobject_add_internal 0 32133 NULL
++kobject_add_internal_32133 kobject_add_internal 0 32133 NULL nohasharray
++ftrace_hash_ipmodify_update_32133 ftrace_hash_ipmodify_update 0 32133 &kobject_add_internal_32133
 +acpi_power_on_resources_32134 acpi_power_on_resources 0 32134 NULL nohasharray
 +ds2780_read_user_eeprom_bin_32134 ds2780_read_user_eeprom_bin 6-5-0 32134 &acpi_power_on_resources_32134
 +stv06xx_write_sensor_32136 stv06xx_write_sensor 0 32136 NULL
@@ -131020,6 +131475,7 @@ index 0000000..e3e2614
 +arch_prepare_kprobe_32174 arch_prepare_kprobe 0 32174 NULL
 +ch_do_scsi_32178 ch_do_scsi 5 32178 NULL
 +nfs_file_write_32183 nfs_file_write 0 32183 NULL
++da9150_bulk_write_32184 da9150_bulk_write 2-3 32184 NULL
 +ina209_show_alarm_32185 ina209_show_alarm 0 32185 NULL nohasharray
 +_transport_get_enclosure_identifier_32185 _transport_get_enclosure_identifier 0 32185 &ina209_show_alarm_32185
 +validate_add_page_32189 validate_add_page 0 32189 NULL
@@ -131139,12 +131595,14 @@ index 0000000..e3e2614
 +cx25840_s_ctrl_32444 cx25840_s_ctrl 0 32444 NULL
 +hpfs_symlink_readpage_32450 hpfs_symlink_readpage 0 32450 NULL
 +set_status_32456 set_status 0 32456 NULL
++sdev_format_header_32457 sdev_format_header 0-2 32457 NULL
 +wm8350_block_read_32458 wm8350_block_read 0 32458 NULL nohasharray
 +__ext4_handle_dirty_super_32458 __ext4_handle_dirty_super 0 32458 &wm8350_block_read_32458 nohasharray
 +hid_input_report_32458 hid_input_report 4 32458 &__ext4_handle_dirty_super_32458
 +ext4_file_write_iter_32461 ext4_file_write_iter 0 32461 NULL
 +cache_status_32462 cache_status 5 32462 NULL
-+show_fanin_32463 show_fanin 0 32463 NULL
++show_fanin_32463 show_fanin 0 32463 NULL nohasharray
++ftrace_hash_ipmodify_enable_32463 ftrace_hash_ipmodify_enable 0 32463 &show_fanin_32463
 +fill_readbuf_32464 fill_readbuf 3-0 32464 NULL nohasharray
 +w5300_open_32464 w5300_open 0 32464 &fill_readbuf_32464
 +show_session_param_ISCSI_PARAM_BIDI_CHAP_EN_32465 show_session_param_ISCSI_PARAM_BIDI_CHAP_EN 0 32465 NULL nohasharray
@@ -131239,7 +131697,8 @@ index 0000000..e3e2614
 +xpcs_reg_value_read_32644 xpcs_reg_value_read 3 32644 NULL
 +kvmalloc_32646 kvmalloc 1 32646 NULL
 +cxacru_sysfs_show_upstream_bits_per_frame_32651 cxacru_sysfs_show_upstream_bits_per_frame 0 32651 NULL
-+generic_readlink_32654 generic_readlink 3-0 32654 NULL
++generic_readlink_32654 generic_readlink 3-0 32654 NULL nohasharray
++ftrace_startup_32654 ftrace_startup 0 32654 &generic_readlink_32654
 +snd_seq_device_dev_register_32666 snd_seq_device_dev_register 0 32666 NULL
 +get_unaligned_be24_32667 get_unaligned_be24 0 32667 NULL
 +vbi_cap_start_streaming_32668 vbi_cap_start_streaming 0 32668 NULL
@@ -131310,6 +131769,7 @@ index 0000000..e3e2614
 +ieee80211_tdls_mgmt_32825 ieee80211_tdls_mgmt 10 32825 NULL
 +mac802154_wpan_update_llsec_32831 mac802154_wpan_update_llsec 0 32831 NULL
 +video_autosw_get_32836 video_autosw_get 0 32836 NULL
++__ksize_32837 __ksize 0 32837 NULL
 +stk17ta8_nvram_write_32843 stk17ta8_nvram_write 0-6-5 32843 NULL
 +phy_set_clr_bits_32845 phy_set_clr_bits 0-3-4 32845 NULL
 +vga_rseq_32848 vga_rseq 0 32848 NULL
@@ -131380,6 +131840,7 @@ index 0000000..e3e2614
 +iwl_mvm_power_update_mac_33008 iwl_mvm_power_update_mac 0 33008 NULL
 +rt_mutex_slowtrylock_33011 rt_mutex_slowtrylock 0 33011 NULL
 +br_multicast_set_hash_max_33012 br_multicast_set_hash_max 2 33012 NULL
++nvkm_pmu_create__33013 nvkm_pmu_create_ 4 33013 NULL
 +xfs_attr3_leaf_setflag_33014 xfs_attr3_leaf_setflag 0 33014 NULL
 +efivar_attr_store_33016 efivar_attr_store 0-4 33016 NULL nohasharray
 +snd_hda_parse_hdmi_codec_33016 snd_hda_parse_hdmi_codec 0 33016 &efivar_attr_store_33016
@@ -131457,6 +131918,7 @@ index 0000000..e3e2614
 +il3945_dump_error_log_33189 il3945_dump_error_log 0-4 33189 &hfsplus_security_listxattr_33189
 +rtl_usb_start_33190 rtl_usb_start 0 33190 NULL nohasharray
 +iwl_mvm_mac_ctxt_add_33190 iwl_mvm_mac_ctxt_add 0 33190 &rtl_usb_start_33190
++nvkm_fuse_create__33192 nvkm_fuse_create_ 4 33192 NULL
 +flash_store_33203 flash_store 0-4 33203 NULL
 +dataflash_read_fact_otp_33204 dataflash_read_fact_otp 3-2 33204 NULL nohasharray
 +r820t_write_reg_mask_33204 r820t_write_reg_mask 0 33204 &dataflash_read_fact_otp_33204
@@ -131465,7 +131927,8 @@ index 0000000..e3e2614
 +ax_open_33210 ax_open 0 33210 &xen_allocate_irqs_dynamic_33210
 +reqbufs_capture_33214 reqbufs_capture 0 33214 NULL
 +rt2x00queue_alloc_rxskbs_33217 rt2x00queue_alloc_rxskbs 0 33217 NULL nohasharray
-+mwl8k_send_fw_load_cmd_33217 mwl8k_send_fw_load_cmd 0 33217 &rt2x00queue_alloc_rxskbs_33217
++mwl8k_send_fw_load_cmd_33217 mwl8k_send_fw_load_cmd 0 33217 &rt2x00queue_alloc_rxskbs_33217 nohasharray
++vp_modern_find_vqs_33217 vp_modern_find_vqs 2 33217 &mwl8k_send_fw_load_cmd_33217
 +atm_pcr_check_33218 atm_pcr_check 0 33218 NULL
 +fops_write_33219 fops_write 0-3 33219 NULL
 +iommu_group_attr_store_33221 iommu_group_attr_store 0-4 33221 NULL
@@ -131564,6 +132027,7 @@ index 0000000..e3e2614
 +mxuport_send_ctrl_data_urb_33427 mxuport_send_ctrl_data_urb 0 33427 NULL
 +fw_vendor_show_33428 fw_vendor_show 0 33428 NULL nohasharray
 +iscsit_ta_prod_mode_write_protect_33428 iscsit_ta_prod_mode_write_protect 0 33428 &fw_vendor_show_33428
++zram_meta_alloc_33432 zram_meta_alloc 2 33432 NULL
 +ubh_scanc_33436 ubh_scanc 0-3-4 33436 NULL
 +map_service_to_pipe_33438 map_service_to_pipe 0 33438 NULL
 +message_stats_list_33440 message_stats_list 5 33440 NULL nohasharray
@@ -131574,7 +132038,8 @@ index 0000000..e3e2614
 +acpi_smbus_transaction_33454 acpi_smbus_transaction 0 33454 NULL
 +ca0132_playback_pcm_prepare_33456 ca0132_playback_pcm_prepare 0 33456 NULL nohasharray
 +rcar_thermal_get_trip_temp_33456 rcar_thermal_get_trip_temp 0 33456 &ca0132_playback_pcm_prepare_33456
-+da903x_enable_33458 da903x_enable 0 33458 NULL
++da903x_enable_33458 da903x_enable 0 33458 NULL nohasharray
++cyapa_i2c_pip_cmd_irq_sync_33458 cyapa_i2c_pip_cmd_irq_sync 3 33458 &da903x_enable_33458
 +st_max_sg_segs_show_33461 st_max_sg_segs_show 0 33461 NULL
 +__verify_length_33462 __verify_length 0 33462 NULL
 +__mt9t112_reg_write_33468 __mt9t112_reg_write 0 33468 NULL nohasharray
@@ -131708,7 +132173,8 @@ index 0000000..e3e2614
 +nfs_idmap_instantiate_33745 nfs_idmap_instantiate 0 33745 &__iscsi_disc_show_password_mutual_33745
 +init_vif_33746 init_vif 0 33746 NULL
 +xfrm_count_pfkey_enc_supported_33748 xfrm_count_pfkey_enc_supported 0 33748 NULL
-+snd_rme96_playback_prepare_33751 snd_rme96_playback_prepare 0 33751 NULL
++snd_rme96_playback_prepare_33751 snd_rme96_playback_prepare 0 33751 NULL nohasharray
++adv7180_write_33751 adv7180_write 0 33751 &snd_rme96_playback_prepare_33751
 +mptscsih_version_nvdata_persistent_show_33753 mptscsih_version_nvdata_persistent_show 0 33753 NULL nohasharray
 +dev_open_33753 dev_open 0 33753 &mptscsih_version_nvdata_persistent_show_33753
 +wusb_phy_rate_show_33754 wusb_phy_rate_show 0 33754 NULL
@@ -131920,6 +132386,7 @@ index 0000000..e3e2614
 +setup_nodes_for_search_34248 setup_nodes_for_search 0 34248 NULL
 +bcm_init_34250 bcm_init 0 34250 NULL nohasharray
 +adp8870_bl_l5_dark_dim_store_34250 adp8870_bl_l5_dark_dim_store 4-0 34250 &bcm_init_34250
++nvkm_volt_create__34256 nvkm_volt_create_ 4 34256 NULL
 +raid_disks_store_34258 raid_disks_store 0-3 34258 NULL
 +xfs_bmbt_get_maxrecs_34259 xfs_bmbt_get_maxrecs 0 34259 NULL
 +max_age_store_34262 max_age_store 4-0 34262 NULL
@@ -132055,6 +132522,7 @@ index 0000000..e3e2614
 +vsock_bind_34572 vsock_bind 0 34572 NULL
 +snd_ice1712_playback_pro_prepare_34573 snd_ice1712_playback_pro_prepare 0 34573 NULL
 +ext4_ind_direct_IO_34574 ext4_ind_direct_IO 4-0 34574 NULL
++ath10k_send_key_34575 ath10k_send_key 0 34575 NULL
 +mwl8k_cmd_set_rf_channel_34578 mwl8k_cmd_set_rf_channel 0 34578 NULL nohasharray
 +via_ircc_net_open_34578 via_ircc_net_open 0 34578 &mwl8k_cmd_set_rf_channel_34578
 +digi_open_34579 digi_open 0 34579 NULL
@@ -132135,7 +132603,8 @@ index 0000000..e3e2614
 +device_add_34766 device_add 0 34766 NULL
 +__iio_device_attr_init_34767 __iio_device_attr_init 0 34767 NULL
 +gsmld_read_34768 gsmld_read 0 34768 NULL
-+pipe_read_34776 pipe_read 0 34776 NULL
++pipe_read_34776 pipe_read 0 34776 NULL nohasharray
++bucket_table_alloc_34776 bucket_table_alloc 2 34776 &pipe_read_34776
 +qib_cdev_init_34778 qib_cdev_init 1 34778 NULL
 +vga16fb_check_var_34784 vga16fb_check_var 0 34784 NULL
 +show_spd_enb_34787 show_spd_enb 0 34787 NULL
@@ -132202,7 +132671,8 @@ index 0000000..e3e2614
 +set_channel_34904 set_channel 0 34904 &fore200e_open_34904
 +fc0011_vcocal_read_34906 fc0011_vcocal_read 0 34906 NULL
 +clear_wdm_read_flag_34910 clear_wdm_read_flag 0 34910 NULL nohasharray
-+find_free_extent_34910 find_free_extent 0 34910 &clear_wdm_read_flag_34910
++find_free_extent_34910 find_free_extent 0 34910 &clear_wdm_read_flag_34910 nohasharray
++mipi_dsi_dcs_write_34910 mipi_dsi_dcs_write 4 34910 &find_free_extent_34910
 +x25_create_34911 x25_create 0 34911 NULL nohasharray
 +no_lun_0_store_34911 no_lun_0_store 0-3 34911 &x25_create_34911
 +gfs2_glock_wait_34913 gfs2_glock_wait 0 34913 NULL nohasharray
@@ -132230,6 +132700,7 @@ index 0000000..e3e2614
 +wusb_dnts_store_34968 wusb_dnts_store 0-4 34968 NULL
 +rawv6_init_sk_34969 rawv6_init_sk 0 34969 NULL
 +qlcnic_sysfs_write_crb_34974 qlcnic_sysfs_write_crb 0-6-5 34974 NULL
++nvkm_pm_create__34976 nvkm_pm_create_ 4 34976 NULL
 +edge_show_34977 edge_show 0 34977 NULL
 +vendor_command_34980 vendor_command 0 34980 NULL
 +mce_cpu_callback_34983 mce_cpu_callback 0 34983 NULL
@@ -132280,7 +132751,8 @@ index 0000000..e3e2614
 +cgroup_subtree_control_write_35077 cgroup_subtree_control_write 0-3 35077 NULL
 +input_dev_show_cap_ev_35082 input_dev_show_cap_ev 0 35082 NULL
 +ntfs_attr_extend_initialized_35084 ntfs_attr_extend_initialized 0 35084 NULL
-+show_sas_rphy_initiator_port_protocols_35090 show_sas_rphy_initiator_port_protocols 0 35090 NULL
++show_sas_rphy_initiator_port_protocols_35090 show_sas_rphy_initiator_port_protocols 0 35090 NULL nohasharray
++ftrace_set_addr_35090 ftrace_set_addr 0 35090 &show_sas_rphy_initiator_port_protocols_35090
 +create_35091 create 0 35091 NULL
 +power_35094 power 0 35094 NULL
 +cifs_sign_rqst_35096 cifs_sign_rqst 0 35096 NULL
@@ -132414,7 +132886,7 @@ index 0000000..e3e2614
 +link_mode_show_35372 link_mode_show 0 35372 &read_kmem_35372
 +reserved_clusters_store_35375 reserved_clusters_store 0-4 35375 NULL
 +queue_rq_affinity_store_35376 queue_rq_affinity_store 3-0 35376 NULL
-+memcpy_from_msg_35380 memcpy_from_msg 3 35380 NULL nohasharray
++memcpy_from_msg_35380 memcpy_from_msg 3-0 35380 NULL nohasharray
 +snd_pcm_do_start_35380 snd_pcm_do_start 0 35380 &memcpy_from_msg_35380
 +show_pwmenable_35381 show_pwmenable 0 35381 NULL
 +iwlagn_mac_start_35383 iwlagn_mac_start 0 35383 NULL
@@ -132484,6 +132956,7 @@ index 0000000..e3e2614
 +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-0 35538 NULL nohasharray
 +pin_pagetable_pfn_35538 pin_pagetable_pfn 2 35538 &rxpipe_tx_xfr_host_int_trig_rx_data_read_35538
++ocfs2_write_zero_page_35539 ocfs2_write_zero_page 0 35539 NULL
 +store_channel_35540 store_channel 0-4 35540 NULL
 +sony_nc_sysfs_store_35541 sony_nc_sysfs_store 0-4 35541 NULL
 +ieee80211_if_write_smps_35550 ieee80211_if_write_smps 3-0 35550 NULL
@@ -132546,6 +133019,7 @@ index 0000000..e3e2614
 +sctp_listen_start_35709 sctp_listen_start 0 35709 NULL
 +bnx2_change_mac_addr_35722 bnx2_change_mac_addr 0 35722 NULL
 +i2c_smbus_write_block_data_35723 i2c_smbus_write_block_data 0 35723 NULL
++mlx4_internal_err_ret_value_35725 mlx4_internal_err_ret_value 0 35725 NULL
 +vfio_fops_read_35733 vfio_fops_read 0-3 35733 NULL
 +ipr_copy_ucode_buffer_35736 ipr_copy_ucode_buffer 0 35736 NULL
 +read_35737 read 0 35737 NULL nohasharray
@@ -132570,6 +133044,7 @@ index 0000000..e3e2614
 +padlock_sha_export_nano_35792 padlock_sha_export_nano 0 35792 NULL
 +governor_show_35794 governor_show 0 35794 NULL
 +da9052_reg_read_35800 da9052_reg_read 0 35800 NULL
++ocfs2_direct_IO_write_35802 ocfs2_direct_IO_write 3-0 35802 NULL
 +alloc_netdev_mqs_35806 alloc_netdev_mqs 1 35806 NULL
 +command_setcompressionparams_35809 command_setcompressionparams 0 35809 NULL
 +csio_vport_delete_35815 csio_vport_delete 0 35815 NULL
@@ -132697,6 +133172,7 @@ index 0000000..e3e2614
 +ath10k_reg_addr_write_36080 ath10k_reg_addr_write 3-0 36080 &snd_pcm_plug_read_transfer_36080
 +mtip_hw_read_device_status_36082 mtip_hw_read_device_status 3-0 36082 NULL
 +cifs_set_file_size_36085 cifs_set_file_size 0 36085 NULL
++map_capability_36089 map_capability 5 36089 NULL
 +nouveau_hwmon_get_pwm1_enable_36091 nouveau_hwmon_get_pwm1_enable 0 36091 NULL
 +queue_max_segments_show_36092 queue_max_segments_show 0 36092 NULL
 +show_yenta_registers_36093 show_yenta_registers 0 36093 NULL
@@ -132762,7 +133238,8 @@ index 0000000..e3e2614
 +i2c_algo_dp_aux_xfer_36227 i2c_algo_dp_aux_xfer 0-3 36227 NULL nohasharray
 +command_setformat_36227 command_setformat 0 36227 &i2c_algo_dp_aux_xfer_36227
 +atomic_stats_read_36228 atomic_stats_read 3-0 36228 NULL
-+wl1273_fm_start_36229 wl1273_fm_start 0 36229 NULL
++wl1273_fm_start_36229 wl1273_fm_start 0 36229 NULL nohasharray
++wil_agg_size_36229 wil_agg_size 0-2 36229 &wl1273_fm_start_36229
 +__padata_remove_cpu_36235 __padata_remove_cpu 0 36235 NULL
 +ping_bind_36236 ping_bind 0 36236 NULL
 +viafb_iga1_odev_proc_write_36241 viafb_iga1_odev_proc_write 3-0 36241 NULL
@@ -132828,6 +133305,7 @@ index 0000000..e3e2614
 +sierra_write_36402 sierra_write 4-0 36402 NULL
 +rx_over_errors_show_36403 rx_over_errors_show 0 36403 NULL nohasharray
 +iwl_dbgfs_d3_sram_write_36403 iwl_dbgfs_d3_sram_write 0-3 36403 &rx_over_errors_show_36403
++_iwl_dbgfs_uapsd_misbehaving_write_36405 _iwl_dbgfs_uapsd_misbehaving_write 3 36405 NULL
 +selinux_inode_listsecurity_36406 selinux_inode_listsecurity 0 36406 NULL
 +qdsb_get_36409 qdsb_get 0 36409 NULL
 +msb_update_block_36412 msb_update_block 2 36412 NULL nohasharray
@@ -132966,7 +133444,8 @@ index 0000000..e3e2614
 +netdev_set_mac_address_36713 netdev_set_mac_address 0 36713 &tg3_phy_auxctl_write_36713
 +snd_soc_update_bits_36714 snd_soc_update_bits 0 36714 NULL
 +solo_p2m_dma_desc_36715 solo_p2m_dma_desc 0 36715 NULL
-+path_getxattr_36717 path_getxattr 4 36717 NULL
++path_getxattr_36717 path_getxattr 4 36717 NULL nohasharray
++cx25821_alsa_dma_init_36717 cx25821_alsa_dma_init 2 36717 &path_getxattr_36717
 +max77802_rtc_read_time_36718 max77802_rtc_read_time 0 36718 NULL
 +kovaplus_sysfs_show_actual_sensitivity_x_36721 kovaplus_sysfs_show_actual_sensitivity_x 0 36721 NULL
 +saa7134_i2c_eeprom_36729 saa7134_i2c_eeprom 3 36729 NULL
@@ -133024,6 +133503,7 @@ index 0000000..e3e2614
 +power_limit_0_tmax_us_show_36847 power_limit_0_tmax_us_show 0 36847 NULL nohasharray
 +ufx_ops_check_var_36847 ufx_ops_check_var 0 36847 &power_limit_0_tmax_us_show_36847
 +user_pin_configs_show_36848 user_pin_configs_show 0 36848 NULL
++be_set_vlan_promisc_36854 be_set_vlan_promisc 0 36854 NULL
 +ov7670_s_autoexp_36855 ov7670_s_autoexp 0 36855 NULL
 +cm_write_36858 cm_write 3-0 36858 NULL nohasharray
 +set_rate_36858 set_rate 0 36858 &cm_write_36858
@@ -133092,7 +133572,7 @@ index 0000000..e3e2614
 +auok190xfb_write_37001 auok190xfb_write 3 37001 NULL nohasharray
 +jfs_ci_hash_37001 jfs_ci_hash 0 37001 &auok190xfb_write_37001
 +dmi_sysfs_attr_show_37003 dmi_sysfs_attr_show 0 37003 NULL
-+setxattr_37006 setxattr 4 37006 NULL nohasharray
++setxattr_37006 setxattr 4-0 37006 NULL nohasharray
 +ata_scsi_lpm_show_37006 ata_scsi_lpm_show 0 37006 &setxattr_37006 nohasharray
 +md_set_readonly_37006 md_set_readonly 0 37006 &ata_scsi_lpm_show_37006
 +target_fabric_nacl_base_attr_store_37009 target_fabric_nacl_base_attr_store 0-4 37009 NULL
@@ -133237,6 +133717,7 @@ index 0000000..e3e2614
 +program_regs_37317 program_regs 0 37317 NULL
 +sisusb_read_mem_bulk_37321 sisusb_read_mem_bulk 0 37321 NULL
 +version_show_37322 version_show 0 37322 NULL
++nvkm_instobj_create__37323 nvkm_instobj_create_ 4 37323 NULL
 +power_mode_store_37324 power_mode_store 0-4 37324 NULL
 +kern_path_37329 kern_path 0 37329 NULL
 +scsi_mode_select_37330 scsi_mode_select 6 37330 NULL
@@ -133421,6 +133902,7 @@ index 0000000..e3e2614
 +filemap_flush_37767 filemap_flush 0 37767 NULL
 +__uncore_storage_mode_show_37771 __uncore_storage_mode_show 0 37771 NULL
 +ext4_commit_super_37775 ext4_commit_super 0 37775 NULL
++mlx4_load_one_37776 mlx4_load_one 3 37776 NULL
 +__il3945_up_37778 __il3945_up 0 37778 NULL
 +elants_i2c_do_update_firmware_37779 elants_i2c_do_update_firmware 0 37779 NULL
 +crkey_timeout_37781 crkey_timeout 0 37781 NULL
@@ -133531,6 +134013,7 @@ index 0000000..e3e2614
 +parser_init_guts_38046 parser_init_guts 2 38046 NULL
 +pmbus_set_page_38048 pmbus_set_page 0 38048 NULL nohasharray
 +SyS_llistxattr_38048 SyS_llistxattr 3 38048 &pmbus_set_page_38048
++_iwl_dbgfs_fw_dbg_conf_write_38050 _iwl_dbgfs_fw_dbg_conf_write 3 38050 NULL
 +sysfs_do_create_link_38051 sysfs_do_create_link 0 38051 NULL
 +create_l2entity_38053 create_l2entity 0 38053 NULL
 +crypto_shash_extsize_38055 crypto_shash_extsize 0 38055 NULL
@@ -133550,6 +134033,7 @@ index 0000000..e3e2614
 +uwb_mac_addr_print_38085 uwb_mac_addr_print 2-0 38085 NULL
 +rtl8821ae_hw_init_38087 rtl8821ae_hw_init 0 38087 NULL
 +tcf_csum_ipv4_udp_38089 tcf_csum_ipv4_udp 3 38089 NULL
++resource_list_create_entry_38090 resource_list_create_entry 2 38090 NULL
 +request_key_auth_new_38092 request_key_auth_new 3 38092 NULL
 +proc_self_readlink_38094 proc_self_readlink 3-0 38094 NULL nohasharray
 +hdpvr_config_call_38094 hdpvr_config_call 0 38094 &proc_self_readlink_38094 nohasharray
@@ -133587,6 +134071,7 @@ index 0000000..e3e2614
 +store_spi_transport_offset_38180 store_spi_transport_offset 0-4 38180 &wil_write_file_reset_38180
 +qlcnic_83xx_get_nic_info_38183 qlcnic_83xx_get_nic_info 0 38183 NULL
 +max8925_rtc_set_alarm_38184 max8925_rtc_set_alarm 0 38184 NULL
++nvkm_gpuobj_create__38187 nvkm_gpuobj_create_ 9 38187 NULL
 +elsa_suspend_38189 elsa_suspend 0 38189 NULL
 +do_path_lookup_38193 do_path_lookup 0 38193 NULL nohasharray
 +readlink_38193 readlink 0 38193 &do_path_lookup_38193
@@ -133704,7 +134189,8 @@ index 0000000..e3e2614
 +dev_set_mtu_38447 dev_set_mtu 0 38447 NULL nohasharray
 +offline_38447 offline 0 38447 &dev_set_mtu_38447
 +idt77252_open_38452 idt77252_open 0 38452 NULL nohasharray
-+rose_bind_38452 rose_bind 0 38452 &idt77252_open_38452
++rose_bind_38452 rose_bind 0 38452 &idt77252_open_38452 nohasharray
++tipc_bclink_xmit_38452 tipc_bclink_xmit 0 38452 &rose_bind_38452
 +udc_ep_enable_38457 udc_ep_enable 0 38457 NULL
 +mISDN_sock_create_38458 mISDN_sock_create 0 38458 NULL nohasharray
 +wl1271_acx_frag_threshold_38458 wl1271_acx_frag_threshold 0 38458 &mISDN_sock_create_38458
@@ -133741,7 +134227,8 @@ index 0000000..e3e2614
 +m41t93_get_time_38520 m41t93_get_time 0 38520 NULL
 +ent_bread_38523 ent_bread 0 38523 NULL nohasharray
 +bond_option_fail_over_mac_set_38523 bond_option_fail_over_mac_set 0 38523 &ent_bread_38523
-+ste10Xp_config_init_38533 ste10Xp_config_init 0 38533 NULL
++ste10Xp_config_init_38533 ste10Xp_config_init 0 38533 NULL nohasharray
++nvkm_fb_create__38533 nvkm_fb_create_ 4 38533 &ste10Xp_config_init_38533
 +pm_trace_store_38534 pm_trace_store 0-4 38534 NULL
 +ath10k_wmi_10_2_cmd_init_38540 ath10k_wmi_10_2_cmd_init 0 38540 NULL nohasharray
 +prepare_header95_38540 prepare_header95 0 38540 &ath10k_wmi_10_2_cmd_init_38540
@@ -133767,6 +134254,7 @@ index 0000000..e3e2614
 +__reiserfs_write_begin_38607 __reiserfs_write_begin 0 38607 &rd_allocate_sgl_table_38607
 +store_enable_clk3a_output_38608 store_enable_clk3a_output 0-4 38608 NULL
 +pep_indicate_38611 pep_indicate 5 38611 NULL
++nvkm_object_create__38612 nvkm_object_create_ 5 38612 NULL
 +s5p_mfc_alloc_instance_buffer_v5_38613 s5p_mfc_alloc_instance_buffer_v5 0 38613 NULL
 +set_temphyst_38616 set_temphyst 0-4 38616 NULL
 +set_mode_densblk_38618 set_mode_densblk 0 38618 NULL nohasharray
@@ -133887,6 +134375,7 @@ index 0000000..e3e2614
 +show_counter_rx_pkey_mismatches_38880 show_counter_rx_pkey_mismatches 0 38880 NULL
 +show_conn_param_ISCSI_PARAM_LOCAL_IPADDR_38882 show_conn_param_ISCSI_PARAM_LOCAL_IPADDR 0 38882 NULL
 +rbd_dev_v2_striping_info_38885 rbd_dev_v2_striping_info 0 38885 NULL
++__blk_queue_init_tags_38887 __blk_queue_init_tags 2 38887 NULL
 +iscsi_stat_login_show_attr_redirects_38890 iscsi_stat_login_show_attr_redirects 0 38890 NULL
 +hdlc_open_38893 hdlc_open 0 38893 NULL
 +dbgfs_state_38894 dbgfs_state 3-0 38894 NULL
@@ -133895,6 +134384,7 @@ index 0000000..e3e2614
 +process_access_response_38899 process_access_response 0 38899 NULL
 +afs_readpage_38902 afs_readpage 0 38902 NULL nohasharray
 +writepage_delalloc_38902 writepage_delalloc 0 38902 &afs_readpage_38902
++nci_core_conn_create_38905 nci_core_conn_create 4 38905 NULL
 +ei_open_38906 ei_open 0 38906 NULL
 +ov5642_g_fmt_38908 ov5642_g_fmt 0 38908 NULL
 +rsi_mgmt_pkt_to_core_38909 rsi_mgmt_pkt_to_core 3 38909 NULL
@@ -133916,6 +134406,7 @@ index 0000000..e3e2614
 +sbp_count_se_tpg_luns_38943 sbp_count_se_tpg_luns 0 38943 NULL
 +sdev_store_queue_ramp_up_period_38946 sdev_store_queue_ramp_up_period 0-4 38946 NULL nohasharray
 +cpumask_parse_38946 cpumask_parse 0 38946 &sdev_store_queue_ramp_up_period_38946
++__be_cmd_rx_filter_38949 __be_cmd_rx_filter 0 38949 NULL
 +select_subconnector_show_38953 select_subconnector_show 0 38953 NULL
 +qlcnic_sriov_pf_config_vport_38955 qlcnic_sriov_pf_config_vport 0 38955 NULL
 +__vsock_bind_stream_38957 __vsock_bind_stream 0 38957 NULL nohasharray
@@ -133948,7 +134439,7 @@ index 0000000..e3e2614
 +twl6030_interrupt_unmask_39013 twl6030_interrupt_unmask 2 39013 NULL
 +force_sc_support_read_39014 force_sc_support_read 3-0 39014 NULL nohasharray
 +show_39014 show 0 39014 &force_sc_support_read_39014
-+__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3 39020 NULL
++__blkdev_issue_zeroout_39020 __blkdev_issue_zeroout 3-0 39020 NULL
 +snd_mask_refine_set_39027 snd_mask_refine_set 0 39027 NULL
 +ftrace_modify_code_direct_39029 ftrace_modify_code_direct 1 39029 NULL
 +ovl_copy_up_39031 ovl_copy_up 0 39031 NULL nohasharray
@@ -134131,11 +134622,13 @@ index 0000000..e3e2614
 +b43legacy_wireless_init_39508 b43legacy_wireless_init 0 39508 NULL
 +lpfc_first_burst_size_show_39511 lpfc_first_burst_size_show 0 39511 NULL
 +wm97xx_probe_39512 wm97xx_probe 0 39512 NULL
++get_std_timing_39517 get_std_timing 0 39517 NULL
 +airspy_alloc_urbs_39522 airspy_alloc_urbs 0 39522 NULL
 +cl_req_alloc_39523 cl_req_alloc 4 39523 NULL
 +acpi_ds_create_node_39526 acpi_ds_create_node 0 39526 NULL
 +state_store_39532 state_store 0-3 39532 NULL
 +ican3_new_send_msg_39533 ican3_new_send_msg 0 39533 NULL
++wlcore_hw_ap_sleep_39534 wlcore_hw_ap_sleep 0 39534 NULL
 +set_rpm_39535 set_rpm 0-4 39535 NULL
 +show_flags_39540 show_flags 0 39540 NULL
 +int_proc_write_39542 int_proc_write 3-0 39542 NULL
@@ -134161,6 +134654,7 @@ index 0000000..e3e2614
 +show_tabletModelCode_39594 show_tabletModelCode 0 39594 NULL
 +memblock_virt_alloc_internal_39600 memblock_virt_alloc_internal 1 39600 NULL nohasharray
 +show_tabletSize_39600 show_tabletSize 0 39600 &memblock_virt_alloc_internal_39600
++copy_chunked_from_user_39601 copy_chunked_from_user 3 39601 NULL
 +bcache_reboot_39606 bcache_reboot 0 39606 NULL
 +v9fs_file_write_internal_39611 v9fs_file_write_internal 0 39611 NULL
 +nfs_idmap_get_key_39616 nfs_idmap_get_key 2 39616 NULL
@@ -134255,6 +134749,7 @@ index 0000000..e3e2614
 +sriov_numvfs_store_39852 sriov_numvfs_store 0-4 39852 &iio_buffer_store_enable_39852
 +hfs_hash_dentry_39854 hfs_hash_dentry 0 39854 NULL
 +kempld_version_show_39859 kempld_version_show 0 39859 NULL
++force_bredr_smp_read_39860 force_bredr_smp_read 3 39860 NULL
 +e4000_get_if_frequency_39865 e4000_get_if_frequency 0 39865 NULL
 +i7core_inject_show_dimm_39869 i7core_inject_show_dimm 0 39869 NULL
 +isl1208_sysfs_show_dtrim_39870 isl1208_sysfs_show_dtrim 0 39870 NULL
@@ -134296,7 +134791,8 @@ index 0000000..e3e2614
 +core_siblings_list_show_39944 core_siblings_list_show 0 39944 NULL
 +ov9640_s_ctrl_39945 ov9640_s_ctrl 0 39945 NULL
 +error_error_frame_read_39947 error_error_frame_read 3-0 39947 NULL nohasharray
-+fwnet_pd_new_39947 fwnet_pd_new 4 39947 &error_error_frame_read_39947
++fwnet_pd_new_39947 fwnet_pd_new 4 39947 &error_error_frame_read_39947 nohasharray
++mlx4_comm_cmd_wait_39947 mlx4_comm_cmd_wait 0 39947 &fwnet_pd_new_39947
 +usb_get_device_descriptor_39951 usb_get_device_descriptor 0 39951 NULL
 +tty_prepare_flip_string_39955 tty_prepare_flip_string 3 39955 NULL nohasharray
 +lpfc_restrict_login_show_39955 lpfc_restrict_login_show 0 39955 &tty_prepare_flip_string_39955
@@ -134373,6 +134869,7 @@ index 0000000..e3e2614
 +rx_rx_frame_checksum_read_40140 rx_rx_frame_checksum_read 3-0 40140 NULL
 +inode_killpriv_40142 inode_killpriv 0 40142 NULL
 +ath10k_write_simulate_fw_crash_40143 ath10k_write_simulate_fw_crash 3-0 40143 NULL
++drm_display_info_set_bus_formats_40148 drm_display_info_set_bus_formats 3 40148 NULL
 +blk_mq_sysfs_show_40149 blk_mq_sysfs_show 0 40149 NULL nohasharray
 +adp8870_bl_l1_daylight_dim_store_40149 adp8870_bl_l1_daylight_dim_store 0-4 40149 &blk_mq_sysfs_show_40149
 +netdev_queue_attr_store_40150 netdev_queue_attr_store 0-4 40150 NULL
@@ -134404,6 +134901,7 @@ index 0000000..e3e2614
 +lpfc_max_vpi_show_40237 lpfc_max_vpi_show 0 40237 &osst_read_40237 nohasharray
 +cx25821_buffer_prepare_40237 cx25821_buffer_prepare 0 40237 &lpfc_max_vpi_show_40237
 +adjust_io_40247 adjust_io 0 40247 NULL
++ocfs2_zero_extend_get_range_40248 ocfs2_zero_extend_get_range 0 40248 NULL
 +btrfs_unfreeze_40249 btrfs_unfreeze 0 40249 NULL
 +fsl_edma_prep_dma_cyclic_40254 fsl_edma_prep_dma_cyclic 4-3 40254 NULL nohasharray
 +of_get_child_count_40254 of_get_child_count 0 40254 &fsl_edma_prep_dma_cyclic_40254
@@ -134566,6 +135064,7 @@ index 0000000..e3e2614
 +ssb_pci_xtal_40581 ssb_pci_xtal 0 40581 NULL
 +nilfs_segctor_current_seg_sequence_show_40582 nilfs_segctor_current_seg_sequence_show 0 40582 NULL
 +tps6105x_regulator_disable_40589 tps6105x_regulator_disable 0 40589 NULL
++nvkm_clk_create__40592 nvkm_clk_create_ 8 40592 NULL
 +b1_get_byte_40597 b1_get_byte 0 40597 NULL
 +skge_rx_get_40598 skge_rx_get 3 40598 NULL
 +reshape_position_show_40599 reshape_position_show 0 40599 NULL
@@ -134613,6 +135112,7 @@ index 0000000..e3e2614
 +set_extent_bit_40719 set_extent_bit 0 40719 NULL nohasharray
 +uri_store_40719 uri_store 0 40719 &set_extent_bit_40719
 +nilfs_bmap_lookup_at_level_40724 nilfs_bmap_lookup_at_level 0 40724 NULL
++tipc_node_get_mtu_40725 tipc_node_get_mtu 0 40725 NULL
 +raw_disconnect_40726 raw_disconnect 0 40726 NULL
 +adt7410_i2c_write_word_40731 adt7410_i2c_write_word 0 40731 NULL
 +of_pdt_build_one_prop_40735 of_pdt_build_one_prop 5 40735 NULL
@@ -134635,6 +135135,7 @@ index 0000000..e3e2614
 +show_bitmask_40774 show_bitmask 0 40774 NULL
 +show_list_40775 show_list 3-0 40775 NULL
 +acpi_ps_next_parse_state_40776 acpi_ps_next_parse_state 0-3 40776 NULL
++store_gamma_curve_40779 store_gamma_curve 4 40779 NULL
 +ipv4_helper_40780 ipv4_helper 0 40780 NULL nohasharray
 +roccat_common2_sysfs_write_keys_extra_40780 roccat_common2_sysfs_write_keys_extra 0-6-5 40780 &ipv4_helper_40780
 +tps65217_pmic_disable_40783 tps65217_pmic_disable 0 40783 NULL
@@ -134654,6 +135155,7 @@ index 0000000..e3e2614
 +arcmsr_attr_host_driver_abort_40803 arcmsr_attr_host_driver_abort 0 40803 NULL nohasharray
 +cifs_sign_smbv_40803 cifs_sign_smbv 0 40803 &arcmsr_attr_host_driver_abort_40803
 +bonding_show_ad_aggregator_40805 bonding_show_ad_aggregator 0 40805 NULL
++mwifiex_cmd_issue_chan_report_request_40807 mwifiex_cmd_issue_chan_report_request 0 40807 NULL
 +smk_fill_rule_40808 smk_fill_rule 0 40808 NULL
 +assign_out_path_ctls_40810 assign_out_path_ctls 0 40810 NULL
 +netdev_alloc_skb_ip_align_40811 netdev_alloc_skb_ip_align 2 40811 NULL
@@ -134672,6 +135174,7 @@ index 0000000..e3e2614
 +udp_lib_setsockopt_40851 udp_lib_setsockopt 0 40851 NULL nohasharray
 +rndis_opts_qmult_store_40851 rndis_opts_qmult_store 0-3 40851 &udp_lib_setsockopt_40851 nohasharray
 +isku_sysfs_write_keys_thumbster_40851 isku_sysfs_write_keys_thumbster 6-0-5 40851 &rndis_opts_qmult_store_40851
++write_file_wow_40852 write_file_wow 3 40852 NULL
 +cxacru_sysfs_show_downstream_fec_errors_40853 cxacru_sysfs_show_downstream_fec_errors 0 40853 NULL
 +validate_negotiate_40854 validate_negotiate 0 40854 NULL
 +cx25840_audio_s_ctrl_40855 cx25840_audio_s_ctrl 0 40855 NULL nohasharray
@@ -134693,6 +135196,7 @@ index 0000000..e3e2614
 +ide_park_show_40896 ide_park_show 0 40896 NULL
 +show_boardversion_40901 show_boardversion 0 40901 NULL
 +waiters_read_40902 waiters_read 3-0 40902 NULL
++xfs_sync_sb_40903 xfs_sync_sb 0 40903 NULL
 +isdn_add_channels_40905 isdn_add_channels 3 40905 NULL
 +snd_seq_ioctl_get_client_pool_40907 snd_seq_ioctl_get_client_pool 0 40907 NULL
 +acpi_ex_system_wait_mutex_40911 acpi_ex_system_wait_mutex 0 40911 NULL nohasharray
@@ -134785,7 +135289,8 @@ index 0000000..e3e2614
 +dma_attach_41094 dma_attach 5-6 41094 NULL
 +rcar_vin_videobuf_setup_41096 rcar_vin_videobuf_setup 0 41096 NULL nohasharray
 +target_core_store_dev_control_41096 target_core_store_dev_control 0-3 41096 &rcar_vin_videobuf_setup_41096
-+velocity_vlan_rx_add_vid_41103 velocity_vlan_rx_add_vid 0 41103 NULL
++velocity_vlan_rx_add_vid_41103 velocity_vlan_rx_add_vid 0 41103 NULL nohasharray
++nvkm_subdev_create__41103 nvkm_subdev_create_ 7 41103 &velocity_vlan_rx_add_vid_41103
 +provide_user_output_41105 provide_user_output 3-0 41105 NULL
 +show_in_0_41107 show_in_0 0 41107 NULL nohasharray
 +bnx2x_set_pf_tx_switching_41107 bnx2x_set_pf_tx_switching 0 41107 &show_in_0_41107
@@ -134801,6 +135306,7 @@ index 0000000..e3e2614
 +thermal_cooling_device_max_state_show_41132 thermal_cooling_device_max_state_show 0 41132 NULL
 +lpfc_issue_reset_41139 lpfc_issue_reset 0-4 41139 NULL
 +qla2x00_optrom_gold_fw_version_show_41144 qla2x00_optrom_gold_fw_version_show 0 41144 NULL
++ath10k_wmi_tlv_op_gen_bcn_tmpl_41145 ath10k_wmi_tlv_op_gen_bcn_tmpl 8 41145 NULL
 +read_default_nvram_41149 read_default_nvram 0-5-6 41149 NULL
 +vmci_transport_send_read_notification_41152 vmci_transport_send_read_notification 0 41152 NULL
 +uvc_v4l2_read_41156 uvc_v4l2_read 0-3 41156 NULL
@@ -134841,7 +135347,8 @@ index 0000000..e3e2614
 +vid_to_reg_41246 vid_to_reg 0-1 41246 &mcp3422_show_scales_41246
 +show_dts_mode_41247 show_dts_mode 0 41247 NULL
 +ext3_journalled_write_end_41248 ext3_journalled_write_end 0-5 41248 NULL
-+send_41249 send 0 41249 NULL
++send_41249 send 0 41249 NULL nohasharray
++get_fan_status_41249 get_fan_status 0 41249 &send_41249
 +degraded_show_41251 degraded_show 0 41251 NULL nohasharray
 +xfs_zero_last_block_41251 xfs_zero_last_block 3-2-0 41251 &degraded_show_41251
 +wakeup_abort_count_show_41252 wakeup_abort_count_show 0 41252 NULL
@@ -135052,11 +135559,13 @@ index 0000000..e3e2614
 +connector_write_41709 connector_write 3-0 41709 NULL
 +read_block_41711 read_block 0 41711 NULL
 +allow_restart_show_41712 allow_restart_show 0 41712 NULL
++nfs_revalidate_mapping_protected_41716 nfs_revalidate_mapping_protected 0 41716 NULL
 +lowpan_header_create_41717 lowpan_header_create 0 41717 NULL
 +bdx_tx_db_init_41719 bdx_tx_db_init 2 41719 NULL nohasharray
 +store_41719 store 0-4 41719 &bdx_tx_db_init_41719
 +st_fixed_buffer_size_show_41720 st_fixed_buffer_size_show 0 41720 NULL
-+sys_pwritev_41722 sys_pwritev 3 41722 NULL
++sys_pwritev_41722 sys_pwritev 3 41722 NULL nohasharray
++remove_device_41722 remove_device 4 41722 &sys_pwritev_41722
 +esas2r_read_fs_41732 esas2r_read_fs 0-3-4 41732 NULL
 +lpphy_b2062_tune_41742 lpphy_b2062_tune 0 41742 NULL
 +arch_add_memory_41743 arch_add_memory 0 41743 NULL
@@ -135098,6 +135607,7 @@ index 0000000..e3e2614
 +show_ipFragFails_41824 show_ipFragFails 0 41824 NULL
 +acpi_device_set_power_41826 acpi_device_set_power 0 41826 NULL
 +kimage_file_alloc_init_41827 kimage_file_alloc_init 5 41827 NULL
++_i8k_get_temp_41837 _i8k_get_temp 0 41837 NULL
 +test_irq_show_41838 test_irq_show 0 41838 NULL
 +ixgbe_dbg_netdev_ops_read_41839 ixgbe_dbg_netdev_ops_read 3-0 41839 NULL nohasharray
 +__bio_copy_iov_41839 __bio_copy_iov 0 41839 &ixgbe_dbg_netdev_ops_read_41839
@@ -135176,6 +135686,7 @@ index 0000000..e3e2614
 +spidev_sync_read_42014 spidev_sync_read 0 42014 NULL
 +rs_sta_dbgfs_scale_table_write_42017 rs_sta_dbgfs_scale_table_write 3-0 42017 NULL
 +vfat_revalidate_ci_42018 vfat_revalidate_ci 0 42018 NULL
++ath10k_write_nf_cal_period_42019 ath10k_write_nf_cal_period 3 42019 NULL
 +sony_pic_fanspeed_show_42021 sony_pic_fanspeed_show 0 42021 NULL
 +create_port0_egr_42027 create_port0_egr 0 42027 NULL
 +acpi_ut_create_buffer_object_42030 acpi_ut_create_buffer_object 1 42030 NULL
@@ -135203,6 +135714,7 @@ index 0000000..e3e2614
 +store_target_speed_42073 store_target_speed 0-4 42073 &ceph_readpage_from_fscache_42073
 +ql_write_cfg_42074 ql_write_cfg 0 42074 NULL
 +show_conn_param_ISCSI_PARAM_PERSISTENT_PORT_42076 show_conn_param_ISCSI_PARAM_PERSISTENT_PORT 0 42076 NULL
++named_prepare_buf_42077 named_prepare_buf 3 42077 NULL
 +si4713_powerdown_42078 si4713_powerdown 0 42078 NULL
 +ath10k_ce_init_src_ring_42080 ath10k_ce_init_src_ring 0 42080 NULL
 +SMB2_read_42082 SMB2_read 0 42082 NULL
@@ -135389,7 +135901,8 @@ index 0000000..e3e2614
 +sdev_store_evt_capacity_change_reported_42538 sdev_store_evt_capacity_change_reported 0-4 42538 NULL
 +mtip_hw_submit_io_42539 mtip_hw_submit_io 4 42539 NULL
 +mt9m111_set_hvflip_42542 mt9m111_set_hvflip 0 42542 NULL
-+__wa_xfer_setup_42543 __wa_xfer_setup 0 42543 NULL
++__wa_xfer_setup_42543 __wa_xfer_setup 0 42543 NULL nohasharray
++__register_ftrace_function_42543 __register_ftrace_function 0 42543 &__wa_xfer_setup_42543
 +dbAllocNear_42546 dbAllocNear 0 42546 NULL
 +mvs_task_exec_42547 mvs_task_exec 0 42547 NULL
 +ath6kl_wmi_proc_events_vif_42549 ath6kl_wmi_proc_events_vif 5 42549 NULL nohasharray
@@ -135471,11 +135984,13 @@ index 0000000..e3e2614
 +taos_smbus_xfer_42714 taos_smbus_xfer 0 42714 NULL
 +regulator_print_state_42718 regulator_print_state 0 42718 NULL
 +adxl34x_calibrate_show_42719 adxl34x_calibrate_show 0 42719 NULL
-+read_status_42722 read_status 0 42722 NULL
++read_status_42722 read_status 0 42722 NULL nohasharray
++ath10k_pci_qca6174_chip_reset_42722 ath10k_pci_qca6174_chip_reset 0 42722 &read_status_42722
 +selinux_ip_postroute_42725 selinux_ip_postroute 0 42725 NULL
 +setup_ntlmv2_rsp_42726 setup_ntlmv2_rsp 0 42726 NULL
 +iwl_mvm_coex_dump_mbox_old_42727 iwl_mvm_coex_dump_mbox_old 0-3-4 42727 NULL
 +bmg160_data_rdy_trigger_set_state_42728 bmg160_data_rdy_trigger_set_state 0 42728 NULL
++ath10k_pci_warm_reset_42729 ath10k_pci_warm_reset 0 42729 NULL
 +dvb_demux_ioctl_42733 dvb_demux_ioctl 2 42733 NULL nohasharray
 +target_stat_scsi_auth_intr_show_attr_hs_num_cmds_42733 target_stat_scsi_auth_intr_show_attr_hs_num_cmds 0 42733 &dvb_demux_ioctl_42733 nohasharray
 +fw_get_filesystem_firmware_42733 fw_get_filesystem_firmware 0 42733 &target_stat_scsi_auth_intr_show_attr_hs_num_cmds_42733
@@ -135524,7 +136039,8 @@ index 0000000..e3e2614
 +show_sas_rphy_target_port_protocols_42840 show_sas_rphy_target_port_protocols 0 42840 NULL
 +prop_compression_validate_42847 prop_compression_validate 0 42847 NULL
 +show_ata_dev_xfer_mode_42848 show_ata_dev_xfer_mode 0 42848 NULL
-+btmrvl_fwdump_write_42850 btmrvl_fwdump_write 3-0 42850 NULL
++btmrvl_fwdump_write_42850 btmrvl_fwdump_write 3-0 42850 NULL nohasharray
++ath10k_pci_qca988x_chip_reset_42850 ath10k_pci_qca988x_chip_reset 0 42850 &btmrvl_fwdump_write_42850
 +prandom_u32_42853 prandom_u32 0 42853 NULL nohasharray
 +ath6kl_wmi_config_debug_module_cmd_42853 ath6kl_wmi_config_debug_module_cmd 0 42853 &prandom_u32_42853
 +wl12xx_init_vif_data_42855 wl12xx_init_vif_data 0 42855 NULL
@@ -135607,6 +136123,7 @@ index 0000000..e3e2614
 +snd_pcm_pre_start_43020 snd_pcm_pre_start 0 43020 NULL nohasharray
 +export_store_43020 export_store 0-4 43020 &snd_pcm_pre_start_43020
 +p54_add_interface_43022 p54_add_interface 0 43022 NULL
++nvkm_parent_create__43024 nvkm_parent_create_ 7 43024 NULL
 +isr_rx_mem_overflow_read_43025 isr_rx_mem_overflow_read 3-0 43025 NULL
 +b43_write_initvals_43028 b43_write_initvals 0 43028 NULL
 +ab3100_otp_paf_show_43029 ab3100_otp_paf_show 0 43029 NULL
@@ -135687,6 +136204,7 @@ index 0000000..e3e2614
 +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
 +isl29003_set_range_43211 isl29003_set_range 0 43211 NULL
++ovl_split_lowerdirs_43214 ovl_split_lowerdirs 0 43214 NULL
 +link_failure_count_show_43216 link_failure_count_show 0 43216 NULL nohasharray
 +nes_show_flash_data_43216 nes_show_flash_data 0 43216 &link_failure_count_show_43216
 +gfs2_direct_IO_43220 gfs2_direct_IO 4-0 43220 NULL
@@ -135764,9 +136282,11 @@ index 0000000..e3e2614
 +tpm_inf_send_43388 tpm_inf_send 0-3 43388 NULL
 +scsiback_make_nexus_43391 scsiback_make_nexus 0 43391 NULL
 +xfs_btree_new_iroot_43392 xfs_btree_new_iroot 0 43392 NULL
++mdfour_43396 mdfour 0 43396 NULL
 +fsp_attr_show_getreg_43397 fsp_attr_show_getreg 0 43397 NULL nohasharray
 +tcm_qla2xxx_tpg_attrib_show_prod_mode_write_protect_43397 tcm_qla2xxx_tpg_attrib_show_prod_mode_write_protect 0 43397 &fsp_attr_show_getreg_43397
 +iscsi_sw_tcp_conn_get_param_43398 iscsi_sw_tcp_conn_get_param 0 43398 NULL
++get_user_pages_unlocked_43399 get_user_pages_unlocked 0 43399 NULL
 +o2hb_read_block_input_43402 o2hb_read_block_input 0 43402 NULL
 +wl1251_acx_data_path_params_43404 wl1251_acx_data_path_params 0 43404 NULL
 +xenfb_write_43412 xenfb_write 3 43412 NULL
@@ -135789,7 +136309,8 @@ index 0000000..e3e2614
 +send_pre_block_43442 send_pre_block 0 43442 NULL
 +usemap_size_43443 usemap_size 0-1-2 43443 NULL nohasharray
 +usb_string_43443 usb_string 0 43443 &usemap_size_43443
-+dm_attr_name_show_43444 dm_attr_name_show 0 43444 NULL
++dm_attr_name_show_43444 dm_attr_name_show 0 43444 NULL nohasharray
++get_vm_area_size_43444 get_vm_area_size 0 43444 &dm_attr_name_show_43444
 +nilfs_palloc_get_bitmap_block_43448 nilfs_palloc_get_bitmap_block 0 43448 NULL
 +decode_ntlmssp_challenge_43450 decode_ntlmssp_challenge 0 43450 NULL
 +store_temp_beep_43452 store_temp_beep 0-4 43452 NULL
@@ -135866,6 +136387,7 @@ index 0000000..e3e2614
 +tps6105x_get_43643 tps6105x_get 0 43643 NULL nohasharray
 +setup_sdma_43643 setup_sdma 0 43643 &tps6105x_get_43643
 +si4713_wait_stc_43644 si4713_wait_stc 0 43644 NULL
++gf100_vm_create_43645 gf100_vm_create 2-3 43645 NULL
 +generic_get_free_region_43646 generic_get_free_region 0-3 43646 NULL
 +kmalloc_large_node_hook_43651 kmalloc_large_node_hook 2 43651 NULL
 +__orinoco_hw_set_bitrate_43655 __orinoco_hw_set_bitrate 0 43655 NULL
@@ -135992,6 +136514,7 @@ index 0000000..e3e2614
 +tsl2550_show_lux1_input_43931 tsl2550_show_lux1_input 0 43931 NULL
 +snd_cs5535audio_capture_prepare_43934 snd_cs5535audio_capture_prepare 0 43934 NULL nohasharray
 +store_engine_mode_43934 store_engine_mode 0-4 43934 &snd_cs5535audio_capture_prepare_43934
++__ftrace_hash_update_ipmodify_43937 __ftrace_hash_update_ipmodify 0 43937 NULL
 +st_press_buffer_postenable_43943 st_press_buffer_postenable 0 43943 NULL
 +xen_register_gsi_43946 xen_register_gsi 2-1 43946 NULL
 +stats_dot11RTSFailureCount_read_43948 stats_dot11RTSFailureCount_read 3-0 43948 NULL
@@ -136223,6 +136746,7 @@ index 0000000..e3e2614
 +eth_change_mtu_44450 eth_change_mtu 0 44450 &iwl_dbgfs_bf_params_write_44450
 +koneplus_sysfs_read_profilex_buttons_44454 koneplus_sysfs_read_profilex_buttons 0-5-6 44454 NULL
 +dma_mask_bits_show_44456 dma_mask_bits_show 0 44456 NULL
++af_alg_make_sg_44459 af_alg_make_sg 0-3 44459 NULL
 +snd_pcm_do_suspend_44460 snd_pcm_do_suspend 0 44460 NULL
 +___alloc_bootmem_node_nopanic_44461 ___alloc_bootmem_node_nopanic 2 44461 NULL
 +cpuid_class_cpu_callback_44464 cpuid_class_cpu_callback 0 44464 NULL
@@ -136267,7 +136791,8 @@ index 0000000..e3e2614
 +comm_write_44537 comm_write 3-0 44537 NULL nohasharray
 +sys_msgsnd_44537 sys_msgsnd 3 44537 &comm_write_44537
 +shmem_getpage_gfp_44556 shmem_getpage_gfp 0 44556 NULL
-+picolcd_set_par_44559 picolcd_set_par 0 44559 NULL
++picolcd_set_par_44559 picolcd_set_par 0 44559 NULL nohasharray
++br_fdb_external_learn_del_44559 br_fdb_external_learn_del 0 44559 &picolcd_set_par_44559
 +sctp_gen_sack_44565 sctp_gen_sack 0 44565 NULL
 +default_pvid_store_44566 default_pvid_store 0-4 44566 NULL
 +show_registers_44567 show_registers 0 44567 NULL nohasharray
@@ -136308,6 +136833,7 @@ index 0000000..e3e2614
 +store_44659 store 0-3 44659 NULL
 +alloc_ctrl_packet_44667 alloc_ctrl_packet 1 44667 NULL
 +show_ctrl_44671 show_ctrl 0 44671 NULL
++raid56_parity_write_44672 raid56_parity_write 0-4 44672 NULL
 +mpi_resize_44674 mpi_resize 2 44674 NULL
 +auxch_init_44675 auxch_init 0 44675 NULL
 +ipheth_rx_submit_44679 ipheth_rx_submit 0 44679 NULL nohasharray
@@ -136565,6 +137091,7 @@ index 0000000..e3e2614
 +btmrvl_send_sync_cmd_45296 btmrvl_send_sync_cmd 4 45296 NULL
 +snd_pcm_oss_sync1_45298 snd_pcm_oss_sync1 2 45298 NULL nohasharray
 +sn9c2028_short_command_45298 sn9c2028_short_command 0 45298 &snd_pcm_oss_sync1_45298
++__ocfs2_extend_allocation_45301 __ocfs2_extend_allocation 0 45301 NULL
 +category_show_45304 category_show 0 45304 NULL nohasharray
 +xfs_alert_fsblock_zero_45304 xfs_alert_fsblock_zero 0 45304 &category_show_45304
 +disk_capability_show_45306 disk_capability_show 0 45306 NULL
@@ -136591,6 +137118,7 @@ index 0000000..e3e2614
 +snd_ctl_add_45389 snd_ctl_add 0 45389 NULL nohasharray
 +write_rbu_image_type_45389 write_rbu_image_type 0-6-5 45389 &snd_ctl_add_45389
 +wlcore_write_45391 wlcore_write 0 45391 NULL
++vring_pci_size_45392 vring_pci_size 1 45392 NULL
 +count_skb_frag_slots_45395 count_skb_frag_slots 0 45395 NULL
 +lane2_associate_req_45398 lane2_associate_req 4 45398 NULL
 +keymap_store_45406 keymap_store 4 45406 NULL
@@ -136604,7 +137132,8 @@ index 0000000..e3e2614
 +sht15_wait_for_response_45419 sht15_wait_for_response 0 45419 NULL nohasharray
 +show_45419 show 0 45419 &sht15_wait_for_response_45419
 +ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 ieee80211_if_fmt_dot11MeshHWMProotInterval 3 45421 NULL nohasharray
-+snd_sonicvibes_playback_prepare_45421 snd_sonicvibes_playback_prepare 0 45421 &ieee80211_if_fmt_dot11MeshHWMProotInterval_45421
++snd_sonicvibes_playback_prepare_45421 snd_sonicvibes_playback_prepare 0 45421 &ieee80211_if_fmt_dot11MeshHWMProotInterval_45421 nohasharray
++btusb_intel_secure_send_45421 btusb_intel_secure_send 3 45421 &snd_sonicvibes_playback_prepare_45421
 +gfs2_xattr_set_45424 gfs2_xattr_set 0 45424 NULL
 +tiadc_channel_init_45425 tiadc_channel_init 2 45425 NULL
 +rt2x00lib_load_firmware_45427 rt2x00lib_load_firmware 0 45427 NULL
@@ -136718,7 +137247,8 @@ index 0000000..e3e2614
 +fake_rw_store_45641 fake_rw_store 0-3 45641 NULL
 +wl1273_fm_set_preemphasis_45645 wl1273_fm_set_preemphasis 0 45645 NULL
 +wusb_cdid_show_45647 wusb_cdid_show 0 45647 NULL
-+rj54n1_s_fmt_45650 rj54n1_s_fmt 0 45650 NULL
++rj54n1_s_fmt_45650 rj54n1_s_fmt 0 45650 NULL nohasharray
++rcar_dmac_prep_dma_cyclic_45650 rcar_dmac_prep_dma_cyclic 4-3 45650 &rj54n1_s_fmt_45650
 +ebitmap_next_positive_45651 ebitmap_next_positive 3-0 45651 NULL
 +ext4_reserve_inode_write_45654 ext4_reserve_inode_write 0 45654 NULL
 +wq_numa_show_45656 wq_numa_show 0 45656 NULL
@@ -136850,6 +137380,7 @@ index 0000000..e3e2614
 +alloc_mr_45935 alloc_mr 1 45935 NULL nohasharray
 +dlm_id_show_45935 dlm_id_show 0 45935 &alloc_mr_45935
 +show_fan_value_45938 show_fan_value 0 45938 NULL
++display_store_45940 display_store 4 45940 NULL
 +wl12xx_hw_init_45944 wl12xx_hw_init 0 45944 NULL
 +brcmf_netdev_open_45945 brcmf_netdev_open 0 45945 NULL
 +show_sas_end_dev_I_T_nexus_loss_timeout_45946 show_sas_end_dev_I_T_nexus_loss_timeout 0 45946 NULL
@@ -136901,6 +137432,7 @@ index 0000000..e3e2614
 +dma_tx_errors_read_46060 dma_tx_errors_read 3-0 46060 NULL
 +apds990x_rate_store_46062 apds990x_rate_store 0-4 46062 NULL
 +slhc_toss_46066 slhc_toss 0 46066 NULL
++__vmalloc_node_range_46070 __vmalloc_node_range 1 46070 NULL
 +in_use_show_46075 in_use_show 0 46075 NULL
 +sel_commit_bools_write_46077 sel_commit_bools_write 3-0 46077 NULL
 +mgmt_remote_name_46080 mgmt_remote_name 7 46080 NULL
@@ -136928,6 +137460,7 @@ index 0000000..e3e2614
 +twl6030_pwm_enable_46139 twl6030_pwm_enable 0 46139 NULL nohasharray
 +gpio_keys_store_disabled_switches_46139 gpio_keys_store_disabled_switches 0-4 46139 &twl6030_pwm_enable_46139
 +nilfs_btree_assign_p_46142 nilfs_btree_assign_p 0 46142 NULL
++__walk_page_range_46146 __walk_page_range 0 46146 NULL
 +elan_i2c_get_checksum_46148 elan_i2c_get_checksum 0 46148 NULL
 +set_temp_auto_temp_min_46149 set_temp_auto_temp_min 0-4 46149 NULL
 +ddp_clear_map_46152 ddp_clear_map 4 46152 NULL
@@ -137070,6 +137603,7 @@ index 0000000..e3e2614
 +af_alg_cmsg_send_46457 af_alg_cmsg_send 0 46457 NULL
 +il_dbgfs_clear_traffic_stats_write_46458 il_dbgfs_clear_traffic_stats_write 3-0 46458 NULL
 +show_zero_req_lim_46462 show_zero_req_lim 0 46462 NULL
++E_P24_46463 E_P24 0 46463 NULL
 +add_to_waiters_46464 add_to_waiters 0 46464 NULL
 +v9fs_cache_inode_get_key_46471 v9fs_cache_inode_get_key 0 46471 NULL
 +gether_opts_dev_addr_show_46477 gether_opts_dev_addr_show 0 46477 NULL
@@ -137092,11 +137626,13 @@ index 0000000..e3e2614
 +mthca_alloc_cq_buf_46512 mthca_alloc_cq_buf 3 46512 NULL
 +kmsg_read_46514 kmsg_read 3-0 46514 NULL nohasharray
 +nouveau_drm_ioctl_46514 nouveau_drm_ioctl 2 46514 &kmsg_read_46514
-+mlx4_SET_PORT_VXLAN_46515 mlx4_SET_PORT_VXLAN 0 46515 NULL
++mlx4_SET_PORT_VXLAN_46515 mlx4_SET_PORT_VXLAN 0 46515 NULL nohasharray
++__btrfs_map_block_46515 __btrfs_map_block 3-0 46515 &mlx4_SET_PORT_VXLAN_46515
 +nlm_end_grace_write_46517 nlm_end_grace_write 3-0 46517 NULL nohasharray
 +quota_quantum_store_46517 quota_quantum_store 3-0 46517 &nlm_end_grace_write_46517
 +pptp_bind_46520 pptp_bind 0 46520 NULL
-+isoc_init_46521 isoc_init 0 46521 NULL
++isoc_init_46521 isoc_init 0 46521 NULL nohasharray
++__ath10k_htt_rx_ring_fill_n_46521 __ath10k_htt_rx_ring_fill_n 0 46521 &isoc_init_46521
 +bdx_rxdb_create_46525 bdx_rxdb_create 1 46525 NULL
 +show_iface_data_digest_46528 show_iface_data_digest 0 46528 NULL
 +snd_hda_gen_parse_auto_config_46535 snd_hda_gen_parse_auto_config 0 46535 NULL nohasharray
@@ -137124,6 +137660,7 @@ index 0000000..e3e2614
 +snd_compr_write_data_46592 snd_compr_write_data 3-0 46592 NULL
 +show_mute_46600 show_mute 0 46600 NULL nohasharray
 +mode_store_46600 mode_store 0-4 46600 &show_mute_46600
++ftrace_set_filter_ip_46601 ftrace_set_filter_ip 0 46601 NULL
 +multicast_querier_show_46605 multicast_querier_show 0 46605 NULL
 +il3945_stats_flag_46606 il3945_stats_flag 3-0 46606 NULL nohasharray
 +sxgbe_get_regs_len_46606 sxgbe_get_regs_len 0 46606 &il3945_stats_flag_46606
@@ -137178,6 +137715,7 @@ index 0000000..e3e2614
 +wl1271_rx_filter_alloc_field_46721 wl1271_rx_filter_alloc_field 5 46721 NULL
 +bcmgenet_set_mac_addr_46722 bcmgenet_set_mac_addr 0 46722 NULL
 +ov6650_cropcap_46726 ov6650_cropcap 0 46726 NULL
++put_cfg_tlv_u32_46728 put_cfg_tlv_u32 0 46728 NULL
 +pinctrl_register_map_46730 pinctrl_register_map 2 46730 NULL
 +irq_domain_add_simple_46734 irq_domain_add_simple 2-3 46734 NULL
 +ctnetlink_nlmsg_size_46736 ctnetlink_nlmsg_size 0 46736 NULL
@@ -137198,6 +137736,7 @@ index 0000000..e3e2614
 +int_hw_irq_en_46776 int_hw_irq_en 3-0 46776 NULL
 +regcache_lzo_sync_46777 regcache_lzo_sync 2 46777 NULL
 +ov2640_s_ctrl_46785 ov2640_s_ctrl 0 46785 NULL
++radar_detection_write_46787 radar_detection_write 3 46787 NULL
 +__hdaps_read_pair_46792 __hdaps_read_pair 0 46792 NULL
 +host_show_commands_outstanding_46795 host_show_commands_outstanding 0 46795 NULL
 +show_max_min_46796 show_max_min 0 46796 NULL
@@ -137273,6 +137812,7 @@ index 0000000..e3e2614
 +lp_wait_ready_46962 lp_wait_ready 0 46962 NULL
 +SYSC_poll_46965 SYSC_poll 2 46965 NULL nohasharray
 +snd_rme32_capture_prepare_46965 snd_rme32_capture_prepare 0 46965 &SYSC_poll_46965
++nvkm_falcon_create__46966 nvkm_falcon_create_ 8 46966 NULL
 +lbs_start_iface_46973 lbs_start_iface 0 46973 NULL
 +enc28j60_net_open_46974 enc28j60_net_open 0 46974 NULL
 +mgmt_pending_add_46976 mgmt_pending_add 5 46976 NULL
@@ -137436,6 +137976,7 @@ index 0000000..e3e2614
 +store_spi_transport_rd_strm_47397 store_spi_transport_rd_strm 0-4 47397 NULL
 +lbs_wrmac_write_47400 lbs_wrmac_write 3-0 47400 NULL
 +efi_pstore_read_func_47401 efi_pstore_read_func 0 47401 NULL
++walk_pte_range_47402 walk_pte_range 0 47402 NULL
 +store_bitmask_47403 store_bitmask 0-4 47403 NULL
 +store_select_amcb1_transmit_clock_47406 store_select_amcb1_transmit_clock 0-4 47406 NULL
 +ocfs2_resv_end_47408 ocfs2_resv_end 0 47408 NULL nohasharray
@@ -137501,7 +138042,8 @@ index 0000000..e3e2614
 +il_send_cmd_sync_47541 il_send_cmd_sync 0 47541 NULL
 +_lm3533_als_get_zone_47546 _lm3533_als_get_zone 0 47546 NULL
 +atl1_open_47550 atl1_open 0 47550 NULL
-+drbg_statelen_47551 drbg_statelen 0 47551 NULL
++drbg_statelen_47551 drbg_statelen 0 47551 NULL nohasharray
++leb_read_sanity_check_47551 leb_read_sanity_check 0 47551 &drbg_statelen_47551
 +pci_endrun_init_47554 pci_endrun_init 0 47554 NULL
 +_ctl_diag_trigger_scsi_show_47558 _ctl_diag_trigger_scsi_show 0 47558 NULL
 +send_cmd_47563 send_cmd 0 47563 NULL
@@ -137569,6 +138111,7 @@ index 0000000..e3e2614
 +show_prochot_avg_47718 show_prochot_avg 0 47718 NULL
 +wl1251_fetch_firmware_47724 wl1251_fetch_firmware 0 47724 NULL
 +__sock_sendmsg_nosec_47729 __sock_sendmsg_nosec 0-4 47729 NULL
++walk_page_test_47731 walk_page_test 0 47731 NULL
 +bits_to_user_47733 bits_to_user 3-2 47733 NULL
 +ov9740_s_fmt_47735 ov9740_s_fmt 0 47735 NULL nohasharray
 +sockfs_listxattr_47735 sockfs_listxattr 0-3 47735 &ov9740_s_fmt_47735
@@ -137688,6 +138231,7 @@ index 0000000..e3e2614
 +l2cap_sock_alloc_skb_cb_47997 l2cap_sock_alloc_skb_cb 3-2 47997 &show_session_param_ISCSI_PARAM_AUTO_SND_TGT_DISABLE_47997
 +__tda18271_write_regs_47998 __tda18271_write_regs 0 47998 NULL
 +lustre_cfg_len_48002 lustre_cfg_len 0 48002 NULL
++_iwl_dbgfs_enable_scan_iteration_notif_write_48007 _iwl_dbgfs_enable_scan_iteration_notif_write 3 48007 NULL
 +aa_file_perm_48010 aa_file_perm 0 48010 NULL
 +koneplus_sysfs_show_actual_profile_48011 koneplus_sysfs_show_actual_profile 0 48011 NULL nohasharray
 +ipx_create_48011 ipx_create 0 48011 &koneplus_sysfs_show_actual_profile_48011 nohasharray
@@ -137697,6 +138241,7 @@ index 0000000..e3e2614
 +coda_statfs_48015 coda_statfs 0 48015 NULL
 +rtl92se_hw_init_48027 rtl92se_hw_init 0 48027 NULL
 +trace_show_48031 trace_show 0 48031 NULL
++scsi_format_sense_hdr_48035 scsi_format_sense_hdr 2 48035 NULL
 +id_mode_to_cifs_acl_48036 id_mode_to_cifs_acl 0 48036 NULL nohasharray
 +cs_parse_auto_config_48036 cs_parse_auto_config 0 48036 &id_mode_to_cifs_acl_48036
 +sys32_pread_48037 sys32_pread 3 48037 NULL
@@ -137771,6 +138316,7 @@ index 0000000..e3e2614
 +integrity_attr_store_48189 integrity_attr_store 0-4 48189 &eni_send_48189
 +uhid_dev_create2_48191 uhid_dev_create2 0 48191 NULL
 +mwl8k_cmd_enable_sniffer_48197 mwl8k_cmd_enable_sniffer 0 48197 NULL
++skb_copy_to_page_nocache_48200 skb_copy_to_page_nocache 6-0 48200 NULL
 +startup_48205 startup 0 48205 NULL
 +show_48207 show 0 48207 NULL
 +snd_seq_dump_var_event_48209 snd_seq_dump_var_event 0 48209 NULL
@@ -137804,6 +138350,7 @@ index 0000000..e3e2614
 +qlcnic_83xx_get_regs_len_48275 qlcnic_83xx_get_regs_len 0 48275 NULL nohasharray
 +xgene_rtc_read_time_48275 xgene_rtc_read_time 0 48275 &qlcnic_83xx_get_regs_len_48275 nohasharray
 +trace_options_write_48275 trace_options_write 3 48275 &xgene_rtc_read_time_48275
++E_md4hash_48276 E_md4hash 0 48276 NULL
 +ath5k_hw_reset_tx_queue_48279 ath5k_hw_reset_tx_queue 0 48279 NULL
 +compat_sys_io_getevents_48283 compat_sys_io_getevents 3 48283 NULL
 +send_set_info_48288 send_set_info 7 48288 NULL
@@ -137871,6 +138418,7 @@ index 0000000..e3e2614
 +nfs_weak_revalidate_48432 nfs_weak_revalidate 0 48432 NULL
 +b43legacy_chip_init_48439 b43legacy_chip_init 0 48439 NULL
 +print_filtered_48442 print_filtered 0-2 48442 NULL
++snd_find_free_minor_48446 snd_find_free_minor 0 48446 NULL
 +vlv_pipe_crc_ctl_reg_48447 vlv_pipe_crc_ctl_reg 0 48447 NULL
 +rtl2830_rd_48451 rtl2830_rd 0 48451 NULL nohasharray
 +shmem_add_to_page_cache_48451 shmem_add_to_page_cache 0 48451 &rtl2830_rd_48451
@@ -138151,6 +138699,7 @@ index 0000000..e3e2614
 +sanity_check_49114 sanity_check 0 49114 &show_lanerev_enb_49114
 +memcg_write_event_control_49119 memcg_write_event_control 0-3 49119 NULL
 +ll_max_cached_mb_seq_write_49122 ll_max_cached_mb_seq_write 3 49122 NULL
++walk_pmd_range_49127 walk_pmd_range 0 49127 NULL
 +dn_check_state_49133 dn_check_state 0 49133 NULL
 +pt_read_49136 pt_read 3-0 49136 NULL nohasharray
 +qib_user_sdma_pin_pages_49136 qib_user_sdma_pin_pages 0-5-4 49136 &pt_read_49136 nohasharray
@@ -138441,7 +138990,8 @@ index 0000000..e3e2614
 +nilfs_dev_revision_show_49827 nilfs_dev_revision_show 0 49827 NULL
 +ntfs_copy_from_user_iovec_49829 ntfs_copy_from_user_iovec 0-6-3 49829 NULL
 +add_uuid_49831 add_uuid 4 49831 NULL nohasharray
-+ns_get_name_49831 ns_get_name 0 49831 &add_uuid_49831
++ns_get_name_49831 ns_get_name 0 49831 &add_uuid_49831 nohasharray
++nvkm_engctx_create__49831 nvkm_engctx_create_ 8 49831 &ns_get_name_49831
 +tcf_csum_ipv4_tcp_49834 tcf_csum_ipv4_tcp 3 49834 NULL
 +ath6kl_fwlog_block_read_49836 ath6kl_fwlog_block_read 3-0 49836 NULL
 +snd_azf3328_pcm_prepare_49838 snd_azf3328_pcm_prepare 0 49838 NULL nohasharray
@@ -138551,6 +139101,7 @@ index 0000000..e3e2614
 +show_chassis_clear_50119 show_chassis_clear 0 50119 NULL
 +rx_streaming_interval_write_50120 rx_streaming_interval_write 3-0 50120 NULL nohasharray
 +show_counter_ib_symbol_errs_50120 show_counter_ib_symbol_errs 0 50120 &rx_streaming_interval_write_50120
++ocrdma_dbgfs_ops_write_50123 ocrdma_dbgfs_ops_write 3 50123 NULL
 +roccat_common2_sysfs_write_light_50130 roccat_common2_sysfs_write_light 0-6-5 50130 NULL
 +wake_up_wlan_store_50132 wake_up_wlan_store 0-4 50132 NULL nohasharray
 +elan_i2c_finish_fw_update_50132 elan_i2c_finish_fw_update 0 50132 &wake_up_wlan_store_50132
@@ -138612,6 +139163,7 @@ index 0000000..e3e2614
 +isci_phy_control_50264 isci_phy_control 0 50264 NULL
 +vlan_dev_init_50267 vlan_dev_init 0 50267 NULL nohasharray
 +pwm1_store_50267 pwm1_store 4-0 50267 &vlan_dev_init_50267
++__i915_add_request_50272 __i915_add_request 0 50272 NULL
 +cifs_setattr_unix_50275 cifs_setattr_unix 0 50275 NULL
 +con2fb_acquire_newinfo_50278 con2fb_acquire_newinfo 0 50278 NULL
 +ahci_led_show_50279 ahci_led_show 0 50279 NULL
@@ -138639,6 +139191,7 @@ index 0000000..e3e2614
 +nouveau_engine_create__50331 nouveau_engine_create_ 7 50331 NULL
 +picolcd_fb_update_rate_show_50333 picolcd_fb_update_rate_show 0 50333 NULL
 +lpfc_idiag_pcicfg_read_50334 lpfc_idiag_pcicfg_read 3-0 50334 NULL
++dax_io_50336 dax_io 5-4-0 50336 NULL
 +snd_pcm_lib_writev_50337 snd_pcm_lib_writev 3-0 50337 NULL nohasharray
 +ocfs2_block_to_cluster_group_50337 ocfs2_block_to_cluster_group 2 50337 &snd_pcm_lib_writev_50337
 +roccat_common2_send_with_status_50343 roccat_common2_send_with_status 0-4 50343 NULL
@@ -138788,6 +139341,7 @@ index 0000000..e3e2614
 +ext3_readpage_50653 ext3_readpage 0 50653 NULL
 +show_fc_rport_node_name_50655 show_fc_rport_node_name 0 50655 NULL
 +snd_seq_ioctl_set_queue_info_50657 snd_seq_ioctl_set_queue_info 0 50657 NULL
++raid56_parity_alloc_scrub_rbio_50658 raid56_parity_alloc_scrub_rbio 4 50658 NULL
 +__sha1_ssse3_update_50659 __sha1_ssse3_update 0 50659 NULL
 +adcxx_show_min_50663 adcxx_show_min 0 50663 NULL nohasharray
 +iscsi_tpg_param_show_DefaultTime2Wait_50663 iscsi_tpg_param_show_DefaultTime2Wait 0 50663 &adcxx_show_min_50663
@@ -138909,7 +139463,8 @@ index 0000000..e3e2614
 +set_50949 set 0 50949 NULL nohasharray
 +wl1271_op_add_interface_50949 wl1271_op_add_interface 0 50949 &set_50949
 +irq_timeout_write_50950 irq_timeout_write 3-0 50950 NULL nohasharray
-+mld_newpack_50950 mld_newpack 2 50950 &irq_timeout_write_50950
++mld_newpack_50950 mld_newpack 2 50950 &irq_timeout_write_50950 nohasharray
++tp_la_write_50950 tp_la_write 3 50950 &mld_newpack_50950
 +virtio_cread16_50951 virtio_cread16 0 50951 NULL
 +zl10036_write_50952 zl10036_write 0 50952 NULL
 +uwb_rc_mac_addr_set_50953 uwb_rc_mac_addr_set 0 50953 NULL
@@ -139050,7 +139605,8 @@ index 0000000..e3e2614
 +compat_dccp_setsockopt_51263 compat_dccp_setsockopt 5 51263 NULL nohasharray
 +ipv4_blackhole_mtu_51263 ipv4_blackhole_mtu 0 51263 &compat_dccp_setsockopt_51263
 +target_alloc_sgl_51264 target_alloc_sgl 3 51264 NULL nohasharray
-+channelmap_show_51264 channelmap_show 0 51264 &target_alloc_sgl_51264
++channelmap_show_51264 channelmap_show 0 51264 &target_alloc_sgl_51264 nohasharray
++ath10k_dbg_sta_write_addba_51264 ath10k_dbg_sta_write_addba 3 51264 &channelmap_show_51264
 +target_stat_scsi_port_show_attr_indx_51265 target_stat_scsi_port_show_attr_indx 0 51265 NULL
 +e100_up_51268 e100_up 0 51268 NULL
 +pm8001_tag_alloc_51273 pm8001_tag_alloc 0 51273 NULL nohasharray
@@ -139103,8 +139659,10 @@ index 0000000..e3e2614
 +radeon_kms_compat_ioctl_51371 radeon_kms_compat_ioctl 2 51371 NULL
 +try_to_freeze_tasks_51375 try_to_freeze_tasks 0 51375 NULL
 +qla2x00_allow_cna_fw_dump_show_51376 qla2x00_allow_cna_fw_dump_show 0 51376 NULL
-+__uncore_qlx_cfg_show_51377 __uncore_qlx_cfg_show 0 51377 NULL
-+btrfs_wq_submit_bio_51381 btrfs_wq_submit_bio 0 51381 NULL
++__uncore_qlx_cfg_show_51377 __uncore_qlx_cfg_show 0 51377 NULL nohasharray
++geneve_xmit_skb_51377 geneve_xmit_skb 13 51377 &__uncore_qlx_cfg_show_51377
++btrfs_wq_submit_bio_51381 btrfs_wq_submit_bio 0 51381 NULL nohasharray
++ath10k_dbg_sta_read_aggr_mode_51381 ath10k_dbg_sta_read_aggr_mode 3 51381 &btrfs_wq_submit_bio_51381
 +bmAttributes_show_51384 bmAttributes_show 0 51384 NULL
 +ocfs2_file_read_iter_51386 ocfs2_file_read_iter 0 51386 NULL
 +sru_s_ctrl_51389 sru_s_ctrl 0 51389 NULL
@@ -139137,6 +139695,7 @@ index 0000000..e3e2614
 +ov9640_g_crop_51461 ov9640_g_crop 0 51461 NULL nohasharray
 +get_cur_state_51461 get_cur_state 0 51461 &ov9640_g_crop_51461
 +vmxnet3_acquire_msix_vectors_51462 vmxnet3_acquire_msix_vectors 2 51462 NULL
++nvkm_vm_create_51466 nvkm_vm_create 3-2 51466 NULL
 +__gsc_s_ctrl_51470 __gsc_s_ctrl 0 51470 NULL
 +count_trail_chars_51471 count_trail_chars 0 51471 NULL
 +____alloc_ei_netdev_51475 ____alloc_ei_netdev 1 51475 NULL nohasharray
@@ -139146,7 +139705,8 @@ index 0000000..e3e2614
 +calc_send_wqe_51480 calc_send_wqe 0 51480 NULL nohasharray
 +logi_dj_hidpp_event_51480 logi_dj_hidpp_event 4 51480 &calc_send_wqe_51480
 +geodewdt_write_51486 geodewdt_write 0-3 51486 NULL
-+wl18xx_enable_interrupts_51490 wl18xx_enable_interrupts 0 51490 NULL
++wl18xx_enable_interrupts_51490 wl18xx_enable_interrupts 0 51490 NULL nohasharray
++nested_vmx_store_msr_51490 nested_vmx_store_msr 2 51490 &wl18xx_enable_interrupts_51490
 +show_temp_tolerance_51491 show_temp_tolerance 0 51491 NULL
 +kvm_fetch_guest_virt_51493 kvm_fetch_guest_virt 2-4 51493 NULL
 +delay_show_51497 delay_show 0 51497 NULL
@@ -139170,6 +139730,7 @@ index 0000000..e3e2614
 +pci_quatech_init_51542 pci_quatech_init 0 51542 NULL
 +new_offset_show_51546 new_offset_show 0 51546 NULL
 +store_hairpin_mode_51547 store_hairpin_mode 0 51547 NULL
++mbox_write_51548 mbox_write 3 51548 NULL
 +pyra_sysfs_read_profile_buttons_51549 pyra_sysfs_read_profile_buttons 0-5-6 51549 NULL nohasharray
 +__alloc_eip_netdev_51549 __alloc_eip_netdev 1 51549 &pyra_sysfs_read_profile_buttons_51549
 +security_kernel_fw_from_file_51553 security_kernel_fw_from_file 0 51553 NULL
@@ -139267,7 +139828,8 @@ index 0000000..e3e2614
 +store_51814 store 0-3 51814 &qlcnic_82xx_get_pci_info_51814
 +edd_show_default_cylinders_51815 edd_show_default_cylinders 0 51815 NULL
 +qib_alloc_devdata_51819 qib_alloc_devdata 2 51819 NULL
-+buffer_from_user_51826 buffer_from_user 3 51826 NULL
++buffer_from_user_51826 buffer_from_user 3 51826 NULL nohasharray
++scsi_format_opcode_name_51826 scsi_format_opcode_name 0-2 51826 &buffer_from_user_51826
 +topology_add_dev_51831 topology_add_dev 0 51831 NULL
 +_write_user_prot_reg_51832 _write_user_prot_reg 0 51832 NULL
 +rbd_dev_v1_header_info_51837 rbd_dev_v1_header_info 0 51837 NULL
@@ -139276,7 +139838,8 @@ index 0000000..e3e2614
 +store_filter_select_51840 store_filter_select 0-4 51840 &wl1251_acx_sg_enable_51840
 +uinput_setup_device_51841 uinput_setup_device 0 51841 NULL
 +zd_set_encryption_type_51842 zd_set_encryption_type 0 51842 NULL
-+raw6_getfrag_51846 raw6_getfrag 3-4 51846 NULL
++raw6_getfrag_51846 raw6_getfrag 3-4 51846 NULL nohasharray
++wwan_store_51846 wwan_store 4 51846 &raw6_getfrag_51846
 +ioread32_51847 ioread32 0 51847 NULL nohasharray
 +read_file_tgt_tx_stats_51847 read_file_tgt_tx_stats 3-0 51847 &ioread32_51847
 +do_readv_writev_51849 do_readv_writev 4-0 51849 NULL
@@ -139581,6 +140144,7 @@ index 0000000..e3e2614
 +show_id_ext_52472 show_id_ext 0 52472 NULL
 +cifs_readpage_worker_52477 cifs_readpage_worker 0 52477 NULL nohasharray
 +ieee80211_alloc_txb_52477 ieee80211_alloc_txb 2-1 52477 &cifs_readpage_worker_52477
++ocfs2_extend_no_holes_52483 ocfs2_extend_no_holes 0 52483 NULL
 +pch_i2c_wait_for_check_xfer_52485 pch_i2c_wait_for_check_xfer 0 52485 NULL nohasharray
 +snd_hda_gen_build_controls_52485 snd_hda_gen_build_controls 0 52485 &pch_i2c_wait_for_check_xfer_52485
 +bru_s_ctrl_52486 bru_s_ctrl 0 52486 NULL
@@ -139660,6 +140224,7 @@ index 0000000..e3e2614
 +xen_swiotlb_unmap_page_52660 xen_swiotlb_unmap_page 2 52660 NULL
 +cachefiles_daemon_add_cache_52668 cachefiles_daemon_add_cache 0 52668 NULL
 +target_stat_scsi_port_show_attr_role_52670 target_stat_scsi_port_show_attr_role 0 52670 NULL
++fld_proc_hash_seq_write_52671 fld_proc_hash_seq_write 3 52671 NULL
 +SYSC_gethostname_52677 SYSC_gethostname 2 52677 NULL
 +__rpc_clnt_handle_event_52679 __rpc_clnt_handle_event 0 52679 NULL
 +u2_timeout_store_52681 u2_timeout_store 0-4 52681 NULL
@@ -139965,6 +140530,7 @@ index 0000000..e3e2614
 +uwb_radio_change_channel_53420 uwb_radio_change_channel 0 53420 NULL
 +qt2_control_msg_53422 qt2_control_msg 0 53422 NULL
 +b43_wireless_core_start_53426 b43_wireless_core_start 0 53426 NULL
++nvkm_fifo_channel_create__53430 nvkm_fifo_channel_create_ 9 53430 NULL
 +set_eeprom5_53432 set_eeprom5 4-0 53432 NULL nohasharray
 +qlcnic_83xx_set_nic_info_53432 qlcnic_83xx_set_nic_info 0 53432 &set_eeprom5_53432
 +acpi_ex_field_datum_io_53436 acpi_ex_field_datum_io 0 53436 NULL
@@ -140015,6 +140581,7 @@ index 0000000..e3e2614
 +force_sc_support_write_53512 force_sc_support_write 3-0 53512 &check_acl_53512
 +ea_remove_stuffed_53517 ea_remove_stuffed 0 53517 NULL
 +m41t80_sysfs_show_flags_53525 m41t80_sysfs_show_flags 0 53525 NULL
++clk_core_enable_53527 clk_core_enable 0 53527 NULL
 +snd_seq_ioctl_get_named_queue_53529 snd_seq_ioctl_get_named_queue 0 53529 NULL
 +qla2x00_serial_num_show_53535 qla2x00_serial_num_show 0 53535 NULL
 +xfs_vn_listxattr_53536 xfs_vn_listxattr 0-3 53536 NULL
@@ -140140,13 +140707,13 @@ index 0000000..e3e2614
 +wacom_status1_luminance_store_53844 wacom_status1_luminance_store 4-0 53844 NULL
 +ath10k_wmi_vdev_set_param_53849 ath10k_wmi_vdev_set_param 0 53849 NULL
 +store_imon_clock_53854 store_imon_clock 0-4 53854 NULL
++copy_from_guest_53856 copy_from_guest 3-4 53856 NULL
 +smi_data_buf_phys_addr_show_53858 smi_data_buf_phys_addr_show 0 53858 NULL
 +__mpage_writepage_53860 __mpage_writepage 0 53860 NULL
 +show_led_53867 show_led 0 53867 NULL
 +mlx4_bitmap_alloc_range_53870 mlx4_bitmap_alloc_range 0-3 53870 NULL
 +btrfs_free_reserved_extent_53873 btrfs_free_reserved_extent 2 53873 NULL nohasharray
-+show_lssw_53873 show_lssw 0 53873 &btrfs_free_reserved_extent_53873 nohasharray
-+pms_read_53873 pms_read 3 53873 &show_lssw_53873
++show_lssw_53873 show_lssw 0 53873 &btrfs_free_reserved_extent_53873
 +wcn36xx_smd_rsp_status_check_53874 wcn36xx_smd_rsp_status_check 0 53874 NULL nohasharray
 +HYPERVISOR_dom0_op_53874 HYPERVISOR_dom0_op 0 53874 &wcn36xx_smd_rsp_status_check_53874
 +nf_hook_thresh_53875 nf_hook_thresh 0 53875 NULL
@@ -140324,7 +140891,8 @@ index 0000000..e3e2614
 +venus_setattr_54255 venus_setattr 0 54255 NULL
 +queue_logical_block_size_show_54257 queue_logical_block_size_show 0 54257 NULL
 +ceph_msgpool_get_54258 ceph_msgpool_get 2 54258 NULL
-+inv_reset_fifo_54259 inv_reset_fifo 0 54259 NULL
++inv_reset_fifo_54259 inv_reset_fifo 0 54259 NULL nohasharray
++iwl_pcie_set_cmd_in_flight_54259 iwl_pcie_set_cmd_in_flight 0 54259 &inv_reset_fifo_54259
 +audio_write_54261 audio_write 4-0 54261 NULL nohasharray
 +wusb_prf_54261 wusb_prf 7-0 54261 &audio_write_54261 nohasharray
 +asus_wmi_get_devstate_bits_54261 asus_wmi_get_devstate_bits 0-3 54261 &wusb_prf_54261 nohasharray
@@ -140407,6 +140975,7 @@ index 0000000..e3e2614
 +read_firmid_54443 read_firmid 0 54443 NULL
 +cot_decompress_54452 cot_decompress 0 54452 NULL
 +mc13783_gpo_regulator_is_enabled_54460 mc13783_gpo_regulator_is_enabled 0 54460 NULL
++nested_vmx_load_msr_54462 nested_vmx_load_msr 2 54462 NULL
 +lola_pcm_prepare_54465 lola_pcm_prepare 0 54465 NULL
 +uvesafb_show_vendor_54467 uvesafb_show_vendor 0 54467 NULL
 +dev_cpu_callback_54475 dev_cpu_callback 0 54475 NULL nohasharray
@@ -140436,7 +141005,8 @@ index 0000000..e3e2614
 +rfc4106_set_key_54519 rfc4106_set_key 3 54519 NULL nohasharray
 +remove_id_show_54519 remove_id_show 0 54519 &rfc4106_set_key_54519
 +memory_get_max_bandwidth_54523 memory_get_max_bandwidth 0 54523 NULL
-+vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4-0 54525 NULL
++vmci_transport_dgram_enqueue_54525 vmci_transport_dgram_enqueue 4-0 54525 NULL nohasharray
++walk_pud_range_54525 walk_pud_range 0 54525 &vmci_transport_dgram_enqueue_54525
 +viacam_read_54526 viacam_read 3-0 54526 NULL
 +pnp_assign_resources_54531 pnp_assign_resources 0 54531 NULL
 +bq2415x_sysfs_show_timer_54533 bq2415x_sysfs_show_timer 0 54533 NULL
@@ -140501,7 +141071,8 @@ index 0000000..e3e2614
 +s35390a_get_reg_54664 s35390a_get_reg 0 54664 &nfs4_server_capabilities_54664
 +bus_add_device_54665 bus_add_device 0 54665 NULL
 +cw1200_queue_stats_init_54670 cw1200_queue_stats_init 2 54670 NULL nohasharray
-+atmtcp_v_open_54670 atmtcp_v_open 0 54670 &cw1200_queue_stats_init_54670
++atmtcp_v_open_54670 atmtcp_v_open 0 54670 &cw1200_queue_stats_init_54670 nohasharray
++tipc_tlv_alloc_54670 tipc_tlv_alloc 1 54670 &atmtcp_v_open_54670
 +bio_kmalloc_54672 bio_kmalloc 2 54672 NULL
 +show_target_temp_54673 show_target_temp 0 54673 NULL
 +evm_read_key_54674 evm_read_key 3-0 54674 NULL nohasharray
@@ -140514,6 +141085,7 @@ index 0000000..e3e2614
 +apei_exec_read_register_54687 apei_exec_read_register 0 54687 NULL nohasharray
 +jfs_direct_IO_54687 jfs_direct_IO 4-0 54687 &apei_exec_read_register_54687
 +ad7879_disable_store_54690 ad7879_disable_store 0-4 54690 NULL
++kfd_gtt_sa_init_54695 kfd_gtt_sa_init 3-2 54695 NULL
 +ath9k_hw_rf_set_freq_54699 ath9k_hw_rf_set_freq 0 54699 NULL
 +platform_get_irq_byname_54700 platform_get_irq_byname 0 54700 NULL
 +smack_task_setscheduler_54707 smack_task_setscheduler 0 54707 NULL
@@ -140589,7 +141161,8 @@ index 0000000..e3e2614
 +prism_build_supp_rates_54865 prism_build_supp_rates 0 54865 NULL
 +f2fs_xattr_generic_list_54866 f2fs_xattr_generic_list 0-5 54866 NULL nohasharray
 +acpi_ex_resolve_node_to_value_54866 acpi_ex_resolve_node_to_value 0 54866 &f2fs_xattr_generic_list_54866
-+cpuset_track_online_nodes_54867 cpuset_track_online_nodes 0 54867 NULL
++cpuset_track_online_nodes_54867 cpuset_track_online_nodes 0 54867 NULL nohasharray
++nvkm_bar_create__54867 nvkm_bar_create_ 4 54867 &cpuset_track_online_nodes_54867
 +show_learning_54874 show_learning 0 54874 NULL
 +time_show_54879 time_show 0 54879 NULL nohasharray
 +xfs_alloc_read_agfl_54879 xfs_alloc_read_agfl 0 54879 &time_show_54879
@@ -140695,8 +141268,10 @@ index 0000000..e3e2614
 +sha256_ssse3_init_55131 sha256_ssse3_init 0 55131 NULL
 +crypto_ahash_setkey_55134 crypto_ahash_setkey 0-3 55134 NULL nohasharray
 +gr_ep_enable_55134 gr_ep_enable 0 55134 &crypto_ahash_setkey_55134
-+wp512_update_55143 wp512_update 0 55143 NULL
++wp512_update_55143 wp512_update 0 55143 NULL nohasharray
++intel_ring_alloc_request_55143 intel_ring_alloc_request 0 55143 &wp512_update_55143
 +iscsi_tpg_param_store_DataPDUInOrder_55147 iscsi_tpg_param_store_DataPDUInOrder 0-3 55147 NULL
++ocfs2_truncate_file_55148 ocfs2_truncate_file 0 55148 NULL
 +ieee80211_if_read_uapsd_queues_55150 ieee80211_if_read_uapsd_queues 3-0 55150 NULL
 +tcp_splice_read_55151 tcp_splice_read 0 55151 NULL
 +btrfs_fdatawrite_range_55152 btrfs_fdatawrite_range 0 55152 NULL nohasharray
@@ -140741,9 +141316,11 @@ index 0000000..e3e2614
 +firm_send_command_55222 firm_send_command 0 55222 NULL
 +dbAllocDmap_55227 dbAllocDmap 0 55227 NULL
 +be_vlan_add_vid_55230 be_vlan_add_vid 0 55230 NULL
++nvkm_client_create__55232 nvkm_client_create_ 5 55232 NULL
 +show_counter_rx_ebps_55234 show_counter_rx_ebps 0 55234 NULL
 +zd_chip_enable_int_55245 zd_chip_enable_int 0 55245 NULL
-+show_host_param_ISCSI_HOST_PARAM_PORT_STATE_55246 show_host_param_ISCSI_HOST_PARAM_PORT_STATE 0 55246 NULL
++show_host_param_ISCSI_HOST_PARAM_PORT_STATE_55246 show_host_param_ISCSI_HOST_PARAM_PORT_STATE 0 55246 NULL nohasharray
++ssp_send_instruction_55246 ssp_send_instruction 5 55246 &show_host_param_ISCSI_HOST_PARAM_PORT_STATE_55246
 +memcpy_fromiovec_55247 memcpy_fromiovec 3-0 55247 NULL
 +create_proc_profile_55256 create_proc_profile 0 55256 NULL
 +xhci_evaluate_context_result_55258 xhci_evaluate_context_result 0 55258 NULL
@@ -140780,6 +141357,7 @@ index 0000000..e3e2614
 +udf_writepage_55347 udf_writepage 0 55347 NULL
 +device_user_lock_55350 device_user_lock 0 55350 NULL
 +show_in0_max_55351 show_in0_max 0 55351 NULL
++i915_gem_obj_offset_view_55353 i915_gem_obj_offset_view 0 55353 NULL
 +input_dev_show_cap_ff_55354 input_dev_show_cap_ff 0 55354 NULL nohasharray
 +set_nic_info_55354 set_nic_info 0 55354 &input_dev_show_cap_ff_55354
 +relay_hotcpu_callback_55355 relay_hotcpu_callback 0 55355 NULL
@@ -140791,6 +141369,7 @@ index 0000000..e3e2614
 +cxacru_sysfs_show_line_startable_55372 cxacru_sysfs_show_line_startable 0 55372 NULL
 +get_fan_alarm_55373 get_fan_alarm 0 55373 NULL
 +netpoll_setup_55376 netpoll_setup 0 55376 NULL
++wimax_store_55380 wimax_store 4 55380 NULL
 +protocol_id_get_55382 protocol_id_get 0 55382 NULL
 +nf_nat_ipv4_manip_pkt_55387 nf_nat_ipv4_manip_pkt 2 55387 NULL
 +compass_calibration_store_55390 compass_calibration_store 4-0 55390 NULL
@@ -140854,6 +141433,7 @@ index 0000000..e3e2614
 +ina209_set_value_55517 ina209_set_value 0-4 55517 NULL
 +ea_get_55522 ea_get 0-3 55522 NULL
 +cafe_smbus_write_data_55535 cafe_smbus_write_data 0 55535 NULL
++__kmem_cache_shrink_55536 __kmem_cache_shrink 0 55536 NULL
 +qla4xxx_fw_ext_timestamp_show_55537 qla4xxx_fw_ext_timestamp_show 0 55537 NULL
 +set_msr_interception_55538 set_msr_interception 2 55538 NULL
 +bitmap_create_55543 bitmap_create 0 55543 NULL nohasharray
@@ -140955,6 +141535,7 @@ index 0000000..e3e2614
 +cxacru_sysfs_showattr_dB_55774 cxacru_sysfs_showattr_dB 0 55774 NULL
 +isp1760_urb_enqueue_55777 isp1760_urb_enqueue 0 55777 NULL
 +strlen_55778 strlen 0 55778 NULL
++wil_addba_tx_request_55780 wil_addba_tx_request 3 55780 NULL
 +conf_read_55786 conf_read 3-0 55786 NULL nohasharray
 +req_bio_endio_55786 req_bio_endio 3 55786 &conf_read_55786
 +tcmu_netlink_event_55791 tcmu_netlink_event 0 55791 NULL
@@ -141071,7 +141652,8 @@ index 0000000..e3e2614
 +__igb_open_56052 __igb_open 0 56052 &iwl_trans_read_prph_56052
 +bnad_get_eeprom_len_56053 bnad_get_eeprom_len 0 56053 NULL nohasharray
 +visorchannel_get_physaddr_56053 visorchannel_get_physaddr 0 56053 &bnad_get_eeprom_len_56053
-+qh_link_periodic_56055 qh_link_periodic 0 56055 NULL
++qh_link_periodic_56055 qh_link_periodic 0 56055 NULL nohasharray
++cyapa_i2c_pip_read_56055 cyapa_i2c_pip_read 3 56055 &qh_link_periodic_56055
 +show_numbatt_56056 show_numbatt 0 56056 NULL nohasharray
 +show_nic_type_56056 show_nic_type 0 56056 &show_numbatt_56056
 +garmin_open_56057 garmin_open 0 56057 NULL nohasharray
@@ -141167,6 +141749,7 @@ index 0000000..e3e2614
 +ksz9021_rd_mmd_phyreg_56309 ksz9021_rd_mmd_phyreg 0 56309 NULL
 +erst_exec_subtract_56310 erst_exec_subtract 0 56310 NULL nohasharray
 +speakup_file_write_56310 speakup_file_write 3 56310 &erst_exec_subtract_56310
++ftrace_shutdown_56312 ftrace_shutdown 0 56312 NULL
 +linear_add_56314 linear_add 0 56314 NULL
 +patch_stac92hd83xxx_56315 patch_stac92hd83xxx 0 56315 NULL
 +show_constraint_max_power_uw_56319 show_constraint_max_power_uw 0 56319 NULL nohasharray
@@ -141237,7 +141820,8 @@ index 0000000..e3e2614
 +get_linkerrors_56444 get_linkerrors 0 56444 NULL
 +cifs_getxattr_56445 cifs_getxattr 0 56445 NULL
 +show_ipv4_iface_tos_56446 show_ipv4_iface_tos 0 56446 NULL
-+i2400m_idle_timeout_store_56450 i2400m_idle_timeout_store 0-4 56450 NULL
++i2400m_idle_timeout_store_56450 i2400m_idle_timeout_store 0-4 56450 NULL nohasharray
++walk_pgd_range_56450 walk_pgd_range 0 56450 &i2400m_idle_timeout_store_56450
 +cx231xx_init_isoc_56453 cx231xx_init_isoc 3-4-2-0 56453 NULL
 +wl1271_acx_sleep_auth_56455 wl1271_acx_sleep_auth 0 56455 NULL
 +pcf8563_set_alarm_mode_56456 pcf8563_set_alarm_mode 0 56456 NULL
@@ -141250,6 +141834,7 @@ index 0000000..e3e2614
 +make_pnode_dirty_56464 make_pnode_dirty 0 56464 &osd_req_list_partition_objects_56464
 +wl1251_hw_init_hwenc_config_56465 wl1251_hw_init_hwenc_config 0 56465 NULL
 +putused_user_56467 putused_user 3 56467 NULL
++ocfs2_zero_extend_range_56468 ocfs2_zero_extend_range 0 56468 NULL
 +lbs_rdmac_write_56471 lbs_rdmac_write 3-0 56471 NULL
 +phy_write_56475 phy_write 0 56475 NULL nohasharray
 +bond_option_arp_ip_target_rem_56475 bond_option_arp_ip_target_rem 0 56475 &phy_write_56475
@@ -141316,7 +141901,8 @@ index 0000000..e3e2614
 +show_56649 show 0 56649 &ceph_vxattrcb_dir_subdirs_56649
 +uvc_debugfs_stats_read_56651 uvc_debugfs_stats_read 3-0 56651 NULL
 +lxt970_config_init_56653 lxt970_config_init 0 56653 NULL nohasharray
-+qla2x00_reset_chip_56653 qla2x00_reset_chip 0 56653 &lxt970_config_init_56653
++qla2x00_reset_chip_56653 qla2x00_reset_chip 0 56653 &lxt970_config_init_56653 nohasharray
++s3c_hsotg_handle_unaligned_buf_start_56653 s3c_hsotg_handle_unaligned_buf_start 0 56653 &qla2x00_reset_chip_56653
 +show_bank2_setting_56655 show_bank2_setting 0 56655 NULL
 +qlcnic_sysfs_get_esw_stats_56657 qlcnic_sysfs_get_esw_stats 0-6-5 56657 NULL
 +clk_nodrv_prepare_enable_56659 clk_nodrv_prepare_enable 0 56659 NULL
@@ -141660,6 +142246,7 @@ index 0000000..e3e2614
 +fscaps_show_57434 fscaps_show 0 57434 NULL nohasharray
 +fuse_notify_inval_inode_57434 fuse_notify_inval_inode 0 57434 &fscaps_show_57434
 +gadget_dev_desc_bDeviceSubClass_store_57437 gadget_dev_desc_bDeviceSubClass_store 0-3 57437 NULL
++rss_key_write_57441 rss_key_write 3 57441 NULL
 +vmxnet3_rq_init_all_57442 vmxnet3_rq_init_all 0 57442 NULL
 +ov7670_s_gain_57445 ov7670_s_gain 0 57445 NULL
 +sys_pselect6_57449 sys_pselect6 1 57449 NULL
@@ -141707,6 +142294,7 @@ index 0000000..e3e2614
 +vsock_dgram_sendmsg_57538 vsock_dgram_sendmsg 0-4 57538 NULL
 +show_country_rel_date_57539 show_country_rel_date 0 57539 NULL
 +compat_SyS_process_vm_writev_57542 compat_SyS_process_vm_writev 3-5 57542 NULL
++ls_switch_store_57554 ls_switch_store 4 57554 NULL
 +ext4_group_first_block_no_57559 ext4_group_first_block_no 0-2 57559 NULL nohasharray
 +iscsi_tpg_attrib_show_demo_mode_discovery_57559 iscsi_tpg_attrib_show_demo_mode_discovery 0 57559 &ext4_group_first_block_no_57559 nohasharray
 +ReadHDLCPnP_57559 ReadHDLCPnP 0 57559 &iscsi_tpg_attrib_show_demo_mode_discovery_57559
@@ -141741,6 +142329,7 @@ index 0000000..e3e2614
 +msi_compose_msg_57637 msi_compose_msg 0 57637 NULL
 +mr_read_57639 mr_read 0 57639 NULL
 +iwl_mvm_flush_tx_path_57640 iwl_mvm_flush_tx_path 0 57640 NULL
++nvkm_fifo_create__57643 nvkm_fifo_create_ 5-6 57643 NULL
 +xen_swiotlb_sync_single_for_cpu_57648 xen_swiotlb_sync_single_for_cpu 2 57648 NULL nohasharray
 +skein_256_update_57648 skein_256_update 0 57648 &xen_swiotlb_sync_single_for_cpu_57648
 +mce_disable_error_reporting_57651 mce_disable_error_reporting 0 57651 NULL
@@ -141773,6 +142362,7 @@ index 0000000..e3e2614
 +ipgre_tunnel_init_57728 ipgre_tunnel_init 0 57728 NULL
 +show_status_str_57729 show_status_str 0 57729 NULL
 +bt_6lowpan_disconnect_57732 bt_6lowpan_disconnect 0 57732 NULL
++i915_gem_object_get_pages_57734 i915_gem_object_get_pages 0 57734 NULL
 +ip6table_nat_out_57735 ip6table_nat_out 0 57735 NULL nohasharray
 +sc1200wdt_notify_sys_57735 sc1200wdt_notify_sys 0 57735 &ip6table_nat_out_57735
 +ath10k_wait_for_peer_created_57736 ath10k_wait_for_peer_created 0 57736 NULL nohasharray
@@ -141810,7 +142400,8 @@ index 0000000..e3e2614
 +max8997_update_reg_57818 max8997_update_reg 0 57818 NULL
 +mptsas_sas_enclosure_pg0_57820 mptsas_sas_enclosure_pg0 0 57820 NULL
 +sedlbauer_suspend_57826 sedlbauer_suspend 0 57826 NULL
-+__bnx2fc_disable_57827 __bnx2fc_disable 0 57827 NULL
++__bnx2fc_disable_57827 __bnx2fc_disable 0 57827 NULL nohasharray
++ath10k_install_key_57827 ath10k_install_key 0 57827 &__bnx2fc_disable_57827
 +bfad_debugfs_read_regrd_57830 bfad_debugfs_read_regrd 3-0 57830 NULL
 +copy_to_user_57835 copy_to_user 3-0 57835 NULL nohasharray
 +ecryptfs_decrypt_page_57835 ecryptfs_decrypt_page 0 57835 &copy_to_user_57835
@@ -141835,6 +142426,7 @@ index 0000000..e3e2614
 +show_pwm_weight_temp_sel_57872 show_pwm_weight_temp_sel 0 57872 NULL
 +hsi_async_57877 hsi_async 0 57877 NULL
 +radeon_ttm_gtt_read_57879 radeon_ttm_gtt_read 3-0 57879 NULL
++nvkm_mxm_create__57880 nvkm_mxm_create_ 4 57880 NULL
 +bmg160_setup_any_motion_interrupt_57881 bmg160_setup_any_motion_interrupt 0 57881 NULL
 +iscsi_disc_show_enforce_discovery_auth_57891 iscsi_disc_show_enforce_discovery_auth 0 57891 NULL
 +e100_set_mac_address_57894 e100_set_mac_address 0 57894 NULL
@@ -141844,6 +142436,7 @@ index 0000000..e3e2614
 +num_tgts_store_57900 num_tgts_store 0-3 57900 &user_dlm_lock_57900
 +xt_alloc_table_info_57903 xt_alloc_table_info 1 57903 NULL nohasharray
 +sb1000_reset_57903 sb1000_reset 0 57903 &xt_alloc_table_info_57903
++ls_level_store_57907 ls_level_store 4 57907 NULL
 +emi26_writememory_57908 emi26_writememory 4 57908 NULL
 +iio_read_first_n_kfifo_57910 iio_read_first_n_kfifo 2-0 57910 NULL
 +ll_xattr_find_get_lock_57912 ll_xattr_find_get_lock 0 57912 NULL
@@ -141890,6 +142483,7 @@ index 0000000..e3e2614
 +pfkey_create_58010 pfkey_create 0 58010 NULL
 +srpt_tpg_attrib_store_srp_max_rdma_size_58012 srpt_tpg_attrib_store_srp_max_rdma_size 0-3 58012 NULL
 +dbg_walk_index_58013 dbg_walk_index 0 58013 NULL
++__ip6_append_data_58014 __ip6_append_data 9-10 58014 NULL
 +ocfs2_getattr_58020 ocfs2_getattr 0 58020 NULL
 +iwl_dbgfs_ucode_rx_stats_read_58023 iwl_dbgfs_ucode_rx_stats_read 3-0 58023 NULL nohasharray
 +si4713_set_power_state_58023 si4713_set_power_state 0 58023 &iwl_dbgfs_ucode_rx_stats_read_58023
@@ -141932,6 +142526,7 @@ index 0000000..e3e2614
 +pnp_stop_dev_58100 pnp_stop_dev 0 58100 &sanity_checks_show_58100
 +acpi_get_table_by_index_58102 acpi_get_table_by_index 0 58102 NULL
 +deadline_fifo_batch_store_58104 deadline_fifo_batch_store 3-0 58104 NULL
++alloc_rbio_58107 alloc_rbio 3 58107 NULL
 +nilfs_cpfile_get_header_block_58111 nilfs_cpfile_get_header_block 0 58111 NULL
 +padata_set_cpumask_58112 padata_set_cpumask 0 58112 NULL
 +show_force_pwm_max_58119 show_force_pwm_max 0 58119 NULL
@@ -141955,7 +142550,8 @@ index 0000000..e3e2614
 +platform_suspend_prepare_noirq_58149 platform_suspend_prepare_noirq 0 58149 NULL nohasharray
 +simple_xattr_remove_58149 simple_xattr_remove 0 58149 &platform_suspend_prepare_noirq_58149
 +_osd_req_finalize_attr_page_58151 _osd_req_finalize_attr_page 0 58151 NULL nohasharray
-+xfs_bmap_add_extent_delay_real_58151 xfs_bmap_add_extent_delay_real 0 58151 &_osd_req_finalize_attr_page_58151
++xfs_bmap_add_extent_delay_real_58151 xfs_bmap_add_extent_delay_real 0 58151 &_osd_req_finalize_attr_page_58151 nohasharray
++gf100_ram_create__58151 gf100_ram_create_ 5 58151 &xfs_bmap_add_extent_delay_real_58151
 +elan_update_firmware_58154 elan_update_firmware 0 58154 NULL
 +error_state_write_58159 error_state_write 0-6-5 58159 NULL
 +open_ttys_show_58161 open_ttys_show 0 58161 NULL
@@ -141963,6 +142559,7 @@ index 0000000..e3e2614
 +nilfs_writepage_58164 nilfs_writepage 0 58164 NULL
 +max6900_i2c_read_regs_58165 max6900_i2c_read_regs 0 58165 NULL
 +xfs_btree_update_58167 xfs_btree_update 0 58167 NULL
++btrfs_map_sblock_58168 btrfs_map_sblock 3 58168 NULL
 +ext4_bg_num_gdb_58171 ext4_bg_num_gdb 0 58171 NULL
 +bonding_show_num_peer_notif_58172 bonding_show_num_peer_notif 0 58172 NULL
 +domid_mask_show_58174 domid_mask_show 0 58174 NULL
@@ -142294,9 +142891,11 @@ index 0000000..e3e2614
 +print_devstats_dot11FCSErrorCount_58919 print_devstats_dot11FCSErrorCount 3 58919 NULL
 +ncp_request_58920 ncp_request 0 58920 NULL
 +clocksource_unbind_58922 clocksource_unbind 0 58922 NULL
++klp_disable_object_58923 klp_disable_object 0 58923 NULL
 +pipeline_cs_rx_packet_out_read_58926 pipeline_cs_rx_packet_out_read 3-0 58926 NULL nohasharray
 +isku_sysfs_show_actual_profile_58926 isku_sysfs_show_actual_profile 0 58926 &pipeline_cs_rx_packet_out_read_58926
 +t4vf_config_rss_range_58930 t4vf_config_rss_range 0 58930 NULL
++write_pmsg_58932 write_pmsg 3 58932 NULL
 +SyS_pread64_58935 SyS_pread64 3 58935 NULL
 +xfs_bmap_read_extents_58936 xfs_bmap_read_extents 0 58936 NULL
 +set_als_58942 set_als 0-4 58942 NULL
@@ -142432,6 +143031,7 @@ index 0000000..e3e2614
 +ib_ucm_write_59250 ib_ucm_write 0-3 59250 NULL nohasharray
 +brcmf_p2p_ifchange_59250 brcmf_p2p_ifchange 0 59250 &ib_ucm_write_59250
 +lola_set_clock_59255 lola_set_clock 0 59255 NULL
++cyapa_i2c_pip_write_59260 cyapa_i2c_pip_write 3 59260 NULL
 +hid_rtc_read_time_59262 hid_rtc_read_time 0 59262 NULL nohasharray
 +store_target_temp_59262 store_target_temp 0-4 59262 &hid_rtc_read_time_59262
 +max_active_store_59266 max_active_store 0-4 59266 NULL
@@ -142490,6 +143090,7 @@ index 0000000..e3e2614
 +fc_frame_alloc_fill_59394 fc_frame_alloc_fill 2 59394 NULL
 +qlcnic_83xx_config_intrpt_59397 qlcnic_83xx_config_intrpt 0 59397 NULL
 +pci_write_config_59398 pci_write_config 0-5-6 59398 NULL
++dax_do_io_59399 dax_do_io 0-5 59399 NULL
 +idProduct_show_59405 idProduct_show 0 59405 NULL
 +ds1286_read_time_59406 ds1286_read_time 0 59406 NULL
 +isku_sysfs_read_keys_function_59412 isku_sysfs_read_keys_function 6-0-5 59412 NULL
@@ -142598,6 +143199,7 @@ index 0000000..e3e2614
 +sock_sendpage_59622 sock_sendpage 4 59622 &mtrr_write_59622
 +gfs2_writepage_59624 gfs2_writepage 0 59624 NULL
 +core_alua_allocate_lba_map_mem_59632 core_alua_allocate_lba_map_mem 0 59632 NULL
++seq_open_tab_59633 seq_open_tab 3-2 59633 NULL
 +find_first_zero_bit_59636 find_first_zero_bit 0-2 59636 NULL nohasharray
 +v9fs_cache_session_get_key_59636 v9fs_cache_session_get_key 0 59636 &find_first_zero_bit_59636
 +console_show_59641 console_show 0 59641 NULL
@@ -142918,7 +143520,8 @@ index 0000000..e3e2614
 +uevent_show_60385 uevent_show 0 60385 NULL
 +notifier_call_60391 notifier_call 0 60391 NULL
 +mthca_alloc_resize_buf_60394 mthca_alloc_resize_buf 3 60394 NULL
-+iscsi_tpg_attrib_store_demo_mode_discovery_60396 iscsi_tpg_attrib_store_demo_mode_discovery 0-3 60396 NULL
++iscsi_tpg_attrib_store_demo_mode_discovery_60396 iscsi_tpg_attrib_store_demo_mode_discovery 0-3 60396 NULL nohasharray
++ocfs2_zero_extend_60396 ocfs2_zero_extend 0 60396 &iscsi_tpg_attrib_store_demo_mode_discovery_60396
 +tveeprom_read_60397 tveeprom_read 3 60397 NULL
 +cfv_netdev_open_60398 cfv_netdev_open 0 60398 NULL
 +driver_names_read_60399 driver_names_read 3-0 60399 NULL
@@ -142939,7 +143542,8 @@ index 0000000..e3e2614
 +elan_i2c_iap_get_mode_60439 elan_i2c_iap_get_mode 0 60439 &show_carrier_60439
 +sysv_write_begin_60442 sysv_write_begin 0 60442 NULL nohasharray
 +rx_data_60442 rx_data 4 60442 &sysv_write_begin_60442
-+s5k4aa_set_hvflip_60444 s5k4aa_set_hvflip 0 60444 NULL
++s5k4aa_set_hvflip_60444 s5k4aa_set_hvflip 0 60444 NULL nohasharray
++t4_wait_op_done_60444 t4_wait_op_done 0 60444 &s5k4aa_set_hvflip_60444
 +read_usrate_60445 read_usrate 0 60445 NULL
 +tcf_csum_ipv4_igmp_60446 tcf_csum_ipv4_igmp 3 60446 NULL
 +__uncore_mask0_show_60454 __uncore_mask0_show 0 60454 NULL
@@ -142997,6 +143601,7 @@ index 0000000..e3e2614
 +instance_ue_count_show_60587 instance_ue_count_show 0 60587 NULL
 +usbhid_get_raw_report_60588 usbhid_get_raw_report 0 60588 NULL nohasharray
 +default_read_file_60588 default_read_file 0-3 60588 &usbhid_get_raw_report_60588
++i915_vma_bind_60589 i915_vma_bind 0 60589 NULL
 +nilfs_segctor_next_pseg_offset_show_60590 nilfs_segctor_next_pseg_offset_show 0 60590 NULL nohasharray
 +set_brightness_60590 set_brightness 0-4 60590 &nilfs_segctor_next_pseg_offset_show_60590
 +getoptions_60593 getoptions 0 60593 NULL
@@ -143020,7 +143625,8 @@ index 0000000..e3e2614
 +usb_control_msg_60624 usb_control_msg 0 60624 NULL nohasharray
 +igbvf_vlan_rx_add_vid_60624 igbvf_vlan_rx_add_vid 0 60624 &usb_control_msg_60624
 +store_60628 store 0 60628 NULL
-+acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL
++acl_alloc_stack_init_60630 acl_alloc_stack_init 1 60630 NULL nohasharray
++ath10k_wmi_sta_keepalive_60630 ath10k_wmi_sta_keepalive 0 60630 &acl_alloc_stack_init_60630
 +x509_key_preparse_60633 x509_key_preparse 0 60633 NULL
 +show_fnode_port_60637 show_fnode_port 0 60637 NULL nohasharray
 +nilfs_transaction_begin_60637 nilfs_transaction_begin 0 60637 &show_fnode_port_60637
@@ -143102,6 +143708,8 @@ index 0000000..e3e2614
 +i_ipmi_request_60811 i_ipmi_request 0 60811 NULL
 +qlcnic_sriov_pf_init_60813 qlcnic_sriov_pf_init 0 60813 NULL
 +bnx2i_show_sq_info_60815 bnx2i_show_sq_info 0 60815 NULL
++set_current_rng_60816 set_current_rng 0 60816 NULL
++bdev_direct_access_60818 bdev_direct_access 0-5 60818 NULL
 +show_sched0_60819 show_sched0 0 60819 NULL
 +gfs2_bmap_alloc_60822 gfs2_bmap_alloc 0 60822 NULL
 +sync_read_60823 sync_read 0 60823 NULL
@@ -143157,6 +143765,7 @@ index 0000000..e3e2614
 +dw2102_serit_i2c_transfer_60942 dw2102_serit_i2c_transfer 0-3 60942 NULL
 +f_ecm_opts_attr_show_60943 f_ecm_opts_attr_show 0 60943 NULL
 +bch_cached_dev_show_60949 bch_cached_dev_show 0 60949 NULL
++s3c_hsotg_map_dma_60951 s3c_hsotg_map_dma 0 60951 NULL
 +_ivtvfb_check_var_60952 _ivtvfb_check_var 0 60952 NULL
 +set_pwm_max_60954 set_pwm_max 0-4 60954 NULL
 +send_pktsched_cmd_60957 send_pktsched_cmd 0 60957 NULL
@@ -143164,7 +143773,8 @@ index 0000000..e3e2614
 +acpi_ds_init_field_objects_60960 acpi_ds_init_field_objects 0 60960 &pti_char_write_60960
 +mwifiex_alloc_sdio_mpa_buffers_60961 mwifiex_alloc_sdio_mpa_buffers 2-3 60961 NULL
 +bttv_i2c_readbytes_60964 bttv_i2c_readbytes 0 60964 NULL
-+store_60970 store 0 60970 NULL
++store_60970 store 0 60970 NULL nohasharray
++unregister_ftrace_function_60970 unregister_ftrace_function 0 60970 &store_60970
 +vga16fb_set_par_60971 vga16fb_set_par 0 60971 NULL
 +acpi_suspend_begin_60973 acpi_suspend_begin 0 60973 NULL
 +il_dbgfs_ucode_tx_stats_read_60975 il_dbgfs_ucode_tx_stats_read 0-3 60975 NULL
@@ -143342,6 +143952,7 @@ index 0000000..e3e2614
 +online_pages_61385 online_pages 0 61385 NULL nohasharray
 +clps711x_fb_check_var_61385 clps711x_fb_check_var 0 61385 &online_pages_61385
 +change_xattr_61390 change_xattr 5 61390 NULL
++dax_get_addr_61391 dax_get_addr 0 61391 NULL
 +system_enable_write_61396 system_enable_write 3 61396 NULL
 +rdac_activate_61397 rdac_activate 0 61397 NULL
 +size_entry_mwt_61400 size_entry_mwt 0 61400 NULL nohasharray
@@ -143356,6 +143967,7 @@ index 0000000..e3e2614
 +tw9910_power_61435 tw9910_power 0 61435 NULL
 +store_fc_rport_dev_loss_tmo_61436 store_fc_rport_dev_loss_tmo 0-4 61436 NULL
 +dma_ops_area_alloc_61440 dma_ops_area_alloc 0-3-4-5 61440 NULL
++smbhash_61444 smbhash 0 61444 NULL
 +target_core_alua_tg_pt_gp_store_attr_alua_support_active_optimized_61445 target_core_alua_tg_pt_gp_store_attr_alua_support_active_optimized 0-3 61445 NULL
 +target_core_dev_pr_show_spc3_res_61447 target_core_dev_pr_show_spc3_res 0 61447 NULL
 +job_control_61452 job_control 0 61452 NULL
@@ -143403,7 +144015,8 @@ index 0000000..e3e2614
 +show_fcstat_seconds_since_last_reset_61541 show_fcstat_seconds_since_last_reset 0 61541 NULL nohasharray
 +adt7x10_set_temp_61541 adt7x10_set_temp 0-4 61541 &show_fcstat_seconds_since_last_reset_61541 nohasharray
 +proc_write_device_61541 proc_write_device 3 61541 &adt7x10_set_temp_61541
-+compat_SyS_select_61542 compat_SyS_select 1 61542 NULL
++compat_SyS_select_61542 compat_SyS_select 1 61542 NULL nohasharray
++be_clear_vlan_promisc_61542 be_clear_vlan_promisc 0 61542 &compat_SyS_select_61542
 +set_gssp_clnt_61543 set_gssp_clnt 0 61543 NULL nohasharray
 +shrink_store_61543 shrink_store 0-3 61543 &set_gssp_clnt_61543
 +get_ohm_of_thermistor_61545 get_ohm_of_thermistor 0 61545 NULL
@@ -143566,6 +144179,7 @@ index 0000000..e3e2614
 +send_bulk_static_data_61932 send_bulk_static_data 3 61932 &host_show_hp_ssd_smart_path_status_61932
 +iscsi_stat_instance_show_attr_sessions_61934 iscsi_stat_instance_show_attr_sessions 0 61934 NULL
 +be_mcc_notify_wait_61936 be_mcc_notify_wait 0 61936 NULL
++ath10k_wmi_dbglog_cfg_61937 ath10k_wmi_dbglog_cfg 0 61937 NULL
 +adv7175_init_61938 adv7175_init 0 61938 NULL
 +as3935_read_61939 as3935_read 0 61939 NULL
 +multicast_startup_query_count_store_61940 multicast_startup_query_count_store 4-0 61940 NULL nohasharray
@@ -143580,6 +144194,7 @@ index 0000000..e3e2614
 +set_type_61961 set_type 0-4 61961 &squashfs_read_id_index_table_61961
 +cmpc_accel_sensitivity_store_61964 cmpc_accel_sensitivity_store 0-4 61964 NULL
 +fix_read_error_61965 fix_read_error 4 61965 NULL
++ath10k_mac_vif_recalc_ps_wake_threshold_61971 ath10k_mac_vif_recalc_ps_wake_threshold 0 61971 NULL
 +raw_getfrag_61976 raw_getfrag 3-4 61976 NULL
 +fd_locked_ioctl_61978 fd_locked_ioctl 3 61978 NULL
 +cow_file_range_61979 cow_file_range 3-0 61979 NULL nohasharray
@@ -143804,6 +144419,7 @@ index 0000000..e3e2614
 +__kmalloc_node_track_caller_62534 __kmalloc_node_track_caller 1 62534 &test_iso_queue_62534
 +debugfs_read_62535 debugfs_read 3-0 62535 NULL nohasharray
 +qlcnicvf_config_led_62535 qlcnicvf_config_led 0 62535 &debugfs_read_62535
++mv88e6352_wait_62536 mv88e6352_wait 0 62536 NULL
 +mei_fw_status_62539 mei_fw_status 0 62539 NULL nohasharray
 +batadv_softif_create_vlan_62539 batadv_softif_create_vlan 0 62539 &mei_fw_status_62539
 +sco_sock_sendmsg_62542 sco_sock_sendmsg 4-0 62542 NULL
@@ -143920,6 +144536,7 @@ index 0000000..e3e2614
 +bttv_prepare_buffer_62787 bttv_prepare_buffer 0 62787 NULL nohasharray
 +update_clusterinfo_62787 update_clusterinfo 0 62787 &bttv_prepare_buffer_62787
 +smack_inode_setattr_62789 smack_inode_setattr 0 62789 NULL
++hpsa_change_queue_depth_62793 hpsa_change_queue_depth 2 62793 NULL
 +_create_message_62795 _create_message 0 62795 NULL
 +max_freq_show_62797 max_freq_show 0 62797 NULL nohasharray
 +hdaps_temp1_show_62797 hdaps_temp1_show 0 62797 &max_freq_show_62797 nohasharray
@@ -144043,7 +144660,8 @@ index 0000000..e3e2614
 +show_conn_param_ISCSI_PARAM_IFMARKER_EN_63059 show_conn_param_ISCSI_PARAM_IFMARKER_EN 0 63059 &unlink1_63059
 +__nilfs_btree_get_block_63062 __nilfs_btree_get_block 0 63062 NULL
 +show_in_max_63065 show_in_max 0 63065 NULL nohasharray
-+remote_settings_file_read_63065 remote_settings_file_read 0-3 63065 &show_in_max_63065
++remote_settings_file_read_63065 remote_settings_file_read 0-3 63065 &show_in_max_63065 nohasharray
++br_fdb_external_learn_add_63065 br_fdb_external_learn_add 0 63065 &remote_settings_file_read_63065
 +xen_set_nslabs_63066 xen_set_nslabs 0 63066 NULL
 +parport_ieee1284_ecp_write_data_63067 parport_ieee1284_ecp_write_data 0 63067 NULL
 +iwl_dbgfs_fw_rx_stats_read_63070 iwl_dbgfs_fw_rx_stats_read 3-0 63070 NULL
@@ -144111,7 +144729,8 @@ index 0000000..e3e2614
 +bnx2x_func_start_63221 bnx2x_func_start 0 63221 NULL
 +zl10039_set_params_63225 zl10039_set_params 0 63225 NULL
 +encrypted_instantiate_63226 encrypted_instantiate 0 63226 NULL
-+SyS_gethostname_63227 SyS_gethostname 2 63227 NULL
++SyS_gethostname_63227 SyS_gethostname 2 63227 NULL nohasharray
++nvkm_device_create__63227 nvkm_device_create_ 7 63227 &SyS_gethostname_63227
 +ttm_bo_global_show_63228 ttm_bo_global_show 0 63228 NULL
 +stk17ta8_rtc_set_alarm_63230 stk17ta8_rtc_set_alarm 0 63230 NULL
 +ctxsize_63232 ctxsize 0 63232 NULL
@@ -144120,6 +144739,7 @@ index 0000000..e3e2614
 +pcan_usb_pro_set_ts_63236 pcan_usb_pro_set_ts 0 63236 NULL
 +show_firmware_63239 show_firmware 0 63239 NULL nohasharray
 +pnp_activate_dev_63239 pnp_activate_dev 0 63239 &show_firmware_63239
++cyapa_i2c_write_63241 cyapa_i2c_write 3 63241 NULL
 +lp3971_ldo_is_enabled_63245 lp3971_ldo_is_enabled 0 63245 NULL
 +do_convert_63247 do_convert 0 63247 NULL
 +setxattr_63249 setxattr 0 63249 NULL
@@ -144180,7 +144800,8 @@ index 0000000..e3e2614
 +adc128_set_in_63419 adc128_set_in 0-4 63419 NULL
 +start_power_clamp_63423 start_power_clamp 0 63423 NULL
 +show_temp0_min_63424 show_temp0_min 0 63424 NULL
-+l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 0-4 63427 NULL
++l2cap_sock_sendmsg_63427 l2cap_sock_sendmsg 0-4 63427 NULL nohasharray
++tpm_tis_init_63427 tpm_tis_init 3-4 63427 &l2cap_sock_sendmsg_63427
 +show_fcstat_nos_count_63429 show_fcstat_nos_count 0 63429 NULL
 +led_trigger_show_63434 led_trigger_show 0 63434 NULL
 +kone_send_63435 kone_send 0-4 63435 NULL nohasharray
@@ -144191,6 +144812,7 @@ index 0000000..e3e2614
 +mac80211_hwsim_start_63447 mac80211_hwsim_start 0 63447 NULL
 +ipv6_is_mld_63461 ipv6_is_mld 3 63461 NULL
 +ath10k_wmi_cmd_send_63462 ath10k_wmi_cmd_send 0 63462 NULL
++nvkm_i2c_port_create__63465 nvkm_i2c_port_create_ 7 63465 NULL
 +sock_common_setsockopt_63466 sock_common_setsockopt 0 63466 NULL
 +root_path_cost_show_63467 root_path_cost_show 0 63467 NULL nohasharray
 +integrity_verify_show_63467 integrity_verify_show 0 63467 &root_path_cost_show_63467
@@ -144315,7 +144937,8 @@ index 0000000..e3e2614
 +write_63755 write 0-3 63755 NULL
 +show_atmindex_63757 show_atmindex 0 63757 NULL nohasharray
 +uv_cpu_mask_to_apicid_and_63757 uv_cpu_mask_to_apicid_and 0 63757 &show_atmindex_63757
-+tvp5150_cropcap_63758 tvp5150_cropcap 0 63758 NULL
++tvp5150_cropcap_63758 tvp5150_cropcap 0 63758 NULL nohasharray
++nvkm_therm_create__63758 nvkm_therm_create_ 4 63758 &tvp5150_cropcap_63758
 +__send_control_msg_63761 __send_control_msg 0 63761 NULL
 +snd_cs4281_trigger_63762 snd_cs4281_trigger 0 63762 NULL
 +isl12022_get_datetime_63765 isl12022_get_datetime 0 63765 NULL nohasharray
@@ -144459,6 +145082,7 @@ index 0000000..e3e2614
 +ipoib_hard_header_64116 ipoib_hard_header 0 64116 NULL nohasharray
 +keyring_instantiate_64116 keyring_instantiate 0 64116 &ipoib_hard_header_64116
 +do_load_xattr_datum_64118 do_load_xattr_datum 0 64118 NULL
++vxlan_remcsum_64121 vxlan_remcsum 4-3 64121 NULL
 +max77693_chg_is_enabled_64122 max77693_chg_is_enabled 0 64122 NULL
 +ext4_prepare_inline_data_64124 ext4_prepare_inline_data 3 64124 NULL
 +mwifiex_cmd_802_11_deauthenticate_64129 mwifiex_cmd_802_11_deauthenticate 0 64129 NULL
@@ -144601,6 +145225,7 @@ index 0000000..e3e2614
 +uvesafb_set_par_64430 uvesafb_set_par 0 64430 &_ctl_host_trace_buffer_size_show_64430
 +read_file_spectral_short_repeat_64431 read_file_spectral_short_repeat 3-0 64431 NULL nohasharray
 +ext4_trim_extent_64431 ext4_trim_extent 4 64431 &read_file_spectral_short_repeat_64431
++t4_read_flash_64432 t4_read_flash 0 64432 NULL
 +show_in2_input_64433 show_in2_input 0 64433 NULL
 +trace_store_64437 trace_store 0-3 64437 NULL
 +iscsi_stat_tgt_attr_show_attr_last_fail_time_64438 iscsi_stat_tgt_attr_show_attr_last_fail_time 0 64438 NULL
@@ -144659,6 +145284,7 @@ index 0000000..e3e2614
 +type_show_64547 type_show 0 64547 &lm8323_read_64547
 +rbd_obj_read_sync_64554 rbd_obj_read_sync 3-4-0 64554 NULL nohasharray
 +s5p_mfc_alloc_codec_buffers_v6_64554 s5p_mfc_alloc_codec_buffers_v6 0 64554 &rbd_obj_read_sync_64554
++blkdev_issue_zeroout_64555 blkdev_issue_zeroout 3-0 64555 NULL
 +enic_set_mac_address_dynamic_64556 enic_set_mac_address_dynamic 0 64556 NULL
 +mptsas_get_bay_identifier_64560 mptsas_get_bay_identifier 0 64560 NULL
 +__spi_sync_64561 __spi_sync 0 64561 NULL nohasharray
@@ -144697,7 +145323,8 @@ index 0000000..e3e2614
 +max8997_bulk_write_64633 max8997_bulk_write 0 64633 NULL
 +tw68_queue_setup_64637 tw68_queue_setup 0 64637 NULL
 +store_64641 store 0 64641 NULL
-+_iwl_dbgfs_d0i3_refs_write_64642 _iwl_dbgfs_d0i3_refs_write 3-0 64642 NULL
++_iwl_dbgfs_d0i3_refs_write_64642 _iwl_dbgfs_d0i3_refs_write 3-0 64642 NULL nohasharray
++ocfs2_truncate_inline_64642 ocfs2_truncate_inline 0 64642 &_iwl_dbgfs_d0i3_refs_write_64642
 +tse_open_64644 tse_open 0 64644 NULL
 +playback_pcm_prepare_64646 playback_pcm_prepare 0 64646 NULL
 +wl1271_ap_init_templates_64654 wl1271_ap_init_templates 0 64654 NULL
@@ -144912,6 +145539,7 @@ index 0000000..e3e2614
 +card_wait_for_busy_clear_65196 card_wait_for_busy_clear 0 65196 NULL
 +power_limit_0_step_uw_show_65199 power_limit_0_step_uw_show 0 65199 NULL nohasharray
 +logfs_segment_read_65199 logfs_segment_read 0 65199 &power_limit_0_step_uw_show_65199
++rtl2832_pid_filter_65209 rtl2832_pid_filter 2 65209 NULL
 +fcopy_write_65211 fcopy_write 0-3 65211 NULL
 +rx_rx_done_read_65217 rx_rx_done_read 3-0 65217 NULL
 +show_pwm_enable_65224 show_pwm_enable 0 65224 NULL nohasharray
@@ -144968,6 +145596,7 @@ index 0000000..e3e2614
 +dma_rx_requested_read_65354 dma_rx_requested_read 3-0 65354 NULL
 +ns_proc_read_65358 ns_proc_read 0 65358 NULL nohasharray
 +sxgbe_init_dma_engine_65358 sxgbe_init_dma_engine 0 65358 &ns_proc_read_65358
++rtl2830_pid_filter_65361 rtl2830_pid_filter 2 65361 NULL
 +alloc_cpu_rmap_65363 alloc_cpu_rmap 1 65363 NULL
 +set_tcrit1_hyst_65366 set_tcrit1_hyst 0-4 65366 NULL
 +__ext4_new_inode_65370 __ext4_new_inode 5 65370 NULL nohasharray
@@ -145039,6 +145668,7 @@ index 0000000..e3e2614
 +__xudc_ep_enable_65502 __xudc_ep_enable 0 65502 NULL
 +dcdbas_smi_request_65515 dcdbas_smi_request 0 65515 NULL
 +tdfxfb_check_var_65516 tdfxfb_check_var 0 65516 NULL
++dax_zero_page_range_65518 dax_zero_page_range 0 65518 NULL
 +comm_read_regr_65525 comm_read_regr 0 65525 NULL
 +nvme_trans_standard_inquiry_page_65526 nvme_trans_standard_inquiry_page 4 65526 NULL nohasharray
 +__vxge_hw_vpath_rts_table_set_65526 __vxge_hw_vpath_rts_table_set 0 65526 &nvme_trans_standard_inquiry_page_65526
@@ -148851,10 +149481,10 @@ index 0a578fe..b81f62d 100644
  })
  
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 0fba701..4a3dcd4 100644
+index cc6a25d..babf9ee 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
-@@ -78,12 +78,17 @@ LIST_HEAD(vm_list);
+@@ -81,12 +81,17 @@ LIST_HEAD(vm_list);
  
  static cpumask_var_t cpus_hardware_enabled;
  static int kvm_usage_count = 0;
@@ -148874,7 +149504,7 @@ index 0fba701..4a3dcd4 100644
  
  struct dentry *kvm_debugfs_dir;
  
-@@ -785,7 +790,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
+@@ -791,7 +796,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)) ||
@@ -148883,7 +149513,7 @@ index 0fba701..4a3dcd4 100644
  			(void __user *)(unsigned long)mem->userspace_addr,
  			mem->memory_size)))
  		goto out;
-@@ -1684,9 +1689,17 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
+@@ -1729,9 +1734,17 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_cached);
  
  int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len)
  {
@@ -148903,7 +149533,7 @@ index 0fba701..4a3dcd4 100644
  }
  EXPORT_SYMBOL_GPL(kvm_clear_guest_page);
  
-@@ -1931,7 +1944,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
+@@ -2007,7 +2020,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
  	return 0;
  }
  
@@ -148911,8 +149541,8 @@ index 0fba701..4a3dcd4 100644
 +static file_operations_no_const kvm_vcpu_fops __read_only = {
  	.release        = kvm_vcpu_release,
  	.unlocked_ioctl = kvm_vcpu_ioctl,
- #ifdef CONFIG_COMPAT
-@@ -2648,7 +2661,7 @@ out:
+ #ifdef CONFIG_KVM_COMPAT
+@@ -2724,7 +2737,7 @@ out:
  }
  #endif
  
@@ -148920,8 +149550,8 @@ index 0fba701..4a3dcd4 100644
 +static file_operations_no_const kvm_vm_fops __read_only = {
  	.release        = kvm_vm_release,
  	.unlocked_ioctl = kvm_vm_ioctl,
- #ifdef CONFIG_COMPAT
-@@ -2719,7 +2732,7 @@ out:
+ #ifdef CONFIG_KVM_COMPAT
+@@ -2795,7 +2808,7 @@ out:
  	return r;
  }
  
@@ -148930,7 +149560,7 @@ index 0fba701..4a3dcd4 100644
  	.unlocked_ioctl = kvm_dev_ioctl,
  	.compat_ioctl   = kvm_dev_ioctl,
  	.llseek		= noop_llseek,
-@@ -2745,7 +2758,7 @@ static void hardware_enable_nolock(void *junk)
+@@ -2821,7 +2834,7 @@ static void hardware_enable_nolock(void *junk)
  
  	if (r) {
  		cpumask_clear_cpu(cpu, cpus_hardware_enabled);
@@ -148939,7 +149569,7 @@ index 0fba701..4a3dcd4 100644
  		printk(KERN_INFO "kvm: enabling virtualization on "
  				 "CPU%d failed\n", cpu);
  	}
-@@ -2801,10 +2814,10 @@ static int hardware_enable_all(void)
+@@ -2877,10 +2890,10 @@ static int hardware_enable_all(void)
  
  	kvm_usage_count++;
  	if (kvm_usage_count == 1) {
@@ -148952,7 +149582,7 @@ index 0fba701..4a3dcd4 100644
  			hardware_disable_all_nolock();
  			r = -EBUSY;
  		}
-@@ -3211,7 +3224,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
+@@ -3287,7 +3300,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
  	kvm_arch_vcpu_put(vcpu);
  }
  
@@ -148961,7 +149591,7 @@ index 0fba701..4a3dcd4 100644
  		  struct module *module)
  {
  	int r;
-@@ -3258,7 +3271,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3334,7 +3347,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,
@@ -148970,7 +149600,7 @@ index 0fba701..4a3dcd4 100644
  	if (!kvm_vcpu_cache) {
  		r = -ENOMEM;
  		goto out_free_3;
-@@ -3268,9 +3281,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3344,9 +3357,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
  	if (r)
  		goto out_free;
  
@@ -148982,7 +149612,7 @@ index 0fba701..4a3dcd4 100644
  
  	r = misc_register(&kvm_dev);
  	if (r) {
-@@ -3280,9 +3295,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3356,9 +3371,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
  
  	register_syscore_ops(&kvm_syscore_ops);
  
diff --git a/3.19.6/4425_grsec_remove_EI_PAX.patch b/4.0.1/4425_grsec_remove_EI_PAX.patch
index 86e242a..86e242a 100644
--- a/3.19.6/4425_grsec_remove_EI_PAX.patch
+++ b/4.0.1/4425_grsec_remove_EI_PAX.patch
diff --git a/3.19.6/4427_force_XATTR_PAX_tmpfs.patch b/4.0.1/4427_force_XATTR_PAX_tmpfs.patch
index 22c9273..a789f0b 100644
--- a/3.19.6/4427_force_XATTR_PAX_tmpfs.patch
+++ b/4.0.1/4427_force_XATTR_PAX_tmpfs.patch
@@ -6,7 +6,7 @@ namespace supported on tmpfs so that the PaX markings survive emerge.
 diff -Naur a/mm/shmem.c b/mm/shmem.c
 --- a/mm/shmem.c	2013-06-11 21:00:18.000000000 -0400
 +++ b/mm/shmem.c	2013-06-11 21:08:18.000000000 -0400
-@@ -2558,11 +2558,7 @@
+@@ -2555,11 +2555,7 @@
  static int shmem_xattr_validate(const char *name)
  {
  	struct { const char *prefix; size_t len; } arr[] = {
@@ -18,7 +18,7 @@ diff -Naur a/mm/shmem.c b/mm/shmem.c
  		{ XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
  		{ XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
  	};
-@@ -2618,14 +2614,12 @@
+@@ -2615,14 +2611,12 @@
  	if (err)
  		return err;
  
diff --git a/3.19.6/4430_grsec-remove-localversion-grsec.patch b/4.0.1/4430_grsec-remove-localversion-grsec.patch
index 31cf878..31cf878 100644
--- a/3.19.6/4430_grsec-remove-localversion-grsec.patch
+++ b/4.0.1/4430_grsec-remove-localversion-grsec.patch
diff --git a/3.19.6/4435_grsec-mute-warnings.patch b/4.0.1/4435_grsec-mute-warnings.patch
index 0585e08..0585e08 100644
--- a/3.19.6/4435_grsec-mute-warnings.patch
+++ b/4.0.1/4435_grsec-mute-warnings.patch
diff --git a/3.19.6/4440_grsec-remove-protected-paths.patch b/4.0.1/4440_grsec-remove-protected-paths.patch
index 741546d..741546d 100644
--- a/3.19.6/4440_grsec-remove-protected-paths.patch
+++ b/4.0.1/4440_grsec-remove-protected-paths.patch
diff --git a/3.19.6/4450_grsec-kconfig-default-gids.patch b/4.0.1/4450_grsec-kconfig-default-gids.patch
index 5c025da..5c025da 100644
--- a/3.19.6/4450_grsec-kconfig-default-gids.patch
+++ b/4.0.1/4450_grsec-kconfig-default-gids.patch
diff --git a/3.19.6/4465_selinux-avc_audit-log-curr_ip.patch b/4.0.1/4465_selinux-avc_audit-log-curr_ip.patch
index ba89596..ba89596 100644
--- a/3.19.6/4465_selinux-avc_audit-log-curr_ip.patch
+++ b/4.0.1/4465_selinux-avc_audit-log-curr_ip.patch
diff --git a/3.19.6/4470_disable-compat_vdso.patch b/4.0.1/4470_disable-compat_vdso.patch
index 2192180..7aefa02 100644
--- a/3.19.6/4470_disable-compat_vdso.patch
+++ b/4.0.1/4470_disable-compat_vdso.patch
@@ -26,7 +26,7 @@ Closes bug: http://bugs.gentoo.org/show_bug.cgi?id=210138
 diff -urp a/arch/x86/Kconfig b/arch/x86/Kconfig
 --- a/arch/x86/Kconfig	2009-07-31 01:36:57.323857684 +0100
 +++ b/arch/x86/Kconfig	2009-07-31 01:51:39.395749681 +0100
-@@ -1953,29 +1953,8 @@
+@@ -1988,29 +1988,8 @@
  
  config COMPAT_VDSO
  	def_bool n
diff --git a/3.19.6/4475_emutramp_default_on.patch b/4.0.1/4475_emutramp_default_on.patch
index ad4967a..ad4967a 100644
--- a/3.19.6/4475_emutramp_default_on.patch
+++ b/4.0.1/4475_emutramp_default_on.patch