From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Sun, 7 Oct 2012 22:56:48 +0000 (+1100)
Subject: Merge remote-tracking branch 'arm/for-next'
X-Git-Tag: next-20121008~77
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2b731ff5249cc49a5ec2af9636df5ba58103bebd;p=karo-tx-linux.git

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

Conflicts:
	arch/arm/kernel/smp.c
---

2b731ff5249cc49a5ec2af9636df5ba58103bebd
diff --cc arch/arm/kernel/setup.c
index febafa0f552d,df6cd7307bd7..da1d1aa20ad9
--- a/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 d100eacdb798,939ac2f2f2a3..8e20754dd31d
--- a/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