From: Len Brown <[email protected]> Syntax update only -- no logical or functional change.
In response to the new multi-die/package changes, update variable names to use the more generic "pmuid" terminology, instead of "pkgid", as the pmu can refer to either packages or die. Signed-off-by: Len Brown <[email protected]> Cc: Kan Liang <[email protected]> --- arch/x86/events/intel/rapl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index e49f69c51b10..497eae4b4c9b 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -161,13 +161,13 @@ static u64 rapl_timer_ms; static inline struct rapl_pmu *cpu_to_rapl_pmu(unsigned int cpu) { - unsigned int pkgid = topology_logical_die_id(cpu); + unsigned int pmuid = topology_logical_die_id(cpu); /* * The unsigned check also catches the '-1' return value for non * existent mappings in the topology map. */ - return pkgid < rapl_pmus->maxpkg ? rapl_pmus->pmus[pkgid] : NULL; + return pmuid < rapl_pmus->maxpkg ? rapl_pmus->pmus[pmuid] : NULL; } static inline u64 rapl_read_counter(struct perf_event *event) -- 2.18.0-rc0
