After the previous patches, on x86, it is safe to call memblock_build_node_order() after init_cpu_to_node(), which has set up node to cpumask map. So calling memblock_build_node_order() to feed memblock with numa node fall back info.
Signed-off-by: Pingfan Liu <[email protected]> CC: Thomas Gleixner <[email protected]> CC: Ingo Molnar <[email protected]> CC: Borislav Petkov <[email protected]> CC: "H. Peter Anvin" <[email protected]> CC: Dave Hansen <[email protected]> CC: Vlastimil Babka <[email protected]> CC: Mike Rapoport <[email protected]> CC: Andrew Morton <[email protected]> CC: Mel Gorman <[email protected]> CC: Joonsoo Kim <[email protected]> CC: Andy Lutomirski <[email protected]> CC: Andi Kleen <[email protected]> CC: Petr Tesarik <[email protected]> CC: Michal Hocko <[email protected]> CC: Stephen Rothwell <[email protected]> CC: Jonathan Corbet <[email protected]> CC: Nicholas Piggin <[email protected]> CC: Daniel Vacek <[email protected]> CC: [email protected] --- arch/x86/kernel/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 3d872a5..3ec1a6e 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1245,6 +1245,8 @@ void __init setup_arch(char **cmdline_p) prefill_possible_map(); init_cpu_to_node(); + /* node to cpumask map is ready */ + memblock_build_node_order(); io_apic_init_mappings(); -- 2.7.4
