From 695f244d6587a8bb37a919cccf1d0e6ed1d0fb0d Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Tue, 19 Jan 2021 18:41:52 +0000 Subject: [PATCH] Revert "ANDROID: arm64: gki_defconfig: Disable VHE" This reverts commit 65f5ed41f62af83d76dd00becdcab7b31e87e9ec. We need to bring VHE back to allow partners to use SVE. The Protected KVM work will make use of [1] once it lands to force the kernel in nVHE mode on VHE hardware. [1] https://lore.kernel.org/r/20210118094533.2874082-1-maz@kernel.org Bug: 177680998 Change-Id: I9d793724a05157285f439c42c9594a61b731b974 Signed-off-by: Quentin Perret --- arch/arm64/configs/gki_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 63819402e6eb..4deeb13966b4 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -56,7 +56,6 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y -# CONFIG_ARM64_VHE is not set # CONFIG_ARM64_PTR_AUTH is not set CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set