From a8db4f03c37ad9bee11f6b673d17f42ef7a742f0 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 7 Feb 2014 16:00:46 +0100 Subject: [PATCH] time: Fixup fallout from recent clockevent/tick changes Make the stub function static inline instead of static and move the clockevents related function into the proper ifdeffed section. Reported-by: Fengguang Wu Signed-off-by: Thomas Gleixner Cc: Soren Brinkmann Cc: Preeti U Murthy (cherry picked from commit f1689bb7abec8e2e670d8ad11eaa86d54bad8cfd) Signed-off-by: Mark Brown --- include/linux/clockchips.h | 2 +- kernel/time/tick-internal.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index 702935e1884c..fd294ee03dcf 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -186,7 +186,7 @@ extern void tick_setup_hrtimer_broadcast(void); extern int tick_check_broadcast_expired(void); #else static inline int tick_check_broadcast_expired(void) { return 0; } -static void tick_setup_hrtimer_broadcast(void) {}; +static inline void tick_setup_hrtimer_broadcast(void) {}; #endif #ifdef CONFIG_GENERIC_CLOCKEVENTS diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h index ae120c263a74..c85edb18d68e 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h @@ -145,6 +145,8 @@ static inline int tick_device_is_functional(struct clock_event_device *dev) return !(dev->features & CLOCK_EVT_FEAT_DUMMY); } +int __clockevents_update_freq(struct clock_event_device *dev, u32 freq); + #endif extern void do_timer(unsigned long ticks); -- 2.34.1