x86 is the lone architecture that uses numa_meminfo. Move and rename
NUMA_KEEP_MEMINFO from the core mm/Kconfig to X86_NUMA_KEEP_MEMINFO in
arch/x86/mm/Kconfig. This is in preparation for defining a generic
memblock based implementation of memory_add_physaddr_to_nid() and
phys_to_target_node().
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: x86@xxxxxxxxxx
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
---
arch/x86/Kconfig | 7 ++++++-
arch/x86/mm/numa.c | 2 +-
arch/x86/mm/numa_internal.h | 7 +++++++
include/linux/numa.h | 7 -------
mm/Kconfig | 5 -----
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6a0cc524882d..fc9264ea4041 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1560,6 +1560,11 @@ config NUMA
Otherwise, you should say N.
+# Keep NUMA mapping infrastructure post-init.
+config X86_NUMA_KEEP_MEMINFO
+ def_bool MEMORY_HOTPLUG
+ depends on NUMA
+
config AMD_NUMA
def_bool y
prompt "Old style AMD Opteron NUMA detection"
@@ -1640,7 +1645,7 @@ config X86_PMEM_LEGACY
depends on PHYS_ADDR_T_64BIT
depends on BLK_DEV
select X86_PMEM_LEGACY_DEVICE
- select NUMA_KEEP_MEMINFO if NUMA
+ select X86_NUMA_KEEP_MEMINFO if NUMA
select LIBNVDIMM
help
Treat memory marked using the non-standard e820 type of 12 as used
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 44fdf06d497e..311d22cf8ac2 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -893,7 +893,7 @@ EXPORT_SYMBOL(cpumask_of_node);
#endif /* !CONFIG_DEBUG_PER_CPU_MAPS */
-#ifdef CONFIG_NUMA_KEEP_MEMINFO
+#ifdef CONFIG_X86_NUMA_KEEP_MEMINFO
static int meminfo_to_nid(struct numa_meminfo *mi, u64 start)
{
int i;
diff --git a/arch/x86/mm/numa_internal.h b/arch/x86/mm/numa_internal.h
index 86860f279662..7b843414335f 100644
--- a/arch/x86/mm/numa_internal.h
+++ b/arch/x86/mm/numa_internal.h
@@ -11,6 +11,13 @@ struct numa_memblk {
int nid;
};
+/* optionally keep NUMA memory info available post init */
+#ifdef CONFIG_X86_NUMA_KEEP_MEMINFO
+#define __initdata_or_meminfo
+#else
+#define __initdata_or_meminfo __initdata
+#endif
+
struct numa_meminfo {
int nr_blks;
struct numa_memblk blk[NR_NODE_MEMBLKS];
diff --git a/include/linux/numa.h b/include/linux/numa.h
index a42df804679e..5d25c5de1322 100644
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@ -13,13 +13,6 @@
#define NUMA_NO_NODE (-1)
-/* optionally keep NUMA memory info available post init */
-#ifdef CONFIG_NUMA_KEEP_MEMINFO
-#define __initdata_or_meminfo
-#else
-#define __initdata_or_meminfo __initdata
-#endif
-
#ifdef CONFIG_NUMA
/* Generic implementation available */
int numa_map_to_online_node(int node);
diff --git a/mm/Kconfig b/mm/Kconfig
index f2104cc0d35c..0051f735ad98 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -139,10 +139,6 @@ config HAVE_FAST_GUP
config ARCH_KEEP_MEMBLOCK
bool
-# Keep arch NUMA mapping infrastructure post-init.
-config NUMA_KEEP_MEMINFO
- bool
-
config MEMORY_ISOLATION
bool
@@ -159,7 +155,6 @@ config MEMORY_HOTPLUG
depends on SPARSEMEM || X86_64_ACPI_NUMA
depends on ARCH_ENABLE_MEMORY_HOTPLUG
depends on 64BIT || BROKEN
- select NUMA_KEEP_MEMINFO if NUMA
config MEMORY_HOTPLUG_SPARSE
def_bool y
