diff options
| author | Christoph Hellwig <hch@lst.de> | 2024-02-15 07:54:10 +0100 |
|---|---|---|
| committer | Carlos Maiolino <cem@kernel.org> | 2024-03-13 08:48:37 +0100 |
| commit | 6539cd18ec88015462940eb0503a11f87c618c6b (patch) | |
| tree | 9b605df31b599478de47049cdfc38900bba66e2f | |
| parent | 90bcaf5a7569f7f69b6ea57e91017ce6641889b3 (diff) | |
| download | xfsprogs-dev-6539cd18ec88015462940eb0503a11f87c618c6b.tar.gz | |
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>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | include/builddefs.in | 1 | ||||
| -rw-r--r-- | io/Makefile | 9 | ||||
| -rw-r--r-- | io/io.h | 5 | ||||
| -rw-r--r-- | m4/package_libcdev.m4 | 18 |
5 files changed, 1 insertions, 33 deletions
diff --git a/configure.ac b/configure.ac index 0194af7bf8..3a708c3596 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 df01cfed86..aca6d15106 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 f01f32d163..f480272aec 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 @@ -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 9586ef03d1..87c294b244 100644 --- a/m4/package_libcdev.m4 +++ b/m4/package_libcdev.m4 @@ -1,22 +1,4 @@ # -# 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) # AC_DEFUN([AC_HAVE_FALLOCATE], |