use base->hres_active directly when we already have a pointer to base instead of calling hrtimer_hres_active(). As that would lead to:
__this_cpu_read(hrtimer_bases.hres_active) Signed-off-by: Viresh Kumar <viresh.ku...@linaro.org> --- V1->V2: Removed few entries as hres_active isn't available if CONFIG_HIGH_RES_TIMERS isn't enabled. kernel/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 83e5f2d..9e18145 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -883,7 +883,7 @@ static void __remove_hrtimer(struct hrtimer *timer, unsigned long newstate, #ifdef CONFIG_HIGH_RES_TIMERS /* Reprogram the clock event device. if enabled */ - if (reprogram && hrtimer_hres_active() && + if (reprogram && base->cpu_base->hres_active && &timer->node == timerqueue_getnext(&base->active)) { ktime_t expires; -- 1.7.12.rc2.18.g61b472e -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/