Skip to content

Commit

Permalink
powerpc: Re-order the call to smp_setup_cpu_maps()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benjamin Herrenschmidt authored and Michael Ellerman committed Jul 21, 2016
1 parent 8f212cb commit e39afba
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/kernel/setup_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion arch/powerpc/kernel/setup_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit e39afba

Please sign in to comment.