Skip to content
Snippets Groups Projects
Commit b2d6cca8 authored by David Arcari's avatar David Arcari
Browse files

x86/cpu/topology: Rename topology_max_die_per_package()

JIRA: https://issues.redhat.com/browse/RHEL-35363


Conflicts: limited to intel_rapl, also for now I'm provide both
	   topology_max_die_per_package and topology_max_dies_per_package
	   to allow for an easier transition.  We can remove
	   topology_max_die_per_package at a later date.

commit bd745d1c41e7fa56242889eb5dc6df2d7dd5df32
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Tue Feb 13 22:06:13 2024 +0100

    x86/cpu/topology: Rename topology_max_die_per_package()

    The plural of die is dies.

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



Signed-off-by: default avatarDavid Arcari <darcari@redhat.com>
parent 3031f17b
No related branches found
No related tags found
No related merge requests found
......@@ -129,6 +129,11 @@ static inline int topology_max_die_per_package(void)
return __max_die_per_package;
}
static inline int topology_max_dies_per_package(void)
{
return __max_die_per_package;
}
extern int __max_smt_threads;
static inline int topology_max_smt_threads(void)
......
......@@ -1587,7 +1587,7 @@ struct rapl_package *rapl_add_package_cpuslocked(int id, struct rapl_if_priv *pr
if (id_is_cpu) {
rp->id = topology_logical_die_id(id);
rp->lead_cpu = id;
if (topology_max_die_per_package() > 1)
if (topology_max_dies_per_package() > 1)
snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d-die-%d",
topology_physical_package_id(id), topology_die_id(id));
else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment