diff options
-rw-r--r-- | include/linux/sched_clock.h | 2 | ||||
-rw-r--r-- | kernel/time/sched_clock.c | 9 |
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); | |||
18 | extern void sched_clock_register(u64 (*read)(void), int bits, | 18 | extern void sched_clock_register(u64 (*read)(void), int bits, |
19 | unsigned long rate); | 19 | unsigned long rate); |
20 | 20 | ||
21 | extern unsigned long long (*sched_clock_func)(void); | ||
22 | |||
23 | #endif | 21 | #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) | |||
63 | return (cyc * mult) >> shift; | 63 | return (cyc * mult) >> shift; |
64 | } | 64 | } |
65 | 65 | ||
66 | static unsigned long long notrace sched_clock_32(void) | 66 | unsigned long long notrace sched_clock(void) |
67 | { | 67 | { |
68 | u64 epoch_ns; | 68 | u64 epoch_ns; |
69 | u64 epoch_cyc; | 69 | u64 epoch_cyc; |
@@ -170,13 +170,6 @@ void __init setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate) | |||
170 | sched_clock_register(read_sched_clock_32_wrapper, bits, rate); | 170 | sched_clock_register(read_sched_clock_32_wrapper, bits, rate); |
171 | } | 171 | } |
172 | 172 | ||
173 | unsigned long long __read_mostly (*sched_clock_func)(void) = sched_clock_32; | ||
174 | |||
175 | unsigned long long notrace sched_clock(void) | ||
176 | { | ||
177 | return sched_clock_func(); | ||
178 | } | ||
179 | |||
180 | void __init sched_clock_postinit(void) | 173 | void __init sched_clock_postinit(void) |
181 | { | 174 | { |
182 | /* | 175 | /* |