diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2014-06-27 22:05:21 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2014-06-27 22:05:21 +0000 |
| commit | 37a107a407cdb47ee0f4c4337e369e9973b34076 (patch) | |
| tree | fce5301b062a855bc68b9cb76c6b5966c5a2acbe /sys/vm/vm_mmap.c | |
| parent | d2f1b8f4d2975ca1ec3e7519f9d755af40f357e0 (diff) | |
| download | src-37a107a407cdb47ee0f4c4337e369e9973b34076.tar.gz src-37a107a407cdb47ee0f4c4337e369e9973b34076.zip | |
Revert r267961, r267973:
These changes prevent sysctl(8) from returning proper output,
such as:
1) no output from sysctl(8)
2) erroneously returning ENOMEM with tools like truss(1)
or uname(1)
truss: can not get etype: Cannot allocate memory
Notes
Notes:
svn path=/head/; revision=267985
Diffstat (limited to 'sys/vm/vm_mmap.c')
| -rw-r--r-- | sys/vm/vm_mmap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index e94090c53e88..a5248399ab9a 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -92,8 +92,9 @@ __FBSDID("$FreeBSD$"); #endif int old_mlock = 0; -SYSCTL_INT(_vm, OID_AUTO, old_mlock, CTLFLAG_RWTUN, &old_mlock, 0, +SYSCTL_INT(_vm, OID_AUTO, old_mlock, CTLFLAG_RW | CTLFLAG_TUN, &old_mlock, 0, "Do not apply RLIMIT_MEMLOCK on mlockall"); +TUNABLE_INT("vm.old_mlock", &old_mlock); #ifdef MAP_32BIT #define MAP_32BIT_MAX_ADDR ((vm_offset_t)1 << 31) |