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>wifi-calibration
parent
5d1638acb9
commit
f1689bb7ab
|
@ -191,7 +191,7 @@ extern void tick_setup_hrtimer_broadcast(void);
|
||||||
extern int tick_check_broadcast_expired(void);
|
extern int tick_check_broadcast_expired(void);
|
||||||
#else
|
#else
|
||||||
static inline int tick_check_broadcast_expired(void) { return 0; }
|
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
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_GENERIC_CLOCKEVENTS
|
#ifdef CONFIG_GENERIC_CLOCKEVENTS
|
||||||
|
|
|
@ -155,8 +155,9 @@ static inline int tick_device_is_functional(struct clock_event_device *dev)
|
||||||
return !(dev->features & CLOCK_EVT_FEAT_DUMMY);
|
return !(dev->features & CLOCK_EVT_FEAT_DUMMY);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int __clockevents_update_freq(struct clock_event_device *dev, u32 freq);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int __clockevents_update_freq(struct clock_event_device *dev, u32 freq);
|
|
||||||
extern void do_timer(unsigned long ticks);
|
extern void do_timer(unsigned long ticks);
|
||||||
extern void update_wall_time(void);
|
extern void update_wall_time(void);
|
||||||
|
|
Loading…
Reference in New Issue