Mark & Catalin,
Could you like to review the merge conflict patch, which at: git://git.linaro.org/kernel/linux-linaro-stable.git linux-linaro-lsk-test
=== commit 450cdfa9c5713551ab1438ab210679868b52a994 Merge: bf78886 8b4ed85 Author: Alex Shi alex.shi@linaro.org Date: Fri Jan 10 10:50:57 2014 +0800
Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
Conflicts: arch/arm64/kernel/smp.c
Signed-off-by: Alex Shi alex.shi@linaro.org
diff --cc arch/arm64/kernel/smp.c index 5e9d274,9c93e12..87340fd --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@@ -150,17 -187,17 +150,10 @@@ asmlinkage void __cpuinit secondary_sta preempt_disable(); trace_hardirqs_off();
- /* - * Let the primary processor know we're out of the - * pen, then head off into the C entry point - */ - write_pen_release(INVALID_HWID); + if (cpu_ops[cpu]->cpu_postboot) + cpu_ops[cpu]->cpu_postboot();
-- /* - * Enable local interrupts. - */ - notify_cpu_starting(cpu); - local_irq_enable(); - local_fiq_enable(); - - * Synchronise with the boot thread. - */ - raw_spin_lock(&boot_lock); - raw_spin_unlock(&boot_lock); + smp_store_cpu_info(cpu);
/* * OK, now it's safe to let the boot CPU continue. Wait for