mremap has been around since before the dawn of it.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
configure.ac | 1 -
include/builddefs.in | 1 -
io/Makefile | 4 ----
io/mmap.c | 8 --------
m4/package_libcdev.m4 | 13 -------------
5 files changed, 27 deletions(-)
diff --git a/configure.ac b/configure.ac
index 66feba8f7..296eb3c1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,7 +165,6 @@ AC_PACKAGE_NEED_RCU_INIT
AC_HAVE_PWRITEV2
AC_HAVE_COPY_FILE_RANGE
AC_HAVE_FSETXATTR
-AC_HAVE_MREMAP
AC_NEED_INTERNAL_FSXATTR
AC_NEED_INTERNAL_FSCRYPT_ADD_KEY_ARG
AC_NEED_INTERNAL_FSCRYPT_POLICY_V2
diff --git a/include/builddefs.in b/include/builddefs.in
index 0e0f26144..4b55f97cd 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -93,7 +93,6 @@ HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
HAVE_PWRITEV2 = @have_pwritev2@
HAVE_COPY_FILE_RANGE = @have_copy_file_range@
HAVE_FSETXATTR = @have_fsetxattr@
-HAVE_MREMAP = @have_mremap@
NEED_INTERNAL_FSXATTR = @need_internal_fsxattr@
NEED_INTERNAL_FSCRYPT_ADD_KEY_ARG = @need_internal_fscrypt_add_key_arg@
NEED_INTERNAL_FSCRYPT_POLICY_V2 = @need_internal_fscrypt_policy_v2@
diff --git a/io/Makefile b/io/Makefile
index a81a75fc8..35b3ebd52 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -33,10 +33,6 @@ ifeq ($(HAVE_PWRITEV2),yes)
LCFLAGS += -DHAVE_PWRITEV2
endif
-ifeq ($(HAVE_MREMAP),yes)
-LCFLAGS += -DHAVE_MREMAP
-endif
-
ifeq ($(HAVE_MAP_SYNC),yes)
LCFLAGS += -DHAVE_MAP_SYNC
endif
diff --git a/io/mmap.c b/io/mmap.c
index 425957d4b..c3bb211a8 100644
--- a/io/mmap.c
+++ b/io/mmap.c
@@ -16,9 +16,7 @@ static cmdinfo_t mread_cmd;
static cmdinfo_t msync_cmd;
static cmdinfo_t munmap_cmd;
static cmdinfo_t mwrite_cmd;
-#ifdef HAVE_MREMAP
static cmdinfo_t mremap_cmd;
-#endif /* HAVE_MREMAP */
mmap_region_t *maptable;
int mapcount;
@@ -636,7 +634,6 @@ mwrite_f(
return 0;
}
-#ifdef HAVE_MREMAP
static void
mremap_help(void)
{
@@ -712,7 +709,6 @@ mremap_f(
mapping->length = new_length;
return 0;
}
-#endif /* HAVE_MREMAP */
void
mmap_init(void)
@@ -769,7 +765,6 @@ mmap_init(void)
_("writes data into a region in the current memory mapping");
mwrite_cmd.help = mwrite_help;
-#ifdef HAVE_MREMAP
mremap_cmd.name = "mremap";
mremap_cmd.altname = "mrm";
mremap_cmd.cfunc = mremap_f;
@@ -780,14 +775,11 @@ mmap_init(void)
mremap_cmd.oneline =
_("alters the size of the current memory mapping");
mremap_cmd.help = mremap_help;
-#endif /* HAVE_MREMAP */
add_command(&mmap_cmd);
add_command(&mread_cmd);
add_command(&msync_cmd);
add_command(&munmap_cmd);
add_command(&mwrite_cmd);
-#ifdef HAVE_MREMAP
add_command(&mremap_cmd);
-#endif /* HAVE_MREMAP */
}
diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index 7d7679fa0..dd04be5f0 100644
--- a/m4/package_libcdev.m4
+++ b/m4/package_libcdev.m4
@@ -48,19 +48,6 @@ AC_DEFUN([AC_HAVE_FSETXATTR],
AC_SUBST(have_fsetxattr)
])
-#
-# Check if we have a mremap call (not on Mac OS X)
-#
-AC_DEFUN([AC_HAVE_MREMAP],
- [ AC_CHECK_DECL([mremap],
- have_mremap=yes,
- [],
- [#define _GNU_SOURCE
- #include <sys/mman.h>]
- )
- AC_SUBST(have_mremap)
- ])
-
#
# Check if we need to override the system struct fsxattr with
# the internal definition. This /only/ happens if the system
--
2.39.2
