Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1689bb7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarFengguang Wu <fengguang.wu@intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Soren Brinkmann <soren.brinkmann@xilinx.com>
Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com>
parent 5d1638ac

include/linux/clockchips.h

+1 −1
Original line number Diff line number Diff line
@@ -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

kernel/time/tick-internal.h

+2 −1
Original line number Diff line number Diff line
@@ -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);