diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-18 20:52:38 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-02-18 20:52:38 +0300 |
| commit | 7ad54bbbc9c512ba3bc90e4368264bcf15c25759 (patch) | |
| tree | 7c259b03360a9f6e016c3d1542082a9257bd6696 | |
| parent | 2961f841b025fb234860bac26dfb7fa7cb0fb122 (diff) | |
| parent | ef0e60083f768b32cda17b1b0ca9519405db89a6 (diff) | |
| download | linux-7ad54bbbc9c512ba3bc90e4368264bcf15c25759.tar.xz | |
Merge tag 'turbostat-2026.02.14-AMD-RAPL-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull turbostat fix from Len Brown:
"Fix a recent AMD regression due to errant code cleanup"
* tag 'turbostat-2026.02.14-AMD-RAPL-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools/power turbostat: Fix AMD RAPL regression
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 1aace9b3269e..1a2671c28209 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -5164,7 +5164,7 @@ static inline int get_rapl_domain_id(int cpu) if (!platform->has_per_core_rapl) return cpus[cpu].package_id; - return GLOBAL_CORE_ID(cpu, cpus[cpu].package_id); + return GLOBAL_CORE_ID(cpus[cpu].core_id, cpus[cpu].package_id); } /* @@ -9633,7 +9633,6 @@ void topology_probe(bool startup) } topo.max_core_id = max_core_id; /* within a package */ topo.max_package_id = max_package_id; - topo.num_cores = (max_core_id + 1) * topo.num_packages; /* per system */ topo.cores_per_node = max_core_id + 1; if (debug > 1) |