Merge "kernel: time: Fix low resolution timer not fire in 32bit case" into msm-4.14 (92064445) · Commits · e / devices / android_kernel_oneplus_sm8150

kernel/time/timer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1385,8 +1385,8 @@ static int next_pending_bucket(struct timer_base *base, unsigned offset,

		pos = find_next_bit(base->pending_map, start, offset);
		pos_down = pos < start ? pos + LVL_SIZE - start : -1;
		if (((pos_up + base->clk) << LVL_SHIFT(lvl)) >
		((pos_down + base->clk) << LVL_SHIFT(lvl)))
		if (((pos_up + (u64)base->clk) << LVL_SHIFT(lvl)) >
		((pos_down + (u64)base->clk) << LVL_SHIFT(lvl)))
		return pos_down;
		return pos_up;
		}