Commit e20bac65 authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Andrew Morton
Browse files

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: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Reviewed-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Tested-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> [arm64 + CXL via QEMU]
Acked-by: default avatarDan 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 6c701269

arch/mips/include/asm/mach-loongson64/mmzone.h

+2 −2
Original line number Diff line number Diff line
@@ -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

+4 −4
Original line number Diff line number Diff line
@@ -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(unsigned int node) 
	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(int nid) 


void arch_refresh_nodedata(int nid, pg_data_t *pgdat)

{

	__node_data[nid] = pgdat;

	node_data[nid] = pgdat;

}