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

Commit 849401b6 authored by Preeti U Murthy's avatar Preeti U Murthy Committed by Thomas Gleixner
Browse files

tick: Fixup more fallout from hrtimer broadcast mode 



The hrtimer mode of broadcast is supported only when
GENERIC_CLOCKEVENTS_BROADCAST and TICK_ONESHOT config options
are enabled. Hence compile in the functions for hrtimer mode
of broadcast only when these options are selected.
Also fix max_delta_ticks value for the pseudo clock device.

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Reported-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarPreeti U Murthy <preeti@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/52F719EE.9010304@linux.vnet.ibm.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent f1689bb7

include/linux/clockchips.h

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ static inline void clockevents_resume(void) {} 


static inline int clockevents_notify(unsigned long reason, void *arg) { return 0; }

static inline int tick_check_broadcast_expired(void) { return 0; }

static inline void tick_setup_hrtimer_broadcast(void) {};



#endif

kernel/time/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -3,7 +3,10 @@ obj-y += timeconv.o posix-clock.o alarmtimer.o 


obj-$(CONFIG_GENERIC_CLOCKEVENTS_BUILD)		+= clockevents.o

obj-$(CONFIG_GENERIC_CLOCKEVENTS)		+= tick-common.o

obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST)	+= tick-broadcast.o tick-broadcast-hrtimer.o

ifeq ($(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST),y)

 obj-y						+= tick-broadcast.o

 obj-$(CONFIG_TICK_ONESHOT)			+= tick-broadcast-hrtimer.o

endif

obj-$(CONFIG_GENERIC_SCHED_CLOCK)		+= sched_clock.o

obj-$(CONFIG_TICK_ONESHOT)			+= tick-oneshot.o

obj-$(CONFIG_TICK_ONESHOT)			+= tick-sched.o

kernel/time/tick-broadcast-hrtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static struct clock_event_device ce_broadcast_hrtimer = { 
	.min_delta_ns		= 1,

	.max_delta_ns		= KTIME_MAX,

	.min_delta_ticks	= 1,

	.max_delta_ticks	= KTIME_MAX,

	.max_delta_ticks	= ULONG_MAX,

	.mult			= 1,

	.shift			= 0,

	.cpumask		= cpu_all_mask,