mips-loongson64-rename-__node_data-to-node_data.patch removed from -mm tree
The quilt patch titled
Subject: MIPS: loongson64: rename __node_data to node_data
has been removed from the -mm tree. Its filename was
mips-loongson64-rename-__node_data-to-node_data.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: MIPS: loongson64: rename __node_data to node_data
Date: Wed, 7 Aug 2024 09:40:49 +0300
Make definition of node_data match other architectures. This will allow pulling declaration of node_data to the generic mm code in the following commit.
Signed-off-by Mike Rapoport (Microsoft) <[email protected]>
Reviewed-by Jiaxun Yang <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>
Reviewed-by Jonathan Cameron <[email protected]>
Acked-by Dan Williams <[email protected]>
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 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]>
Cc Zi Yan <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/mips/include/asm/mach-loongson64/mmzone.h | 4 ++-- arch/mips/loongson64/numa.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/mips/include/asm/mach-loongson64/mmzone.h renamed from arch/mips/include/asm/mach-loongson64/mmzone.h~mips-loongson64-rename-__node_data-to-node_data +2 -2
@@ -14,9 +14,9 @@#define pa_to_nid (addr) (((addr) & 0xf00000000000) >> NODE_ADDRSPACE_SHIFT)#define nid_to_addrbase (nid) ((unsigned long)(nid) << NODE_ADDRSPACE_SHIFT) -extern struct pglist_data *__node_data[]; +extern struct pglist_data *node_data[]; -#define NODE_DATA (n) (__node_data[n]) +#define NODE_DATA (n) (node_data[n])extern void __init prom_init_numa_memory (void );
arch/mips/loongson64/numa.c renamed from arch/mips/loongson64/numa.c~mips-loongson64-rename-__node_data-to-node_data +4 -4
@@ -29,8 +29,8 @@unsigned char __node_distances[MAX_NUMNODES ][MAX_NUMNODES ];EXPORT_SYMBOL (__node_distances); -struct pglist_data *__node_data[MAX_NUMNODES ]; -EXPORT_SYMBOL (__node_data); +struct pglist_data *node_data[MAX_NUMNODES ]; +EXPORT_SYMBOL (node_data);cpumask_t __node_cpumask[MAX_NUMNODES ];EXPORT_SYMBOL (__node_cpumask);
@@ -107,7 +107,7 @@ static void __init node_mem_init(unsigne tnid =early_pfn_to_nid (nd_pa >>PAGE_SHIFT );if (tnid != node)pr_info ("NODE_DATA(%d) on node %d\n" , node, tnid); - __node_data[node] = nd; + node_data[node] = nd;NODE_DATA (node)->node_start_pfn = start_pfn;NODE_DATA (node)->node_spanned_pages = end_pfn - start_pfn;
@@ -206,5 +206,5 @@ pg_data_t * __init arch_alloc_nodedata(ivoid arch_refresh_nodedata (int nid,pg_data_t *pgdat) { - __node_data[nid] = pgdat; + node_data[nid] = pgdat; }
_
Patches currently in -mm which might be from [email protected] are