scheduler fixes
Linus,
Please pull the latest sched-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus
Thanks,
Ingo
------------------>
Peter Zijlstra (2):
MAINTAINERS: Update tip.git related git trees
sched: Fix select_idle_sibling() regression in selecting an idle SMT sibling
MAINTAINERS | 13 +++++++++---- kernel/sched_fair.c | 14 ++++++++------ 2 files changed, 17 insertions(+), 10 deletions(-)
MAINTAINERS +9 -4
@@ -3118,6 +3118,7 @@ F: include/linux/hid* HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS M: Thomas Gleixner <[email protected]> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core S: Maintained F: Documentation/timers/ F: kernel/hrtimer.c
@@ -3627,7 +3628,7 @@ F: net/irda/ IRQ SUBSYSTEM M: Thomas Gleixner <[email protected]> S: Maintained -T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq/core +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core F: kernel/irq/ ISAPNP
@@ -4115,7 +4116,7 @@ F: drivers/hwmon/lm90.c LOCKDEP AND LOCKSTAT M: Peter Zijlstra <[email protected]> M: Ingo Molnar <[email protected]> -T: git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking S: Maintained F: Documentation/lockdep*.txt F: Documentation/lockstat.txt
@@ -5102,6 +5103,7 @@ M: Peter Zijlstra <[email protected]> M: Paul Mackerras <[email protected]> M: Ingo Molnar <[email protected]> M: Arnaldo Carvalho de Melo <[email protected]> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core S: Supported F: kernel/events/* F: include/linux/perf_event.h
@@ -5181,6 +5183,7 @@ F: drivers/scsi/pm8001/ POSIX CLOCKS and TIMERS M: Thomas Gleixner <[email protected]> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core S: Supported F: fs/timerfd.c F: include/linux/timer*
@@ -5696,6 +5699,7 @@ F: drivers/dma/dw_dmac.c TIMEKEEPING, NTP M: John Stultz <[email protected]> M: Thomas Gleixner <[email protected]> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core S: Supported F: include/linux/clocksource.h F: include/linux/time.h
@@ -5720,6 +5724,7 @@ F: drivers/watchdog/sc1200wdt.c SCHEDULER M: Ingo Molnar <[email protected]> M: Peter Zijlstra <[email protected]> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core S: Maintained F: kernel/sched* F: include/linux/sched.h
@@ -6647,7 +6652,7 @@ TRACING M: Steven Rostedt <[email protected]> M: Frederic Weisbecker <[email protected]> M: Ingo Molnar <[email protected]> -T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core S: Maintained F: Documentation/trace/ftrace.txt F: arch/*/*/*/ftrace.h
@@ -7397,7 +7402,7 @@ M: Thomas Gleixner <[email protected]> M: Ingo Molnar <[email protected]> M: "H. Peter Anvin" <[email protected]> M: [email protected] -T: git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core S: Maintained F: Documentation/x86/ F: arch/x86/
kernel/sched_fair.c +8 -6
@@ -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 ();