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 <kernelfans@xxxxxxxxx> CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CC: Ingo Molnar <mingo@xxxxxxxxxx> CC: Borislav Petkov <bp@xxxxxxxxx> CC: "H. Peter Anvin" <hpa@xxxxxxxxx> CC: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> CC: Vlastimil Babka <vbabka@xxxxxxx> CC: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx> CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> CC: Mel Gorman <mgorman@xxxxxxx> CC: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> CC: Andy Lutomirski <luto@xxxxxxxxxx> CC: Andi Kleen <ak@xxxxxxxxxxxxxxx> CC: Petr Tesarik <ptesarik@xxxxxxx> CC: Michal Hocko <mhocko@xxxxxxxx> CC: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> CC: Jonathan Corbet <corbet@xxxxxxx> CC: Nicholas Piggin <npiggin@xxxxxxxxx> CC: Daniel Vacek <neelx@xxxxxxxxxx> CC: linux-kernel@xxxxxxxxxxxxxxx --- 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
