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

Revert "ANDROID: sched: Add vendor hooks for find_energy_efficient_cpu"

Browse Source 
This reverts commit 147a9b3d9e 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 <rickyiu@google.com>
Cc: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Icc8148871b5f2511c79ea5d7ff547b923acecf9a
This commit is contained in:
Greg Kroah-Hartman
2022-08-03 16:49:39 +02:00
parent 535b1a9a9d
commit bc8ceb018f
3 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/android/vendor_hooks.c
View File

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

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

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

4
kernel/sched/fair.c
View File

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