]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'fixes' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 11 Oct 2012 09:55:04 +0000 (10:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 11 Oct 2012 09:55:04 +0000 (10:55 +0100)
Conflicts:
arch/arm/kernel/smp.c

1  2 
arch/arm/include/asm/glue-cache.h
arch/arm/kernel/Makefile
arch/arm/kernel/head.S
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c
arch/arm/mm/cache-v7.S

Simple merge
Simple merge
Simple merge
index 04fd01feea86ed82672a406fa5343f6144023875,febafa0f552d6a75e2bc51755054a8b6e68cf5a8..da1d1aa20ad957ccd7021815014d12530de4f3a1
  #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();
index f34514a0834e53b13a177a49a9d178153ff9088e,d100eacdb7983f8e490a8dc88d4f830b7fab3b8c..8e20754dd31d5946f5297aae2023ae2c8d5cd572
@@@ -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
Simple merge