--- a/arch/ia64/kernel/mca.c	2004-10-26 11:52:44.000000000 -0700
+++ b/arch/ia64/kernel/mca.c	2004-10-28 14:07:12.000000000 -0700
@@ -686,6 +686,7 @@ ia64_mca_wakeup_ipi_wait(void)
 			irr = ia64_getreg(_IA64_REG_CR_IRR3);
 			break;
 		}
+		cpu_relax();
 	} while (!(irr & (1UL << irr_bit))) ;
 }
 
--- a/arch/ia64/kernel/smp.c	2004-10-26 11:52:44.000000000 -0700
+++ b/arch/ia64/kernel/smp.c	2004-10-28 14:08:21.000000000 -0700
@@ -290,11 +290,11 @@ smp_call_function_single (int cpuid, voi
 
 	/* Wait for response */
 	while (atomic_read(&data.started) != cpus)
-		barrier();
+		cpu_relax();
 
 	if (wait)
 		while (atomic_read(&data.finished) != cpus)
-			barrier();
+			cpu_relax();
 	call_data = NULL;
 
 	spin_unlock_bh(&call_lock);
@@ -349,11 +349,11 @@ smp_call_function (void (*func) (void *i
 
 	/* Wait for response */
 	while (atomic_read(&data.started) != cpus)
-		barrier();
+		cpu_relax();
 
 	if (wait)
 		while (atomic_read(&data.finished) != cpus)
-			barrier();
+			cpu_relax();
 	call_data = NULL;
 
 	spin_unlock(&call_lock);