Commit bd745d1c authored Feb 13, 2024 by Thomas Gleixner

x86/cpu/topology: Rename topology_max_die_per_package()



The plural of die is dies.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michael Kelley <mhklinux@outlook.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Link: https://lore.kernel.org/r/20240213210253.065874205@linutronix.de

parent 8078f4d6

arch/x86/events/intel/cstate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -834,7 +834,7 @@ static int __init cstate_init(void)
		}

		if (has_cstate_pkg) {
		if (topology_max_die_per_package() > 1) {
		if (topology_max_dies_per_package() > 1) {
		err = perf_pmu_register(&cstate_pkg_pmu,
		"cstate_die", -1);
		} else {

arch/x86/events/intel/uncore.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1893,7 +1893,7 @@ static int __init intel_uncore_init(void)
		return -ENODEV;

		__uncore_max_dies =
		topology_max_packages() * topology_max_die_per_package();
		topology_max_packages() * topology_max_dies_per_package();

		id = x86_match_cpu(intel_uncore_match);
		if (!id) {

arch/x86/events/intel/uncore_snbep.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1406,7 +1406,7 @@ static int topology_gidnid_map(int nodeid, u32 gidnid)
		*/
		for (i = 0; i < 8; i++) {
		if (nodeid == GIDNIDMAP(gidnid, i)) {
		if (topology_max_die_per_package() > 1)
		if (topology_max_dies_per_package() > 1)
		die_id = i;
		else
		die_id = topology_phys_to_logical_pkg(i);

arch/x86/events/rapl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -674,7 +674,7 @@ static const struct attribute_group *rapl_attr_update[] = {

		static int __init init_rapl_pmus(void)
		{
		int maxdie = topology_max_packages() * topology_max_die_per_package();
		int maxdie = topology_max_packages() * topology_max_dies_per_package();
		size_t size;

		size = sizeof(rapl_pmus) + maxdie sizeof(struct rapl_pmu *);

arch/x86/include/asm/topology.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,7 @@ static inline unsigned int topology_max_packages(void)
		return __max_logical_packages;
		}

		static inline unsigned int topology_max_die_per_package(void)
		static inline unsigned int topology_max_dies_per_package(void)
		{
		return __max_dies_per_package;
		}