diff options
Diffstat (limited to 'src/runtime/mpagealloc.go')
| -rw-r--r-- | src/runtime/mpagealloc.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/runtime/mpagealloc.go b/src/runtime/mpagealloc.go index 3e789ab85c..f87565417f 100644 --- a/src/runtime/mpagealloc.go +++ b/src/runtime/mpagealloc.go @@ -1038,8 +1038,8 @@ func mergeSummaries(sums []pallocSum, logMaxPagesPerSum uint) pallocSum { // Merge the summaries in sums into one. // // We do this by keeping a running summary representing the merged - // summaries of sums[:i] in start, max, and end. - start, max, end := sums[0].unpack() + // summaries of sums[:i] in start, most, and end. + start, most, end := sums[0].unpack() for i := 1; i < len(sums); i++ { // Merge in sums[i]. si, mi, ei := sums[i].unpack() @@ -1055,12 +1055,7 @@ func mergeSummaries(sums []pallocSum, logMaxPagesPerSum uint) pallocSum { // across the boundary between the running sum and sums[i] // and at the max sums[i], taking the greatest of those two // and the max of the running sum. - if end+si > max { - max = end + si - } - if mi > max { - max = mi - } + most = max(most, end+si, mi) // Merge in end by checking if this new summary is totally // free. If it is, then we want to extend the running sum's @@ -1073,5 +1068,5 @@ func mergeSummaries(sums []pallocSum, logMaxPagesPerSum uint) pallocSum { end = ei } } - return packPallocSum(start, max, end) + return packPallocSum(start, most, end) } |