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

Revert "ANDROID: sched: add cpumask parameter to cpu capacity vendor hook"

Browse Source 
This reverts commit 07f80e7c1e.

Hooks in arch_topology.h conflict with upstream changes in 5.19-rc1 so
revert them for now.  If they are still needed they can come back in
later.

Bug: 167126223
Cc: Yun Hsiang <yun.hsiang@mediatek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5f794ccbbc6ef51baf8e32d08c220d551bab3164
This commit is contained in:
Greg Kroah-Hartman
2022-07-06 19:15:48 +02:00
parent 834285e43d
commit 903a9a5ed0
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/arch_topology.c
View File

@@ -143,7 +143,7 @@ void topology_set_freq_scale(const struct cpumask *cpus, unsigned long cur_freq,
scale = (cur_freq << SCHED_CAPACITY_SHIFT) / max_freq;
trace_android_vh_arch_set_freq_scale(cpus, cur_freq, max_freq, &scale);
trace_android_vh_arch_set_freq_scale(cur_freq, max_freq, &scale);
for_each_cpu(i, cpus)
per_cpu(arch_freq_scale, i) = scale;

6
include/trace/hooks/topology.h
View File

@@ -8,12 +8,10 @@
#define _TRACE_HOOK_TOPOLOGY_H
#include <trace/hooks/vendor_hooks.h>
#include <linux/cpumask.h>
DECLARE_HOOK(android_vh_arch_set_freq_scale,
TP_PROTO(const struct cpumask *cpus, unsigned long freq,
unsigned long max, unsigned long *scale),
TP_ARGS(cpus, freq, max, scale));
TP_PROTO(unsigned long freq, unsigned long max, unsigned long *scale),
TP_ARGS(freq, max, scale));
#endif /* _TRACE_HOOK_TOPOLOGY_H */
/* This part must be outside protection */