diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2020-04-02 19:50:31 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2020-04-02 19:50:31 -0700 |
| commit | d3b88655c0a157c11370b8faf50e82ecb1c17d54 (patch) | |
| tree | e3c868d5243a6073625287979bd52cf76f4eaaa8 /mm/Kconfig | |
| parent | 91bf79bcb61df7a89690f894f06b78b0e66fb43c (diff) | |
| parent | 7b27a8622f802761d5c6abd6c37b22312a35343c (diff) | |
| download | lwn-d3b88655c0a157c11370b8faf50e82ecb1c17d54.tar.gz lwn-d3b88655c0a157c11370b8faf50e82ecb1c17d54.zip | |
Merge branch 'for-5.7/numa' into libnvdimm-for-next
- Promote numa_map_to_online_node() to a cross-kernel generic facility.
- Save x86 numa information to allow for node-id lookups for reserved
memory ranges, deploy that capability for the e820-pmem driver.
- Introduce phys_to_target_node() to facilitate drivers that want to
know resulting numa node if a given reserved address range was
onlined.
Diffstat (limited to 'mm/Kconfig')
| -rw-r--r-- | mm/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index ab80933be65f..328268473fec 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -139,6 +139,10 @@ 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 @@ -154,6 +158,7 @@ config MEMORY_HOTPLUG bool "Allow for memory hot-add" depends on SPARSEMEM || X86_64_ACPI_NUMA depends on ARCH_ENABLE_MEMORY_HOTPLUG + select NUMA_KEEP_MEMINFO if NUMA config MEMORY_HOTPLUG_SPARSE def_bool y |