mincore has been supported since Linux 2.3.99pre1 and glibc 2.2. Signed-off-by: Christoph Hellwig <hch@xxxxxx> --- configure.ac | 1 - include/builddefs.in | 1 - io/Makefile | 9 +-------- io/io.h | 5 ----- m4/package_libcdev.m4 | 18 ------------------ 5 files changed, 1 insertion(+), 33 deletions(-) diff --git a/configure.ac b/configure.ac index 4d5609129..3b5ebf375 100644 --- a/configure.ac +++ b/configure.ac @@ -162,7 +162,6 @@ AC_PACKAGE_NEED_PTHREADMUTEXINIT AC_PACKAGE_NEED_URCU_H AC_PACKAGE_NEED_RCU_INIT -AC_HAVE_MINCORE AC_HAVE_FALLOCATE AC_HAVE_FIEMAP AC_HAVE_PWRITEV2 diff --git a/include/builddefs.in b/include/builddefs.in index f8558a79f..353a03d18 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -90,7 +90,6 @@ ENABLE_SCRUB = @enable_scrub@ HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ -HAVE_MINCORE = @have_mincore@ HAVE_FALLOCATE = @have_fallocate@ HAVE_FIEMAP = @have_fiemap@ HAVE_PREADV = @have_preadv@ diff --git a/io/Makefile b/io/Makefile index f01f32d16..f480272ae 100644 --- a/io/Makefile +++ b/io/Makefile @@ -13,19 +13,12 @@ CFILES = init.c \ file.c freeze.c fsuuid.c fsync.c getrusage.c imap.c inject.c label.c \ link.c mmap.c open.c parent.c pread.c prealloc.c pwrite.c reflink.c \ resblks.c scrub.c seek.c shutdown.c stat.c swapext.c sync.c \ - truncate.c utimes.c fadvise.c sendfile.c madvise.c + truncate.c utimes.c fadvise.c sendfile.c madvise.c mincore.c LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUUID) LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG) LLDFLAGS = -static-libtool-libs -ifeq ($(HAVE_MINCORE),yes) -CFILES += mincore.c -LCFLAGS += -DHAVE_MINCORE -else -LSRCFILES += mincore.c -endif - ifeq ($(HAVE_FIEMAP),yes) CFILES += fiemap.c LCFLAGS += -DHAVE_FIEMAP diff --git a/io/io.h b/io/io.h index d90dc91cb..9c056efb5 100644 --- a/io/io.h +++ b/io/io.h @@ -119,12 +119,7 @@ extern void utimes_init(void); extern void fadvise_init(void); extern void sendfile_init(void); extern void madvise_init(void); - -#ifdef HAVE_MINCORE extern void mincore_init(void); -#else -#define mincore_init() do { } while (0) -#endif #ifdef HAVE_FIEMAP extern void fiemap_init(void); diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 index 9586ef03d..87c294b24 100644 --- a/m4/package_libcdev.m4 +++ b/m4/package_libcdev.m4 @@ -1,21 +1,3 @@ -# -# Check if we have a working mincore system call -# -AC_DEFUN([AC_HAVE_MINCORE], - [ AC_MSG_CHECKING([for mincore ]) - AC_COMPILE_IFELSE( - [ AC_LANG_PROGRAM([[ -#define _GNU_SOURCE -#include <sys/mman.h> - ]], [[ -mincore(0, 0, 0); - ]]) - ], have_mincore=yes - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - AC_SUBST(have_mincore) - ]) - # # Check if we have a fallocate libc call (Linux) # -- 2.39.2