commit 342a0b672947323bce6c8a949bacdca8fefdfea0
author David Brazdil <dbrazdil@google.com> Thu Oct 28 14:58:23 2021 +0100
committer David Brazdil <dbrazdil@google.com> Mon Dec 06 14:31:05 2021 +0000
tree 0425e4c80c325e66efedecb874263540f7ce5756
parent 0946eb8b856ca7be39296e637d8facffc1448ad4

ANDROID: Enable KVM_S2MPU in gki_defconfig

Enable the KVM S2MPU driver in GKI.

Test: builds, boots
Bug: 190463801
Signed-off-by: David Brazdil <dbrazdil@google.com>
Change-Id: I24285cc85af63b090c9bd0191b3841e44c2d8a0c

arch/arm64/configs/gki_defconfig

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index db6f172..08ab8d6 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -87,6 +87,7 @@
 # CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
+CONFIG_KVM_S2MPU=y
 CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA512_ARM64_CE=y
 CONFIG_CRYPTO_AES_ARM64_CE_BLK=y