| Message ID | 20240801060826.559858-7-rppt@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | mm: introduce numa_memblks | expand |
On Thu, 1 Aug 2024 09:08:06 +0300 Mike Rapoport <rppt@kernel.org> wrote: > From: "Mike Rapoport (Microsoft)" <rppt@kernel.org> > > Commit f8f9f21c7848 ("MIPS: Fix build error for loongson64 and > sgi-ip27") added HAVE_ARCH_NODEDATA_EXTENSION to loongson64 to silence a > compilation error that happened because loongson64 didn't define array > of pg_data_t as node_data like most other architectures did. > > After rename of __node_data to node_data arch_alloc_nodedata() and > HAVE_ARCH_NODEDATA_EXTENSION can be dropped from loongson64. > > Since it was the only user of HAVE_ARCH_NODEDATA_EXTENSION config option > also remove this option from arch/mips/Kconfig. > > Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org> These are as you say now identical to the generic form, so don't need a special version for any reason I can see. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > arch/mips/Kconfig | 4 ---- > arch/mips/loongson64/numa.c | 10 ---------- > 2 files changed, 14 deletions(-) > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index ea5f3c3c31f6..43da6d596e2b 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -502,7 +502,6 @@ config MACH_LOONGSON64 > select USE_OF > select BUILTIN_DTB > select PCI_HOST_GENERIC > - select HAVE_ARCH_NODEDATA_EXTENSION if NUMA > help > This enables the support of Loongson-2/3 family of machines. > > @@ -2612,9 +2611,6 @@ config NUMA > config SYS_SUPPORTS_NUMA > bool > > -config HAVE_ARCH_NODEDATA_EXTENSION > - bool > - > config RELOCATABLE > bool "Relocatable kernel" > depends on SYS_SUPPORTS_RELOCATABLE > diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c > index b50ce28d2741..64fcfaa885b6 100644 > --- a/arch/mips/loongson64/numa.c > +++ b/arch/mips/loongson64/numa.c > @@ -198,13 +198,3 @@ void __init prom_init_numa_memory(void) > pr_info("CP0_PageGrain: CP0 5.1 (0x%x)\n", read_c0_pagegrain()); > prom_meminit(); > } > - > -pg_data_t * __init arch_alloc_nodedata(int nid) > -{ > - return memblock_alloc(sizeof(pg_data_t), SMP_CACHE_BYTES); > -} > - > -void arch_refresh_nodedata(int nid, pg_data_t *pgdat) > -{ > - node_data[nid] = pgdat; > -}
On 01.08.24 08:08, Mike Rapoport wrote: > From: "Mike Rapoport (Microsoft)" <rppt@kernel.org> > > Commit f8f9f21c7848 ("MIPS: Fix build error for loongson64 and > sgi-ip27") added HAVE_ARCH_NODEDATA_EXTENSION to loongson64 to silence a > compilation error that happened because loongson64 didn't define array > of pg_data_t as node_data like most other architectures did. > > After rename of __node_data to node_data arch_alloc_nodedata() and > HAVE_ARCH_NODEDATA_EXTENSION can be dropped from loongson64. > > Since it was the only user of HAVE_ARCH_NODEDATA_EXTENSION config option > also remove this option from arch/mips/Kconfig. > > Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org> > --- Acked-by: David Hildenbrand <david@redhat.com>
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ea5f3c3c31f6..43da6d596e2b 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -502,7 +502,6 @@ config MACH_LOONGSON64 select USE_OF select BUILTIN_DTB select PCI_HOST_GENERIC - select HAVE_ARCH_NODEDATA_EXTENSION if NUMA help This enables the support of Loongson-2/3 family of machines. @@ -2612,9 +2611,6 @@ config NUMA config SYS_SUPPORTS_NUMA bool -config HAVE_ARCH_NODEDATA_EXTENSION - bool - config RELOCATABLE bool "Relocatable kernel" depends on SYS_SUPPORTS_RELOCATABLE diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c index b50ce28d2741..64fcfaa885b6 100644 --- a/arch/mips/loongson64/numa.c +++ b/arch/mips/loongson64/numa.c @@ -198,13 +198,3 @@ void __init prom_init_numa_memory(void) pr_info("CP0_PageGrain: CP0 5.1 (0x%x)\n", read_c0_pagegrain()); prom_meminit(); } - -pg_data_t * __init arch_alloc_nodedata(int nid) -{ - return memblock_alloc(sizeof(pg_data_t), SMP_CACHE_BYTES); -} - -void arch_refresh_nodedata(int nid, pg_data_t *pgdat) -{ - node_data[nid] = pgdat; -}