From b268c28e7e68870a872fffa9a75978a3c13b912d Mon Sep 17 00:00:00 2001 From: Masamichi Takagi Date: Mon, 15 Jun 2020 13:02:05 +0900 Subject: [PATCH] TO RESET: mmap: ignore MAP_HUGETLB Change-Id: Ifd50f24de0747b06d71ebba441ae2ef451f66c4d --- arch/arm64/kernel/syscall.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/kernel/syscall.c b/arch/arm64/kernel/syscall.c index 4bfe6bd8..448405fd 100644 --- a/arch/arm64/kernel/syscall.c +++ b/arch/arm64/kernel/syscall.c @@ -1723,6 +1723,7 @@ SYSCALL_DECLARE(mmap) /* check arguments */ pgsize = PAGE_SIZE; +#ifndef ENABLE_FUGAKU_HACKS if (flags & MAP_HUGETLB) { int hugeshift = flags & (0x3F << MAP_HUGE_SHIFT); @@ -1763,6 +1764,11 @@ SYSCALL_DECLARE(mmap) goto out; } } +#else + if (flags & MAP_HUGETLB) { + flags &= ~(MAP_HUGETLB); + } +#endif #define VALID_DUMMY_ADDR ((region->user_start + PTL3_SIZE - 1) & ~(PTL3_SIZE - 1)) addr = (flags & MAP_FIXED)? addr0: VALID_DUMMY_ADDR;