diff options
| author | Olof Johansson <olof@lixom.net> | 2013-07-23 17:51:34 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-07-23 19:54:15 -0400 |
| commit | 47dcd3563e45fc5a59bf7f3326ef56087be8bebe (patch) | |
| tree | 5cebf3d803be1ad0ac8914332da1472cdc0e2652 /arch/arm/mach-realview | |
| parent | 3b2f64d00c46e1e4e9bd0bb9bb12619adac27a4b (diff) | |
| parent | 060fd3043e5e3488504b9e70182e188dd9113aea (diff) | |
Merge tag 'remove-local-timers' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/arm/mach-realview')
| -rw-r--r-- | arch/arm/mach-realview/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig index d210c0f9c2c4..9db2029aa632 100644 --- a/arch/arm/mach-realview/Kconfig +++ b/arch/arm/mach-realview/Kconfig | |||
| @@ -13,7 +13,7 @@ config REALVIEW_EB_A9MP | |||
| 13 | depends on MACH_REALVIEW_EB | 13 | depends on MACH_REALVIEW_EB |
| 14 | select CPU_V7 | 14 | select CPU_V7 |
| 15 | select HAVE_ARM_SCU if SMP | 15 | select HAVE_ARM_SCU if SMP |
| 16 | select HAVE_ARM_TWD if LOCAL_TIMERS | 16 | select HAVE_ARM_TWD if SMP |
| 17 | select HAVE_SMP | 17 | select HAVE_SMP |
| 18 | select MIGHT_HAVE_CACHE_L2X0 | 18 | select MIGHT_HAVE_CACHE_L2X0 |
| 19 | help | 19 | help |
| @@ -26,7 +26,7 @@ config REALVIEW_EB_ARM11MP | |||
| 26 | select ARCH_HAS_BARRIERS if SMP | 26 | select ARCH_HAS_BARRIERS if SMP |
| 27 | select CPU_V6K | 27 | select CPU_V6K |
| 28 | select HAVE_ARM_SCU if SMP | 28 | select HAVE_ARM_SCU if SMP |
| 29 | select HAVE_ARM_TWD if LOCAL_TIMERS | 29 | select HAVE_ARM_TWD if SMP |
| 30 | select HAVE_SMP | 30 | select HAVE_SMP |
| 31 | select MIGHT_HAVE_CACHE_L2X0 | 31 | select MIGHT_HAVE_CACHE_L2X0 |
| 32 | help | 32 | help |
| @@ -48,7 +48,7 @@ config MACH_REALVIEW_PB11MP | |||
| 48 | select ARM_GIC | 48 | select ARM_GIC |
| 49 | select CPU_V6K | 49 | select CPU_V6K |
| 50 | select HAVE_ARM_SCU if SMP | 50 | select HAVE_ARM_SCU if SMP |
| 51 | select HAVE_ARM_TWD if LOCAL_TIMERS | 51 | select HAVE_ARM_TWD if SMP |
| 52 | select HAVE_PATA_PLATFORM | 52 | select HAVE_PATA_PLATFORM |
| 53 | select HAVE_SMP | 53 | select HAVE_SMP |
| 54 | select MIGHT_HAVE_CACHE_L2X0 | 54 | select MIGHT_HAVE_CACHE_L2X0 |
| @@ -92,7 +92,7 @@ config MACH_REALVIEW_PBX | |||
| 92 | select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET | 92 | select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET |
| 93 | select ARM_GIC | 93 | select ARM_GIC |
| 94 | select HAVE_ARM_SCU if SMP | 94 | select HAVE_ARM_SCU if SMP |
| 95 | select HAVE_ARM_TWD if LOCAL_TIMERS | 95 | select HAVE_ARM_TWD if SMP |
| 96 | select HAVE_PATA_PLATFORM | 96 | select HAVE_PATA_PLATFORM |
| 97 | select HAVE_SMP | 97 | select HAVE_SMP |
| 98 | select MIGHT_HAVE_CACHE_L2X0 | 98 | select MIGHT_HAVE_CACHE_L2X0 |