Revert "selftest/vm: verify mmap addr in mremap_test"

BugLink: https://bugs.launchpad.net/bugs/1988479
This reverts commit e8b9989597daac896b3400b7005f24bf15233d9a.

The upstream commit 9c85a9bae267 ("selftest/vm: verify mmap addr in
mremap_test") was backported as commit a17404fcbfd0 ("selftest/vm:
verify mmap addr in mremap_test"). Repeated backport introduced the
duplicate of function get_mmap_min_addr to the file breakign the vm
selftest build.

Fixes: e8b9989597da ("selftest/vm: verify mmap addr in mremap_test")
Signed-off-by: Oleksandr Tymoshenko <ovt@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/tools/testing/selftests/vm/mremap_test.c b/tools/testing/selftests/vm/mremap_test.c
index efcbf537b3d575ebe496d9d5daa114f5ab45a7f0..e3ce33a9954ea94ef04a033d159064016810e56c 100644 (file)
--- a/tools/testing/selftests/vm/mremap_test.c
+++ b/tools/testing/selftests/vm/mremap_test.c
@@ -66,35 +66,6 @@ enum {
        .expect_failure = should_fail                           \
 }
 
-/* Returns mmap_min_addr sysctl tunable from procfs */
-static unsigned long long get_mmap_min_addr(void)
-{
-       FILE *fp;
-       int n_matched;
-       static unsigned long long addr;
-
-       if (addr)
-               return addr;
-
-       fp = fopen("/proc/sys/vm/mmap_min_addr", "r");
-       if (fp == NULL) {
-               ksft_print_msg("Failed to open /proc/sys/vm/mmap_min_addr: %s\n",
-                       strerror(errno));
-               exit(KSFT_SKIP);
-       }
-
-       n_matched = fscanf(fp, "%llu", &addr);
-       if (n_matched != 1) {
-               ksft_print_msg("Failed to read /proc/sys/vm/mmap_min_addr: %s\n",
-                       strerror(errno));
-               fclose(fp);
-               exit(KSFT_SKIP);
-       }
-
-       fclose(fp);
-       return addr;
-}
-
 /*
  * Returns false if the requested remap region overlaps with an
  * existing mapping (e.g text, stack) else returns true.