ANDROID: Drop duplicate call to trace_sched_cpu_capacity_tp()

In previous merges with upstream in 6.2-rc1, somehow we ended up with an
additional call to trace_sched_cpu_capacity_tp(), and this resulted in
the fixup patch in the common-patches repo caled:
  android-mainline/FIXME-sched-fair-Remove-duplicate-call-to-trace_sched_cpu_capacity_tp.patch

Fix this obvious merge problem up by removing the duplicate call to
bring the tree back in line with what is upstream.  This was noticed as
it caused an unexpected merge conflict with the upstream scheduler
changes in 6.3-rc1.

Fixes: a28ff6f883 ("Merge bf57ae2165 ("Merge tag 'sched-core-2022-12-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip") into android-mainline")
Reported-by: Lee Jones <joneslee@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3546aa136903ee9ec960ffddda04bffad2ff045b
This commit is contained in:
Greg Kroah-Hartman
2023-03-02 12:25:04 +00:00
committed by Treehugger Robot
parent a8d9faf6f6
commit 5be62ba73a
-1
View File
@@ -8932,7 +8932,6 @@ static void update_cpu_capacity(struct sched_domain *sd, int cpu)
capacity = 1;
rq->cpu_capacity = capacity;
trace_sched_cpu_capacity_tp(rq);
/*
* Detect if the performance domain is in capacity inversion state.