diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-06-01 23:39:40 -0700 |
---|---|---|
committer | Ajay Nandakumar <anandakumarm@nvidia.com> | 2014-01-13 12:03:37 +0530 |
commit | 9677b59f55e348c330eeb8cd9a6f7b2f613839a5 (patch) | |
tree | 51c4e85fb28b3915e3446b142881ce0bcb908e1b /drivers/clocksource | |
parent | 8ec79f015299aafb8e44095545a4e2656e6992c9 (diff) |
sched_clock: Make ARM's sched_clock generic for all architectures
Nothing about the sched_clock implementation in the ARM port is
specific to the architecture. Generalize the code so that other
architectures can use it by selecting GENERIC_SCHED_CLOCK.
Bug 1399318
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
[jstultz: Merge minor collisions with other patches in my tree]
Signed-off-by: John Stultz <john.stultz@linaro.org>
(cherry picked from commit 38ff87f77af0b5a93fc8581cff1d6e5692ab8970)
Signed-off-by: Ajay Nandakumar <anandakumarm@nvidia.com>
Change-Id: Iaac325635344ef4adee8fa0f9ca11aee089bce0f
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/bcm2835_timer.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/clksrc-dbx500-prcmu.c | 3 | ||||
-rw-r--r-- | drivers/clocksource/dw_apb_timer_of.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/mxs_timer.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/nomadik-mtu.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/samsung_pwm_timer.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/tegra-nvtimers.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/tegra-tsc-timer.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/tegra-wakeup-nvtimers.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/time-armada-370-xp.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/timer-marco.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/timer-prima2.c | 2 |
12 files changed, 12 insertions, 13 deletions
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c index 766611d29945..07ea7ce900dc 100644 --- a/drivers/clocksource/bcm2835_timer.c +++ b/drivers/clocksource/bcm2835_timer.c @@ -28,8 +28,8 @@ #include <linux/of_platform.h> #include <linux/slab.h> #include <linux/string.h> +#include <linux/sched_clock.h> -#include <asm/sched_clock.h> #include <asm/irq.h> #define REG_CONTROL 0x00 diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c index 54f3d119d99c..0a7fb2440e29 100644 --- a/drivers/clocksource/clksrc-dbx500-prcmu.c +++ b/drivers/clocksource/clksrc-dbx500-prcmu.c @@ -14,8 +14,7 @@ */ #include <linux/clockchips.h> #include <linux/clksrc-dbx500-prcmu.h> - -#include <asm/sched_clock.h> +#include <linux/sched_clock.h> #define RATE_32K 32768 diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c index 6b02eddc5f50..6b25a956218f 100644 --- a/drivers/clocksource/dw_apb_timer_of.c +++ b/drivers/clocksource/dw_apb_timer_of.c @@ -20,9 +20,9 @@ #include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> +#include <linux/sched_clock.h> #include <asm/mach/time.h> -#include <asm/sched_clock.h> static void timer_get_base_and_rate(struct device_node *np, void __iomem **base, u32 *rate) diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c index 02af4204af86..0f5e65f74dc3 100644 --- a/drivers/clocksource/mxs_timer.c +++ b/drivers/clocksource/mxs_timer.c @@ -29,9 +29,9 @@ #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/stmp_device.h> +#include <linux/sched_clock.h> #include <asm/mach/time.h> -#include <asm/sched_clock.h> /* * There are 2 versions of the timrot on Freescale MXS-based SoCs. diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index e405531e1cc5..8864c17841c8 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c @@ -18,8 +18,8 @@ #include <linux/delay.h> #include <linux/err.h> #include <linux/platform_data/clocksource-nomadik-mtu.h> +#include <linux/sched_clock.h> #include <asm/mach/time.h> -#include <asm/sched_clock.h> /* * The MTU device hosts four different counters, with 4 set of diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c index 0234c8d2c8f2..584b5472eea3 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c @@ -21,10 +21,10 @@ #include <linux/of_irq.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/sched_clock.h> #include <clocksource/samsung_pwm.h> -#include <asm/sched_clock.h> /* * Clocksource driver diff --git a/drivers/clocksource/tegra-nvtimers.c b/drivers/clocksource/tegra-nvtimers.c index c7c4a1a61686..9d78a692a5b3 100644 --- a/drivers/clocksource/tegra-nvtimers.c +++ b/drivers/clocksource/tegra-nvtimers.c @@ -36,11 +36,11 @@ #include <linux/tegra-soc.h> #include <linux/tegra-timer.h> #include <linux/delay.h> +#include <linux/sched_clock.h> #include <asm/mach/time.h> #include <asm/delay.h> #ifndef CONFIG_ARM64 -#include <asm/sched_clock.h> #include <asm/localtimer.h> #endif diff --git a/drivers/clocksource/tegra-tsc-timer.c b/drivers/clocksource/tegra-tsc-timer.c index cc4e74c77af8..a56f963fd136 100644 --- a/drivers/clocksource/tegra-tsc-timer.c +++ b/drivers/clocksource/tegra-tsc-timer.c @@ -30,12 +30,12 @@ #include <linux/tegra-timer.h> #include <linux/tegra-soc.h> #include <linux/of_address.h> +#include <linux/sched_clock.h> #include <asm/mach/time.h> #include <asm/cputype.h> #include <asm/system.h> #include <asm/arch_timer.h> -#include <asm/sched_clock.h> #include <asm/delay.h> #include "../../arch/arm/mach-tegra/clock.h" diff --git a/drivers/clocksource/tegra-wakeup-nvtimers.c b/drivers/clocksource/tegra-wakeup-nvtimers.c index 11b60f573c29..f7ed7f7c837b 100644 --- a/drivers/clocksource/tegra-wakeup-nvtimers.c +++ b/drivers/clocksource/tegra-wakeup-nvtimers.c @@ -35,13 +35,13 @@ #include <linux/tegra-soc.h> #include <linux/tegra-timer.h> #include <linux/tegra-cpuidle.h> +#include <linux/sched_clock.h> #include <linux/of.h> #include <linux/of_irq.h> #include <asm/mach/time.h> #include <asm/localtimer.h> -#include <asm/sched_clock.h> #include <asm/smp_plat.h> #include <mach/irqs.h> diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c index 47a673070d70..efdca3263afe 100644 --- a/drivers/clocksource/time-armada-370-xp.c +++ b/drivers/clocksource/time-armada-370-xp.c @@ -27,8 +27,8 @@ #include <linux/of_address.h> #include <linux/irq.h> #include <linux/module.h> +#include <linux/sched_clock.h> -#include <asm/sched_clock.h> #include <asm/localtimer.h> #include <linux/percpu.h> /* diff --git a/drivers/clocksource/timer-marco.c b/drivers/clocksource/timer-marco.c index 97738dbf3e3b..e5dc9129ca26 100644 --- a/drivers/clocksource/timer-marco.c +++ b/drivers/clocksource/timer-marco.c @@ -17,7 +17,7 @@ #include <linux/of.h> #include <linux/of_irq.h> #include <linux/of_address.h> -#include <asm/sched_clock.h> +#include <linux/sched_clock.h> #include <asm/localtimer.h> #include <asm/mach/time.h> diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c index 760882665d7a..ef3cfb269d8b 100644 --- a/drivers/clocksource/timer-prima2.c +++ b/drivers/clocksource/timer-prima2.c @@ -18,7 +18,7 @@ #include <linux/of.h> #include <linux/of_irq.h> #include <linux/of_address.h> -#include <asm/sched_clock.h> +#include <linux/sched_clock.h> #include <asm/mach/time.h> #define SIRFSOC_TIMER_COUNTER_LO 0x0000 |