diff options
Diffstat (limited to 'arch/x86/mm/numa.c')
-rw-r--r-- | arch/x86/mm/numa.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 8bf93bae1f13..24aec58d6afd 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c | |||
@@ -567,6 +567,17 @@ static int __init numa_init(int (*init_func)(void)) | |||
567 | ret = init_func(); | 567 | ret = init_func(); |
568 | if (ret < 0) | 568 | if (ret < 0) |
569 | return ret; | 569 | return ret; |
570 | |||
571 | /* | ||
572 | * We reset memblock back to the top-down direction | ||
573 | * here because if we configured ACPI_NUMA, we have | ||
574 | * parsed SRAT in init_func(). It is ok to have the | ||
575 | * reset here even if we did't configure ACPI_NUMA | ||
576 | * or acpi numa init fails and fallbacks to dummy | ||
577 | * numa init. | ||
578 | */ | ||
579 | memblock_set_bottom_up(false); | ||
580 | |||
570 | ret = numa_cleanup_meminfo(&numa_meminfo); | 581 | ret = numa_cleanup_meminfo(&numa_meminfo); |
571 | if (ret < 0) | 582 | if (ret < 0) |
572 | return ret; | 583 | return ret; |