configure: don't check for mincor

mincore has been supported since Linux 2.3.99pre1 and glibc 2.2.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/configure.ac b/configure.ac
index 0194af7bf88a3b81ea90dd0b43eeaa037e45dc28..3a708c35964b55a43593cbe9bed9d717ead0cbe5 100644 (file)
--- 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 df01cfed8651e15c113eceb4045aede5477fd8a4..aca6d15106ca9339103793e8ad7c830ceb7f49ab 100644 (file)
--- 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 f01f32d1630dafc8ad13ace3a6e3f7b0750136bc..f480272aec2dc676cd9233bf4b86246b6e370d50 100644 (file)
--- 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 2a9ef97c30772daa473a0c7f004d8d8a63b80b4d..44ada500b89f7adfd87f2e82d4403948915115fe 100644 (file)
--- 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 9586ef03d1d2dfd11d223b067fb07003b5194c33..87c294b2445f2ff7fc39d34e9e4c081cd521407c 100644 (file)
--- 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)
 #