From 535b1a9a9db77da91cfc336ff967f9bb4584ca64 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 3 Aug 2022 16:46:53 +0200 Subject: [PATCH] Revert "ANDROID: sched: add em_cpu_energy vendor hook" This reverts commit b5a8eefc03fcb87d34114ad46ac6abcba64b29d9 as it causes merge conflicts in 6.0-rc1. If this is still needed after 6.0-rc1 is merged, it can be added back. Bug: 178022444 Cc: Yun Hsiang Signed-off-by: Greg Kroah-Hartman Change-Id: I73d2cb0674bb2a6cab10dcec1dc1a151ebf05d8c --- drivers/android/vendor_hooks.c | 1 - include/trace/hooks/sched.h | 7 ------- kernel/sched/fair.c | 7 +------ 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 32bbfadae1a7..5af6f741ac19 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -91,7 +91,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_fork_init); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_ttwu_cond); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_schedule_bug); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_exec); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_em_cpu_energy); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_oops_enter); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_oops_exit); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_size_check); diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 36154293451e..4858c8eb694b 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -151,13 +151,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_sched_exec, TP_PROTO(bool *cond), TP_ARGS(cond), 1); -struct em_perf_domain; -DECLARE_HOOK(android_vh_em_cpu_energy, - TP_PROTO(struct em_perf_domain *pd, - unsigned long max_util, unsigned long sum_util, - unsigned long *energy), - TP_ARGS(pd, max_util, sum_util, energy)); - DECLARE_HOOK(android_vh_build_sched_domains, TP_PROTO(bool has_asym), TP_ARGS(has_asym)); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 92b05c8541a6..78866a5280ef 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6684,7 +6684,6 @@ compute_energy(struct task_struct *p, int dst_cpu, struct perf_domain *pd) unsigned long cpu_cap = arch_scale_cpu_capacity(cpumask_first(pd_mask)); unsigned long max_util = 0, sum_util = 0; unsigned long _cpu_cap = cpu_cap; - unsigned long energy = 0; int cpu; _cpu_cap -= arch_scale_thermal_pressure(cpumask_first(pd_mask)); @@ -6741,11 +6740,7 @@ compute_energy(struct task_struct *p, int dst_cpu, struct perf_domain *pd) max_util = max(max_util, min(cpu_util, _cpu_cap)); } - trace_android_vh_em_cpu_energy(pd->em_pd, max_util, sum_util, &energy); - if (!energy) - energy = em_cpu_energy(pd->em_pd, max_util, sum_util, _cpu_cap); - - return energy; + return em_cpu_energy(pd->em_pd, max_util, sum_util, _cpu_cap); } /*