Merge "nohz: Fix !HIGH_RES_TIMERS hang" (a5cb5e6c) · Commits · e / devices / android_kernel_xiaomi_markw

kernel/time/tick-sched.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -1058,11 +1058,9 @@ static void tick_nohz_switch_to_nohz(void)
		if (!tick_nohz_enabled)
		return;

		local_irq_disable();
		if (tick_switch_to_oneshot(tick_nohz_handler)) {
		local_irq_enable();
		if (tick_switch_to_oneshot(tick_nohz_handler))
		return;
		}

		tick_nohz_active = 1;
		ts->nohz_mode = NOHZ_MODE_LOWRES;

		@@ -1080,7 +1078,6 @@ static void tick_nohz_switch_to_nohz(void)
		break;
		next = ktime_add(next, tick_period);
		}
		local_irq_enable();
		}

		/*
		@@ -1331,7 +1328,7 @@ void tick_oneshot_notify(void)
		* Called cyclic from the hrtimer softirq (driven by the timer
		* softirq) allow_nohz signals, that we can switch into low-res nohz
		* mode, because high resolution timers are disabled (either compile
		* or runtime).
		* or runtime). Called with interrupts disabled.
		*/
		int tick_check_oneshot_change(int allow_nohz)
		{