Merge "sched: move watchdog_disable() call before isolation work" (f3912da8) · Commits · e / devices / android_kernel_oneplus_sm7250

kernel/sched/core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -5983,8 +5983,6 @@ int do_isolation_work_cpu_stop(void *data)
		struct rq *rq = cpu_rq(cpu);
		struct rq_flags rf;

		watchdog_disable(cpu);

		local_irq_disable();

		irq_migrate_all_off_this_cpu();
		@@ -6131,6 +6129,7 @@ int sched_isolate_cpu(int cpu)
		smp_call_function_any(&avail_cpus, hrtimer_quiesce_cpu, &cpu, 1);
		smp_call_function_any(&avail_cpus, timer_quiesce_cpu, &cpu, 1);

		watchdog_disable(cpu);
		stop_cpus(cpumask_of(cpu), do_isolation_work_cpu_stop, 0);

		calc_load_migrate(rq);