shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: sched: add em_cpu_energy vendor hook"

Browse Source 
This reverts commit b5a8eefc03 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 <yun.hsiang@mediatek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I73d2cb0674bb2a6cab10dcec1dc1a151ebf05d8c
This commit is contained in:
Greg Kroah-Hartman
2022-08-03 16:46:53 +02:00
parent ca59313305
commit 535b1a9a9d
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/android/vendor_hooks.c
View File

@@ -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);

7
include/trace/hooks/sched.h
View File

@@ -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));

7
kernel/sched/fair.c
View File

@@ -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);
}
/*