From 6d4485877385f32fdf45e24bde8e5b19cfac2691 Mon Sep 17 00:00:00 2001
From: David Brazdil <dbrazdil@google.com>
Date: Thu, 28 Oct 2021 14:58:23 +0100
Subject: [PATCH] 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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index db6f17205b0f..08ab8d68b640 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -87,6 +87,7 @@ CONFIG_ARM_SCPI_PROTOCOL=y
 # 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