Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2f53cc2 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "timer: Fix incorrect parenthesis in timer" into msm-4.9

parents f2a54243 df06519a

kernel/time/timer.c

+2 −1
Original line number Diff line number Diff line
@@ -873,10 +873,11 @@ static inline struct timer_base *get_timer_this_cpu_base(u32 tflags) 
	 * the deferrable base.

	 */

	if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active &&

	    (tflags & TIMER_DEFERRABLE))

	    (tflags & TIMER_DEFERRABLE)) {

		base = &timer_base_deferrable;

		if (tflags & TIMER_PINNED)

			base = this_cpu_ptr(&timer_bases[BASE_DEF]);

	}

	return base;

}