Skip to contentSkip to conversation

mm-move-numa_distance-and-related-code-from-x86-to-numa_memblks.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Sep 4, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: move numa_distance and related code from x86 to numa_memblks
has been removed from the -mm tree. Its filename was
mm-move-numa_distance-and-related-code-from-x86-to-numa_memblks.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)" <[email protected]>
Subject: mm: move numa_distance and related code from x86 to numa_memblks
Date: Wed, 7 Aug 2024 09:41:02 +0300

Move code dealing with numa_distance array from arch/x86 to mm/numa_memblks.c

This code will be later reused by arch_numa.

No functional changes.

Cc Alexander Gordeev <[email protected]>
Cc Andreas Larsson <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Davidlohr Bueso <[email protected]>
Cc David S. Miller <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc Huacai Chen <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiaxun Yang <[email protected]>
Cc John Paul Adrian Glaubitz <[email protected]>
Cc Jonathan Corbet <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
Cc Rob Herring (Arm) <[email protected]>
Cc Samuel Holland <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Vasily Gorbik <[email protected]>
Cc Will Deacon <[email protected]>

---

 arch/x86/include/asm/numa.h  |    2 
 arch/x86/mm/numa.c           |  104 ---------------------------------
 arch/x86/mm/numa_internal.h  |    2 
 include/linux/numa_memblks.h |    4 +
 mm/numa_memblks.c            |  104 +++++++++++++++++++++++++++++++++
 5 files changed, 108 insertions(+), 108 deletions(-)
arch/x86/include/asm/numa.h renamed from arch/x86/include/asm/numa.h~mm-move-numa_distance-and-related-code-from-x86-to-numa_memblks +0 -2
@@ -23,8 +23,6 @@ extern int numa_off;
 extern s16 __apicid_to_node[MAX_LOCAL_APIC];
 extern nodemask_t numa_nodes_parsed __initdata;
 
-extern void __init numa_set_distance(int from, int to, int distance);
-
 static inline void set_apicid_to_node(int apicid, s16 node)
 {
 	__apicid_to_node[apicid] = node;
arch/x86/mm/numa.c renamed from arch/x86/mm/numa.c~mm-move-numa_distance-and-related-code-from-x86-to-numa_memblks +0 -104

116 lines not on this page · raw message

arch/x86/mm/numa_internal.h renamed from arch/x86/mm/numa_internal.h~mm-move-numa_distance-and-related-code-from-x86-to-numa_memblks +0 -2
@@ -5,8 +5,6 @@
 #include <linux/types.h>
 #include <asm/numa.h>
 
-void __init numa_reset_distance(void);
-
 void __init x86_numa_init(void);
 
 struct numa_meminfo;
include/linux/numa_memblks.h renamed from include/linux/numa_memblks.h~mm-move-numa_distance-and-related-code-from-x86-to-numa_memblks +4 -0
@@ -7,6 +7,10 @@
 
 #define NR_NODE_MEMBLKS		(MAX_NUMNODES * 2)
 
+extern int numa_distance_cnt;
+void __init numa_set_distance(int from, int to, int distance);
+void __init numa_reset_distance(void);
+
 struct numa_memblk {
 	u64			start;
 	u64			end;
mm/numa_memblks.c renamed from mm/numa_memblks.c~mm-move-numa_distance-and-related-code-from-x86-to-numa_memblks +104 -0

115 lines not on this page · raw message

_

Patches currently in -mm which might be from [email protected] are