[SRU][D][linux-kvm][PATCH] mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n

Andrea Righi andrea.righi at canonical.com
Fri Sep 6 15:47:58 UTC 2019


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 at intel.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky at gmail.com>
Cc: Henry Burns <henrywolfeburns at gmail.com>
Cc: Minchan Kim <minchan at kernel.org>
Cc: Shakeel Butt <shakeelb at google.com>
Cc: Jonathan Adams <jwadams at google.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
(cherry picked from commit 441e254cd40dc03beec3c650ce6ce6074bc6517f)
Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
---
 mm/zsmalloc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 515b00801af2..7d62ef2daf83 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -2432,7 +2432,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




More information about the kernel-team mailing list