aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/genx2apic_cluster.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c
index d451c9b9fdff..6ce497cc372d 100644
--- a/arch/x86/kernel/genx2apic_cluster.c
+++ b/arch/x86/kernel/genx2apic_cluster.c
@@ -114,7 +114,7 @@ static unsigned int x2apic_cpu_mask_to_apicid(const struct cpumask *cpumask)
114 int cpu; 114 int cpu;
115 115
116 /* 116 /*
117 * We're using fixed IRQ delivery, can only return one phys APIC ID. 117 * We're using fixed IRQ delivery, can only return one logical APIC ID.
118 * May as well be the first. 118 * May as well be the first.
119 */ 119 */
120 cpu = cpumask_first(cpumask); 120 cpu = cpumask_first(cpumask);
@@ -130,14 +130,14 @@ static unsigned int x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
130 int cpu; 130 int cpu;
131 131
132 /* 132 /*
133 * We're using fixed IRQ delivery, can only return one phys APIC ID. 133 * We're using fixed IRQ delivery, can only return one logical APIC ID.
134 * May as well be the first. 134 * May as well be the first.
135 */ 135 */
136 for_each_cpu_and(cpu, cpumask, andmask) 136 for_each_cpu_and(cpu, cpumask, andmask)
137 if (cpumask_test_cpu(cpu, cpu_online_mask)) 137 if (cpumask_test_cpu(cpu, cpu_online_mask))
138 break; 138 break;
139 if (cpu < nr_cpu_ids) 139 if (cpu < nr_cpu_ids)
140 return per_cpu(x86_cpu_to_apicid, cpu); 140 return per_cpu(x86_cpu_to_logical_apicid, cpu);
141 return BAD_APICID; 141 return BAD_APICID;
142} 142}
143 143