From 5592d04940700ff2bb06307660e28e47fad0606b Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 20 Jul 2017 17:33:46 -0400 Subject: [PATCH] Fix: assignment from incompatible pointer type warnings On some platforms, mmap returns a caddr_t pointer which generates compiler warnings, cast to the proper pointer type to eliminate them. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- src/urcu-bp.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/urcu-bp.c b/src/urcu-bp.c index 81bb91a..c0fac83 100644 --- a/src/urcu-bp.c +++ b/src/urcu-bp.c @@ -374,7 +374,8 @@ void expand_arena(struct registry_arena *arena) sizeof(struct registry_chunk) + sizeof(struct rcu_reader)); new_chunk_len = ARENA_INIT_ALLOC; - new_chunk = mmap(NULL, new_chunk_len, + new_chunk = (struct registry_chunk *) mmap(NULL, + new_chunk_len, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); @@ -408,7 +409,8 @@ void expand_arena(struct registry_arena *arena) } /* Remap did not succeed, we need to add a new chunk. */ - new_chunk = mmap(NULL, new_chunk_len, + new_chunk = (struct registry_chunk *) mmap(NULL, + new_chunk_len, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); @@ -625,7 +627,7 @@ void rcu_bp_exit(void) cds_list_for_each_entry_safe(chunk, tmp, ®istry_arena.chunk_list, node) { - munmap(chunk, chunk->data_len + munmap((void *) chunk, chunk->data_len + sizeof(struct registry_chunk)); } CDS_INIT_LIST_HEAD(®istry_arena.chunk_list); -- 2.34.1