From fbfc5c68b69cdf7239ddb000fc61ce9089943345 Mon Sep 17 00:00:00 2001 From: Joe Fradley Date: Mon, 18 Apr 2022 19:37:45 +0000 Subject: [PATCH] ANDROID: GKI: Disable CONFIG_KUNIT Disabling KUNIT (and KUNIT_DEBUGFS) due to unresolved concerns. Bug: 228892853 Signed-off-by: Joe Fradley Change-Id: I6e2cabb6e86326f0da664f7e36cd73fcb0ecfd25 --- arch/arm64/configs/gki_defconfig | 2 -- arch/x86/configs/gki_defconfig | 2 -- 2 files changed, 4 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 62683f5e7645..c614217981af 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -691,6 +691,4 @@ CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_TRACE_MMIO_ACCESS=y CONFIG_HIST_TRIGGERS=y CONFIG_PID_IN_CONTEXTIDR=y -CONFIG_KUNIT=y -CONFIG_KUNIT_DEBUGFS=y # CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 60ba8e3a9220..86f91ab7fbdc 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -626,5 +626,3 @@ CONFIG_SCHEDSTATS=y CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_HIST_TRIGGERS=y CONFIG_UNWINDER_FRAME_POINTER=y -CONFIG_KUNIT=y -CONFIG_KUNIT_DEBUGFS=y