Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[sfrench/cifs-2.6.git] / include / asm-sparc64 / backoff.h

diff --git a/include/asm-sparc64/backoff.h b/include/asm-sparc64/backoff.h
index 0e32f8b62fd29e18cf0f0b3d7cf9e44b32c228a7..fa1fdf67e350e07d950107289f25bdf3c41a73b3 100644 (file)
--- a/include/asm-sparc64/backoff.h
+++ b/include/asm-sparc64/backoff.h
@@ -12,7 +12,8 @@
        mov     reg, tmp; \
 88:    brnz,pt tmp, 88b; \
         sub    tmp, 1, tmp; \
-       cmp     reg, BACKOFF_LIMIT; \
+       set     BACKOFF_LIMIT, tmp; \
+       cmp     reg, tmp; \
        bg,pn   %xcc, label; \
         nop; \
        ba,pt   %xcc, label; \
@@ -21,7 +22,9 @@
 #else
 
 #define BACKOFF_SETUP(reg)
-#define BACKOFF_SPIN(reg, tmp, label)
+#define BACKOFF_SPIN(reg, tmp, label) \
+       ba,pt   %xcc, label; \
+        nop;
 
 #endif