aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Varlese <marco.varlese@suse.com>2018-03-06 08:09:04 +0100
committerDamjan Marion <dmarion.lists@gmail.com>2018-03-06 13:11:18 +0000
commit3f6ede3ab3df9624ba3682d5bc82c4f2aa2e0506 (patch)
treeb84d091abc782ca9710cd9b880b066d9cd283c6f
parent07dce1e11de9872b5c9695e8cbbf89a2bcb3f63d (diff)
glibc 2.27 fix
With glibc 2.27 the memfd_create has been added to the devel libraries. That's causing the internally defined static function to clash with the system wide one. This patch addresses that issue on systems with latest glibc libraries. Change-Id: I788bf49b23d5b5f1cb1c0374e243d8a429178a71 Signed-off-by: Marco Varlese <marco.varlese@suse.com>
-rw-r--r--src/configure.ac1
-rw-r--r--src/vppinfra/linux/syscall.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/configure.ac b/src/configure.ac
index 857bd01521a..d9c8a47b582 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -234,6 +234,7 @@ PLUGIN_ENABLED(stn)
###############################################################################
# Dependency checks
###############################################################################
+AC_CHECK_FUNC([memfd_create], [AC_DEFINE([HAVE_MEMFD_CREATE], [1], [Define if memfd exists])])
AM_COND_IF([ENABLE_DPDK_SHARED],
[
diff --git a/src/vppinfra/linux/syscall.h b/src/vppinfra/linux/syscall.h
index f8ec5919f3f..4511b85ac1d 100644
--- a/src/vppinfra/linux/syscall.h
+++ b/src/vppinfra/linux/syscall.h
@@ -39,11 +39,13 @@ move_pages (int pid, unsigned long count, void **pages, const int *nodes,
return syscall (__NR_move_pages, pid, count, pages, nodes, status, flags);
}
+#ifndef HAVE_MEMFD_CREATE
static inline int
memfd_create (const char *name, unsigned int flags)
{
return syscall (__NR_memfd_create, name, flags);
}
+#endif
#endif /* included_linux_syscall_h */