Merge remote-tracking branch 'origin/master'kernel-4.13.0-0.rc5.git3.1.vanilla.knurd.1.fc26

7 files changed, 88 insertions, 3 deletions

diff --git a/0001-mm-vmalloc-Don-t-unconditonally-use-__GFP_HIGHMEM.patch b/0001-mm-vmalloc-Don-t-unconditonally-use-__GFP_HIGHMEM.patch
new file mode 100644
index 000000000..d3b025547
--- /dev/null
+++ b/0001-mm-vmalloc-Don-t-unconditonally-use-__GFP_HIGHMEM.patch
@@ -0,0 +1,73 @@
+From caa7919d0402b9ebe40ac3f5228c31e28a933327 Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@redhat.com>
+Date: Wed, 16 Aug 2017 14:56:31 -0700
+Subject: [PATCH] mm/vmalloc: Don't unconditonally use __GFP_HIGHMEM
+To: Andrew Morton <akpm@linux-foundation.org>
+To: Michal Hocko <mhocko@suse.com>
+To: Vlastimil Babka <vbabka@suse.cz>
+To: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
+Cc: linux-mm@kvack.org
+Cc: linux-kernel@vger.kernel.org
+
+Commit 19809c2da28a ("mm, vmalloc: use __GFP_HIGHMEM implicitly")
+added use of __GFP_HIGHMEM for allocations. vmalloc_32 may use
+GFP_DMA/GFP_DMA32 which does not play nice with __GFP_HIGHMEM
+and will drigger a BUG in gfp_zone. Only add __GFP_HIGHMEM if
+we aren't using GFP_DMA/GFP_DMA32.
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1482249
+Fixes: 19809c2da28a ("mm, vmalloc: use __GFP_HIGHMEM implicitly")
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+---
+ mm/vmalloc.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/mm/vmalloc.c b/mm/vmalloc.c
+index 8698c1c86c4d..a47e3894c775 100644
+--- a/mm/vmalloc.c
++++ b/mm/vmalloc.c
+@@ -1671,7 +1671,10 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
+ 	struct page **pages;
+ 	unsigned int nr_pages, array_size, i;
+ 	const gfp_t nested_gfp = (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO;
+-	const gfp_t alloc_mask = gfp_mask | __GFP_HIGHMEM | __GFP_NOWARN;
++	const gfp_t alloc_mask = gfp_mask | __GFP_NOWARN;
++	const gfp_t highmem_mask = (gfp_mask & (GFP_DMA | GFP_DMA32)) ?
++					0 :
++					__GFP_HIGHMEM;
+ 
+ 	nr_pages = get_vm_area_size(area) >> PAGE_SHIFT;
+ 	array_size = (nr_pages * sizeof(struct page *));
+@@ -1679,7 +1682,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
+ 	area->nr_pages = nr_pages;
+ 	/* Please note that the recursion is strictly bounded. */
+ 	if (array_size > PAGE_SIZE) {
+-		pages = __vmalloc_node(array_size, 1, nested_gfp|__GFP_HIGHMEM,
++		pages = __vmalloc_node(array_size, 1, nested_gfp|highmem_mask,
+ 				PAGE_KERNEL, node, area->caller);
+ 	} else {
+ 		pages = kmalloc_node(array_size, nested_gfp, node);
+@@ -1700,9 +1703,9 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
+ 		}
+ 
+ 		if (node == NUMA_NO_NODE)
+-			page = alloc_page(alloc_mask);
++			page = alloc_page(alloc_mask|highmem_mask);
+ 		else
+-			page = alloc_pages_node(node, alloc_mask, 0);
++			page = alloc_pages_node(node, alloc_mask|highmem_mask, 0);
+ 
+ 		if (unlikely(!page)) {
+ 			/* Successfully allocated i pages, free them in __vunmap() */
+@@ -1710,7 +1713,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
+ 			goto fail;
+ 		}
+ 		area->pages[i] = page;
+-		if (gfpflags_allow_blocking(gfp_mask))
++		if (gfpflags_allow_blocking(gfp_mask|highmem_mask))
+ 			cond_resched();
+ 	}
+ 
+-- 
+2.13.0
+
diff --git a/baseconfig/x86/x86_64/CONFIG_88EU_AP_MODE b/baseconfig/x86/x86_64/CONFIG_88EU_AP_MODE
new file mode 100644
index 000000000..8ba98fbe9
--- /dev/null
+++ b/baseconfig/x86/x86_64/CONFIG_88EU_AP_MODE
@@ -0,0 +1 @@
+CONFIG_88EU_AP_MODE=y
diff --git a/gitrev b/gitrev
index 7e75b5c48..4f254efd8 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-510c8a899caf095cb13d09d203573deef15db2fe
+ac9a40905a610fb02086a37b11ff4bf046825a88
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 5b46187aa..6a91c3475 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -26,6 +26,7 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8723AU_AP_MODE is not set
 # CONFIG_8723AU_BT_COEXIST is not set
+CONFIG_88EU_AP_MODE=y
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FS_POSIX_ACL=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 67b01320c..e9fc3df83 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -26,6 +26,7 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_8723AU_AP_MODE is not set
 # CONFIG_8723AU_BT_COEXIST is not set
+CONFIG_88EU_AP_MODE=y
 CONFIG_9P_FSCACHE=y
 CONFIG_9P_FS=m
 CONFIG_9P_FS_POSIX_ACL=y
diff --git a/kernel.spec b/kernel.spec
index e17052253..1fb097857 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 5
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -666,6 +666,9 @@ Patch617: Fix-for-module-sig-verification.patch
 # request for bug fix
 Patch618: iio-race-fix.patch
 
+# rhbz 1482249
+Patch619: 0001-mm-vmalloc-Don-t-unconditonally-use-__GFP_HIGHMEM.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2222,6 +2225,12 @@ fi
 #
 #
 %changelog
+* Thu Aug 17 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc5.git3.1
+- Linux v4.13-rc5-75-gac9a40905a61
+
+* Thu Aug 17 2017 Laura Abbott <labbott@fedoraproject.org>
+- Fix for vmalloc_32 failure (rhbz 1482249)
+
 * Wed Aug 16 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc5.git2.1
 - Linux v4.13-rc5-67-g510c8a899caf
 
diff --git a/sources b/sources
index cc62dee57..f53ad5026 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c
 SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 SHA512 (patch-4.13-rc5.xz) = eebba5b56aa93aaea8ff450febbd13bb5ffef9a8331666dc6ac44a73b355e8ec36d9d27da1aaec07e45844669bd31e9d8fadd278aa6d04356af2aa90387d65ac
-SHA512 (patch-4.13-rc5-git2.xz) = 7905147a287ca2dc2eec2315a1bce0da34406799d98af796fadd79a55c8d82d7254a4348c42da786c5fadf8bdbfc8f1de993705e2ac369fe397ba9853f831690
+SHA512 (patch-4.13-rc5-git3.xz) = 5b3967fa17a87878b4604be8e9d9c50dfb567beec4b4261c691e61b3d44ec7d39186f0a618a463f6600bb5e8a7882ae1fcf00cb7e6ccf22ef2412dba6a7b7b26