diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index ec9ab2f0148978f75d401b77b84c8a5388604ca1..1eb82661ecdb1257adcbf1c377804a4fc446c93b 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -194,7 +194,7 @@ static int multi_cpu_stop(void *data)
 	/* Simple state machine */
 	do {
 		/* Chill out and ensure we re-read multi_stop_state. */
-		cpu_relax();
+		cpu_relax_yield();
 		if (msdata->state != curstate) {
 			curstate = msdata->state;
 			switch (curstate) {