Merge tag 'v4.1.10' of ../../stable/linux-stable into linux-4.1.y-rt

This is the 4.1.10 stable release

1 files changed, 8 insertions, 0 deletions

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 392aad4ec3d6..799b75b273a2 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5672,6 +5672,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;