| Message ID | 20240716111346.3676969-4-rppt@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm: introduce numa_memblks | expand |
在2024年7月16日七月 下午7:13，Mike Rapoport写道： > From: "Mike Rapoport (Microsoft)" <rppt@kernel.org> > > 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) <rppt@kernel.org> Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com> MIPS should go arch_numa at some point as well. Thanks - Jiaxun > --- > arch/mips/include/asm/mach-loongson64/mmzone.h | 4 ++-- > arch/mips/loongson64/numa.c | 8 ++++---- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/mips/include/asm/mach-loongson64/mmzone.h > b/arch/mips/include/asm/mach-loongson64/mmzone.h > index a3d65d37b8b5..2effd5f8ed62 100644 > --- a/arch/mips/include/asm/mach-loongson64/mmzone.h > +++ b/arch/mips/include/asm/mach-loongson64/mmzone.h > @@ -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); > > diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c > index 68dafd6d3e25..b50ce28d2741 100644 > --- a/arch/mips/loongson64/numa.c > +++ b/arch/mips/loongson64/numa.c > @@ -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; > } > -- > 2.43.0
On 16.07.24 13:13, Mike Rapoport wrote: > From: "Mike Rapoport (Microsoft)" <rppt@kernel.org> > > 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) <rppt@kernel.org> > --- Reviewed-by: David Hildenbrand <david@redhat.com>
On Tue, 16 Jul 2024 14:13:32 +0300 Mike Rapoport <rppt@kernel.org> wrote: > From: "Mike Rapoport (Microsoft)" <rppt@kernel.org> > > 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) <rppt@kernel.org> FWIW rename looks fine Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
diff --git a/arch/mips/include/asm/mach-loongson64/mmzone.h b/arch/mips/include/asm/mach-loongson64/mmzone.h index a3d65d37b8b5..2effd5f8ed62 100644 --- a/arch/mips/include/asm/mach-loongson64/mmzone.h +++ b/arch/mips/include/asm/mach-loongson64/mmzone.h @@ -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); diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c index 68dafd6d3e25..b50ce28d2741 100644 --- a/arch/mips/loongson64/numa.c +++ b/arch/mips/loongson64/numa.c @@ -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; }