diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-07-19 01:21:19 +0200 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-10-10 01:54:39 +0200 |
| commit | b4042ceaabbd913bc5b397ddd1e396eeb312d72f (patch) | |
| tree | b3392b81fb965700b1332c93f76d63770a21da46 /kernel/time/sched_clock.c | |
| parent | arch_timer: Move to generic sched_clock framework (diff) | |
| download | linux-b4042ceaabbd913bc5b397ddd1e396eeb312d72f.tar.xz linux-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>
Diffstat (limited to 'kernel/time/sched_clock.c')
| -rw-r--r-- | kernel/time/sched_clock.c | 9 |
1 files changed, 1 insertions, 8 deletions
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) { /* |