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 /include/linux/clockchips.h | |
| parent | 5d1638acb9f62fa7eb0c07cb85318bbe1f13b227 (diff) | |
| download | linux-f1689bb7abec8e2e670d8ad11eaa86d54bad8cfd.tar.gz linux-f1689bb7abec8e2e670d8ad11eaa86d54bad8cfd.tar.bz2 linux-f1689bb7abec8e2e670d8ad11eaa86d54bad8cfd.zip | |
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>
Diffstat (limited to 'include/linux/clockchips.h')
| -rw-r--r-- | include/linux/clockchips.h | 2 |
1 files changed, 1 insertions, 1 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 |