From patchwork Tue Jun 23 19:56:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223164 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98D95C433DF for ; Tue, 23 Jun 2020 21:25:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69DC020786 for ; Tue, 23 Jun 2020 21:25:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592947504; bh=unXX75l7378VHfw0LAbGxggPIkORTvXTWA0IDMpMiBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XJxiti8G5mdPvz6W1f6bR6sF5sOpvDYoKHE8TCNLsqqQqJ1XXL4vdAd0Q9autm3EN QldzsSdfTDfi8P+solzIcK7x3+efhEG9OVR2w2a6hcWMEycXFNi/2aEVYV1fmAWjiA aJtl94HRBJybj92GLbyMKHKAPfepzBpwRisyb4ew= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389211AbgFWUTO (ORCPT ); Tue, 23 Jun 2020 16:19:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:36184 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388569AbgFWUTJ (ORCPT ); Tue, 23 Jun 2020 16:19:09 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1207F2064B; Tue, 23 Jun 2020 20:19:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943549; bh=unXX75l7378VHfw0LAbGxggPIkORTvXTWA0IDMpMiBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CpRmE6k0T1SKy7riG2UVhkOhnvQVWa9k/Q22zknkdqSRa6vQLZuN3Z38eSoJe8rop cOV6SN4ZivZqND+ByRpQJQ65xnkg/rXodBNyoHIzUw6J1iOmDFGwQQRUHF+Rot5W4K 5JQb6GLbufzJKlwPcdARWIUZN61UP8Gn+pY62eu8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qian Cai , Heiko Carstens , Vasily Gorbik , Sasha Levin Subject: [PATCH 5.7 405/477] s390/numa: let NODES_SHIFT depend on NEED_MULTIPLE_NODES Date: Tue, 23 Jun 2020 21:56:42 +0200 Message-Id: <20200623195426.678210466@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Heiko Carstens [ Upstream commit 64438e1bc0cdbe6d30bcdcb976f935eb3c297adc ] Qian Cai reported: """ When NUMA=n and nr_node_ids=2, in apply_wqattrs_prepare(), it has, for_each_node(node) { if (wq_calc_node_cpumask(... where it will trigger a booting warning, WARNING: workqueue cpumask: online intersect > possible intersect because it found 2 nodes and wq_numa_possible_cpumask[1] is an empty cpumask. """ Let NODES_SHIFT depend on NEED_MULTIPLE_NODES like it is done on other architectures in order to fix this. Fixes: 701dc81e7412 ("s390/mm: remove fake numa support") Reported-by: Qian Cai Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik Signed-off-by: Sasha Levin --- arch/s390/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 2167bce993ff6..ae01be202204b 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -462,6 +462,7 @@ config NUMA config NODES_SHIFT int + depends on NEED_MULTIPLE_NODES default "1" config SCHED_SMT