This is a note to let you know that I've just added the patch titled Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems" to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: revert-selftests-mm-fix-map_hugetlb-failure-on-64k-page-size-systems.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From harshit.m.mogalapalli@xxxxxxxxxx Thu May 23 13:27:11 2024 From: Harshit Mogalapalli <harshit.m.mogalapalli@xxxxxxxxxx> Date: Mon, 6 May 2024 01:46:35 -0700 Subject: Revert "selftests: mm: fix map_hugetlb failure on 64K page size systems" To: stable@xxxxxxxxxxxxxxx Cc: sashal@xxxxxxxxxx, vegard.nossum@xxxxxxxxxx, darren.kenny@xxxxxxxxxx, Harshit Mogalapalli <harshit.m.mogalapalli@xxxxxxxxxx> Message-ID: <20240506084635.2942238-1-harshit.m.mogalapalli@xxxxxxxxxx> This reverts commit 0d29b474fb90ff35920642f378d9baace9b47edd 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.15.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@xxxxxxxxxx> --- tools/testing/selftests/vm/map_hugetlb.c | 7 ------- 1 file changed, 7 deletions(-) --- 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) { Patches currently in stable-queue which might be from harshit.m.mogalapalli@xxxxxxxxxx are queue-5.15/revert-selftests-mm-fix-map_hugetlb-failure-on-64k-page-size-systems.patch