diff --git a/include/linux/sched_clock.h b/include/linux/sched_clock.h index 342391954d13..abe28d5cb3f4 100644 --- a/include/linux/sched_clock.h +++ b/include/linux/sched_clock.h @@ -13,8 +13,6 @@ extern void generic_sched_clock_init(void); extern void sched_clock_register(u64 (*read)(void), int bits, unsigned long rate); -extern int sched_clock_suspend(void); -extern void sched_clock_resume(void); #else static inline void generic_sched_clock_init(void) { } @@ -22,8 +20,6 @@ static inline void sched_clock_register(u64 (*read)(void), int bits, unsigned long rate) { } -static inline int sched_clock_suspend(void) { return 0; } -static inline void sched_clock_resume(void) { } #endif #endif diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index 145e0c72f0f2..54465103ecc1 100644 --- a/kernel/time/sched_clock.c +++ b/kernel/time/sched_clock.c @@ -278,7 +278,7 @@ static u64 notrace suspended_sched_clock_read(void) return cd.read_data[seq & 1].epoch_cyc; } -int sched_clock_suspend(void) +static int sched_clock_suspend(void) { struct clock_read_data *rd = &cd.read_data[0]; @@ -294,7 +294,7 @@ int sched_clock_suspend(void) return 0; } -void sched_clock_resume(void) +static void sched_clock_resume(void) { struct clock_read_data *rd = &cd.read_data[0]; diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c index de7ebe552e3a..14de3727b18e 100644 --- a/kernel/time/tick-common.c +++ b/kernel/time/tick-common.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -492,7 +491,6 @@ void tick_freeze(void) trace_suspend_resume(TPS("timekeeping_freeze"), smp_processor_id(), true); system_state = SYSTEM_SUSPEND; - sched_clock_suspend(); timekeeping_suspend(); } else { tick_suspend_local(); @@ -517,7 +515,6 @@ void tick_unfreeze(void) if (tick_freeze_depth == num_online_cpus()) { timekeeping_resume(); system_state = SYSTEM_RUNNING; - sched_clock_resume(); trace_suspend_resume(TPS("timekeeping_freeze"), smp_processor_id(), false); } else {