diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2016-07-05 05:04:11 (GMT) |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-21 09:14:32 (GMT) |
| commit | e39afba3aa11f7088ddc00d37ab34a85d960a76e (patch) | |
| tree | ad33c77a37e59b1482145c326dd181a3e258cb60 | |
| parent | 8f212cb26fc74dcf7b8c5c3dbcf3c3741990c31d (diff) | |
| download | linux-e39afba3aa11f7088ddc00d37ab34a85d960a76e.tar.xz | |
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>
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 5457911..58674b6 100644 --- 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 61c3e6c4..3fd59bc 100644 --- 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(); |