From 13d7c1f13e43fa36138bb8ef328cab127ce1319b Mon Sep 17 00:00:00 2001
From: Quentin Perret <qperret@google.com>
Date: Fri, 4 Mar 2022 11:49:36 +0000
Subject: [PATCH] ANDROID: gki_defconfig: Disable KVM_S2MPU temporarily

Bug: 219180169
Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: Idc96da0b25619d47dd0af6721b1ba2058be5812c
---
 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 857bf01d19b7..ea60da94ada1 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -87,7 +87,6 @@ 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