diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-03-28 06:36:27 +0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-04-07 04:33:14 +0400 |
| commit | 36ae37e3436b0c7731ae15a03d9215ff24bef9f2 (patch) | |
| tree | 4650b7188b536cddae6cbe4c21aa334a01e90aec /arch/powerpc/kernel/prom.c | |
| parent | 4a85b31d369b496c316d89b144ee9626073e5ef2 (diff) | |
| download | linux-36ae37e3436b0c7731ae15a03d9215ff24bef9f2.tar.xz | |
powerpc: Make boot_cpuid common between 32 and 64-bit
Move the definition to setup-common.c and set the init value
to -1 on both 32 and 64-bit (it was 0 on 64-bit).
Additionally add a check to prom.c to garantee that the init
value has been udpated after the DT scan.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/prom.c')
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 337646ce4f34..ea50a7ecd81b 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -747,6 +747,10 @@ void __init early_init_devtree(void *params) * (altivec support, boot CPU ID, ...) */ of_scan_flat_dt(early_init_dt_scan_cpus, NULL); + if (boot_cpuid < 0) { + printk("Failed to indentify boot CPU !\n"); + BUG(); + } #if defined(CONFIG_SMP) && defined(CONFIG_PPC64) /* We'll later wait for secondaries to check in; there are |