diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-07 10:00:46 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-07 10:00:46 -0500 |
commit | f1689bb7abec8e2e670d8ad11eaa86d54bad8cfd (patch) | |
tree | 37f8be2110bad4419368f61d2a63f8f751664cf7 /kernel/time | |
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>
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/tick-internal.h | 3 |
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) | |||
155 | return !(dev->features & CLOCK_EVT_FEAT_DUMMY); | 155 | return !(dev->features & CLOCK_EVT_FEAT_DUMMY); |
156 | } | 156 | } |
157 | 157 | ||
158 | int __clockevents_update_freq(struct clock_event_device *dev, u32 freq); | ||
159 | |||
158 | #endif | 160 | #endif |
159 | 161 | ||
160 | int __clockevents_update_freq(struct clock_event_device *dev, u32 freq); | ||
161 | extern void do_timer(unsigned long ticks); | 162 | extern void do_timer(unsigned long ticks); |
162 | extern void update_wall_time(void); | 163 | extern void update_wall_time(void); |