From bc8ceb018f3897daa487932e149e09bd86a1a98f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 3 Aug 2022 16:49:39 +0200 Subject: [PATCH] Revert "ANDROID: sched: Add vendor hooks for find_energy_efficient_cpu" This reverts commit 147a9b3d9eab750d90678af8a70ce80a69f6d510 as it causes merge conflicts with 6.0-rc1. If this is still needed, it can be added back after 6.0-rc1 is merged. Bug: 170507310 Cc: Rick Yiu Cc: Will McVicker Signed-off-by: Greg Kroah-Hartman Change-Id: Icc8148871b5f2511c79ea5d7ff547b923acecf9a --- drivers/android/vendor_hooks.c | 1 - include/trace/hooks/sched.h | 4 ---- kernel/sched/fair.c | 4 ---- 3 files changed, 9 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 5af6f741ac19..677ed58ee313 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -76,7 +76,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_nohz_balancer_kick); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_rebalance_domains); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_busiest_queue); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_migrate_queued_task); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_energy_efficient_cpu); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_overutilized); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_setaffinity); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_update_cpus_allowed); diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 4858c8eb694b..d037440a6d99 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -104,10 +104,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_migrate_queued_task, int *detached), TP_ARGS(rq, rf, p, new_cpu, detached), 1); -DECLARE_RESTRICTED_HOOK(android_rvh_find_energy_efficient_cpu, - TP_PROTO(struct task_struct *p, int prev_cpu, int sync, int *new_cpu), - TP_ARGS(p, prev_cpu, sync, new_cpu), 1); - DECLARE_RESTRICTED_HOOK(android_rvh_cpu_overutilized, TP_PROTO(int cpu, int *overutilized), TP_ARGS(cpu, overutilized), 1); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 78866a5280ef..8434495f943c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6790,12 +6790,8 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu, int sy unsigned long cpu_cap, util, base_energy = 0; struct sched_domain *sd; struct perf_domain *pd; - int new_cpu = INT_MAX; sync_entity_load_avg(&p->se); - trace_android_rvh_find_energy_efficient_cpu(p, prev_cpu, sync, &new_cpu); - if (new_cpu != INT_MAX) - return new_cpu; rcu_read_lock(); pd = rcu_dereference(rd->pd);