powerpc: Re-order the call to smp_setup_cpu_maps()

It makes more sense to do it before intializing xmon() as xmon might
use the info in there. We do want to register the console early
though in case we want some functioning printk's in the cpu map setup.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 5457911d662d7c0d70fec2900f9eb314ffb16332..58674b60214991c9b4420bcd5cfe247acb06092a 100644 (file)
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -281,11 +281,11 @@ void __init setup_arch(char **cmdline_p)
 
        find_legacy_serial_ports();
 
-       smp_setup_cpu_maps();
-
        /* Register early console */
        register_early_udbg_console();
 
+       smp_setup_cpu_maps();
+
        xmon_setup();
 
        if (ppc_md.panic)

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 61c3e6c4226244ca062d2e7db1b7e1431a5b3b26..3fd59bca06f7792aeaedce93aa5646cec3b105ab 100644 (file)
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -661,12 +661,13 @@ void __init setup_arch(char **cmdline_p)
         */
        register_early_udbg_console();
 
+       smp_setup_cpu_maps();
+
        /*
         * Initialize xmon
         */
        xmon_setup();
 
-       smp_setup_cpu_maps();
        check_smt_enabled();
        setup_tlb_core_data();