Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Rob Herring [Mon, 24 Oct 2011 19:02:37 +0000 (14:02 -0500)]
1  2 
arch/arm/Kconfig
arch/arm/kernel/smp_scu.c
arch/arm/mach-exynos4/mct.c
arch/arm/mach-exynos4/platsmp.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mm/dma-mapping.c

Simple merge
Simple merge
@@@ -395,16 -391,15 +397,17 @@@ static void exynos4_mct_tick_init(struc
  }
  
  /* Setup the local clock events for a CPU */
 -void __cpuinit local_timer_setup(struct clock_event_device *evt)
 +int __cpuinit local_timer_setup(struct clock_event_device *evt)
  {
        exynos4_mct_tick_init(evt);
 +
 +      return 0;
  }
  
- int local_timer_ack(void)
+ void local_timer_stop(struct clock_event_device *evt)
  {
-       return 0;
+       evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
+       disable_irq(evt->irq);
  }
  
  #endif /* CONFIG_LOCAL_TIMERS */
Simple merge
Simple merge
Simple merge