Revert "selftest/vm: verify remap destination address in mremap_test"

This reverts commit 0b4e16093e081a3ab08b0d6cedf79b249f41b248.

The upstream commit 18d609daa546 ("selftest/vm: verify remap destination
address in mremap_test") was backported as commit 2688d967ec65
("selftest/vm: verify remap destination address in mremap_test").
Repeated backport introduced the duplicate of function
is_remap_region_valid to the file breakign the vm selftest build.

Fixes: 0b4e16093e08 ("selftest/vm: verify remap destination address in mremap_test")
Signed-off-by: Oleksandr Tymoshenko <ovt@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/testing/selftests/vm/mremap_test.c b/tools/testing/selftests/vm/mremap_test.c
index 8f4dbbd..efcbf53 100644 (file)
--- a/tools/testing/selftests/vm/mremap_test.c
+++ b/tools/testing/selftests/vm/mremap_test.c
@@ -66,30 +66,6 @@ enum {
        .expect_failure = should_fail                           \
 }
 
-/*
- * Returns false if the requested remap region overlaps with an
- * existing mapping (e.g text, stack) else returns true.
- */
-static bool is_remap_region_valid(void *addr, unsigned long long size)
-{
-       void *remap_addr = NULL;
-       bool ret = true;
-
-       /* Use MAP_FIXED_NOREPLACE flag to ensure region is not mapped */
-       remap_addr = mmap(addr, size, PROT_READ | PROT_WRITE,
-                                        MAP_FIXED_NOREPLACE | MAP_ANONYMOUS | MAP_SHARED,
-                                        -1, 0);
-
-       if (remap_addr == MAP_FAILED) {
-               if (errno == EEXIST)
-                       ret = false;
-       } else {
-               munmap(remap_addr, size);
-       }
-
-       return ret;
-}
-
 /* Returns mmap_min_addr sysctl tunable from procfs */
 static unsigned long long get_mmap_min_addr(void)
 {