2 files changed, 8 insertions, 2 deletions

diff --git a/arch/sparc/include/asm/backoff.h b/arch/sparc/include/asm/backoff.h
index db3af0d30fb1..64b077b3b13b 100644
--- a/arch/sparc/include/asm/backoff.h
+++ b/arch/sparc/include/asm/backoff.h
@@ -13,7 +13,10 @@
 
 #define BACKOFF_SPIN(reg, tmp, label)   \
         mov     reg, tmp; \
-88:     brnz,pt tmp, 88b; \
+88:     rd      %ccr, %g0; \
+        rd      %ccr, %g0; \
+        rd      %ccr, %g0; \
+        brnz,pt tmp, 88b; \
          sub    tmp, 1, tmp; \
         set     BACKOFF_LIMIT, tmp; \
         cmp     reg, tmp; \
diff --git a/arch/sparc/include/asm/processor_64.h b/arch/sparc/include/asm/processor_64.h
index 4e5a483122a0..986563409469 100644
--- a/arch/sparc/include/asm/processor_64.h
+++ b/arch/sparc/include/asm/processor_64.h
@@ -196,7 +196,10 @@ extern unsigned long get_wchan(struct task_struct *task);
 #define KSTK_EIP(tsk)  (task_pt_regs(tsk)->tpc)
 #define KSTK_ESP(tsk)  (task_pt_regs(tsk)->u_regs[UREG_FP])
 
-#define cpu_relax()     barrier()
+#define cpu_relax()     asm volatile("rd        %%ccr, %%g0\n\t" \
+                                     "rd        %%ccr, %%g0\n\t" \
+                                     "rd        %%ccr, %%g0" \
+                                     ::: "memory")
 
 /* Prefetch support.  This is tuned for UltraSPARC-III and later.
  * UltraSPARC-I will treat these as nops, and UltraSPARC-II has