2 files changed, 7 insertions, 0 deletions

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 82e079a0d363..78d6a9e5830e 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -568,6 +568,8 @@ static int __init numa_init(int (*init_func)(void))
         memset(&numa_meminfo, 0, sizeof(numa_meminfo));
         WARN_ON(memblock_set_node(0, ULLONG_MAX, &memblock.memory,
                                   MAX_NUMNODES));
+        /* In case that parsing SRAT failed. */
+        WARN_ON(memblock_clear_hotplug(0, ULLONG_MAX));
         numa_reset_distance();
 
         ret = init_func();
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index 266ca912f62e..1a25187e151e 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -181,6 +181,11 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
                 (unsigned long long) start, (unsigned long long) end - 1,
                 hotpluggable ? " hotplug" : "");
 
+        /* Mark hotplug range in memblock. */
+        if (hotpluggable && memblock_mark_hotplug(start, ma->length))
+                pr_warn("SRAT: Failed to mark hotplug range [mem %#010Lx-%#010Lx] in memblock\n",
+                        (unsigned long long)start, (unsigned long long)end - 1);
+
         return 0;
 out_err_bad_srat:
         bad_srat();