summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/time.c
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-06-01 23:39:40 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-06-12 14:02:13 -0700
commit38ff87f77af0b5a93fc8581cff1d6e5692ab8970 (patch)
tree7a157528657400d0486cd4e74da98bad40992c3c /arch/arm/kernel/time.c
parentffbfb5e316f0db486798ccf1db36a577ffe79637 (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. 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>
Diffstat (limited to 'arch/arm/kernel/time.c')
-rw-r--r--arch/arm/kernel/time.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index abff4e9aaee0..98aee3258398 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -24,9 +24,9 @@
#include <linux/timer.h>
#include <linux/clocksource.h>
#include <linux/irq.h>
+#include <linux/sched_clock.h>
#include <asm/thread_info.h>
-#include <asm/sched_clock.h>
#include <asm/stacktrace.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
@@ -120,6 +120,4 @@ void __init time_init(void)
machine_desc->init_time();
else
clocksource_of_init();
-
- sched_clock_postinit();
}