From: Andrew Gerrand <adg@golang.org>
Date: Mon, 22 Jul 2013 23:31:37 +0000 (+1000)
Subject: [release-branch.go1.1] runtime: properly set G status after syscall
X-Git-Tag: go1.1.2~9
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f2fa9953240092bce6c0bf282cc503104bbb8a4a;p=gostls13.git

[release-branch.go1.1] runtime: properly set G status after syscall

««« CL 9307045 / fab6ba2a2d10
runtime: properly set G status after syscall

R=golang-dev, r, dave
CC=golang-dev
https://golang.org/cl/9307045
»»»

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/11694043
---

diff --git a/src/pkg/runtime/proc.c b/src/pkg/runtime/proc.c
index 31876b62a9..5734509e0c 100644
--- a/src/pkg/runtime/proc.c
+++ b/src/pkg/runtime/proc.c
@@ -1371,6 +1371,8 @@ runtime·exitsyscall(void)
 		runtime·unlock(&runtime·sched);
 		if(p) {
 			acquirep(p);
+			m->p->tick++;
+			g->status = Grunning;
 			g->gcstack = (uintptr)nil;
 			g->gcsp = (uintptr)nil;
 			return;