diff options
| -rw-r--r-- | extras/mini-os/include/posix/sys/mman.h | 4 | ||||
| -rw-r--r-- | tools/libxc/xc_linux_osdep.c | 2 | ||||
| -rw-r--r-- | tools/libxc/xc_mem_paging.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/extras/mini-os/include/posix/sys/mman.h b/extras/mini-os/include/posix/sys/mman.h index 3b9ef19aa1..4d349792b6 100644 --- a/extras/mini-os/include/posix/sys/mman.h +++ b/extras/mini-os/include/posix/sys/mman.h @@ -16,7 +16,7 @@ void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset) asm("mmap64"); int munmap(void *start, size_t length); -#define munlock(addr, len) ((void)(addr), (void)(len), 0) -#define mlock(addr, len) ((void)(addr), (void)(len), 0) +static inline mlock(const void *addr, size_t len) { return 0; } +static inline munlock(const void *addr, size_t len) { return 0; } #endif /* _POSIX_SYS_MMAN_H */ diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 02df9c5ba0..4ee970d9c0 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -106,7 +106,7 @@ static void *linux_privcmd_alloc_hypercall_buffer(xc_interface *xch, xc_osdep_ha static void linux_privcmd_free_hypercall_buffer(xc_interface *xch, xc_osdep_handle h, void *ptr, int npages) { - (void) munlock(ptr, npages * XC_PAGE_SIZE); + munlock(ptr, npages * XC_PAGE_SIZE); free(ptr); } diff --git a/tools/libxc/xc_mem_paging.c b/tools/libxc/xc_mem_paging.c index 0c309b5e2f..a108a5c4cf 100644 --- a/tools/libxc/xc_mem_paging.c +++ b/tools/libxc/xc_mem_paging.c @@ -87,7 +87,7 @@ int xc_mem_paging_load(xc_interface *xch, domid_t domain_id, buffer, NULL, gfn); old_errno = errno; - (void) munlock(buffer, XC_PAGE_SIZE); + munlock(buffer, XC_PAGE_SIZE); errno = old_errno; return rc; |