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

Conflicts:
	arch/arm/include/asm/timex.h
	arch/arm/kernel/smp.c
	arch/arm/mach-integrator/integrator_cp.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

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

diff --cc arch/arm/include/asm/timex.h
index 963342acebb7200445970aeb51907e6cdf2eceed,9acc135dad94b6aac6f20c5c02492b20fbac28f3..83f2aa83899c4b14cede7dd798178655884c951f
--- 1/arch/arm/include/asm/timex.h
--- 2/arch/arm/include/asm/timex.h
+++ b/arch/arm/include/asm/timex.h
@@@ -12,19 -12,9 +12,13 @@@
  #ifndef _ASMARM_TIMEX_H
  #define _ASMARM_TIMEX_H
  
- #include <asm/arch_timer.h>
 +#ifdef CONFIG_ARCH_MULTIPLATFORM
 +#define CLOCK_TICK_RATE 1000000
 +#else
  #include <mach/timex.h>
 +#endif
  
  typedef unsigned long cycles_t;
- 
- #ifdef ARCH_HAS_READ_CURRENT_TIMER
  #define get_cycles()  ({ cycles_t c; read_current_timer(&c) ? 0 : c; })
- #else
- #define get_cycles()  (0)
- #endif
  
  #endif

diff --cc arch/arm/kernel/Makefile
index d81f3a6d9ad84df7917d2a1edefb68b0dcae6ac9,34e49dd0e09277d66582f21c7075023b854d080d..5bbec7b8183e46e0d5ba4f078ba146789f409be1
--- 1/arch/arm/kernel/Makefile
--- 2/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -19,8 -19,11 +19,10 @@@ obj-y               := elf.o entry-armv.o entry-comm
                   process.o ptrace.o return_address.o sched_clock.o \
                   setup.o signal.o stacktrace.o sys_arm.o time.o traps.o
  
- obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += compat.o
+ obj-$(CONFIG_ATAGS)           += atags_parse.o
+ obj-$(CONFIG_ATAGS_PROC)      += atags_proc.o
+ obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
  
 -obj-$(CONFIG_LEDS)            += leds.o
  obj-$(CONFIG_OC_ETM)          += etm.o
  obj-$(CONFIG_CPU_IDLE)                += cpuidle.o
  obj-$(CONFIG_ISA_DMA_API)     += dma.o

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

diff --cc arch/arm/kernel/setup.c
index 725f9f2a95414e10d8f73a0360741031dd16db48,df6cd7307bd7e0c53b73569cf97a1c4c83a27db9..da1d1aa20ad957ccd7021815014d12530de4f3a1
--- 1/arch/arm/kernel/setup.c
--- 2/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -977,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 aa4ffe6e5ecfbd9a8feeedf1c002ca50861ae541,939ac2f2f2a3e0d05fbcc8fa407ba2b22d06bca2..f5214737399710bef8930197e647879fb575e744
--- 1/arch/arm/kernel/smp.c
--- 2/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@@ -42,7 -42,7 +42,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
@@@ -51,14 -51,9 +52,15 @@@
   */
  struct secondary_data secondary_data;
  
 +/*
 + * control for which core is the next to come out of the secondary
 + * boot "holding pen"
 + */
 +volatile int __cpuinitdata pen_release = -1;
 +
  enum ipi_msg_type {
-       IPI_TIMER = 2,
+       IPI_WAKEUP,
+       IPI_TIMER,
        IPI_RESCHEDULE,
        IPI_CALL_FUNC,
        IPI_CALL_FUNC_SINGLE,

diff --cc arch/arm/mach-exynos/platsmp.c
Simple merge

diff --cc arch/arm/mach-integrator/core.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_ap.c
index 2215d96cd7357b0c28a5cfc9ad72f1a990bddc29,ff1255ae712151fb0df7331f7f68a07870cf099d..d5b5435a09aed30896817ce1930c1af6ab4aa88a
--- 1/arch/arm/mach-integrator/integrator_ap.c
--- 2/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@@ -155,26 -162,8 +158,9 @@@ static void __init ap_map_io(void
  {
        iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));
        vga_base = PCI_MEMORY_VADDR;
 +      pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));
  }
  
- #define INTEGRATOR_SC_VALID_INT       0x003fffff
- 
- static void __init ap_init_irq(void)
- {
-       /* Disable all interrupts initially. */
-       /* Do the core module ones */
-       writel(-1, VA_CMIC_BASE + IRQ_ENABLE_CLEAR);
- 
-       /* do the header card stuff next */
-       writel(-1, VA_IC_BASE + IRQ_ENABLE_CLEAR);
-       writel(-1, VA_IC_BASE + FIQ_ENABLE_CLEAR);
- 
-       fpga_irq_init(VA_IC_BASE, "SC", IRQ_PIC_START,
-               -1, INTEGRATOR_SC_VALID_INT, NULL);
-       integrator_clk_init(false);
- }
- 
  #ifdef CONFIG_PM
  static unsigned long ic_irq_enable;
  

diff --cc arch/arm/mach-integrator/integrator_cp.c
index 3df5fc36936172ce4cf3e47dc4cf6a87918f6917,f51363e2d6feb0f7e22179c89c15b1d27e30d683..6870a1fbcd7870233d20746d1ab892d10c989161
--- 1/arch/arm/mach-integrator/integrator_cp.c
--- 2/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@@ -52,14 -55,7 +55,7 @@@
  
  #define INTCP_PA_CLCD_BASE            0xc0000000
  
- #define INTCP_VA_CIC_BASE             __io_address(INTEGRATOR_HDR_BASE + 0x40)
- #define INTCP_VA_PIC_BASE             __io_address(INTEGRATOR_IC_BASE)
- #define INTCP_VA_SIC_BASE             __io_address(INTEGRATOR_CP_SIC_BASE)
- 
- #define INTCP_ETH_SIZE                        0x10
- 
 -#define INTCP_VA_CTRL_BASE            IO_ADDRESS(INTEGRATOR_CP_CTL_BASE)
 +#define INTCP_VA_CTRL_BASE            __io_address(INTEGRATOR_CP_CTL_BASE)
  #define INTCP_FLASHPROG                       0x04
  #define CINTEGRATOR_FLASHPROG_FLVPPEN (1 << 0)
  #define CINTEGRATOR_FLASHPROG_FLWREN  (1 << 1)

diff --cc arch/arm/mach-shmobile/smp-emev2.c
Simple merge

diff --cc arch/arm/mm/cache-l2x0.c
Simple merge

diff --cc arch/arm/mm/ioremap.c
Simple merge