Merge tag 'soc-drivers-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-block.git] / arch / x86 / events / intel / uncore_snb.c

diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c
index 7fd4334e12a172d495bdf9353ac678f2a19f86f6..9462fd9f3b7abc2263c203651a89f01230bd3b51 100644 (file)
--- a/arch/x86/events/intel/uncore_snb.c
+++ b/arch/x86/events/intel/uncore_snb.c
@@ -364,8 +364,8 @@ static struct intel_uncore_type *snb_msr_uncores[] = {
 void snb_uncore_cpu_init(void)
 {
        uncore_msr_uncores = snb_msr_uncores;
-       if (snb_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
-               snb_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+       if (snb_uncore_cbox.num_boxes > topology_num_cores_per_package())
+               snb_uncore_cbox.num_boxes = topology_num_cores_per_package();
 }
 
 static void skl_uncore_msr_init_box(struct intel_uncore_box *box)
@@ -428,8 +428,8 @@ static struct intel_uncore_type *skl_msr_uncores[] = {
 void skl_uncore_cpu_init(void)
 {
        uncore_msr_uncores = skl_msr_uncores;
-       if (skl_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)
-               skl_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;
+       if (skl_uncore_cbox.num_boxes > topology_num_cores_per_package())
+               skl_uncore_cbox.num_boxes = topology_num_cores_per_package();
        snb_uncore_arb.ops = &skl_uncore_msr_ops;
 }