Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4965628pxj; Wed, 9 Jun 2021 06:19:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztygquMLx+uywB+35wnJT44n6YMP/OCdF5SbZF5WGEK7r7ElmgRjRWRLrsecO1ua1qgTR6 X-Received: by 2002:a50:d7d5:: with SMTP id m21mr24463817edj.134.1623244798485; Wed, 09 Jun 2021 06:19:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623244798; cv=none; d=google.com; s=arc-20160816; b=hl6mHVwzaRe4gqWk+QzsXzF+EHB9iudKKYra95aAjlsuskDBophLMgW7jF9fo/4i1o wIUdsk8pT6jJe/PQoDMFtK8AbAqGzFK/ATrhaGHnLaIwtQUYU/k8FeB0zNjcMRfR3i7Q vNIY8iwNqWObgpiZwzI/Y+WUnA5RTyJ3QjahaQbMsl4mf2MLssdv1S/yhf/eKGc1QUIe A1Bc81SuT6UFr1PxBiMd0vYEZFLBdXeKfRmnhWwtmeSpv6aq4t+5xLehnMOc8uJmPdUR pKw+ndzBvufnkzwCuC4nOE7/7ErcJe14qcwdeaZPUBCHp+mR1n6mu9WAzprzphHtl+NS fSYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=9NfZXK4gsB9btnxjUGp8y8vOzX62hamrfG6+LEIyOZ0=; b=LmwjKIs+13FwgGeuSrh9wFcNJ9rLYKoZaRWp/gOVsp915wpGHejNUOL45XhMrGAS61 //NlV0LCikY8PtTbT6ye9t43PMYMt3/Y18KSkmqN8FlKfRs8DMyLFOWBFi92j9cT4LxR EjJWMn+KxtC+/BSekMS2bxd18HUGkKylJk6Unz62biX9PlnfMSeXxmcme85rmHfO3hhd rcdYJGrsogQoAYbSWllOqrdmR88KoXZYwtmOmzSP6AvgnGEBOukLI1DmB/kOaknNpNWe f+lxO+TCZQlBw2gflJMHB1CV2DLgdy5m0Tm13PonqFUMOQyS5K5OKStoDuAHzrxYV4Ws guHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R3Ua7SSr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n2si2357648edr.39.2021.06.09.06.19.35; Wed, 09 Jun 2021 06:19:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=R3Ua7SSr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233101AbhFIGyR (ORCPT + 99 others); Wed, 9 Jun 2021 02:54:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:49094 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231660AbhFIGyP (ORCPT ); Wed, 9 Jun 2021 02:54:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F40D661249; Wed, 9 Jun 2021 06:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623221541; bh=1NOcR9X1qrsVWC8pZ+WOBsJYlerWmKCJZFjAHZSyi1g=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=R3Ua7SSrAmPcigjQENQSeeEMj920XMPbd0mRAH+B4DHPNXP+taIOYwYUWcVIXb5j6 VJBySmzsOYZnbE6P4kMoE9ZvUpFBLiddGWhEYtU+E0KEUzEdWHkJqeLVtgBH6jO4C9 Pe9x2UVR5RoSXUB4d6262LpkrrGlAOAE5RSKB4ZbL931VU3fcHDPQIgBFXazdDNmx0 KYGm7I3vStPQPXah/NfmgtdSVOkJw8ewGPxvh3kYk2hvG8vZe26iLuJ3PqURc/rI07 p6tkwWjdfIcQ6IB7Wn8wiS2wG0e2oDGZCpnQAvL+zgWVSStPrtFhj2bz5Vv7w2pP3G OCNYfrxKsGSKw== Date: Wed, 9 Jun 2021 09:52:08 +0300 From: Mike Rapoport To: Andrew Morton Cc: Arnd Bergmann , Geert Uytterhoeven , Ivan Kokshaysky , Jonathan Corbet , Matt Turner , Mike Rapoport , Richard Henderson , Vineet Gupta , kexec@lists.infradead.org, linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-xtensa@linux-xtensa.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org Subject: Re: [PATCH v3 8/9] mm: replace CONFIG_NEED_MULTIPLE_NODES with CONFIG_NUMA Message-ID: References: <20210608091316.3622-1-rppt@kernel.org> <20210608091316.3622-9-rppt@kernel.org> <20210608172544.d9bf17549565d866fbb18451@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210608172544.d9bf17549565d866fbb18451@linux-foundation.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 08, 2021 at 05:25:44PM -0700, Andrew Morton wrote: > On Tue, 8 Jun 2021 12:13:15 +0300 Mike Rapoport wrote: > > > From: Mike Rapoport > > > > After removal of DISCINTIGMEM the NEED_MULTIPLE_NODES and NUMA > > configuration options are equivalent. > > > > Drop CONFIG_NEED_MULTIPLE_NODES and use CONFIG_NUMA instead. > > > > Done with > > > > $ sed -i 's/CONFIG_NEED_MULTIPLE_NODES/CONFIG_NUMA/' \ > > $(git grep -wl CONFIG_NEED_MULTIPLE_NODES) > > $ sed -i 's/NEED_MULTIPLE_NODES/NUMA/' \ > > $(git grep -wl NEED_MULTIPLE_NODES) > > > > with manual tweaks afterwards. > > > > ... > > > > --- a/include/linux/mmzone.h > > +++ b/include/linux/mmzone.h > > @@ -987,7 +987,7 @@ extern int movable_zone; > > #ifdef CONFIG_HIGHMEM > > static inline int zone_movable_is_highmem(void) > > { > > -#ifdef CONFIG_NEED_MULTIPLE_NODES > > +#ifdef CONFIG_NUMA > > return movable_zone == ZONE_HIGHMEM; > > #else > > return (ZONE_MOVABLE - 1) == ZONE_HIGHMEM; > > I dropped this hunk - your "mm/mmzone.h: simplify is_highmem_idx()" > removed zone_movable_is_highmem(). Ah, right. Thanks! -- Sincerely yours, Mike.