diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 5719e972d9f2..c8bd7b9946ea 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -66,8 +66,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_wake); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_finished); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_rwsem_list_add); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alter_futex_plist_add); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mutex_wait_start); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mutex_wait_finish); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_read_wait_start); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_read_wait_finish); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_rwsem_write_wait_start); diff --git a/include/trace/hooks/dtask.h b/include/trace/hooks/dtask.h index 8856bdceed06..80fd5fc2cef8 100644 --- a/include/trace/hooks/dtask.h +++ b/include/trace/hooks/dtask.h @@ -11,14 +11,6 @@ * Following tracepoints are not exported in tracefs and provide a * mechanism for vendor modules to hook and extend functionality */ -struct mutex; -DECLARE_HOOK(android_vh_mutex_wait_start, - TP_PROTO(struct mutex *lock), - TP_ARGS(lock)); -DECLARE_HOOK(android_vh_mutex_wait_finish, - TP_PROTO(struct mutex *lock), - TP_ARGS(lock)); - struct rw_semaphore; DECLARE_HOOK(android_vh_rwsem_read_wait_start, TP_PROTO(struct rw_semaphore *sem), diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c index ef47af63f4b5..56bb3de0705e 100644 --- a/kernel/locking/mutex.c +++ b/kernel/locking/mutex.c @@ -36,8 +36,6 @@ # include "mutex.h" #endif -#include - void __mutex_init(struct mutex *lock, const char *name, struct lock_class_key *key) { @@ -1007,7 +1005,6 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas waiter.task = current; - trace_android_vh_mutex_wait_start(lock); set_current_state(state); for (;;) { /* @@ -1063,7 +1060,6 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas spin_lock(&lock->wait_lock); acquired: __set_current_state(TASK_RUNNING); - trace_android_vh_mutex_wait_finish(lock); if (ww_ctx) { /* @@ -1092,8 +1088,6 @@ __mutex_lock_common(struct mutex *lock, unsigned int state, unsigned int subclas err: __set_current_state(TASK_RUNNING); - trace_android_vh_mutex_wait_finish(lock); - __mutex_remove_waiter(lock, &waiter); err_early_kill: spin_unlock(&lock->wait_lock); debug_mutex_free_waiter(&waiter);