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

ecbfc7c2 · David Mosberger · 6502c68c · ecbfc7c2
Commit ecbfc7c2 authored Aug 24, 2003 by David Mosberger
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/ia64/kernel/mca.c arch/ia64/kernel/mca.c +1 -1

No files found.
--- 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);