From dba07d2039387db48dd65477032417677968d6d8 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 20 May 2024 15:14:46 +0100 Subject: [PATCH] ANDROID: gki_defconfig: Set VA bits back to 39 VA bits used to be set to 39 when ARM64_4K_PAGES was selected. However upstream commit 5d101654226d ("arm64: defconfig: Enable LPA2 support") recently adapted the default to 52. This breaks the pre-submit ack_platform_integration_main_cf_arm64_boot_test. In a recent exchange Ard and Sami suggested forcibly setting 39 bits for GKI. This is the commit that does that. Bug: 331572406 Signed-off-by: Lee Jones Change-Id: I2664a32d98c60ee493c4d04ea1edc25616f20106 --- arch/arm64/configs/gki_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index d28fb2471ad9..ae8121f22890 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -47,6 +47,7 @@ CONFIG_PROFILING=y CONFIG_ARCH_SUNXI=y CONFIG_ARCH_HISI=y CONFIG_ARCH_QCOM=y +CONFIG_ARM64_VA_BITS_39=y CONFIG_SCHED_MC=y CONFIG_NR_CPUS=32 CONFIG_PARAVIRT_TIME_ACCOUNTING=y