summaryrefslogtreecommitdiff
path: root/include/linux/clockchips.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-02-07 19:00:46 +0400
committerThomas Gleixner <tglx@linutronix.de>2014-02-07 19:00:46 +0400
commitf1689bb7abec8e2e670d8ad11eaa86d54bad8cfd (patch)
tree37f8be2110bad4419368f61d2a63f8f751664cf7 /include/linux/clockchips.h
parent5d1638acb9f62fa7eb0c07cb85318bbe1f13b227 (diff)
downloadlinux-f1689bb7abec8e2e670d8ad11eaa86d54bad8cfd.tar.xz
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.h2
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