From: Russ Cox <rsc@golang.org>
Date: Wed, 30 Jun 2010 00:47:27 +0000 (-0700)
Subject: runtime: fix scheduling bug - world wasn't stopping
X-Git-Tag: weekly.2010-07-01~30
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=774333685e0407307bccbcdd8254d8244cbd73ba;p=gostls13.git

runtime: fix scheduling bug - world wasn't stopping

Fixes #886.

R=r
CC=golang-dev
https://golang.org/cl/1667051
---

diff --git a/src/pkg/runtime/proc.c b/src/pkg/runtime/proc.c
index a587a7fd43..2abb28307e 100644
--- a/src/pkg/runtime/proc.c
+++ b/src/pkg/runtime/proc.c
@@ -168,7 +168,7 @@ gput(G *g)
 	M *m;
 
 	// If g is wired, hand it off directly.
-	if((m = g->lockedm) != nil) {
+	if(sched.mcpu < sched.mcpumax && (m = g->lockedm) != nil) {
 		mnextg(m, g);
 		return;
 	}