From 66867deb3401ed14b03adb756748adfc6a734d2b Mon Sep 17 00:00:00 2001 From: Jeevan Shriram Date: Tue, 8 Jun 2021 12:08:04 -0700 Subject: [PATCH] arch: arm64: defconfig: Disable MTE in GKI configuration Disable MTE configuration in GKI until the support for required feature is available from firmware. Bug: 190413556 Change-Id: I488bac6544b76593f3e75938e3bd81a8ea97820e Signed-off-by: Jeevan Shriram --- 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 53355a35dee2..f59c9b4dac56 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -56,6 +56,7 @@ CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y +# CONFIG_ARM64_MTE is not set CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off" @@ -630,7 +631,6 @@ CONFIG_PAGE_OWNER=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_KASAN=y -CONFIG_KASAN_HW_TAGS=y CONFIG_KFENCE=y CONFIG_KFENCE_SAMPLE_INTERVAL=500 CONFIG_KFENCE_NUM_OBJECTS=63