Merge samba.org:/home/anton/ppc64/for-linus-ppc64

into samba.org:/home/anton/ppc64/for-linus-ppc64_tmp

Merge samba.org:/home/anton/ppc64/for-linus-ppc64
into samba.org:/home/anton/ppc64/for-linus-ppc64_tmp
dd951843 · Anton Blanchard · 2bed9c56 · b8c3b554 · dd951843
Commit dd951843 authored Jul 22, 2002 by Anton Blanchard
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

include/asm-ppc64/processor.h include/asm-ppc64/processor.h +5 -0

No files found.
--- a/include/asm-ppc64/processor.h
+++ b/include/asm-ppc64/processor.h
@@ -692,7 +692,12 @@ 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)
+/* XXX Temporary work around for a gcc 3.1 bug - Anton */
+#if 0
 #define cpu_relax()     do { } while (0)
+#else
+#define cpu_relax()     barrier()
+#endif
 /*
 * Prefetch macros.