From 5f71d6134244852e5e29f92ebaec0aad9fc8cbcc Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Mon, 9 Mar 2020 16:03:42 -0700 Subject: [PATCH] ANDROID: gki_defconfig: disable CONFIG_DEBUG_DEVRES Disable CONFIG_DEBUG_DEVRES to fix ABI differences caused by changes to devres_alloc_node function when this debug option is enabled. Bug: 151110905 Test: build Signed-off-by: Suren Baghdasaryan Change-Id: I27ba172843c80ffd1dfbcc6cc4d706c5b18eb5d3 --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 2b121172bc29..e7919a7664ec 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -206,7 +206,6 @@ CONFIG_RFKILL=y # CONFIG_UEVENT_HELPER is not set # CONFIG_FW_CACHE is not set # CONFIG_ALLOW_DEV_COREDUMP is not set -CONFIG_DEBUG_DEVRES=y CONFIG_DMA_CMA=y CONFIG_GNSS=y CONFIG_ZRAM=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 3a5816b869ed..5b8cb9242ab4 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -176,7 +176,6 @@ CONFIG_RFKILL=y # CONFIG_UEVENT_HELPER is not set # CONFIG_FW_CACHE is not set # CONFIG_ALLOW_DEV_COREDUMP is not set -CONFIG_DEBUG_DEVRES=y CONFIG_GNSS=y CONFIG_OF=y CONFIG_ZRAM=y