Code Review
/
vpp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
3e13c09
)
physmem: fix alloc when dlmaloc is used
88/13588/3
author
Damjan Marion
<damarion@cisco.com>
Fri, 20 Jul 2018 13:33:17 +0000
(15:33 +0200)
committer
Damjan Marion
<dmarion@me.com>
Fri, 20 Jul 2018 17:38:22 +0000
(17:38 +0000)
Change-Id: I4b6cdf95ac694c8408eb6cf3259b335a8148b5aa
Signed-off-by: Damjan Marion <damarion@cisco.com>
src/vlib/linux/physmem.c
patch
|
blob
|
history
diff --git
a/src/vlib/linux/physmem.c
b/src/vlib/linux/physmem.c
index
6c6b072
..
4d16486
100755
(executable)
--- a/
src/vlib/linux/physmem.c
+++ b/
src/vlib/linux/physmem.c
@@
-112,7
+112,11
@@
unix_physmem_alloc_aligned (vlib_main_t * vm, vlib_physmem_region_index_t idx,
vec_free (to_free);
}
- return lo_offset != ~0 ? pr->heap + lo_offset : 0;
+#if USE_DLMALLOC == 0
+ return lo_offset != ~0 ? (void *) (pr->heap + lo_offset) : 0;
+#else
+ return lo_offset != ~0 ? (void *) lo_offset : 0;
+#endif
}
static void