From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 11 Oct 2012 09:55:04 +0000 (+0100)
Subject: Merge branch 'fixes' into for-linus
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~12285^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a0f0dd57f4a85310d9936f1770a0424b49fef876;p=mirror_ubuntu-zesty-kernel.git

Merge branch 'fixes' into for-linus

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

a0f0dd57f4a85310d9936f1770a0424b49fef876
diff --cc arch/arm/kernel/setup.c
index 04fd01feea86,febafa0f552d..da1d1aa20ad9
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -55,11 -53,7 +53,8 @@@
  #include <asm/traps.h>
  #include <asm/unwind.h>
  #include <asm/memblock.h>
 +#include <asm/virt.h>
  
- #if defined(CONFIG_DEPRECATED_PARAM_STRUCT)
- #include "compat.h"
- #endif
  #include "atags.h"
  #include "tcm.h"
  
@@@ -993,13 -743,11 +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 f34514a0834e,d100eacdb798..8e20754dd31d
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -42,7 -43,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