evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sched_clock: Remove sched_clock_func() hook

Browse source 
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>
This commit is contained in:
Stephen Boyd 2013-07-18 16:21:19 -07:00 • committed by John Stultz
parent 65cd4f6c99
commit b4042ceaab
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/linux/sched_clock.h
View file

@ -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, extern void sched_clock_register(u64 (*read)(void), int bits,
unsigned long rate); unsigned long rate);
extern unsigned long long (*sched_clock_func)(void);
#endif #endif

9
kernel/time/sched_clock.c
View file

@ -63,7 +63,7 @@ static inline u64 notrace cyc_to_ns(u64 cyc, u32 mult, u32 shift)
return (cyc * mult) >> 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_ns;
u64 epoch_cyc; 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); 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) void __init sched_clock_postinit(void)
{ {
/* /*