Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

MIPS: loongson64: rename __node_data to node_data

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.

Link: https://lkml.kernel.org/r/20240807064110.1003856-6-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> [arm64 + CXL via QEMU]
Acked-by: Dan Williams <dan.j.williams@intel.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: David S. Miller <davem@davemloft.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Rob Herring (Arm) <robh@kernel.org>
Cc: Samuel Holland <samuel.holland@sifive.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Mike Rapoport (Microsoft) and committed by
Andrew Morton
e20bac65 6c701269

+6 -6
+2 -2
arch/mips/include/asm/mach-loongson64/mmzone.h
··· 14 14 #define pa_to_nid(addr) (((addr) & 0xf00000000000) >> NODE_ADDRSPACE_SHIFT) 15 15 #define nid_to_addrbase(nid) ((unsigned long)(nid) << NODE_ADDRSPACE_SHIFT) 16 16 17 - extern struct pglist_data *__node_data[]; 17 + extern struct pglist_data *node_data[]; 18 18 19 - #define NODE_DATA(n) (__node_data[n]) 19 + #define NODE_DATA(n) (node_data[n]) 20 20 21 21 extern void __init prom_init_numa_memory(void); 22 22
+4 -4
arch/mips/loongson64/numa.c
··· 29 29 30 30 unsigned char __node_distances[MAX_NUMNODES][MAX_NUMNODES]; 31 31 EXPORT_SYMBOL(__node_distances); 32 - struct pglist_data *__node_data[MAX_NUMNODES]; 33 - EXPORT_SYMBOL(__node_data); 32 + struct pglist_data *node_data[MAX_NUMNODES]; 33 + EXPORT_SYMBOL(node_data); 34 34 35 35 cpumask_t __node_cpumask[MAX_NUMNODES]; 36 36 EXPORT_SYMBOL(__node_cpumask); ··· 107 107 tnid = early_pfn_to_nid(nd_pa >> PAGE_SHIFT); 108 108 if (tnid != node) 109 109 pr_info("NODE_DATA(%d) on node %d\n", node, tnid); 110 - __node_data[node] = nd; 110 + node_data[node] = nd; 111 111 NODE_DATA(node)->node_start_pfn = start_pfn; 112 112 NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn; 113 113 ··· 206 206 207 207 void arch_refresh_nodedata(int nid, pg_data_t *pgdat) 208 208 { 209 - __node_data[nid] = pgdat; 209 + node_data[nid] = pgdat; 210 210 }