Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0FDF6BB4B for ; Wed, 4 Sep 2024 04:17:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725423431; cv=none; b=LfBNmMxh54Lmg69CzSXm23KYjNCt3j+yLhDG5hMnFwMlGCJtWWP2ICz+9rex2CvyQIATogMBFt10UJ4CTUlzbdj3bDBhIpp8DQD/bR4mX6+Iec/mqZtjS2amyEvxwvAyzM0boiMHrrDRuY+iMWfvbrhCYixwxvTB0KcKj5rq0D8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725423431; c=relaxed/simple; bh=mhjJsc/3UY2XxPx7gANrqFRT3WMQO2xB3S8RyeVHeZA=; h=Date:To:From:Subject:Message-Id; b=fx6peH2jdwWAtaUAomJ67jufgGZXzs4S6uIP9wNJAH7z0A6MqzQFJoIUexkGX00M58lWFCY0eKv4jDtqyW4R01KNKpOLd18oS7h9TtQ1DT9OgcEKt+58jx26K/TkP91FMcBnqSDUft6ZBchm9ZQmFmhY7eO2RB0p4ITAFoXrGvA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=ch/FtGY+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="ch/FtGY+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D834C4CEC2; Wed, 4 Sep 2024 04:17:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1725423431; bh=mhjJsc/3UY2XxPx7gANrqFRT3WMQO2xB3S8RyeVHeZA=; h=Date:To:From:Subject:From; b=ch/FtGY+3Gjz5hk2odfYNJ84adH8pya1vAsO8M+huSmdpm0zRzGtT7Aq/8poCFKZP cmAPLJTPvXP5gUxbAXJsHC4GlY6DXFd2+bCEy1z/x0RCQrbxJIkmMOszr/kAnPZZVJ EW1po7OVQOPUCRcQEUanr5lvEah8FaoNMo7fCchs= Date: Tue, 03 Sep 2024 21:17:10 -0700 To: mm-commits@vger.kernel.org,ziy@nvidia.com,will@kernel.org,tsbogend@alpha.franken.de,tglx@linutronix.de,samuel.holland@sifive.com,robh@kernel.org,rafael@kernel.org,palmer@dabbelt.com,mpe@ellerman.id.au,mingo@redhat.com,Jonathan.Cameron@huawei.com,jiaxun.yang@flygoat.com,hca@linux.ibm.com,gregkh@linuxfoundation.org,gor@linux.ibm.com,glaubitz@physik.fu-berlin.de,david@redhat.com,dave@stgolabs.net,davem@davemloft.net,dave.hansen@linux.intel.com,dan.j.williams@intel.com,corbet@lwn.net,christophe.leroy@csgroup.eu,chenhuacai@kernel.org,catalin.marinas@arm.com,bp@alien8.de,arnd@arndb.de,andreas@gaisler.com,agordeev@linux.ibm.com,rppt@kernel.org,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] x86-numa-move-fake_node_-defines-to-numa_emu.patch removed from -mm tree Message-Id: <20240904041711.6D834C4CEC2@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: x86/numa: move FAKE_NODE_* defines to numa_emu has been removed from the -mm tree. Its filename was x86-numa-move-fake_node_-defines-to-numa_emu.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: "Mike Rapoport (Microsoft)" Subject: x86/numa: move FAKE_NODE_* defines to numa_emu Date: Wed, 7 Aug 2024 09:40:56 +0300 The definitions of FAKE_NODE_MIN_SIZE and FAKE_NODE_MIN_HASH_MASK are only used by numa emulation code, make them local to arch/x86/mm/numa_emulation.c Link: https://lkml.kernel.org/r/20240807064110.1003856-13-rppt@kernel.org Signed-off-by: Mike Rapoport (Microsoft) Reviewed-by: Jonathan Cameron Tested-by: Zi Yan # for x86_64 and arm64 Tested-by: Jonathan Cameron [arm64 + CXL via QEMU] Acked-by: Dan Williams Acked-by: David Hildenbrand Cc: Alexander Gordeev Cc: Andreas Larsson Cc: Arnd Bergmann Cc: Borislav Petkov Cc: Catalin Marinas Cc: Christophe Leroy Cc: Dave Hansen Cc: Davidlohr Bueso Cc: David S. Miller Cc: Greg Kroah-Hartman Cc: Heiko Carstens Cc: Huacai Chen Cc: Ingo Molnar Cc: Jiaxun Yang Cc: John Paul Adrian Glaubitz Cc: Jonathan Corbet Cc: Michael Ellerman Cc: Palmer Dabbelt Cc: Rafael J. Wysocki Cc: Rob Herring (Arm) Cc: Samuel Holland Cc: Thomas Bogendoerfer Cc: Thomas Gleixner Cc: Vasily Gorbik Cc: Will Deacon Signed-off-by: Andrew Morton --- arch/x86/include/asm/numa.h | 2 -- arch/x86/mm/numa_emulation.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) --- a/arch/x86/include/asm/numa.h~x86-numa-move-fake_node_-defines-to-numa_emu +++ a/arch/x86/include/asm/numa.h @@ -71,8 +71,6 @@ void debug_cpumask_set_cpu(int cpu, int #endif #ifdef CONFIG_NUMA_EMU -#define FAKE_NODE_MIN_SIZE ((u64)32 << 20) -#define FAKE_NODE_MIN_HASH_MASK (~(FAKE_NODE_MIN_SIZE - 1UL)) int numa_emu_cmdline(char *str); #else /* CONFIG_NUMA_EMU */ static inline int numa_emu_cmdline(char *str) --- a/arch/x86/mm/numa_emulation.c~x86-numa-move-fake_node_-defines-to-numa_emu +++ a/arch/x86/mm/numa_emulation.c @@ -10,6 +10,9 @@ #include "numa_internal.h" +#define FAKE_NODE_MIN_SIZE ((u64)32 << 20) +#define FAKE_NODE_MIN_HASH_MASK (~(FAKE_NODE_MIN_SIZE - 1UL)) + static int emu_nid_to_phys[MAX_NUMNODES]; static char *emu_cmdline __initdata; _ Patches currently in -mm which might be from rppt@kernel.org are