From: Mark Brown <broonie@linaro.org>
Date: Wed, 21 May 2014 23:13:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~122^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb64c4d995f8ed48e1b3ba95f64c6c52c199cd41;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

Conflicts:
	arch/arm64/kernel/debug-monitors.c
	arch/arm64/mm/dma-mapping.c
---

fb64c4d995f8ed48e1b3ba95f64c6c52c199cd41
diff --cc arch/arm64/include/asm/virt.h
index 130e2be952cf,439827271e3d..215ad4649dd7
--- a/arch/arm64/include/asm/virt.h
+++ b/arch/arm64/include/asm/virt.h
@@@ -18,11 -18,9 +18,10 @@@
  #ifndef __ASM__VIRT_H
  #define __ASM__VIRT_H
  
 -#define BOOT_CPU_MODE_EL2	(0x0e12b007)
 +#define BOOT_CPU_MODE_EL1	(0xe11)
 +#define BOOT_CPU_MODE_EL2	(0xe12)
  
  #ifndef __ASSEMBLY__
- #include <asm/cacheflush.h>
  
  /*
   * __boot_cpu_mode records what mode CPUs were booted in.
diff --cc arch/arm64/kernel/smp.c
index 6b0001216189,6555060f9e97..f18fb802b790
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@@ -170,9 -154,12 +170,10 @@@ asmlinkage void __cpuinit secondary_sta
  	set_cpu_online(cpu, true);
  	complete(&cpu_running);
  
 -	/*
 -	 * Enable GIC and timers.
 -	 */
 -	notify_cpu_starting(cpu);
 +	local_irq_enable();
 +	local_fiq_enable();
  
+ 	local_dbg_enable();
  	local_irq_enable();
  	local_fiq_enable();