From 17ff52af66aa9ba9fb65c6483ed75c37376eed3d Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:49:09 +0100 Subject: [PATCH] Revert "ANDROID: gki_defconfig: Ensure KVM is configured in "protected" mode" This reverts commit 48870890a34c6eaa9da6c30aeafbf84a98797d51. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I143e7d84b5c7b2b143844981e39f255a54418518 --- arch/arm64/configs/gki_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 9bc51ff0a0e4..91f56d9d73f5 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -64,7 +64,7 @@ CONFIG_SETEND_EMULATION=y CONFIG_ARM64_MPAM=y CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set -CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off kvm-arm.mode=protected cgroup_disable=pressure" +CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off cgroup_disable=pressure" CONFIG_CMDLINE_EXTEND=y # CONFIG_DMI is not set CONFIG_PM_WAKELOCKS=y