aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPreeti U Murthy <preeti@linux.vnet.ibm.com>2014-02-09 11:32:22 +0530
committerMark Brown <broonie@kernel.org>2015-01-21 22:08:58 +0000
commiteab6f41c54bbdfb82ba46f3ee047bfe5dbd74e6b (patch)
tree8b87741453fdefeff3a5b64ffc8f54f0fac11241
parenta8db4f03c37ad9bee11f6b673d17f42ef7a742f0 (diff)
downloadlinux-linaro-stable-v3.10/topic/hrtimer.tar.gz
tick: Fixup more fallout from hrtimer broadcast modev3.10/topic/hrtimer
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: Fengguang Wu <fengguang.wu@intel.com> Reported-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Preeti U Murthy <preeti@linux.vnet.ibm.com> Link: http://lkml.kernel.org/r/52F719EE.9010304@linux.vnet.ibm.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> (cherry picked from commit 849401b66d305f3feb75b6db7459b95ad190552a) Signed-off-by: Mark Brown <broonie@kernel.org> Conflicts: kernel/time/Makefile
-rw-r--r--include/linux/clockchips.h1
-rw-r--r--kernel/time/Makefile5
-rw-r--r--kernel/time/tick-broadcast-hrtimer.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index fd294ee..a4520e2 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -202,6 +202,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
diff --git a/kernel/time/Makefile b/kernel/time/Makefile
index efb64be..a64e0de 100644
--- a/kernel/time/Makefile
+++ b/kernel/time/Makefile
@@ -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_TICK_ONESHOT) += tick-oneshot.o
obj-$(CONFIG_TICK_ONESHOT) += tick-sched.o
obj-$(CONFIG_TIMER_STATS) += timer_stats.o
diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c
index 9242527..eb682d5 100644
--- a/kernel/time/tick-broadcast-hrtimer.c
+++ b/kernel/time/tick-broadcast-hrtimer.c
@@ -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,