diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2014-04-08 20:33:19 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2014-04-22 16:38:33 -0400 |
commit | c04ae71c9c264312a6f57d2665a79f7bbccf8758 (patch) | |
tree | 55a6dd59692e24e0a8ee5c07415265c2752f1056 /kernel/time | |
parent | 4d0fa8a0f01272d4de33704f20303dcecdb55df1 (diff) |
sched_clock: Remove deprecated setup_sched_clock() API
Remove the 32-bit only setup_sched_clock() API now that all users
have been converted to the 64-bit friendly 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')
-rw-r--r-- | kernel/time/sched_clock.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index 4d23dc4d8139..445106d2c729 100644 --- a/kernel/time/sched_clock.c +++ b/kernel/time/sched_clock.c | |||
@@ -49,13 +49,6 @@ static u64 notrace jiffy_sched_clock_read(void) | |||
49 | return (u64)(jiffies - INITIAL_JIFFIES); | 49 | return (u64)(jiffies - INITIAL_JIFFIES); |
50 | } | 50 | } |
51 | 51 | ||
52 | static u32 __read_mostly (*read_sched_clock_32)(void); | ||
53 | |||
54 | static u64 notrace read_sched_clock_32_wrapper(void) | ||
55 | { | ||
56 | return read_sched_clock_32(); | ||
57 | } | ||
58 | |||
59 | static u64 __read_mostly (*read_sched_clock)(void) = jiffy_sched_clock_read; | 52 | static u64 __read_mostly (*read_sched_clock)(void) = jiffy_sched_clock_read; |
60 | 53 | ||
61 | static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) | 54 | static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift) |
@@ -176,12 +169,6 @@ void __init sched_clock_register(u64 (*read)(void), int bits, | |||
176 | pr_debug("Registered %pF as sched_clock source\n", read); | 169 | pr_debug("Registered %pF as sched_clock source\n", read); |
177 | } | 170 | } |
178 | 171 | ||
179 | void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate) | ||
180 | { | ||
181 | read_sched_clock_32 = read; | ||
182 | sched_clock_register(read_sched_clock_32_wrapper, bits, rate); | ||
183 | } | ||
184 | |||
185 | void __init sched_clock_postinit(void) | 172 | void __init sched_clock_postinit(void) |
186 | { | 173 | { |
187 | /* | 174 | /* |