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/madv/common | |
| 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/madv/common')
| -rw-r--r-- | usr/src/lib/madv/common/madv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/lib/madv/common/madv.c b/usr/src/lib/madv/common/madv.c index 756825ee34..12a33a19b6 100644 --- a/usr/src/lib/madv/common/madv.c +++ b/usr/src/lib/madv/common/madv.c @@ -721,8 +721,8 @@ shmat(int shmid, const void *shmaddr, int shmflag) /* * mmap interpose */ -caddr_t -mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos) +void * +mmap(void *addr, size_t len, int prot, int flags, int fd, off_t pos) { static caddr_t (*mmapfunc)() = NULL; caddr_t result; @@ -774,8 +774,8 @@ mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos) /* * mmap64 interpose */ -caddr_t -mmap64(caddr_t addr, size_t len, int prot, int flags, int fd, off64_t pos) +void * +mmap64(void *addr, size_t len, int prot, int flags, int fd, off64_t pos) { static caddr_t (*mmap64func)(); caddr_t result; |