diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-03-14 20:23:25 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-03-14 20:23:25 +0100 |
| commit | 745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c (patch) | |
| tree | e556543ed86b7f49e4972d8ea048ff9e46592b4d /arch/parisc/kernel/smp.c | |
| parent | 02428742639bc3300c8c527b054d0ec0bdf5571d (diff) | |
| parent | 18a955219bf7d9008ce480d4451b6b8bf4483a22 (diff) | |
Merge branch 'x86/urgent' into x86/mm to pick up dependencies
Diffstat (limited to 'arch/parisc/kernel/smp.c')
| -rw-r--r-- | arch/parisc/kernel/smp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 30c28ab14540..4065b5e48c9d 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c @@ -292,10 +292,15 @@ smp_cpu_init(int cpunum) * Slaves start using C here. Indirectly called from smp_slave_stext. * Do what start_kernel() and main() do for boot strap processor (aka monarch) */ -void __init smp_callin(void) +void __init smp_callin(unsigned long pdce_proc) { int slave_id = cpu_now_booting; +#ifdef CONFIG_64BIT + WARN_ON(((unsigned long)(PAGE0->mem_pdc_hi) << 32 + | PAGE0->mem_pdc) != pdce_proc); +#endif + smp_cpu_init(slave_id); preempt_disable(); |