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 <kernelf...@gmail.com> CC: Thomas Gleixner <t...@linutronix.de> CC: Ingo Molnar <mi...@redhat.com> CC: Borislav Petkov <b...@alien8.de> CC: "H. Peter Anvin" <h...@zytor.com> CC: Dave Hansen <dave.han...@linux.intel.com> CC: Vlastimil Babka <vba...@suse.cz> CC: Mike Rapoport <r...@linux.vnet.ibm.com> CC: Andrew Morton <a...@linux-foundation.org> CC: Mel Gorman <mgor...@suse.de> CC: Joonsoo Kim <iamjoonsoo....@lge.com> CC: Andy Lutomirski <l...@kernel.org> CC: Andi Kleen <a...@linux.intel.com> CC: Petr Tesarik <ptesa...@suse.cz> CC: Michal Hocko <mho...@suse.com> CC: Stephen Rothwell <s...@canb.auug.org.au> CC: Jonathan Corbet <cor...@lwn.net> CC: Nicholas Piggin <npig...@gmail.com> CC: Daniel Vacek <ne...@redhat.com> CC: linux-kernel@vger.kernel.org --- 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