summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authornia <nia@NetBSD.org>2021-05-24 15:35:06 +0200
committerDaniel Black <daniel@mariadb.org>2021-05-25 10:32:45 +1000
commit2eb357496c9364256e19e1019e228a3a3d95de8b (patch)
tree95d6b162e8d741c2200aaff95aee47e11e0f3ebe /mysys
parentc80cecb5e3e509d37929b4f446edf9b6c636b98f (diff)
downloadmariadb-git-2eb357496c9364256e19e1019e228a3a3d95de8b.tar.gz
my_largepage: Fix build with MAP_ALIGNED by no MAP_ALIGNED_SUPER
This needs backporting to MariaDB 10.5. Any changes I submit are freely available under the new BSD license. Signed-off-by: Nia Alarie <nia@NetBSD.org>
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_largepage.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mysys/my_largepage.c b/mysys/my_largepage.c
index c3fc97ffe0a..0fdc4e17a26 100644
--- a/mysys/my_largepage.c
+++ b/mysys/my_largepage.c
@@ -336,8 +336,10 @@ uchar *my_large_malloc(size_t *size, myf my_flags)
# warning "No explicit large page (HUGETLB pages) support in Linux < 3.8"
#endif
#elif defined(MAP_ALIGNED)
- mapflag|= MAP_ALIGNED_SUPER |
- MAP_ALIGNED(my_bit_log2_size_t(large_page_size));
+ mapflag|= MAP_ALIGNED(my_bit_log2_size_t(large_page_size));
+#if defined(MAP_ALIGNED_SUPER)
+ mapflag|= MAP_ALIGNED_SUPER;
+#endif
#endif
aligned_size= MY_ALIGN(*size, (size_t) large_page_size);
}