diff options
| author | Dmitriy Vyukov <dvyukov@google.com> | 2013-03-14 19:11:29 +0400 |
|---|---|---|
| committer | Dmitriy Vyukov <dvyukov@google.com> | 2013-03-14 19:11:29 +0400 |
| commit | 76959e2cc6841fddcca21987c6fc0d47181fd789 (patch) | |
| tree | 5827b2a3bfb8c23e67c91bca10a58742d0230793 /src/pkg/runtime | |
| parent | 49e0300854dabc8d3c2e91d26897a998345f2447 (diff) | |
| download | go-76959e2cc6841fddcca21987c6fc0d47181fd789.tar.xz | |
runtime: do not memprofile settype_flush
Fixes #4850.
R=golang-dev, bradfitz, rsc
CC=golang-dev
https://golang.org/cl/7745044
Diffstat (limited to 'src/pkg/runtime')
| -rw-r--r-- | src/pkg/runtime/malloc.goc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pkg/runtime/malloc.goc b/src/pkg/runtime/malloc.goc index ac131b3af4..aae3d233fc 100644 --- a/src/pkg/runtime/malloc.goc +++ b/src/pkg/runtime/malloc.goc @@ -516,7 +516,7 @@ runtime·settype_flush(M *mp, bool sysalloc) nbytes3 = 8*sizeof(uintptr) + 1*ntypes; if(!sysalloc) { - data3 = runtime·mallocgc(nbytes3, FlagNoPointers, 0, 1); + data3 = runtime·mallocgc(nbytes3, FlagNoProfiling|FlagNoPointers, 0, 1); } else { data3 = runtime·SysAlloc(nbytes3); if(data3 == nil) @@ -554,7 +554,7 @@ runtime·settype_flush(M *mp, bool sysalloc) nbytes2 = ntypes * sizeof(uintptr); if(!sysalloc) { - data2 = runtime·mallocgc(nbytes2, FlagNoPointers, 0, 1); + data2 = runtime·mallocgc(nbytes2, FlagNoProfiling|FlagNoPointers, 0, 1); } else { data2 = runtime·SysAlloc(nbytes2); if(data2 == nil) |