Messages in this thread | | | Date | Sun, 09 Feb 2014 15:34:31 +0530 | From | Preeti U Murthy <> | Subject | Re: [PATCH] time/cpuidle:Fixup fallout from hrtimer broadcast mode inclusion |
| |
Hi David,
I have sent out a revised patch on https://lkml.org/lkml/2014/2/9/2. Can you let me know if this works for you?
Thanks
Regards Preeti U Murthy
On 02/09/2014 01:01 PM, David Rientjes wrote: > On Fri, 7 Feb 2014, Preeti U Murthy wrote: > >> The broadcast timer registration has to be done only when >> GENERIC_CLOCKEVENTS_BROADCAST and TICK_ONESHOT config options are enabled. >> Also fix max_delta_ticks value for the pseudo clock device. >> >> Reported-by: Fengguang Wu <fengguang.wu@intel.com> >> Signed-off-by: Preeti U Murthy <preeti@linux.vnet.ibm.com> >> Cc: Thomas Gleixner <tglx@linutronix.de> >> Cc: Ingo Molnar <mingo@kernel.org> >> --- >> >> kernel/time/tick-broadcast-hrtimer.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c >> index 5591aaa..bc383ac 100644 >> --- a/kernel/time/tick-broadcast-hrtimer.c >> +++ b/kernel/time/tick-broadcast-hrtimer.c >> @@ -81,7 +81,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, >> @@ -102,9 +102,11 @@ static enum hrtimer_restart bc_handler(struct hrtimer *t) >> return HRTIMER_RESTART; >> } >> >> +#if defined(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST) && defined(CONFIG_TICK_ONESHOT) >> void tick_setup_hrtimer_broadcast(void) >> { >> hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); >> bctimer.function = bc_handler; >> clockevents_register_device(&ce_broadcast_hrtimer); >> } >> +#endif > > I see a build error in timers/core today: > > kernel/time/tick-broadcast-hrtimer.c:101:6: error: redefinition of 'tick_setup_hrtimer_broadcast' > include/linux/clockchips.h:194:20: note: previous definition of 'tick_setup_hrtimer_broadcast' was here > > and I assume this is the intended fix for that, although it isn't > mentioned in the changelog. > > After it's applied, this is left over: > > kernel/time/tick-broadcast-hrtimer.c:91:29: warning: ‘bc_handler’ defined but not used [-Wunused-function] >
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |