Module Name:    src
Committed By:   christos
Date:           Fri Mar 29 12:50:30 UTC 2019

Modified Files:
        src/external/bsd/jemalloc/include/jemalloc/internal:
            jemalloc_internal_defs.h

Log Message:
Change strategy: instead of always defining PAGE_SHIFT in vmparam.h, fail
back to using MAX_PAGE_SHIFT.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
diff -u src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h:1.2 src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h:1.3
--- src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h:1.2	Tue Mar  5 17:39:21 2019
+++ src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h	Fri Mar 29 08:50:30 2019
@@ -200,7 +200,13 @@
 
 /* One page is 2^LG_PAGE bytes. */
 #include <machine/vmparam.h>
+#ifdef PAGE_SHIFT
 #define LG_PAGE PAGE_SHIFT
+#elifdef MAX_PAGE_SHIFT
+#define LG_PAGE MAX_PAGE_SHIFT
+#else
+#error "PAGE_SHIFT is not defined"
+#endif
 
 /*
  * One huge page is 2^LG_HUGEPAGE bytes.  Note that this is defined even if the

Reply via email to