aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2015-02-19 15:45:29 -0500
committerRuss Cox <rsc@golang.org>2015-02-19 20:46:59 +0000
commit6c4b54f409b537ce60e539e2ec1c56abfe1e145c (patch)
tree58f22b6e42b0e370fad9cd09475d4aca6b491031
parent484f801ff4125d86f8c4072f070611afea9c79f7 (diff)
downloadgo-6c4b54f409b537ce60e539e2ec1c56abfe1e145c.tar.gz
go-6c4b54f409b537ce60e539e2ec1c56abfe1e145c.zip
runtime: missed change from reorganization CL
That is, I accidentally dropped this change of Austin's when preparing my CL. I blame Git. Change-Id: I9dd772c84edefad96c4b16785fdd2dea04a4a0d6 Reviewed-on: https://go-review.googlesource.com/5320 Reviewed-by: Austin Clements <austin@google.com>
-rw-r--r--src/runtime/mgc.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go
index 497695cf18..70661e46d0 100644
--- a/src/runtime/mgc.go
+++ b/src/runtime/mgc.go
@@ -423,7 +423,9 @@ func gcinstallmarkwb() {
// This is the concurrent mark phase.
//go:nowritebarrier
func gcmark_m() {
- gcDrain(nil)
+ var gcw gcWork
+ gcDrain(&gcw)
+ gcw.dispose()
// TODO add another harvestwbuf and reset work.nwait=0, work.ndone=0, and work.nproc=1
// and repeat the above gcDrain.
}