quic: update quicly to v0.1.3

[vpp.git] / src / vlib / physmem.c

diff --git a/src/vlib/physmem.c b/src/vlib/physmem.c
old mode 100755 (executable)
new mode 100644 (file)
index a623095..a36444f
--- a/src/vlib/physmem.c
+++ b/src/vlib/physmem.c
@@ -21,7 +21,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <vppinfra/linux/syscall.h>
 #include <vppinfra/linux/sysfs.h>
 #include <vlib/vlib.h>
 #include <vlib/physmem.h>
@@ -29,7 +28,7 @@
 #include <vlib/pci/pci.h>
 #include <vlib/linux/vfio.h>
 
-#ifdef __x86_64__
+#if defined(__x86_64__) && !defined(CLIB_SANITIZE_ADDR)
 /* we keep physmem in low 38 bits of VA address space as some
    IOMMU implamentation cannot map above that range */
 #define VLIB_PHYSMEM_DEFAULT_BASE_ADDDR                (1ULL << 36)
@@ -178,6 +177,9 @@ vlib_physmem_config (vlib_main_t * vm, unformat_input_t * input)
     {
       if (unformat (input, "base-addr 0x%lx", &vpm->base_addr))
        ;
+      else if (unformat (input, "max-size %U",
+                        unformat_memory_size, &vpm->max_size))
+       ;
       else
        return unformat_parse_error (input);
     }