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

Commit 3e927788 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched: Fix cpu_active_mask/cpu_online_mask race"

parents c73e2d06 3b679e46
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -7155,6 +7155,14 @@ static int sched_cpu_active(struct notifier_block *nfb,
	case CPU_STARTING:
		set_cpu_rq_start_time();
		return NOTIFY_OK;
	case CPU_ONLINE:
		/*
		 * At this point a starting CPU has marked itself as online via
		 * set_cpu_online(). But it might not yet have marked itself
		 * as active, which is essential from here on.
		 *
		 * Thus, fall-through and help the starting CPU along.
		 */
	case CPU_DOWN_FAILED:
		set_cpu_active((long)hcpu, true);
		return NOTIFY_OK;