diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index ff2d6dc59c14c9b4e40e87dcf39c3c06454173d8..4275398bc713e1957cf008c4db3b4f9c23ce2863 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -594,11 +594,6 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
 	SEQ_printf(m, "  .%-30s: %d\n", "nr_spread_over",
 			cfs_rq->nr_spread_over);
 	SEQ_printf(m, "  .%-30s: %d\n", "nr_running", cfs_rq->nr_running);
-#ifdef CONFIG_SCHED_STEAL
-	SEQ_printf(m, "  .%-30s: %d\n", "h_nr_running", cfs_rq->h_nr_running);
-	SEQ_printf(m, "  .%-30s: %ld\n", "steal_h_nr_running",
-			cfs_rq->steal_h_nr_running);
-#endif
 	SEQ_printf(m, "  .%-30s: %ld\n", "load", cfs_rq->load.weight);
 #ifdef CONFIG_SMP
 	SEQ_printf(m, "  .%-30s: %lu\n", "load_avg",
@@ -714,6 +709,11 @@ do {									\
 	SEQ_printf(m, "  .%-30s: %Ld.%06ld\n", #x, SPLIT_NS(rq->x))
 
 	P(nr_running);
+#ifdef CONFIG_SCHED_STEAL
+	SEQ_printf(m, "  .%-30s: %d\n", "h_nr_running", rq->cfs.h_nr_running);
+	SEQ_printf(m, "  .%-30s: %ld\n", "steal_h_nr_running",
+			rq->cfs.steal_h_nr_running);
+#endif
 	P(nr_switches);
 	P(nr_uninterruptible);
 	PN(next_balance);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 38841d1d640a744da5258be9ff0bc5c67b6d561c..a518d636f07faf2db0919ce58c4ca897ccf499bb 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -4492,11 +4492,10 @@ static void overload_clear(struct rq *rq)
 	if (!steal_enabled())
 		return;
 
-	if (!group_steal_used() && rq->cfs.h_nr_running >= 2)
-		return;
+	if (rq->cfs.h_nr_running < 2)
+		need_clear = true;
 
-	if (group_steal_used() &&
-	    (rq->cfs.h_nr_running < 2 || rq->cfs.steal_h_nr_running == 0))
+	if (group_steal_used() && rq->cfs.steal_h_nr_running < 1)
 		need_clear = true;
 
 	if (!need_clear)