diff options
| author | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2012-02-08 09:18:22 +0000 |
|---|---|---|
| committer | Pawel Jakub Dawidek <pjd@FreeBSD.org> | 2012-02-08 09:18:22 +0000 |
| commit | 12075c09361aa2fe995f7b94974c3e79c6fd7ee2 (patch) | |
| tree | ccea55a788091db12584c9238cd94fed71ed02c6 /sys/kern/sysv_shm.c | |
| parent | 95208e20d012a87c42c5840eca0fedd2d88c1fd1 (diff) | |
| download | src-12075c09361aa2fe995f7b94974c3e79c6fd7ee2.tar.gz src-12075c09361aa2fe995f7b94974c3e79c6fd7ee2.zip | |
Allow to set kern.ipc.shmmax from /boot/loader.conf.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=231195
Diffstat (limited to 'sys/kern/sysv_shm.c')
| -rw-r--r-- | sys/kern/sysv_shm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 2bad48494c3e..c717c0d9675f 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -891,14 +891,14 @@ shminit() printf("kern.ipc.shmmaxpgs is now called kern.ipc.shmall!\n"); #endif TUNABLE_ULONG_FETCH("kern.ipc.shmall", &shminfo.shmall); - - /* Initialize shmmax dealing with possible overflow. */ - for (i = PAGE_SIZE; i > 0; i--) { - shminfo.shmmax = shminfo.shmall * i; - if (shminfo.shmmax >= shminfo.shmall) - break; + if (!TUNABLE_ULONG_FETCH("kern.ipc.shmmax", &shminfo.shmmax)) { + /* Initialize shmmax dealing with possible overflow. */ + for (i = PAGE_SIZE; i > 0; i--) { + shminfo.shmmax = shminfo.shmall * i; + if (shminfo.shmmax >= shminfo.shmall) + break; + } } - TUNABLE_ULONG_FETCH("kern.ipc.shmmin", &shminfo.shmmin); TUNABLE_ULONG_FETCH("kern.ipc.shmmni", &shminfo.shmmni); TUNABLE_ULONG_FETCH("kern.ipc.shmseg", &shminfo.shmseg); |