From: Alex Shi <alex.shi@linaro.org>
Date: Fri, 10 Jan 2014 02:50:57 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~158^2~15
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=450cdfa9c5713551ab1438ab210679868b52a994;p=firefly-linux-kernel-4.4.55.git

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>
---

450cdfa9c5713551ab1438ab210679868b52a994
diff --cc arch/arm64/kernel/smp.c
index 5e9d27442fbb,9c93e126328c..87340fd53939
--- 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.
 -	 * Synchronise with the boot thread.
--	 */
- 	notify_cpu_starting(cpu);
- 	local_irq_enable();
- 	local_fiq_enable();
- 
 -	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