diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-07 16:00:46 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-07 16:00:46 +0100 |
| commit | f1689bb7abec8e2e670d8ad11eaa86d54bad8cfd (patch) | |
| tree | 37f8be2110bad4419368f61d2a63f8f751664cf7 | |
| parent | 5d1638acb9f62fa7eb0c07cb85318bbe1f13b227 (diff) | |
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 <fengguang.wu@intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Soren Brinkmann <soren.brinkmann@xilinx.com>
Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com>
| -rw-r--r-- | include/linux/clockchips.h | 2 | ||||
| -rw-r--r-- | kernel/time/tick-internal.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index dbe9e1457168..20a7183f2831 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h @@ -191,7 +191,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 0756c62c219a..7ab92b19965a 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h @@ -155,8 +155,9 @@ 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 -int __clockevents_update_freq(struct clock_event_device *dev, u32 freq); extern void do_timer(unsigned long ticks); extern void update_wall_time(void); |