projects
/
userspace-rcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: assignment from incompatible pointer type warnings
[userspace-rcu.git]
/
src
/
urcu-bp.c
diff --git
a/src/urcu-bp.c
b/src/urcu-bp.c
index 81bb91a9f07ebbcea661dd159bc726851ae2f041..c0fac8330bdc43a5d1eb58a6999057461c44a002 100644
(file)
--- 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;
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);
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. */
}
/* 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);
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) {
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);
+ sizeof(struct registry_chunk));
}
CDS_INIT_LIST_HEAD(®istry_arena.chunk_list);
This page took
0.024995 seconds
and
4
git commands to generate.