clock_was_set_delayed() is called from only hrtimer.c and so should be marked static. Along with that its declaration and dummy definition must be removed from hrtimer.h.
Signed-off-by: Viresh Kumar <[email protected]> --- include/linux/hrtimer.h | 5 ----- kernel/hrtimer.c | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 17c08ca..6f524db 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -288,8 +288,6 @@ extern void hrtimer_peek_ahead_timers(void); # define MONOTONIC_RES_NSEC HIGH_RES_NSEC # define KTIME_MONOTONIC_RES KTIME_HIGH_RES -extern void clock_was_set_delayed(void); - #else # define MONOTONIC_RES_NSEC LOW_RES_NSEC @@ -310,9 +308,6 @@ static inline int hrtimer_is_hres_active(struct hrtimer *timer) { return 0; } - -static inline void clock_was_set_delayed(void) { } - #endif extern void clock_was_set(void); diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index e6e1255..1e4eedb 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -715,7 +715,7 @@ static DECLARE_WORK(hrtimer_work, clock_was_set_work); * Called from timekeeping and resume code to reprogramm the hrtimer * interrupt device on all cpus. */ -void clock_was_set_delayed(void) +static void clock_was_set_delayed(void) { schedule_work(&hrtimer_work); } @@ -732,6 +732,7 @@ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer, } static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { } static inline void retrigger_next_event(void *arg) { } +static inline void clock_was_set_delayed(void) { } #endif /* CONFIG_HIGH_RES_TIMERS */ -- 1.7.12.rc2.18.g61b472e -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
