diff options
author | Preeti U Murthy <preeti@linux.vnet.ibm.com> | 2014-02-09 01:02:22 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-09 09:11:47 -0500 |
commit | 849401b66d305f3feb75b6db7459b95ad190552a (patch) | |
tree | d70fbf4ee82d106f700edf54547da69849e1a7f0 /kernel | |
parent | f1689bb7abec8e2e670d8ad11eaa86d54bad8cfd (diff) |
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: 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>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/time/Makefile | 5 | ||||
-rw-r--r-- | kernel/time/tick-broadcast-hrtimer.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kernel/time/Makefile b/kernel/time/Makefile index 06151ef4a744..57a413fd0ebf 100644 --- a/kernel/time/Makefile +++ b/kernel/time/Makefile | |||
@@ -3,7 +3,10 @@ obj-y += timeconv.o posix-clock.o alarmtimer.o | |||
3 | 3 | ||
4 | obj-$(CONFIG_GENERIC_CLOCKEVENTS_BUILD) += clockevents.o | 4 | obj-$(CONFIG_GENERIC_CLOCKEVENTS_BUILD) += clockevents.o |
5 | obj-$(CONFIG_GENERIC_CLOCKEVENTS) += tick-common.o | 5 | obj-$(CONFIG_GENERIC_CLOCKEVENTS) += tick-common.o |
6 | obj-$(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) += tick-broadcast.o tick-broadcast-hrtimer.o | 6 | ifeq ($(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST),y) |
7 | obj-y += tick-broadcast.o | ||
8 | obj-$(CONFIG_TICK_ONESHOT) += tick-broadcast-hrtimer.o | ||
9 | endif | ||
7 | obj-$(CONFIG_GENERIC_SCHED_CLOCK) += sched_clock.o | 10 | obj-$(CONFIG_GENERIC_SCHED_CLOCK) += sched_clock.o |
8 | obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o | 11 | obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o |
9 | obj-$(CONFIG_TICK_ONESHOT) += tick-sched.o | 12 | obj-$(CONFIG_TICK_ONESHOT) += tick-sched.o |
diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c index 92425279312b..eb682d5c697c 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 = { | |||
82 | .min_delta_ns = 1, | 82 | .min_delta_ns = 1, |
83 | .max_delta_ns = KTIME_MAX, | 83 | .max_delta_ns = KTIME_MAX, |
84 | .min_delta_ticks = 1, | 84 | .min_delta_ticks = 1, |
85 | .max_delta_ticks = KTIME_MAX, | 85 | .max_delta_ticks = ULONG_MAX, |
86 | .mult = 1, | 86 | .mult = 1, |
87 | .shift = 0, | 87 | .shift = 0, |
88 | .cpumask = cpu_all_mask, | 88 | .cpumask = cpu_all_mask, |