ANDROID: disable ANDROID_VENDOR_HOOKS
Commit d25e37d89d ("tracepoint: Optimize using static_call()") changed
the format of DEFINE_TRACE() and other tracepoint logic, which broke the
ANDROID_VENDOR_HOOKS logic.
As I can't figure out how to unwind the build traces for the errors,
disable this for now so the merge can continue.
Bug: 156285741
Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6794bdec76ba25370891747b296ea30a51812982
This commit is contained in:
@@ -466,7 +466,6 @@ 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
|
||||
|
||||
@@ -404,7 +404,6 @@ 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
|
||||
|
||||
@@ -57,6 +57,7 @@ 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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user