2 files changed, 5 insertions, 4 deletions

diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index 3998131d1a68..324817735771 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -2621,7 +2621,7 @@ static void intel_pmu_cpu_starting(int cpu)
         if (!(x86_pmu.flags & PMU_FL_NO_HT_SHARING)) {
                 void **onln = &cpuc->kfree_on_online[X86_PERF_KFREE_SHARED];
 
-                for_each_cpu(i, topology_thread_cpumask(cpu)) {
+                for_each_cpu(i, topology_sibling_cpumask(cpu)) {
                         struct intel_shared_regs *pc;
 
                         pc = per_cpu(cpu_hw_events, i).shared_regs;
@@ -2641,7 +2641,7 @@ static void intel_pmu_cpu_starting(int cpu)
         if (x86_pmu.flags & PMU_FL_EXCL_CNTRS) {
                 int h = x86_pmu.num_counters >> 1;
 
-                for_each_cpu(i, topology_thread_cpumask(cpu)) {
+                for_each_cpu(i, topology_sibling_cpumask(cpu)) {
                         struct intel_excl_cntrs *c;
 
                         c = per_cpu(cpu_hw_events, i).excl_cntrs;
@@ -3403,7 +3403,7 @@ static __init int fixup_ht_bug(void)
         if (!(x86_pmu.flags & PMU_FL_EXCL_ENABLED))
                 return 0;
 
-        w = cpumask_weight(topology_thread_cpumask(cpu));
+        w = cpumask_weight(topology_sibling_cpumask(cpu));
         if (w > 1) {
                 pr_info("PMU erratum BJ122, BV98, HSD29 worked around, HT is on\n");
                 return 0;
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index e7d8c7608471..18ca99f2798b 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -12,7 +12,8 @@ static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,
 {
 #ifdef CONFIG_SMP
         seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);
-        seq_printf(m, "siblings\t: %d\n", cpumask_weight(cpu_core_mask(cpu)));
+        seq_printf(m, "siblings\t: %d\n",
+                   cpumask_weight(topology_core_cpumask(cpu)));
         seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);
         seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
         seq_printf(m, "apicid\t\t: %d\n", c->apicid);