ppc64: Make cpu_relax a barrier

0a3eed3a · Anton Blanchard · b5548cc0 · 0a3eed3a · 0a3eed3a
Commit 0a3eed3a authored Jul 31, 2002 by Anton Blanchard
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

arch/ppc64/kernel/irq.c arch/ppc64/kernel/irq.c +1 -3

include/asm-ppc64/processor.h include/asm-ppc64/processor.h +1 -1

No files found.
--- a/arch/ppc64/kernel/irq.c
+++ b/arch/ppc64/kernel/irq.c
@@ -173,10 +173,8 @@ inline void synchronize_irq(unsigned int irq)
 	if (!irq_desc[irq].action)
 		return;
-	while (irq_desc[irq].status & IRQ_INPROGRESS) {
+	while (irq_desc[irq].status & IRQ_INPROGRESS)
-		barrier();
 		cpu_relax();
-	}
 }
 #endif /* CONFIG_SMP */

--- a/include/asm-ppc64/processor.h
+++ b/include/asm-ppc64/processor.h
@@ -692,7 +692,7 @@ unsigned long get_wchan(struct task_struct *p);
 #define KSTK_EIP(tsk)  ((tsk)->thread.regs? (tsk)->thread.regs->nip: 0)
 #define KSTK_ESP(tsk)  ((tsk)->thread.regs? (tsk)->thread.regs->gpr[1]: 0)
-#define cpu_relax()     do { } while (0)
+#define cpu_relax()     barrier()
 /*
 * Prefetch macros.