Caller of hrtimer_switch_to_hres(), i.e. hrtimer_run_pending(), has already verified this by calling hrtimer_hres_active() and so we don't need to do it again in hrtimer_switch_to_hres().
Signed-off-by: Viresh Kumar <viresh.ku...@linaro.org> --- kernel/hrtimer.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 5b3b212..e6e1255 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -685,9 +685,6 @@ static int hrtimer_switch_to_hres(void) struct hrtimer_cpu_base *base = &per_cpu(hrtimer_bases, cpu); unsigned long flags; - if (base->hres_active) - return 1; - local_irq_save(flags); if (tick_init_highres()) { -- 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/