From cc04ccf30350352125bbd0cc137bfaefa5a427d6 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 676b9c6373f5..74da02bbb19f 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -212,7 +212,6 @@ CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y # CONFIG_FW_CACHE is not set # CONFIG_ALLOW_DEV_COREDUMP is not set -CONFIG_DEBUG_DEVRES=y CONFIG_GNSS=y CONFIG_ZRAM=y CONFIG_BLK_DEV_LOOP=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 2643ff0a6345..ac448b5a9cb9 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -186,7 +186,6 @@ CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y # 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