Drop the existing memory_add_physaddr_to_nid() stub and add support for
phys_to_target_node() by selecting the generic CONFIG_MEMBLOCK_NUMAINFO
mechanism for querying firmware numa data at runtime.
Cc: Mike Rapoport <r...@linux.ibm.com>
Cc: Jia He <justin...@arm.com>
Cc: Will Deacon <w...@kernel.org>
Cc: David Hildenbrand <da...@redhat.com>
Cc: Catalin Marinas <catalin.mari...@arm.com>
Cc: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Dan Williams <dan.j.willi...@intel.com>
---
arch/arm64/Kconfig | 1 +
arch/arm64/mm/numa.c | 10 ----------
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index a4a094bedcb2..cfef26ce8c0c 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -65,6 +65,7 @@ config ARM64
select ARCH_INLINE_SPIN_UNLOCK_IRQ if !PREEMPTION
select ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE if !PREEMPTION
select ARCH_KEEP_MEMBLOCK
+ select MEMBLOCK_NUMA_INFO
select ARCH_USE_CMPXCHG_LOCKREF
select ARCH_USE_GNU_PROPERTY
select ARCH_USE_QUEUED_RWLOCKS
diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c
index aafcee3e3f7e..73f8b49d485c 100644
--- a/arch/arm64/mm/numa.c
+++ b/arch/arm64/mm/numa.c
@@ -461,13 +461,3 @@ void __init arm64_numa_init(void)
numa_init(dummy_numa_init);
}
-
-/*
- * We hope that we will be hotplugging memory on nodes we already know about,
- * such that acpi_get_node() succeeds and we never fall back to this...
- */
-int memory_add_physaddr_to_nid(u64 addr)
-{
- pr_warn("Unknown node for memory at 0x%llx, assuming node 0\n", addr);
- return 0;
-}
