1 files changed, 8 insertions, 6 deletions

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index a78ed2736ba..8a39fa3e3c6 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -2352,13 +2352,11 @@ again:
                 if (!smt && (sd->flags & SD_SHARE_CPUPOWER))
                         continue;
 
-                if (!(sd->flags & SD_SHARE_PKG_RESOURCES)) {
-                        if (!smt) {
-                                smt = 1;
-                                goto again;
-                        }
+                if (smt && !(sd->flags & SD_SHARE_CPUPOWER))
+                        break;
+
+                if (!(sd->flags & SD_SHARE_PKG_RESOURCES))
                         break;
-                }
 
                 sg = sd->groups;
                 do {
@@ -2378,6 +2376,10 @@ next:
                         sg = sg->next;
                 } while (sg != sd->groups);
         }
+        if (!smt) {
+                smt = 1;
+                goto again;
+        }
 done:
         rcu_read_unlock();