From 0695bfe5fb84aa830cfd8712906d7464ca7cb534 Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Wed, 21 Oct 2020 08:30:50 -0700 Subject: [PATCH] Revert "ANDROID: disable ANDROID_VENDOR_HOOKS" This reverts commit ff0771e5f881fa5596ff35856fc0df11429c9d80. ANDROID_VENDOR_HOOKS was temporarily disabled since it needed refactoring to work with commit d25e37d89dd2 ("tracepoint: Optimize using static_call()"). It can be enabled again now. Change-Id: Id4920fe20cf07736679f22228d192a251467bbb2 Signed-off-by: Todd Kjos --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + drivers/android/Kconfig | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 3380c8ff22b6..942beffc4c03 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -466,6 +466,7 @@ CONFIG_RAS=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDERFS=y +CONFIG_ANDROID_VENDOR_HOOKS=y CONFIG_LIBNVDIMM=y # CONFIG_ND_BLK is not set CONFIG_INTERCONNECT=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index ba242d67227d..886cbb2be4f8 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -404,6 +404,7 @@ CONFIG_RAS=y CONFIG_ANDROID=y CONFIG_ANDROID_BINDER_IPC=y CONFIG_ANDROID_BINDERFS=y +CONFIG_ANDROID_VENDOR_HOOKS=y CONFIG_LIBNVDIMM=y # CONFIG_ND_BLK is not set CONFIG_INTERCONNECT=y diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig index 72b93002fc0c..32fb9e5b6195 100644 --- a/drivers/android/Kconfig +++ b/drivers/android/Kconfig @@ -57,7 +57,6 @@ config ANDROID_BINDER_IPC_SELFTEST config ANDROID_VENDOR_HOOKS bool "Android Vendor Hooks" depends on TRACEPOINTS - depends on BROKEN help Enable vendor hooks implemented as tracepoints