From 18975040b9441435ae43d41f145ffd358fe9165c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 20 Oct 2021 16:23:03 +0200 Subject: [PATCH] Revert portions of "ANDROID: sched: Add vendor hooks for sched." This reverts part of commit 54f66141a8834e27601fe594d68a97db01bb86b6. The hook android_rvh_entity_tick is not used by any vendor, so remove it to help with merge issues with future LTS releases. If this is needed by any real user, it can easily be reverted to add it back and then the symbol should be added to the abi list at the same time to prevent it from being removed again later. Bug: 203756332 Bug: 183674818 Cc: lijianzhong Signed-off-by: Greg Kroah-Hartman Change-Id: I92acc11802939d1ebfcc8253490193019567695d --- drivers/android/vendor_hooks.c | 1 - include/trace/hooks/sched.h | 4 ---- kernel/sched/fair.c | 1 - 3 files changed, 6 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 4ebf556d855f..6b9285029545 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -315,7 +315,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_after_enqueue_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_after_dequeue_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_enqueue_entity); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_dequeue_entity); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_entity_tick); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_enqueue_task_fair); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_dequeue_task_fair); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sched_stat_runtime_rt); diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index e6c8bd35e189..92690acc1197 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -339,10 +339,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_dequeue_entity, TP_PROTO(struct cfs_rq *cfs, struct sched_entity *se), TP_ARGS(cfs, se), 1); -DECLARE_RESTRICTED_HOOK(android_rvh_entity_tick, - TP_PROTO(struct cfs_rq *cfs_rq, struct sched_entity *se), - TP_ARGS(cfs_rq, se), 1); - DECLARE_RESTRICTED_HOOK(android_rvh_enqueue_task_fair, TP_PROTO(struct rq *rq, struct task_struct *p, int flags), TP_ARGS(rq, p, flags), 1); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 8dc3d9a02b54..725c5224caae 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4607,7 +4607,6 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued) if (cfs_rq->nr_running > 1) check_preempt_tick(cfs_rq, curr); - trace_android_rvh_entity_tick(cfs_rq, curr); }