main/linux-grsec: upgrade to 3.10.25

2 files changed, 125 insertions, 135 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index aa56d40670..e7d8ea0287 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,12 +2,12 @@
 
 _flavor=grsec
 pkgname=linux-${_flavor}
-pkgver=3.10.23
+pkgver=3.10.25
 case $pkgver in
 *.*.*)	_kernver=${pkgver%.*};;
 *.*)	_kernver=${pkgver};;
 esac
-pkgrel=2
+pkgrel=0
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -152,8 +152,8 @@ dev() {
 }
 
 md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481  linux-3.10.tar.xz
-8b9650e10f8beee769545b51202766a5  patch-3.10.23.xz
-82efe899230f7246ca99f3d334c0c1b8  grsecurity-2.9.1-3.10.23-unofficial.patch
+a216b82ba3670c979241a9ef9f1438e4  patch-3.10.25.xz
+83142ed6972c71cf8996e988669a5369  grsecurity-2.9.1-3.10.25-unofficial.patch
 a16f11b12381efb3bec79b9bfb329836  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
 656ae7b10dd2f18dbfa1011041d08d60  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
 aa454ffb96428586447775c21449e284  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
@@ -166,8 +166,8 @@ c6a4ae7e8ca6159e1631545515805216  fix-memory-map-for-PIE-applications.patch
 866e6c4daed45d563829804f8ad50ed9  kernelconfig.x86
 272aaddd0a19a5052208bc25551995a3  kernelconfig.x86_64"
 sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544  linux-3.10.tar.xz
-bdf3983ff3e26c5781edb19a8d0d7765e2e0282cfabda2b0652cc0deff53f445  patch-3.10.23.xz
-f0dfa654e64e79c96127a0f8cd4867a0170f099c7116e7f45e27572294b1b818  grsecurity-2.9.1-3.10.23-unofficial.patch
+58323f60a2c5156e9e46b5947e7b3d81be44895c2b5dc31ced8d0e5346ca4d43  patch-3.10.25.xz
+069ba22e11bbed3d833546e16b91399731cd82ac97882716841c679c83c2b247  grsecurity-2.9.1-3.10.25-unofficial.patch
 6af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
 dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
 0985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
@@ -180,8 +180,8 @@ dcdef241ddd315c6c8296f122fc94f77792fde0304aff07f72afe11333b7ebfb  0001-ip_gre-fi
 7fd28634998ef1fddafed5f2516e902924245d2464b9e86476bfaa55ccfc3bc3  kernelconfig.x86
 f2843ae4f9b3e3c27f3138ce4b740c2803bdab0c7a910c662d951843803b9554  kernelconfig.x86_64"
 sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35  linux-3.10.tar.xz
-0fdb65f1c45e490e1f2206589273e4b8f0f142ab6b16341cb52977e0c6a983b359f01456a9cae3e1c139d5ead5de106c10909b7fdb6a156675cad5d39374e97f  patch-3.10.23.xz
-8905d7215d9f82662e0e7b897fc2fb258c5978d12fed9cf618e60c7b0926af2f76e3b242140e9d3ab4988cee684f350aaf26270d1a8518297cde9928361d146d  grsecurity-2.9.1-3.10.23-unofficial.patch
+89e009d91e90ed76f860e48a944d702d3b1bf5179c07e591918152baacd5592ae0e4d50accfc6bfdccccda0557d61bb30a88bbe0f90afd8be69c638c63c015fc  patch-3.10.25.xz
+25aa4922fc0b4a9cd689def07929f9e1bc2fe92424115f74c89c74167b9e94db8f6114125d664268ce8ce3084e9d7b734b81f48d22fd27584c2bf0d51fd03d43  grsecurity-2.9.1-3.10.25-unofficial.patch
 81e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02  0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
 51ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c  0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
 57d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e  0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
diff --git a/main/linux-grsec/grsecurity-2.9.1-3.10.23-unofficial.patch b/main/linux-grsec/grsecurity-2.9.1-3.10.25-unofficial.patch
index cc4eeaf731..a8bca6ee2b 100644
--- a/main/linux-grsec/grsecurity-2.9.1-3.10.23-unofficial.patch
+++ b/main/linux-grsec/grsecurity-2.9.1-3.10.25-unofficial.patch
@@ -281,7 +281,7 @@ index 2fe6e76..889ee23 100644
  
  	pcd.		[PARIDE]
 diff --git a/Makefile b/Makefile
-index c6d2ec5..b2bfe62 100644
+index cd97e9a..a803acc 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -1972,7 +1972,7 @@ index 86b8fe3..e25f975 100644
  #define L_PTE_DIRTY_HIGH	(1 << (55 - 32))
  
 diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
-index 9bcd262..1ff999b 100644
+index 5aac06f..4cd2e7f 100644
 --- a/arch/arm/include/asm/pgtable.h
 +++ b/arch/arm/include/asm/pgtable.h
 @@ -30,6 +30,9 @@
@@ -2890,7 +2890,7 @@ index 1f2740e..b36e225 100644
  };
  
 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index ab1fe3b..dcd439f 100644
+index ac4c2e5..234fb25 100644
 --- a/arch/arm/kernel/process.c
 +++ b/arch/arm/kernel/process.c
 @@ -223,6 +223,7 @@ void machine_power_off(void)
@@ -2921,7 +2921,7 @@ index ab1fe3b..dcd439f 100644
  	printk("pc : [<%08lx>]    lr : [<%08lx>]    psr: %08lx\n"
  	       "sp : %08lx  ip : %08lx  fp : %08lx\n",
  		regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
-@@ -426,12 +427,6 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -429,12 +430,6 @@ unsigned long get_wchan(struct task_struct *p)
  	return 0;
  }
  
@@ -2934,7 +2934,7 @@ index ab1fe3b..dcd439f 100644
  #ifdef CONFIG_MMU
  #ifdef CONFIG_KUSER_HELPERS
  /*
-@@ -447,7 +442,7 @@ static struct vm_area_struct gate_vma = {
+@@ -450,7 +445,7 @@ static struct vm_area_struct gate_vma = {
  
  static int __init gate_vma_init(void)
  {
@@ -2943,7 +2943,7 @@ index ab1fe3b..dcd439f 100644
  	return 0;
  }
  arch_initcall(gate_vma_init);
-@@ -473,41 +468,16 @@ int in_gate_area_no_mm(unsigned long addr)
+@@ -476,41 +471,16 @@ int in_gate_area_no_mm(unsigned long addr)
  
  const char *arch_vma_name(struct vm_area_struct *vma)
  {
@@ -3596,7 +3596,7 @@ index 044c31d..2ee0861 100644
  struct omap_device *omap_device_alloc(struct platform_device *pdev,
  				      struct omap_hwmod **ohs, int oh_cnt);
 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index 7341eff..fd75e34 100644
+index 44c609a..a63fbf8 100644
 --- a/arch/arm/mach-omap2/omap_hwmod.c
 +++ b/arch/arm/mach-omap2/omap_hwmod.c
 @@ -194,10 +194,10 @@ struct omap_hwmod_soc_ops {
@@ -4098,7 +4098,7 @@ index 04d9006..c547d85 100644
  	return __arm_ioremap_caller(phys_addr, size, mtype,
  			__builtin_return_address(0));
 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
-index 10062ce..8695745 100644
+index f0ef2f7..08d2f76a 100644
 --- a/arch/arm/mm/mmap.c
 +++ b/arch/arm/mm/mmap.c
 @@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
@@ -7265,7 +7265,7 @@ index 2a625fb..9908930 100644
  	DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
  	       me->arch.unwind_section, table, end, gp);
 diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
-index 5dfd248..64914ac 100644
+index 0d3a9d4..a11bc6b 100644
 --- a/arch/parisc/kernel/sys_parisc.c
 +++ b/arch/parisc/kernel/sys_parisc.c
 @@ -33,9 +33,11 @@
@@ -7289,12 +7289,12 @@ index 5dfd248..64914ac 100644
  	return vm_unmapped_area(&info);
  }
  
-@@ -61,10 +64,11 @@ static int get_offset(struct address_space *mapping)
- 	return (unsigned long) mapping >> 8;
+@@ -68,16 +71,18 @@ static unsigned long shared_align_offset(struct file *filp, unsigned long pgoff)
+ 	return (get_offset(mapping) + pgoff) << PAGE_SHIFT;
  }
  
--static unsigned long get_shared_area(struct address_space *mapping,
--		unsigned long addr, unsigned long len, unsigned long pgoff)
+-static unsigned long get_shared_area(struct file *filp, unsigned long addr,
+-		unsigned long len, unsigned long pgoff)
 +static unsigned long get_shared_area(struct file *filp, struct address_space *mapping,
 +		unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags)
  {
@@ -7303,15 +7303,14 @@ index 5dfd248..64914ac 100644
  
  	info.flags = 0;
  	info.length = len;
-@@ -72,6 +76,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
+ 	info.low_limit = PAGE_ALIGN(addr);
  	info.high_limit = TASK_SIZE;
  	info.align_mask = PAGE_MASK & (SHMLBA - 1);
- 	info.align_offset = (get_offset(mapping) + pgoff) << PAGE_SHIFT;
 +	info.threadstack_offset = offset;
+ 	info.align_offset = shared_align_offset(filp, pgoff);
  	return vm_unmapped_area(&info);
  }
- 
-@@ -86,15 +91,22 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -93,13 +98,20 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
  			return -EINVAL;
  		return addr;
  	}
@@ -7326,16 +7325,13 @@ index 5dfd248..64914ac 100644
 +
 +	}
 +
- 	if (filp) {
--		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-+		addr = get_shared_area(filp, filp->f_mapping, addr, len, pgoff, flags);
- 	} else if(flags & MAP_SHARED) {
--		addr = get_shared_area(NULL, addr, len, pgoff);
-+		addr = get_shared_area(filp, NULL, addr, len, pgoff, flags);
- 	} else {
+ 	if (filp || (flags & MAP_SHARED))
+-		addr = get_shared_area(filp, addr, len, pgoff);
++		addr = get_shared_area(filp, addr, len, pgoff, flags);
+ 	else
 -		addr = get_unshared_area(addr, len);
-+		addr = get_unshared_area(filp, addr, len, flags);
- 	}
++		addr = get_unshared_area(addr, len, flags);
+ 
  	return addr;
  }
 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
@@ -7695,7 +7691,7 @@ index 88693ce..ac6f9ab 100644
  #include <asm-generic/getorder.h>
  
 diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
-index b66ae72..4a378cd 100644
+index 64aaf01..7ea1463 100644
 --- a/arch/powerpc/include/asm/pgalloc-64.h
 +++ b/arch/powerpc/include/asm/pgalloc-64.h
 @@ -53,6 +53,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
@@ -7718,7 +7714,7 @@ index b66ae72..4a378cd 100644
  #define pmd_populate(mm, pmd, pte_page) \
  	pmd_populate_kernel(mm, pmd, page_address(pte_page))
  #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
-@@ -171,6 +177,7 @@ extern void __tlb_remove_table(void *_table);
+@@ -169,6 +175,7 @@ extern void __tlb_remove_table(void *_table);
  #endif
  
  #define pud_populate(mm, pud, pmd)	pud_set(pud, (unsigned long)pmd)
@@ -11841,10 +11837,10 @@ index c198b7e..63eea60 100644
  	  This option helps catch unintended modifications to loadable
  	  kernel module's text and read-only data. It also prevents execution
 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
-index 5c47726..8c4fa67 100644
+index 412189d..bcbad06 100644
 --- a/arch/x86/Makefile
 +++ b/arch/x86/Makefile
-@@ -54,6 +54,7 @@ else
+@@ -57,6 +57,7 @@ else
          UTS_MACHINE := x86_64
          CHECKFLAGS += -D__x86_64__ -m64
  
@@ -11852,7 +11848,7 @@ index 5c47726..8c4fa67 100644
          KBUILD_AFLAGS += -m64
          KBUILD_CFLAGS += -m64
  
-@@ -234,3 +235,12 @@ define archhelp
+@@ -240,3 +241,12 @@ define archhelp
    echo  '                  FDARGS="..."  arguments for the booted kernel'
    echo  '                  FDINITRD=file initrd for the booted kernel'
  endef
@@ -11866,13 +11862,13 @@ index 5c47726..8c4fa67 100644
 +archprepare:
 +	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
-index 379814b..add62ce 100644
+index 6cf0111..f2e2398 100644
 --- a/arch/x86/boot/Makefile
 +++ b/arch/x86/boot/Makefile
-@@ -65,6 +65,9 @@ KBUILD_CFLAGS	:= $(USERINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
+@@ -65,6 +65,9 @@ KBUILD_CFLAGS	:= $(USERINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ \
+ 		   $(call cc-option, -fno-unit-at-a-time)) \
  		   $(call cc-option, -fno-stack-protector) \
  		   $(call cc-option, -mpreferred-stack-boundary=2)
- KBUILD_CFLAGS	+= $(call cc-option, -m32)
 +ifdef CONSTIFY_PLUGIN
 +KBUILD_CFLAGS	+= -fplugin-arg-constify_plugin-no-constify
 +endif
@@ -11924,11 +11920,11 @@ index 5b75319..331a4ca 100644
  	return diff;
  }
 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
-index 5ef205c..342191d 100644
+index 7194d9f..0ad497c 100644
 --- a/arch/x86/boot/compressed/Makefile
 +++ b/arch/x86/boot/compressed/Makefile
-@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
- KBUILD_CFLAGS += $(cflags-y)
+@@ -15,6 +15,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)
 +ifdef CONSTIFY_PLUGIN
@@ -26883,7 +26879,7 @@ index 5484d54..d5f90d0 100644
  		case 1:							     \
  			____emulate_2op(ctxt,_op,_bx,_by,"b",u8);	     \
 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
-index 0eee2c8..94a32c3 100644
+index 0987c63..412bedd 100644
 --- a/arch/x86/kvm/lapic.c
 +++ b/arch/x86/kvm/lapic.c
 @@ -55,7 +55,7 @@
@@ -27087,7 +27083,7 @@ index 5402c94..c3bdeee 100644
  
  	vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index e8ba99c..ee9d7d9 100644
+index ad6a016..16ec1e1 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
 @@ -1725,8 +1725,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
@@ -27110,7 +27106,7 @@ index e8ba99c..ee9d7d9 100644
  		if (copy_to_user(user_msr_list->indices, &msrs_to_save,
  				 num_msrs_to_save * sizeof(u32)))
  			goto out;
-@@ -5297,7 +5299,7 @@ static struct notifier_block pvclock_gtod_notifier = {
+@@ -5296,7 +5298,7 @@ static struct notifier_block pvclock_gtod_notifier = {
  };
  #endif
  
@@ -33804,11 +33800,11 @@ index a44f457..9140171 100644
  #endif
  }
 diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
-index 8869287..d577672 100644
+index 9cac825..4890b25 100644
 --- a/arch/x86/realmode/rm/Makefile
 +++ b/arch/x86/realmode/rm/Makefile
-@@ -78,5 +78,8 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \
- 			$(call cc-option, -fno-unit-at-a-time)) \
+@@ -79,5 +79,8 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \
+ 		   $(call cc-option, -fno-unit-at-a-time)) \
  		   $(call cc-option, -fno-stack-protector) \
  		   $(call cc-option, -mpreferred-stack-boundary=2)
 +ifdef CONSTIFY_PLUGIN
@@ -35196,10 +35192,10 @@ index cd6aa28..6f5e966 100644
  
  	/* Create associated sysfs transport objects  */
 diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
-index 0101af5..c70c325 100644
+index 4abdbdf..b7a724e 100644
 --- a/drivers/ata/libata-scsi.c
 +++ b/drivers/ata/libata-scsi.c
-@@ -4105,7 +4105,7 @@ int ata_sas_port_init(struct ata_port *ap)
+@@ -4106,7 +4106,7 @@ int ata_sas_port_init(struct ata_port *ap)
  
  	if (rc)
  		return rc;
@@ -38999,7 +38995,7 @@ index c8d16a6..ca71b5e 100644
  	iir = I915_READ(IIR);
  
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index c714d4d..665732e 100644
+index f1e6004..d0200ac 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
 @@ -8939,13 +8939,13 @@ struct intel_quirk {
@@ -41264,10 +41260,10 @@ index 04c69af..5f92d00 100644
  #include <linux/input.h>
  #include <linux/gameport.h>
 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
-index fa061d4..4a6957c 100644
+index 75e3b10..fb390fd 100644
 --- a/drivers/input/joystick/xpad.c
 +++ b/drivers/input/joystick/xpad.c
-@@ -735,7 +735,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
+@@ -736,7 +736,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
  
  static int xpad_led_probe(struct usb_xpad *xpad)
  {
@@ -41276,7 +41272,7 @@ index fa061d4..4a6957c 100644
  	long led_no;
  	struct xpad_led *led;
  	struct led_classdev *led_cdev;
-@@ -748,7 +748,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
+@@ -749,7 +749,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
  	if (!led)
  		return -ENOMEM;
  
@@ -42001,10 +41997,10 @@ index d907ca6..cfb8384 100644
  				schedule_work(&sc->trigger_event);
  		}
 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
-index 9e3a045..9d0f95b 100644
+index bd88d3da..b754a8b 100644
 --- a/drivers/md/dm-table.c
 +++ b/drivers/md/dm-table.c
-@@ -389,7 +389,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
+@@ -394,7 +394,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
  	if (!dev_size)
  		return 0;
  
@@ -45934,7 +45930,7 @@ index 8c05ae01..b2cf224 100644
  	error = bus_register(&fcoe_bus_type);
  	if (error)
 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
-index df0c3c7..b00e1d0 100644
+index 3cafe0d..f1e87f8 100644
 --- a/drivers/scsi/hosts.c
 +++ b/drivers/scsi/hosts.c
 @@ -42,7 +42,7 @@
@@ -45956,10 +45952,10 @@ index df0c3c7..b00e1d0 100644
  
  	/* These three are default values which can be overridden */
 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 7f4f790..b75b92a 100644
+index 0353d7f..be4e66b 100644
 --- a/drivers/scsi/hpsa.c
 +++ b/drivers/scsi/hpsa.c
-@@ -554,7 +554,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
+@@ -555,7 +555,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
  	unsigned long flags;
  
  	if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
@@ -45968,7 +45964,7 @@ index 7f4f790..b75b92a 100644
  
  	if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
  		a = rq->head[rq->current_entry];
-@@ -3422,7 +3422,7 @@ static void start_io(struct ctlr_info *h)
+@@ -3423,7 +3423,7 @@ static void start_io(struct ctlr_info *h)
  	while (!list_empty(&h->reqQ)) {
  		c = list_entry(h->reqQ.next, struct CommandList, list);
  		/* can't do anything if fifo is full */
@@ -45977,7 +45973,7 @@ index 7f4f790..b75b92a 100644
  			dev_warn(&h->pdev->dev, "fifo full\n");
  			break;
  		}
-@@ -3444,7 +3444,7 @@ static void start_io(struct ctlr_info *h)
+@@ -3445,7 +3445,7 @@ static void start_io(struct ctlr_info *h)
  
  		/* Tell the controller execute command */
  		spin_unlock_irqrestore(&h->lock, flags);
@@ -45986,7 +45982,7 @@ index 7f4f790..b75b92a 100644
  		spin_lock_irqsave(&h->lock, flags);
  	}
  	spin_unlock_irqrestore(&h->lock, flags);
-@@ -3452,17 +3452,17 @@ static void start_io(struct ctlr_info *h)
+@@ -3453,17 +3453,17 @@ static void start_io(struct ctlr_info *h)
  
  static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
  {
@@ -46007,7 +46003,7 @@ index 7f4f790..b75b92a 100644
  		(h->interrupts_enabled == 0);
  }
  
-@@ -4364,7 +4364,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
+@@ -4365,7 +4365,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
  	if (prod_index < 0)
  		return -ENODEV;
  	h->product_name = products[prod_index].product_name;
@@ -46016,7 +46012,7 @@ index 7f4f790..b75b92a 100644
  
  	pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
  			       PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
-@@ -4646,7 +4646,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
+@@ -4647,7 +4647,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
  
  	assert_spin_locked(&lockup_detector_lock);
  	remove_ctlr_from_lockup_detector_list(h);
@@ -46025,7 +46021,7 @@ index 7f4f790..b75b92a 100644
  	spin_lock_irqsave(&h->lock, flags);
  	h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
  	spin_unlock_irqrestore(&h->lock, flags);
-@@ -4823,7 +4823,7 @@ reinit_after_soft_reset:
+@@ -4824,7 +4824,7 @@ reinit_after_soft_reset:
  	}
  
  	/* make sure the board interrupts are off */
@@ -46034,7 +46030,7 @@ index 7f4f790..b75b92a 100644
  
  	if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
  		goto clean2;
-@@ -4857,7 +4857,7 @@ reinit_after_soft_reset:
+@@ -4858,7 +4858,7 @@ reinit_after_soft_reset:
  		 * fake ones to scoop up any residual completions.
  		 */
  		spin_lock_irqsave(&h->lock, flags);
@@ -46043,7 +46039,7 @@ index 7f4f790..b75b92a 100644
  		spin_unlock_irqrestore(&h->lock, flags);
  		free_irqs(h);
  		rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
-@@ -4876,9 +4876,9 @@ reinit_after_soft_reset:
+@@ -4877,9 +4877,9 @@ reinit_after_soft_reset:
  		dev_info(&h->pdev->dev, "Board READY.\n");
  		dev_info(&h->pdev->dev,
  			"Waiting for stale completions to drain.\n");
@@ -46055,7 +46051,7 @@ index 7f4f790..b75b92a 100644
  
  		rc = controller_reset_failed(h->cfgtable);
  		if (rc)
-@@ -4899,7 +4899,7 @@ reinit_after_soft_reset:
+@@ -4900,7 +4900,7 @@ reinit_after_soft_reset:
  	}
  
  	/* Turn the interrupts on so we can service requests */
@@ -46064,7 +46060,7 @@ index 7f4f790..b75b92a 100644
  
  	hpsa_hba_inquiry(h);
  	hpsa_register_scsi(h);	/* hook ourselves into SCSI subsystem */
-@@ -4954,7 +4954,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
+@@ -4955,7 +4955,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
  	 * To write all data in the battery backed cache to disks
  	 */
  	hpsa_flush_cache(h);
@@ -46073,7 +46069,7 @@ index 7f4f790..b75b92a 100644
  	hpsa_free_irqs_and_disable_msix(h);
  }
  
-@@ -5122,7 +5122,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
+@@ -5123,7 +5123,7 @@ static void hpsa_enter_performant_mode(struct ctlr_info *h, u32 use_short_tags)
  		return;
  	}
  	/* Change the access methods to the performant access methods */
@@ -46241,7 +46237,7 @@ index 8b928c6..9c76300 100644
  }
  EXPORT_SYMBOL(fc_exch_update_stats);
 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
-index 161c98e..6d563b3 100644
+index d289583..b745eec 100644
 --- a/drivers/scsi/libsas/sas_ata.c
 +++ b/drivers/scsi/libsas/sas_ata.c
 @@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
@@ -46442,7 +46438,7 @@ index 8523b278e..ce1d812 100644
  
  /**
 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
-index 8e1b737..50ff510 100644
+index bfb72ec..2cdcb0e 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)
@@ -46486,7 +46482,7 @@ index 8e1b737..50ff510 100644
  			  pinstance->num_hrrq;
  
  	if (request_size) {
-@@ -4483,7 +4483,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
+@@ -4484,7 +4484,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 */
@@ -46495,7 +46491,7 @@ index 8e1b737..50ff510 100644
  		return;
  
  	fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
-@@ -5310,8 +5310,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
+@@ -5311,8 +5311,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);
@@ -46506,7 +46502,7 @@ index 8e1b737..50ff510 100644
  
  	INIT_LIST_HEAD(&pinstance->free_res_q);
  	INIT_LIST_HEAD(&pinstance->used_res_q);
-@@ -6024,7 +6024,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
+@@ -6025,7 +6025,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
  	 */
@@ -46810,10 +46806,10 @@ index f379c7f..e8fc69c 100644
  
  	transport_setup_device(&rport->dev);
 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index 734a29a..6b06e4a 100644
+index 9bc913b..1b49616 100644
 --- a/drivers/scsi/sd.c
 +++ b/drivers/scsi/sd.c
-@@ -2923,7 +2923,7 @@ static int sd_probe(struct device *dev)
+@@ -2929,7 +2929,7 @@ static int sd_probe(struct device *dev)
  	sdkp->disk = gd;
  	sdkp->index = index;
  	atomic_set(&sdkp->openers, 0);
@@ -46822,7 +46818,7 @@ index 734a29a..6b06e4a 100644
  
  	if (!sdp->request_queue->rq_timeout) {
  		if (sdp->type != TYPE_MOD)
-@@ -2936,7 +2936,7 @@ static int sd_probe(struct device *dev)
+@@ -2942,7 +2942,7 @@ static int sd_probe(struct device *dev)
  	device_initialize(&sdkp->dev);
  	sdkp->dev.parent = dev;
  	sdkp->dev.class = &sd_disk_class;
@@ -48742,7 +48738,7 @@ index d3aa353..0e284af 100644
  			wake_up(&usb_kill_urb_queue);
  		usb_put_urb(urb);
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 1424a89..62da951 100644
+index 4d25bff2..56537dd 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
 @@ -27,6 +27,7 @@
@@ -48804,7 +48800,7 @@ index b10da72..43aa0b2 100644
  	INIT_LIST_HEAD(&dev->ep0.urb_list);
  	dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
 diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
-index 14d28d6..5f511ac 100644
+index 69948ad..0ad5f87 100644
 --- a/drivers/usb/dwc3/gadget.c
 +++ b/drivers/usb/dwc3/gadget.c
 @@ -550,8 +550,6 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
@@ -53881,10 +53877,10 @@ index 1d5c5f7..0ba0afc 100644
  	spin_lock_init(&delayed_root->lock);
  	init_waitqueue_head(&delayed_root->wait);
 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 8dedf40..1a83977 100644
+index 145b2c7..7673563 100644
 --- a/fs/btrfs/ioctl.c
 +++ b/fs/btrfs/ioctl.c
-@@ -3084,9 +3084,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -3085,9 +3085,12 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
  	for (i = 0; i < num_types; i++) {
  		struct btrfs_space_info *tmp;
  
@@ -53897,7 +53893,7 @@ index 8dedf40..1a83977 100644
  		info = NULL;
  		rcu_read_lock();
  		list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -3108,10 +3111,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -3109,10 +3112,7 @@ static long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
  				memcpy(dest, &space, sizeof(space));
  				dest++;
  				space_args.total_spaces++;
@@ -58707,10 +58703,10 @@ index 582321a..0224663 100644
  };
  
 diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
-index e76244e..9fe8f2f1 100644
+index ec8d97d..3a01bcf 100644
 --- a/fs/nfsd/nfscache.c
 +++ b/fs/nfsd/nfscache.c
-@@ -526,14 +526,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
+@@ -533,14 +533,17 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
  {
  	struct svc_cacherep *rp = rqstp->rq_cacherep;
  	struct kvec	*resv = &rqstp->rq_res.head[0], *cachv;
@@ -59431,7 +59427,7 @@ index 8c74100..4239c48 100644
  		}
  		putname(tmp);
 diff --git a/fs/pipe.c b/fs/pipe.c
-index d2c45e1..009fe1c 100644
+index 0e0752e..7cfdd50 100644
 --- a/fs/pipe.c
 +++ b/fs/pipe.c
 @@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
@@ -59512,7 +59508,16 @@ index d2c45e1..009fe1c 100644
  			mask |= POLLERR;
  	}
  
-@@ -734,17 +734,17 @@ pipe_release(struct inode *inode, struct file *file)
+@@ -731,7 +731,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
+ 	int kill = 0;
+ 
+ 	spin_lock(&inode->i_lock);
+-	if (!--pipe->files) {
++	if (atomic_dec_and_test(&pipe->files)) {
+ 		inode->i_pipe = NULL;
+ 		kill = 1;
+ 	}
+@@ -748,11 +748,11 @@ pipe_release(struct inode *inode, struct file *file)
  
  	__pipe_lock(pipe);
  	if (file->f_mode & FMODE_READ)
@@ -59527,14 +59532,7 @@ index d2c45e1..009fe1c 100644
  		wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
  		kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
  		kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
- 	}
- 	spin_lock(&inode->i_lock);
--	if (!--pipe->files) {
-+	if (atomic_dec_and_test(&pipe->files)) {
- 		inode->i_pipe = NULL;
- 		kill = 1;
- 	}
-@@ -811,7 +811,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
+@@ -817,7 +817,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
  	kfree(pipe);
  }
  
@@ -59543,7 +59541,7 @@ index d2c45e1..009fe1c 100644
  
  /*
   * pipefs_dname() is called from d_path().
-@@ -841,8 +841,9 @@ static struct inode * get_pipe_inode(void)
+@@ -847,8 +847,9 @@ static struct inode * get_pipe_inode(void)
  		goto fail_iput;
  
  	inode->i_pipe = pipe;
@@ -59555,7 +59553,7 @@ index d2c45e1..009fe1c 100644
  	inode->i_fop = &pipefifo_fops;
  
  	/*
-@@ -1022,17 +1023,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -1027,17 +1028,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
  	spin_lock(&inode->i_lock);
  	if (inode->i_pipe) {
  		pipe = inode->i_pipe;
@@ -59576,7 +59574,7 @@ index d2c45e1..009fe1c 100644
  			spin_unlock(&inode->i_lock);
  			free_pipe_info(pipe);
  			pipe = inode->i_pipe;
-@@ -1057,10 +1058,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -1062,10 +1063,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
  	 *  opened, even when there is no process writing the FIFO.
  	 */
  		pipe->r_counter++;
@@ -59589,7 +59587,7 @@ index d2c45e1..009fe1c 100644
  			if ((filp->f_flags & O_NONBLOCK)) {
  				/* suppress POLLHUP until we have
  				 * seen a writer */
-@@ -1079,14 +1080,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -1084,14 +1085,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
  	 *  errno=ENXIO when there is no process reading the FIFO.
  	 */
  		ret = -ENXIO;
@@ -59607,7 +59605,7 @@ index d2c45e1..009fe1c 100644
  			if (wait_for_partner(pipe, &pipe->r_counter))
  				goto err_wr;
  		}
-@@ -1100,11 +1101,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -1105,11 +1106,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
  	 *  the process can at least talk to itself.
  	 */
  
@@ -59622,7 +59620,7 @@ index d2c45e1..009fe1c 100644
  			wake_up_partner(pipe);
  		break;
  
-@@ -1118,20 +1119,20 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -1123,13 +1124,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
  	return 0;
  
  err_rd:
@@ -59638,14 +59636,6 @@ index d2c45e1..009fe1c 100644
  		wake_up_interruptible(&pipe->wait);
  	ret = -ERESTARTSYS;
  	goto err;
- 
- err:
- 	spin_lock(&inode->i_lock);
--	if (!--pipe->files) {
-+	if (atomic_dec_and_test(&pipe->files)) {
- 		inode->i_pipe = NULL;
- 		kill = 1;
- 	}
 diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
 index 15af622..0e9f4467 100644
 --- a/fs/proc/Kconfig
@@ -61814,7 +61804,7 @@ index 6157424..ac98f6d 100644
  			*offset = off & 0x7fffffff;
  			return 0;
 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
-index ca01d83..86b14a7 100644
+index 83dfe6e..2d330c9 100644
 --- a/fs/xfs/xfs_ioctl.c
 +++ b/fs/xfs/xfs_ioctl.c
 @@ -127,7 +127,7 @@ xfs_find_handle(
@@ -81415,7 +81405,7 @@ index 80d92e9..c9ab9de 100644
  			else
  				new_fs = fs;
 diff --git a/kernel/futex.c b/kernel/futex.c
-index 49dacfb..2ac4526 100644
+index a283b30..e35635d 100644
 --- a/kernel/futex.c
 +++ b/kernel/futex.c
 @@ -54,6 +54,7 @@
@@ -81713,10 +81703,10 @@ index e30ac0f..3528cac 100644
  
  	/*
 diff --git a/kernel/kexec.c b/kernel/kexec.c
-index 59f7b55..4022f65 100644
+index 1f8d938..915c3db 100644
 --- a/kernel/kexec.c
 +++ b/kernel/kexec.c
-@@ -1041,7 +1041,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
+@@ -1044,7 +1044,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
  				unsigned long flags)
  {
  	struct compat_kexec_segment in;
@@ -84423,7 +84413,7 @@ index e8b3350..d83d44e 100644
  	.priority = CPU_PRI_MIGRATION,
  };
 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 009a62b..ae011f8 100644
+index da7eebb..9a71428 100644
 --- a/kernel/sched/fair.c
 +++ b/kernel/sched/fair.c
 @@ -831,7 +831,7 @@ void task_numa_fault(int node, int pages, bool migrated)
@@ -84435,7 +84425,7 @@ index 009a62b..ae011f8 100644
  	p->mm->numa_scan_offset = 0;
  }
  
-@@ -5687,7 +5687,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
+@@ -5689,7 +5689,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
   * run_rebalance_domains is triggered when needed from the scheduler tick.
   * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
   */
@@ -85206,7 +85196,7 @@ index a8f5084..5a673cb 100644
  		.clock_get	= alarm_clock_get,
  		.timer_create	= alarm_timer_create,
 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index fcc261c..119dc3b 100644
+index 1c5b0fc..910e6e1 100644
 --- a/kernel/time/timekeeping.c
 +++ b/kernel/time/timekeeping.c
 @@ -15,6 +15,7 @@
@@ -94341,7 +94331,7 @@ index 1f9a1a5..413e487 100644
  	.maxtype	= IFLA_GRE_MAX,
  	.policy		= ip6gre_policy,
 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
-index 0516ebb..a5f065b 100644
+index 209bb4d..e99677d 100644
 --- a/net/ipv6/ip6_tunnel.c
 +++ b/net/ipv6/ip6_tunnel.c
 @@ -88,7 +88,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
@@ -94964,7 +94954,7 @@ index 66f51c5..8f0eef1 100644
  	return res;
  }
 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index 5ab17b8..5b0aae4 100644
+index 18687f1..9c492c6 100644
 --- a/net/mac80211/cfg.c
 +++ b/net/mac80211/cfg.c
 @@ -806,7 +806,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
@@ -94976,7 +94966,7 @@ index 5ab17b8..5b0aae4 100644
  		local->_oper_chandef = *chandef;
  		ieee80211_hw_config(local, 0);
  	}
-@@ -2922,7 +2922,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
+@@ -2921,7 +2921,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
  		else
  			local->probe_req_reg--;
  
@@ -94985,7 +94975,7 @@ index 5ab17b8..5b0aae4 100644
  			break;
  
  		ieee80211_queue_work(&local->hw, &local->reconfig_filter);
-@@ -3385,8 +3385,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
+@@ -3384,8 +3384,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
  	if (chanctx_conf) {
  		*chandef = chanctx_conf->def;
  		ret = 0;
@@ -99850,10 +99840,10 @@ index dad36a6..7e5ffbf 100644
  		lock = &avc_cache.slots_lock[hvalue];
  
 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index 5c6f2cd..b4f945c 100644
+index 5e58d7d..98eef77 100644
 --- a/security/selinux/hooks.c
 +++ b/security/selinux/hooks.c
-@@ -96,8 +96,6 @@
+@@ -97,8 +97,6 @@
  
  #define NUM_SEL_MNT_OPTS 5
  
@@ -99862,7 +99852,7 @@ index 5c6f2cd..b4f945c 100644
  /* SECMARK reference count */
  static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
  
-@@ -5529,7 +5527,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
+@@ -5588,7 +5586,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
  
  #endif
  
@@ -111787,7 +111777,7 @@ index 96b919d..c49bb74 100644
 +
  #endif
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 302681c..3bde377 100644
+index eb99458..634c3ec 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -75,12 +75,17 @@ LIST_HEAD(vm_list);
@@ -111828,7 +111818,7 @@ index 302681c..3bde377 100644
  	.release        = kvm_vcpu_release,
  	.unlocked_ioctl = kvm_vcpu_ioctl,
  #ifdef CONFIG_COMPAT
-@@ -2561,7 +2566,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -2564,7 +2569,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)
  	return 0;
  }
  
@@ -111837,7 +111827,7 @@ index 302681c..3bde377 100644
  	.release        = kvm_vm_release,
  	.unlocked_ioctl = kvm_vm_ioctl,
  #ifdef CONFIG_COMPAT
-@@ -2662,7 +2667,7 @@ out:
+@@ -2665,7 +2670,7 @@ out:
  	return r;
  }
  
@@ -111846,7 +111836,7 @@ index 302681c..3bde377 100644
  	.unlocked_ioctl = kvm_dev_ioctl,
  	.compat_ioctl   = kvm_dev_ioctl,
  	.llseek		= noop_llseek,
-@@ -2688,7 +2693,7 @@ static void hardware_enable_nolock(void *junk)
+@@ -2691,7 +2696,7 @@ static void hardware_enable_nolock(void *junk)
  
  	if (r) {
  		cpumask_clear_cpu(cpu, cpus_hardware_enabled);
@@ -111855,7 +111845,7 @@ index 302681c..3bde377 100644
  		printk(KERN_INFO "kvm: enabling virtualization on "
  				 "CPU%d failed\n", cpu);
  	}
-@@ -2742,10 +2747,10 @@ static int hardware_enable_all(void)
+@@ -2745,10 +2750,10 @@ static int hardware_enable_all(void)
  
  	kvm_usage_count++;
  	if (kvm_usage_count == 1) {
@@ -111868,7 +111858,7 @@ index 302681c..3bde377 100644
  			hardware_disable_all_nolock();
  			r = -EBUSY;
  		}
-@@ -3099,7 +3104,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
+@@ -3102,7 +3107,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
  	kvm_arch_vcpu_put(vcpu);
  }
  
@@ -111877,7 +111867,7 @@ index 302681c..3bde377 100644
  		  struct module *module)
  {
  	int r;
-@@ -3146,7 +3151,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3149,7 +3154,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
  	if (!vcpu_align)
  		vcpu_align = __alignof__(struct kvm_vcpu);
  	kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
@@ -111886,7 +111876,7 @@ index 302681c..3bde377 100644
  	if (!kvm_vcpu_cache) {
  		r = -ENOMEM;
  		goto out_free_3;
-@@ -3156,9 +3161,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3159,9 +3164,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
  	if (r)
  		goto out_free;
  
@@ -111898,7 +111888,7 @@ index 302681c..3bde377 100644
  
  	r = misc_register(&kvm_dev);
  	if (r) {
-@@ -3168,9 +3175,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -3171,9 +3178,6 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
  
  	register_syscore_ops(&kvm_syscore_ops);