Merge bk://kernel.bkbits.net/gregkh/linux/driver-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index 5284825dbf3f..4b70f27b8e69 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -305,13 +305,13 @@ static void __smp_call_function (void (*func) (void *info), void *info,
 	/* Send a message to all other CPUs and wait for them to respond */
 	send_IPI_allbutself(CALL_FUNCTION_VECTOR);
 
-	if (!wait)
-		return;
-
 	/* Wait for response */
 	while (atomic_read(&data.started) != cpus)
 		cpu_relax();
 
+	if (!wait)
+		return;
+
 	while (atomic_read(&data.finished) != cpus)
 		cpu_relax();
 }