diff options
| author | Russ Cox <rsc@golang.org> | 2014-11-24 12:07:11 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-11-24 12:07:11 -0500 |
| commit | b8540fc28867623b23c23e97108a6e975e8a49e7 (patch) | |
| tree | e5c56e6595f5ebf90fc796a7699e53da94076c84 /src/runtime/malloc2.go | |
| parent | 273507aa8f17b2b619934ae63c99a2e31a4df5e2 (diff) | |
| parent | a236804c764c9aa1fb293c24be9c571de5795d05 (diff) | |
| download | go-b8540fc28867623b23c23e97108a6e975e8a49e7.tar.xz | |
[dev.garbage] all: merge dev.cc (493ad916c3b1) into dev.garbage
TBR=austin
CC=golang-codereviews
https://golang.org/cl/179290043
Diffstat (limited to 'src/runtime/malloc2.go')
| -rw-r--r-- | src/runtime/malloc2.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/malloc2.go b/src/runtime/malloc2.go index 511638d3d3..a9d40de306 100644 --- a/src/runtime/malloc2.go +++ b/src/runtime/malloc2.go @@ -126,7 +126,7 @@ const ( // See http://golang.org/issue/5402 and http://golang.org/issue/5236. // On other 64-bit platforms, we limit the arena to 128GB, or 37 bits. // On 32-bit, we don't bother limiting anything, so we use the full 32-bit address. - _MHeapMap_TotalBits = (_64bit*_Windows)*35 + (_64bit*(1-_Windows))*37 + (1-_64bit)*32 + _MHeapMap_TotalBits = (_64bit*goos_windows)*35 + (_64bit*(1-goos_windows))*37 + (1-_64bit)*32 _MHeapMap_Bits = _MHeapMap_TotalBits - _PageShift _MaxMem = uintptr(1<<_MHeapMap_TotalBits - 1) |