From patchwork Fri Sep 6 15:47:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1159084 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46Q25N0HRZz9s7T; Sat, 7 Sep 2019 01:48:07 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1i6GSw-0004p2-Ji; Fri, 06 Sep 2019 15:48:02 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1i6GSv-0004oS-30 for kernel-team@lists.ubuntu.com; Fri, 06 Sep 2019 15:48:01 +0000 Received: from mail-wr1-f72.google.com ([209.85.221.72]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1i6GSu-0004e3-Op for kernel-team@lists.ubuntu.com; Fri, 06 Sep 2019 15:48:00 +0000 Received: by mail-wr1-f72.google.com with SMTP id x1so2727214wrn.11 for ; Fri, 06 Sep 2019 08:48:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=mjQbmMoNPaD8TQXyui/GRtPlFKieHhMBSYa5DelHF7o=; b=mSOhocvwBv89vL2PnBW03pd0+NmpqdgZ4nOtDVob+QT5/Vd531sPIG7AVgdBmqtVq0 +vsW4jsAV1akAIQz5kFyUMPHVj1sEs2DgtVKR3pPbInLxqqnx7YQg9qbIOYFx1cgyERv H9kqE/qgF1f2uwOL0fdAHXLRBe7E/7bT8cUI8xJpDY+gxeHoHJmAiqkG6Ug6rFsYq8ml vxatjNTcmOmqIQjVsTJWTc2Lcirs57ZTvzqt5hNY2N6sfYf1zx3IFk0cKdHkmqkEn3Nj naKDyG9iQndcFWHQ6Uwr0LtqsN0PEUOpW2zCJT8POo4LrzmDTiMVsvs5IHKDDSldzbBV hKSg== X-Gm-Message-State: APjAAAUeTTKOs6hFcjpkgTnZCkO7HwBEjfaz3/nuGSQy2rMFFO8Ic/Og TtsBeD6dQ4Wvj74XtgKvPdYVg5QvE7fYGyGjRoPsgP7pVXhL2yQh49xypuwNNWpI2PkX09cFm+6 ajy8NoSNA0xBWzuQog0Pnr731STISt91AUmyygniR5g== X-Received: by 2002:a1c:3d03:: with SMTP id k3mr8137790wma.138.1567784880296; Fri, 06 Sep 2019 08:48:00 -0700 (PDT) X-Google-Smtp-Source: APXvYqzvmaQCCjgfOlVX2ot3Mx3CuJuiKEQs1Z2yxf/BuEuA89W4bAJjZNZqLI109/YQLouF1Q7QRw== X-Received: by 2002:a1c:3d03:: with SMTP id k3mr8137777wma.138.1567784880068; Fri, 06 Sep 2019 08:48:00 -0700 (PDT) Received: from localhost (host203-171-dynamic.54-82-r.retail.telecomitalia.it. [82.54.171.203]) by smtp.gmail.com with ESMTPSA id p85sm10241420wme.23.2019.09.06.08.47.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2019 08:47:59 -0700 (PDT) Date: Fri, 6 Sep 2019 17:47:58 +0200 From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [SRU][D][linux-kvm][PATCH] mm/zsmalloc.c: fix build when CONFIG_COMPACTION=n Message-ID: <20190906154758.GA9640@xps-13> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 Cc: Sergey Senozhatsky Cc: Henry Burns Cc: Minchan Kim Cc: Shakeel Butt Cc: Jonathan Adams Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds (cherry picked from commit 441e254cd40dc03beec3c650ce6ce6074bc6517f) Signed-off-by: Andrea Righi Acked-by: Colin Ian King Acked-by: Sultan Alsawaf Acked-by: Thadeu Lima de Souza Cascardo --- 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;