X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=svm%2Fsvm.h;h=0b87dbcbc646174f4d273c3d392e4bf5f600dde4;hb=8b2b794ae99a2316caebceb65a5ab16f75536d6b;hp=c42d2b578df61c1ca07aab9be73eefa6cca566de;hpb=b3d93dacfde8ab21bbce171fff2971b2ed7bce6a;p=vpp.git diff --git a/svm/svm.h b/svm/svm.h index c42d2b578df..0b87dbcbc64 100644 --- a/svm/svm.h +++ b/svm/svm.h @@ -117,7 +117,7 @@ void *svm_region_find_or_create (svm_map_region_args_t * a); void svm_region_init (void); void svm_region_init_chroot (char *root_path); void svm_region_init_chroot_uid_gid (char *root_path, int uid, int gid); -void svm_region_init_args (svm_map_region_args_t *a); +void svm_region_init_args (svm_map_region_args_t * a); void svm_region_exit (void); void svm_region_unmap (void *rp_arg); void svm_client_scan (char *root_path); @@ -149,7 +149,8 @@ svm_mem_alloc_aligned_at_offset (svm_region_t * rp, pthread_mutex_lock (&rp->mutex); oldheap = clib_mem_set_heap (rp->data_heap); - rv = clib_mem_alloc_aligned_at_offset (size, align, offset); + rv = clib_mem_alloc_aligned_at_offset (size, align, offset, + 1 /* yes, call os_out_of_memory */ ); clib_mem_set_heap (oldheap); pthread_mutex_unlock (&rp->mutex); return (rv);