Merge branch 'fixes' into for-linus

Conflicts:
	arch/arm/kernel/smp.c

diff --cc arch/arm/include/asm/glue-cache.h
Simple merge

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 04fd01f,febafa0..da1d1aa
--- 1/arch/arm/kernel/setup.c
--- 2/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 f34514a,d100eac..8e20754
--- 1/arch/arm/kernel/smp.c
--- 2/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

diff --cc arch/arm/mm/cache-v7.S
Simple merge