From eb54f1966345072c4366987eb38e657b2a84ccc3 Mon Sep 17 00:00:00 2001 From: Kalesh Singh Date: Tue, 12 Mar 2024 09:17:57 -0700 Subject: [PATCH] ANDROID: 16K: Fix __MAP_NO_COMPAT overflow do_mmap() expects a 32-bit flag. Use the highest bit to avoid potential future conflicts from upstream. Bug: 383389337 Bug: 329210993 Bug: 315325080 Bug: 302403436 Test: tools/bazel run //common-modules/virtual-device:virtual_device_i686_dist Change-Id: I30c1213a2c640e1d4040c208353239ac3c04fbd2 Signed-off-by: Kalesh Singh --- include/linux/page_size_compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/page_size_compat.h b/include/linux/page_size_compat.h index 7c6f5bd05b7f..63635604eafc 100644 --- a/include/linux/page_size_compat.h +++ b/include/linux/page_size_compat.h @@ -100,7 +100,7 @@ static __always_inline unsigned __page_shift(void) * in ___filemap_fixup() */ #define __VM_NO_COMPAT (_AC(1,ULL) << 63) -#define __MAP_NO_COMPAT (_AC(1,ULL) << 63) +#define __MAP_NO_COMPAT (_AC(1,UL) << 31) /* * Conditional page-alignment based on mmap flags