From: Sasha Levin <sashal@kernel.org>
Date: Thu, 5 Sep 2019 08:38:52 +0000 (-0400)
Subject: fixes for 4.9
X-Git-Tag: v4.4.191~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca8ac9ea47174c8513713a66973beb2bf4f452fd;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for 4.9

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.9/mm-zsmalloc.c-fix-build-when-config_compaction-n.patch b/queue-4.9/mm-zsmalloc.c-fix-build-when-config_compaction-n.patch
new file mode 100644
index 00000000000..4d04d3b87c9
--- /dev/null
+++ b/queue-4.9/mm-zsmalloc.c-fix-build-when-config_compaction-n.patch
@@ -0,0 +1,39 @@
+From aea0028bc58715f46d2aac87b17b0039c8a94213 Mon Sep 17 00:00:00 2001
+From: Andrew Morton <akpm@linux-foundation.org>
+Date: Fri, 30 Aug 2019 16:04:35 -0700
+Subject: mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n
+
+[ Upstream commit 441e254cd40dc03beec3c650ce6ce6074bc6517f ]
+
+Fixes: 701d678599d0c1 ("mm/zsmalloc.c: fix race condition in zs_destroy_pool")
+Link: http://lkml.kernel.org/r/201908251039.5oSbEEUT%25lkp@intel.com
+Reported-by: kbuild test robot <lkp@intel.com>
+Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
+Cc: Henry Burns <henrywolfeburns@gmail.com>
+Cc: Minchan Kim <minchan@kernel.org>
+Cc: Shakeel Butt <shakeelb@google.com>
+Cc: Jonathan Adams <jwadams@google.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ mm/zsmalloc.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
+index ad8a34bd15ca7..5a50ad517f0f1 100644
+--- a/mm/zsmalloc.c
++++ b/mm/zsmalloc.c
+@@ -2488,7 +2488,9 @@ struct zs_pool *zs_create_pool(const char *name)
+ 	if (!pool->name)
+ 		goto err;
+ 
++#ifdef CONFIG_COMPACTION
+ 	init_waitqueue_head(&pool->migration_wait);
++#endif
+ 
+ 	if (create_cache(pool))
+ 		goto err;
+-- 
+2.20.1
+
diff --git a/queue-4.9/series b/queue-4.9/series
index 924dbde791a..d2651db09e8 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -81,3 +81,4 @@ kvm-arm-arm64-vgic-fix-potential-deadlock-when-ap_li.patch
 kvm-arm-arm64-vgic-v2-handle-sgi-bits-in-gicd_i-s-c-.patch
 i2c-piix4-fix-port-selection-for-amd-family-16h-mode.patch
 x86-ptrace-fix-up-botched-merge-of-spectrev1-fix.patch
+mm-zsmalloc.c-fix-build-when-config_compaction-n.patch