41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
|
From 9e3190a0f75324a7dcb66da336584918243b2c77 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
|
||
|
|
Date: Fri, 15 Nov 2024 06:07:57 +0000
|
||
|
|
Subject: perf/x86/rapl: Remove the unused get_rapl_pmu_cpumask() function
|
||
|
|
|
||
|
|
commit 9e9af8bbb5f9 ("perf/x86/rapl: Clean up cpumask and hotplug")
|
||
|
|
removes the cpumask handling from rapl. Post that, we no longer need the
|
||
|
|
get_rapl_pmu_cpumask() function. So remove it.
|
||
|
|
|
||
|
|
Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
|
||
|
|
Reviewed-by: Zhang Rui <rui.zhang@intel.com>
|
||
|
|
Tested-by: Zhang Rui <rui.zhang@intel.com>
|
||
|
|
---
|
||
|
|
arch/x86/events/rapl.c | 8 +-------
|
||
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/x86/events/rapl.c
|
||
|
|
+++ b/arch/x86/events/rapl.c
|
||
|
|
@@ -153,7 +153,7 @@ static u64 rapl_timer_ms;
|
||
|
|
static struct perf_msr *rapl_msrs;
|
||
|
|
|
||
|
|
/*
|
||
|
|
- * Helper functions to get the correct topology macros according to the
|
||
|
|
+ * Helper function to get the correct topology id according to the
|
||
|
|
* RAPL PMU scope.
|
||
|
|
*/
|
||
|
|
static inline unsigned int get_rapl_pmu_idx(int cpu)
|
||
|
|
@@ -162,12 +162,6 @@ static inline unsigned int get_rapl_pmu_
|
||
|
|
topology_logical_die_id(cpu);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static inline const struct cpumask *get_rapl_pmu_cpumask(int cpu)
|
||
|
|
-{
|
||
|
|
- return rapl_pmu_is_pkg_scope() ? topology_core_cpumask(cpu) :
|
||
|
|
- topology_die_cpumask(cpu);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
static inline struct rapl_pmu *cpu_to_rapl_pmu(unsigned int cpu)
|
||
|
|
{
|
||
|
|
unsigned int rapl_pmu_idx = get_rapl_pmu_idx(cpu);
|