Commit 7ad54bbb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'turbostat-2026.02.14-AMD-RAPL-fix' of... 

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
parents 2961f841 ef0e6008

tools/power/x86/turbostat/turbostat.c

+1 −2
Original line number Diff line number Diff line
@@ -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)