diff options
Diffstat (limited to 'src/svm')
| -rw-r--r-- | src/svm/ssvm.c | 9 | ||||
| -rw-r--r-- | src/svm/svm_fifo_segment.h | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/svm/ssvm.c b/src/svm/ssvm.c index 7077f8be641..04e0efa3d62 100644 --- a/src/svm/ssvm.c +++ b/src/svm/ssvm.c @@ -33,7 +33,7 @@ ssvm_master_init_shm (ssvm_private_t * ssvm) clib_mem_vm_map_t mapa = { 0 }; u8 junk = 0, *ssvm_filename; ssvm_shared_header_t *sh; - uword page_size; + uword page_size, requested_va = 0; void *oldheap; if (ssvm->ssvm_size == 0) @@ -75,9 +75,12 @@ ssvm_master_init_shm (ssvm_private_t * ssvm) page_size = clib_mem_vm_get_page_size (ssvm_fd); if (ssvm->requested_va) - clib_mem_vm_randomize_va (&ssvm->requested_va, min_log2 (page_size)); + { + requested_va = ssvm->requested_va; + clib_mem_vm_randomize_va (&requested_va, min_log2 (page_size)); + } - mapa.requested_va = ssvm->requested_va; + mapa.requested_va = requested_va; mapa.size = ssvm->ssvm_size; mapa.fd = ssvm_fd; if (clib_mem_vm_ext_map (&mapa)) diff --git a/src/svm/svm_fifo_segment.h b/src/svm/svm_fifo_segment.h index bf8d5139e3c..1872da169f9 100644 --- a/src/svm/svm_fifo_segment.h +++ b/src/svm/svm_fifo_segment.h @@ -31,8 +31,8 @@ typedef enum #define FIFO_SEGMENT_MAX_FIFO_SIZE (8<<20) /* 8mb max fifo size */ #define FIFO_SEGMENT_ALLOC_CHUNK_SIZE 32 /* Allocation quantum */ -#define FIFO_SEGMENT_F_IS_PREALLOCATED 1 << 0 /* Segment is preallocated */ -#define FIFO_SEGMENT_F_WILL_DELETE 1 << 1 /* Segment will be removed */ +#define FIFO_SEGMENT_F_IS_PREALLOCATED (1 << 0) +#define FIFO_SEGMENT_F_WILL_DELETE (1 << 1) typedef struct { |