From: Masami Hiramatsu on
Fix stop_machine_text_poke() to issue smp_mb() before exiting waiting
loop, and use cpu_relax() for waiting.

Signed-off-by: Masami Hiramatsu <mhiramat(a)>
Cc: Mathieu Desnoyers <mathieu.desnoyers(a)>
Cc: Ingo Molnar <mingo(a)>
Cc: Jason Baron <jbaron(a)>

arch/x86/kernel/alternative.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 635e4f4..3a4bf35 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -597,8 +597,8 @@ static int __kprobes stop_machine_text_poke(void *data)
wrote_text = 1;
} else {
while (!wrote_text)
- smp_rmb();
- sync_core();
+ cpu_relax();
+ smp_mb(); /* Load wrote_text before following execution */

flush_icache_range((unsigned long)tpp->addr,

Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: mhiramat(a)
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)
More majordomo info at
Please read the FAQ at