summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2013-07-18 16:21:19 -0700
committerJohn Stultz <john.stultz@linaro.org>2013-10-09 16:54:39 -0700
commitb4042ceaabbd913bc5b397ddd1e396eeb312d72f (patch)
treeb3392b81fb965700b1332c93f76d63770a21da46
parent65cd4f6c99c1170bd0114dbd71b978012ea44d28 (diff)
downloadlinux-stable-b4042ceaabbd913bc5b397ddd1e396eeb312d72f.tar.gz
linux-stable-b4042ceaabbd913bc5b397ddd1e396eeb312d72f.tar.bz2
linux-stable-b4042ceaabbd913bc5b397ddd1e396eeb312d72f.zip
sched_clock: Remove sched_clock_func() hook
Nobody is using sched_clock_func() anymore now that sched_clock supports up to 64 bits. Remove the hook so that new code only uses sched_clock_register(). Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--include/linux/sched_clock.h2
-rw-r--r--kernel/time/sched_clock.c9
2 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/sched_clock.h b/include/linux/sched_clock.h
index eca7abeb86fc..cddf0c2940b6 100644
--- a/include/linux/sched_clock.h
+++ b/include/linux/sched_clock.h
@@ -18,6 +18,4 @@ extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate);
extern void sched_clock_register(u64 (*read)(void), int bits,
unsigned long rate);
-extern unsigned long long (*sched_clock_func)(void);
-
#endif
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
index f388baeaf2b6..68b799375981 100644
--- a/kernel/time/sched_clock.c
+++ b/kernel/time/sched_clock.c
@@ -63,7 +63,7 @@ static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift)
return (cyc * mult) >> shift;
}
-static unsigned long long notrace sched_clock_32(void)
+unsigned long long notrace sched_clock(void)
{
u64 epoch_ns;
u64 epoch_cyc;
@@ -170,13 +170,6 @@ void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate)
sched_clock_register(read_sched_clock_32_wrapper, bits, rate);
}
-unsigned long long __read_mostly (*sched_clock_func)(void) = sched_clock_32;
-
-unsigned long long notrace sched_clock(void)
-{
- return sched_clock_func();
-}
-
void __init sched_clock_postinit(void)
{
/*