On 5/6/24 04:57, Harshit Mogalapalli wrote:

This reverts commit abdbd5f3e8c504d864fdc032dd5a4eb481cb12bf.

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 4.19.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

Looks good to me. Adding Andrew.

This can't be tested on 4.19.y as the selftests for vm/ are not compiled since 4.19.17. I have bisected it to this one, commit: 7696248f9b5a ("selftests: Fix test errors related to lib.mk khdr target"), the reason for reverting it on 4.19.y is to keep 4.19.y in sync with higher stable trees(i.e reverts are sent to 5.4.y, 5.10.y and 5.15.y)

---

tools/testing/selftests/vm/map_hugetlb.c | 7 ------- 1 file changed, 7 deletions(-)

diff --git a/tools/testing/selftests/vm/map_hugetlb.c b/tools/testing/selftests/vm/map_hugetlb.c index c65c55b7a789..312889edb84a 100644 --- a/tools/testing/selftests/vm/map_hugetlb.c +++ b/tools/testing/selftests/vm/map_hugetlb.c @@ -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) {