diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-15 13:04:31 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-15 13:04:31 +0000 |
| commit | 7a34fde236609b18147eb73e6a163e19162d96e2 (patch) | |
| tree | 11d647767f5036bbcccee110ad13891ed603a972 /usr/src/uts/common/vm/vm_seg.c | |
| parent | 0de99a4637b946f1cd1c7d9fb5949112e1afb82f (diff) | |
| parent | c653bb4713ca694c2d16b04b65d5b76c0bb46bd4 (diff) | |
| download | illumos-joyent-7a34fde236609b18147eb73e6a163e19162d96e2.tar.gz | |
[illumos-gate merge]
commit c653bb4713ca694c2d16b04b65d5b76c0bb46bd4
10197 build smatch in parallel
commit 15c07adc1c7b828006b5e3c4d528b92229d6bd23
10081 smatch indenting fixes for usr/src/uts
commit 5661bb7641e85c46713da7a3002b29ecd2c3daf0
10080 smatch Makefile changes for usr/src/cmd
commit 05ede3db5e3b7d540afbccdc872c735770e82ef3
10079 smatch Makefile changes for usr/src/lib
commit cadd68ea0014761eda6a293664086dfa80686d85
10078 smatch fixes for UCB
commit 1ea94c756c0bc9170021d7b570944a24f224c03f
10202 loader: use screen-#rows to find bottom left co-ordinates
commit 08487eea68a2fa501b5042131c6db068089f82e1
10173 loader: support newer ZFS versions
Conflicts:
usr/src/lib/libdladm/Makefile.com
usr/src/lib/fm/topo/modules/i86pc/chip/Makefile
Diffstat (limited to 'usr/src/uts/common/vm/vm_seg.c')
| -rw-r--r-- | usr/src/uts/common/vm/vm_seg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/vm/vm_seg.c b/usr/src/uts/common/vm/vm_seg.c index 14076ddff8..2c4d09fc03 100644 --- a/usr/src/uts/common/vm/vm_seg.c +++ b/usr/src/uts/common/vm/vm_seg.c @@ -21,7 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright (c) 2015, Joyent, Inc. + * Copyright (c) 2018, Joyent, Inc. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ @@ -1831,7 +1831,7 @@ seg_can_change_zones(struct seg *seg) if (svd->type == MAP_SHARED && svd->amp != NULL && svd->amp->swresv > 0) - return (B_FALSE); + return (B_FALSE); } return (B_TRUE); } |