Commit b4042cea authored by Stephen Boyd's avatar Stephen Boyd Committed by John Stultz
Browse files

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: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 65cd4f6c

include/linux/sched_clock.h

+0 −2
Original line number Diff line number Diff line
@@ -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

kernel/time/sched_clock.c

+1 −8
Original line number Diff line number Diff line
@@ -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)

{

	/*