diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-03-16 09:01:55 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-16 09:01:55 +0100 |
commit | ba4e06d68ea4fd2be401d7226c68941892d6bbaf (patch) | |
tree | a9a7125a8c88ba543e4fcfb907869b97688dee3c /arch/parisc/kernel | |
parent | 743146db071c4a828159211a295d12ff4f61752f (diff) | |
parent | 710d60cbf1b312a8075a2158cbfbbd9c66132dcc (diff) |
Merge branch 'linus' into x86/urgent, to pick up dependencies for a fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r-- | arch/parisc/kernel/smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 52e85973a283..c2a9cc55a62f 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c @@ -305,7 +305,7 @@ void __init smp_callin(void) local_irq_enable(); /* Interrupts have been off until now */ - cpu_startup_entry(CPUHP_ONLINE); + cpu_startup_entry(CPUHP_AP_ONLINE_IDLE); /* NOTREACHED */ panic("smp_callin() AAAAaaaaahhhh....\n"); |