ia64: Manual merge with Alex's "UP cmc/cpe polling fix" patch.

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 3626ec5ef21028c15ef0f7accc1f9de1e8272c14..a384ce42e8c486c8080400d472f5d2f5978b55fb 100644 (file)
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1145,7 +1145,7 @@ ia64_mca_cmc_int_caller(int cpe_irq, void *arg, struct pt_regs *ptregs)
 
        ia64_mca_cmc_int_handler(cpe_irq, arg, ptregs);
 
-       for (++cpuid ; !cpu_online(cpuid) && cpuid < NR_CPUS ; cpuid++);
+       for (++cpuid ; cpuid < NR_CPUS && !cpu_online(cpuid) ; cpuid++);
 
        if (cpuid < NR_CPUS) {
                platform_send_ipi(cpuid, IA64_CMCP_VECTOR, IA64_IPI_DM_INT, 0);