]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems"
authorHarshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
Mon, 6 May 2024 08:49:26 +0000 (01:49 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 25 May 2024 14:19:05 +0000 (16:19 +0200)
This reverts commit c9c3cc6a13bddc76bb533ad8147a5528cac5ba5a which is
commit 91b80cc5b39f00399e8e2d17527cad2c7fa535e2 upstream.

map_hugetlb.c:18:10: fatal error: vm_util.h: No such file or directory
   18 | #include "vm_util.h"
      |          ^~~~~~~~~~~
compilation terminated.

vm_util.h is not present in 5.10.y, as commit:642bc52aed9c ("selftests:
vm: bring common functions to a new file") is not present in stable
kernels <=6.1.y

Signed-off-by: Harshit Mogalapalli <harshit.m.mogalapalli@oracle.com>
tools/testing/selftests/vm/map_hugetlb.c

index c65c55b7a789f3cea85691207e8ca35e9443c09c..312889edb84ab799ed6ef99b5d6b15cca57542ae 100644 (file)
@@ -15,7 +15,6 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <fcntl.h>
-#include "vm_util.h"
 
 #define LENGTH (256UL*1024*1024)
 #define PROTECTION (PROT_READ | PROT_WRITE)
@@ -71,16 +70,10 @@ int main(int argc, char **argv)
 {
        void *addr;
        int ret;
-       size_t hugepage_size;
        size_t length = LENGTH;
        int flags = FLAGS;
        int shift = 0;
 
-       hugepage_size = default_huge_page_size();
-       /* munmap with fail if the length is not page aligned */
-       if (hugepage_size > length)
-               length = hugepage_size;
-
        if (argc > 1)
                length = atol(argv[1]) << 20;
        if (argc > 2) {