From fc3bb815cc2d7573883bcd4df4167b40169dea35 Mon Sep 17 00:00:00 2001 From: Alistair Delva Date: Sun, 26 Jan 2020 14:51:11 -0800 Subject: [PATCH] ANDROID: gki_defconfig: Set IKHEADERS back to =m This partially reverts I56e59e1a6232dada090d720f43e0d1036f43d064. The build/runtime vintf check validates that CONFIG_IKHEADERS=m, it is not allowed to be set to =y. While we figure out what the right course of action is here, modify it back to =m. Bug: 139431025 Test: TreeHugger Change-Id: I3624fa4eb40a8aa726275027aa2b2d5bd635ceda Signed-off-by: Alistair Delva --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index d8b0f54d909d..ffab4f50c093 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -8,7 +8,7 @@ CONFIG_TASK_IO_ACCOUNTING=y CONFIG_PSI=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_IKHEADERS=y +CONFIG_IKHEADERS=m CONFIG_UCLAMP_TASK=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index f8a8ad4e05b8..15f06e6a777b 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -9,7 +9,7 @@ CONFIG_TASK_IO_ACCOUNTING=y CONFIG_PSI=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -CONFIG_IKHEADERS=y +CONFIG_IKHEADERS=m CONFIG_UCLAMP_TASK=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y