diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-04-20 14:46:04 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-04-20 14:46:04 -0400 |
| commit | edca041beee90a450071fd47356c26905e1b9937 (patch) | |
| tree | bd9182e1cf7a01446f4145ddd32f98ee29305cba /usr/src/lib/libc/port/gen | |
| parent | f077edea49a734a4c170f2c437f67f85291543e7 (diff) | |
| parent | df5cd018c34371890eeeb8c930245b9323e8aa25 (diff) | |
| download | illumos-joyent-release-20220421.tar.gz | |
[illumos-gate merge]release-20220421
commit df5cd018c34371890eeeb8c930245b9323e8aa25
14418 mman.h symbol visibility is a mess
commit 34331de35882eb41acdf4f0d2065b5e12d083e82
14531 want nvme namespace management mutex
commit 353d89b0745ef752e824c1afc3f0474f66dfbd64
14530 nvme should require exclusive open for attach, detach, and format ioctls
commit c542a624b7efda0b8123026500f05f430ff6c770
14607 Add CONS_GETDEV so we can see which port is /dev/console
Diffstat (limited to 'usr/src/lib/libc/port/gen')
| -rw-r--r-- | usr/src/lib/libc/port/gen/madvise.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/mlock.c | 8 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/munlock.c | 8 |
3 files changed, 7 insertions, 13 deletions
diff --git a/usr/src/lib/libc/port/gen/madvise.c b/usr/src/lib/libc/port/gen/madvise.c index 240c750ab6..01e035b369 100644 --- a/usr/src/lib/libc/port/gen/madvise.c +++ b/usr/src/lib/libc/port/gen/madvise.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "lint.h" #include <sys/types.h> #include <sys/mman.h> @@ -35,7 +33,7 @@ * management of the memory resources of a particular application. */ int -madvise(caddr_t addr, size_t len, int advice) +madvise(void *addr, size_t len, int advice) { return (memcntl(addr, len, MC_ADVISE, (caddr_t)(intptr_t)advice, 0, 0)); } diff --git a/usr/src/lib/libc/port/gen/mlock.c b/usr/src/lib/libc/port/gen/mlock.c index 10f641dd9d..c1ad03da44 100644 --- a/usr/src/lib/libc/port/gen/mlock.c +++ b/usr/src/lib/libc/port/gen/mlock.c @@ -25,9 +25,7 @@ */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" +/* All Rights Reserved */ #pragma weak _mlock = mlock @@ -39,7 +37,7 @@ * Function to lock address range in memory. */ int -mlock(caddr_t addr, size_t len) +mlock(const void *addr, size_t len) { - return (memcntl(addr, len, MC_LOCK, 0, 0, 0)); + return (memcntl((void *)addr, len, MC_LOCK, 0, 0, 0)); } diff --git a/usr/src/lib/libc/port/gen/munlock.c b/usr/src/lib/libc/port/gen/munlock.c index 9757df0e41..8edbfc79d0 100644 --- a/usr/src/lib/libc/port/gen/munlock.c +++ b/usr/src/lib/libc/port/gen/munlock.c @@ -25,9 +25,7 @@ */ /* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" +/* All Rights Reserved */ #pragma weak _munlock = munlock @@ -40,7 +38,7 @@ */ int -munlock(caddr_t addr, size_t len) +munlock(const void *addr, size_t len) { - return (memcntl(addr, len, MC_UNLOCK, 0, 0, 0)); + return (memcntl((void *)addr, len, MC_UNLOCK, 0, 0, 0)); } |