diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 6b9285029545..63a06d02a9a1 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include @@ -355,8 +354,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_v4l2subdev_set_frame_interval); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_v4l2subdev_set_frame_interval); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_scmi_timeout_sync); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_new_ilb); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_uid); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_user); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_freq_qos_add_request); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_freq_qos_update_request); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_freq_qos_remove_request); diff --git a/include/trace/hooks/user.h b/include/trace/hooks/user.h deleted file mode 100644 index b5b507ccd9c2..000000000000 --- a/include/trace/hooks/user.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#undef TRACE_SYSTEM -#define TRACE_SYSTEM user -#undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH trace/hooks -#if !defined(_TRACE_HOOK_USER_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_HOOK_USER_H -#include -#include - -struct user_struct; -DECLARE_HOOK(android_vh_alloc_uid, - TP_PROTO(struct user_struct *user), - TP_ARGS(user)); - -DECLARE_HOOK(android_vh_free_user, - TP_PROTO(struct user_struct *up), - TP_ARGS(up)); - -#endif /* _TRACE_HOOK_USER_H */ -/* This part must be outside protection */ -#include - diff --git a/kernel/user.c b/kernel/user.c index 83adc37251fa..ab445fcc07aa 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -20,8 +20,6 @@ #include #include -#include - /* * userns count is 1 for root user, 1 for init_uts_ns, * and 1 for... ? @@ -141,7 +139,6 @@ static struct user_struct *uid_hash_find(kuid_t uid, struct hlist_head *hashent) static void free_user(struct user_struct *up, unsigned long flags) __releases(&uidhash_lock) { - trace_android_vh_free_user(up); uid_hash_remove(up); spin_unlock_irqrestore(&uidhash_lock, flags); kmem_cache_free(uid_cachep, up); @@ -193,7 +190,6 @@ struct user_struct *alloc_uid(kuid_t uid) new->uid = uid; refcount_set(&new->__count, 1); - trace_android_vh_alloc_uid(new); ratelimit_state_init(&new->ratelimit, HZ, 100); ratelimit_set_flags(&new->ratelimit, RATELIMIT_MSG_ON_RELEASE);