x86/apic: Make cpu_mask_to_apicid() operations check cpu_online_mask

[karo-tx-linux.git] / arch / x86 / kernel / apic / apic.c

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index b8d92606f84fa2c079b26a8e9c008d13336975f9..7e9bbe73bc5a54a256b58acc0a1d11c95a7aab91 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2136,7 +2136,7 @@ static inline int __default_cpu_to_apicid(int cpu, unsigned int *apicid)
 int default_cpu_mask_to_apicid(const struct cpumask *cpumask,
                               unsigned int *apicid)
 {
-       int cpu = cpumask_first(cpumask);
+       int cpu = cpumask_first_and(cpumask, cpu_online_mask);
        return __default_cpu_to_apicid(cpu, apicid);
 }