Merge remote-tracking branch 'arm/for-next'

Conflicts:
	arch/arm/kernel/smp.c

diff --cc arch/arm/kernel/Makefile
Simple merge

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

diff --cc arch/arm/kernel/setup.c
index febafa0f552d6a75e2bc51755054a8b6e68cf5a8,df6cd7307bd7e0c53b73569cf97a1c4c83a27db9..da1d1aa20ad957ccd7021815014d12530de4f3a1
--- 1/arch/arm/kernel/setup.c
--- 2/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -743,11 -759,13 +759,15 @@@ void __init setup_arch(char **cmdline_p
        unflatten_device_tree();
  
  #ifdef CONFIG_SMP
 -      if (is_smp())
 +      if (is_smp()) {
 +              smp_set_ops(mdesc->smp);
                smp_init_cpus();
 +      }
  #endif
+ 
+       if (!is_smp())
+               hyp_mode_check();
+ 
        reserve_crashkernel();
  
        tcm_init();

diff --cc arch/arm/kernel/smp.c
index d100eacdb7983f8e490a8dc88d4f830b7fab3b8c,939ac2f2f2a3e0d05fbcc8fa407ba2b22d06bca2..8e20754dd31d5946f5297aae2023ae2c8d5cd572
--- 1/arch/arm/kernel/smp.c
--- 2/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -43,7 -42,7 +43,8 @@@
  #include <asm/ptrace.h>
  #include <asm/localtimer.h>
  #include <asm/smp_plat.h>
+ #include <asm/virt.h>
 +#include <asm/mach/arch.h>
  
  /*
   * as from 2.5, kernels no longer have an init_tasks structure