diff options
| author | Toomas Soome <tsoome@me.com> | 2018-10-21 15:50:36 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-10-01 12:31:12 +0300 |
| commit | 9dd95169794650baa0f951e24046175899beff70 (patch) | |
| tree | 953386ba4b11b72d12af2c141e35a6ffaa1da3c2 | |
| parent | d0562c105d77a4d4da85007111e260da7ea2616f (diff) | |
| download | illumos-joyent-9dd95169794650baa0f951e24046175899beff70.tar.gz | |
11730 shmsys: cast between incompatible function types
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/os/shm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr/src/uts/common/os/shm.c b/usr/src/uts/common/os/shm.c index bacc595f78..4f6ae11d84 100644 --- a/usr/src/uts/common/os/shm.c +++ b/usr/src/uts/common/os/shm.c @@ -185,14 +185,14 @@ static struct sysent ipcshm_sysent = { #else /* _SYSCALL32_IMPL */ SE_ARGC | SE_NOUNLOAD | SE_32RVAL1, #endif /* _SYSCALL32_IMPL */ - (int (*)())shmsys + (int (*)())(uintptr_t)shmsys }; #ifdef _SYSCALL32_IMPL static struct sysent ipcshm_sysent32 = { 4, SE_ARGC | SE_NOUNLOAD | SE_32RVAL1, - (int (*)())shmsys + (int (*)())(uintptr_t)shmsys }; #endif /* _SYSCALL32_IMPL */ @@ -260,7 +260,7 @@ shmat(int shmid, caddr_t uaddr, int uflags, uintptr_t *rvp) struct as *as = pp->p_as; struct segvn_crargs crargs; /* segvn create arguments */ kmutex_t *lock; - struct seg *segspt = NULL; + struct seg *segspt = NULL; caddr_t addr = uaddr; int flags = (uflags & SHMAT_VALID_FLAGS_MASK); int useISM; @@ -626,7 +626,7 @@ shmctl(int shmid, int cmd, void *arg) kshmid_t *sp; /* shared memory header ptr */ STRUCT_DECL(shmid_ds, ds); /* for SVR4 IPC_SET */ int error = 0; - struct cred *cr = CRED(); + struct cred *cr = CRED(); kmutex_t *lock; model_t mdl = get_udatamodel(); struct shmid_ds64 ds64; |