tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 7ad54bbb 2961f841

+1 -2
+1 -2
tools/power/x86/turbostat/turbostat.c
··· 5164 5164 if (!platform->has_per_core_rapl) 5165 5165 return cpus[cpu].package_id; 5166 5166 5167 - return GLOBAL_CORE_ID(cpu, cpus[cpu].package_id); 5167 + return GLOBAL_CORE_ID(cpus[cpu].core_id, cpus[cpu].package_id); 5168 5168 } 5169 5169 5170 5170 /* ··· 9633 9633 } 9634 9634 topo.max_core_id = max_core_id; /* within a package */ 9635 9635 topo.max_package_id = max_package_id; 9636 - topo.num_cores = (max_core_id + 1) * topo.num_packages; /* per system */ 9637 9636 9638 9637 topo.cores_per_node = max_core_id + 1; 9639 9638 if (debug > 1)