summaryrefslogtreecommitdiffstats
path: root/kernel/time/tick-internal.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-02-07 16:00:46 +0100
committerThomas Gleixner <tglx@linutronix.de>2014-02-07 16:00:46 +0100
commitf1689bb7abec8e2e670d8ad11eaa86d54bad8cfd (patch)
tree37f8be2110bad4419368f61d2a63f8f751664cf7 /kernel/time/tick-internal.h
parenttick: Introduce hrtimer based broadcast (diff)
downloadlinux-f1689bb7abec8e2e670d8ad11eaa86d54bad8cfd.tar.xz
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 'kernel/time/tick-internal.h')
-rw-r--r--kernel/time/tick-internal.h3
1 files changed, 2 insertions, 1 deletions
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);