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

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/cacheflush.h
Simple merge

diff --cc arch/arm64/include/asm/cmpxchg.h
Simple merge

diff --cc arch/arm64/include/asm/virt.h
index 130e2be952cf6e0ebb6fe137afa93832746724fe,439827271e3d5bfada26390c9a226bbf6ec763e5..215ad4649dd7d7492c7d566fda85146359291c20
--- 1/arch/arm64/include/asm/virt.h
--- 2/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/debug-monitors.c
Simple merge

diff --cc arch/arm64/kernel/head.S
Simple merge

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/setup.c
Simple merge

diff --cc arch/arm64/kernel/smp.c
index 6b000121618997128608295ae569b2ab2e6b32a6,6555060f9e9796949b5015680e6d381749d2b01d..f18fb802b790cab77815564f9718acfa7b4415a7
--- 1/arch/arm64/kernel/smp.c
--- 2/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();
  

diff --cc arch/arm64/kernel/smp_spin_table.c
Simple merge

diff --cc arch/arm64/kernel/vdso.c
Simple merge

diff --cc arch/arm64/mm/cache.S
Simple merge

diff --cc arch/arm64/mm/proc.S
Simple merge