Merge tag 'remove-local-timers' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Tue, 23 Jul 2013 21:51:34 +0000 (14:51 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 23 Jul 2013 23:54:15 +0000 (16:54 -0700)
commit47dcd3563e45fc5a59bf7f3326ef56087be8bebe
tree5cebf3d803be1ad0ac8914332da1472cdc0e2652
parent3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b
parent060fd3043e5e3488504b9e70182e188dd9113aea
Merge tag 'remove-local-timers' of git://git./linux/kernel/git/davidb/linux-msm into next/cleanup

From Stephen Boyd:

Now that we have a generic arch hook for broadcast we can remove the
local timer API entirely. Doing so will reduce code in ARM core, reduce
the architecture dependencies of our timer drivers, and simplify the code
because we no longer go through an architecture layer that is essentially
a hotplug notifier.

* tag 'remove-local-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: smp: Remove local timer API
  clocksource: time-armada-370-xp: Divorce from local timer API
  clocksource: time-armada-370-xp: Fix sparse warning
  ARM: msm: Divorce msm_timer from local timer API
  ARM: PRIMA2: Divorce timer-marco from local timer API
  ARM: EXYNOS4: Divorce mct from local timer API
  ARM: OMAP2+: Divorce from local timer API
  ARM: smp_twd: Divorce smp_twd from local timer API
  ARM: smp: Remove duplicate dummy timer implementation

Resolved a large number of conflicts due to __cpuinit cleanups, etc.

Signed-off-by: Olof Johansson <olof@lixom.net>
13 files changed:
arch/arm/Kconfig
arch/arm/kernel/smp.c
arch/arm/kernel/smp_twd.c
arch/arm/mach-imx/Kconfig
arch/arm/mach-msm/timer.c
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/timer.c
arch/arm/mach-tegra/Kconfig
arch/arm/mach-ux500/Kconfig
arch/arm/mach-vexpress/Kconfig
drivers/clocksource/exynos_mct.c
drivers/clocksource/time-armada-370-xp.c
drivers/clocksource/timer-marco.c