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/tegra-nvtimers.c | |
| 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/tegra-nvtimers.c')
| -rw-r--r-- | drivers/clocksource/tegra-nvtimers.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |