浏览代码

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>
Benjamin Herrenschmidt 9 年之前
父节点
当前提交
e39afba3aa
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 2 2
      arch/powerpc/kernel/setup_32.c
  2. 2 1
      arch/powerpc/kernel/setup_64.c

+ 2 - 2
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)

+ 2 - 1
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();