X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fphysmem_funcs.h;h=bff66aa57265768d7bbbb913f2db1d251a5fcf50;hb=5c9083d52646153bdc917a7ae37da696d864ad1c;hp=dbb8d9de5b798425b8cd4d0a4d271f8501ce76aa;hpb=49d66f1f42cbc310e4fa0dc526b9fdb91d0ca220;p=vpp.git

diff --git a/src/vlib/physmem_funcs.h b/src/vlib/physmem_funcs.h
index dbb8d9de5b7..bff66aa5726 100644
--- a/src/vlib/physmem_funcs.h
+++ b/src/vlib/physmem_funcs.h
@@ -43,7 +43,7 @@
 always_inline vlib_physmem_region_t *
 vlib_physmem_get_region (vlib_main_t * vm, u8 index)
 {
-  vlib_physmem_main_t *vpm = &vm->physmem_main;
+  vlib_physmem_main_t *vpm = &physmem_main;
   return pool_elt_at_index (vpm->regions, index);
 }
 
@@ -121,14 +121,15 @@ always_inline void
 vlib_physmem_free (vlib_main_t * vm, vlib_physmem_region_index_t idx,
 		   void *mem)
 {
-  return vm->os_physmem_free (vm, idx, mem);
+  if (mem)
+    vm->os_physmem_free (vm, idx, mem);
 }
 
 always_inline u64
 vlib_physmem_virtual_to_physical (vlib_main_t * vm,
 				  vlib_physmem_region_index_t idx, void *mem)
 {
-  vlib_physmem_main_t *vpm = &vm->physmem_main;
+  vlib_physmem_main_t *vpm = &physmem_main;
   vlib_physmem_region_t *pr = pool_elt_at_index (vpm->regions, idx);
   uword o = mem - pr->mem;
   return vlib_physmem_offset_to_physical (vm, idx, o);