summaryrefslogtreecommitdiff
path: root/arch/x86/events/intel/uncore_nhmex.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2024-02-13 22:06:16 +0100
committerThomas Gleixner <tglx@linutronix.de>2024-02-16 15:51:32 +0100
commit89b0f15f408f7c4ee98c1ec4c3224852fcbc3274 (patch)
treec1260ecb1ae8fb3bdc36ff6bdf6ad1b294abf684 /arch/x86/events/intel/uncore_nhmex.c
parentfd43b8ae76e903c76f14d06eb939449bcc3f614f (diff)
x86/cpu/topology: Get rid of cpuinfo::x86_max_cores
Now that __num_cores_per_package and __num_threads_per_package are available, cpuinfo::x86_max_cores and the related math all over the place can be replaced with the ready to consume data. 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.176147806@linutronix.de
Diffstat (limited to 'arch/x86/events/intel/uncore_nhmex.c')
-rw-r--r--arch/x86/events/intel/uncore_nhmex.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/events/intel/uncore_nhmex.c b/arch/x86/events/intel/uncore_nhmex.c
index 56eea2c66cfb..92da8aaa5966 100644
--- a/arch/x86/events/intel/uncore_nhmex.c
+++ b/arch/x86/events/intel/uncore_nhmex.c
@@ -1221,8 +1221,8 @@ void nhmex_uncore_cpu_init(void)
uncore_nhmex = true;
else
nhmex_uncore_mbox.event_descs = wsmex_uncore_mbox_events;
- if (nhmex_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
- nhmex_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+ if (nhmex_uncore_cbox.num_boxes > topology_num_cores_per_package())
+ nhmex_uncore_cbox.num_boxes = topology_num_cores_per_package();
uncore_msr_uncores = nhmex_msr_uncores;
}
/* end of Nehalem-EX uncore support */