diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:11:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-27 10:11:12 -0700 |
| commit | a2508c0814c6d2c0259fa859a6184343b1e39ea3 (patch) | |
| tree | 3c42cb3daf50b419f8cc20ff1625647306b66e0d /include/asm-sparc64/backoff.h | |
| parent | 0f5a2c553d1484141ebb369ecab61894e9cb074f (diff) | |
| parent | 6ee4e28be80add86a64908472e4b7ab01dab33d9 (diff) | |
| download | kernel-crypto-a2508c0814c6d2c0259fa859a6184343b1e39ea3.tar.gz kernel-crypto-a2508c0814c6d2c0259fa859a6184343b1e39ea3.tar.xz kernel-crypto-a2508c0814c6d2c0259fa859a6184343b1e39ea3.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC32]: Fix build-warning in io-unit.c
[SPARC64]: Fix BACKOFF_SPIN on non-SMP.
[SPARC32]: __inline__ --> inline
[SPARC64]: __inline__ --> inline
Diffstat (limited to 'include/asm-sparc64/backoff.h')
| -rw-r--r-- | include/asm-sparc64/backoff.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-sparc64/backoff.h b/include/asm-sparc64/backoff.h index 0e32f8b62fd..dadd6c385c6 100644 --- a/include/asm-sparc64/backoff.h +++ b/include/asm-sparc64/backoff.h @@ -21,7 +21,9 @@ #else #define BACKOFF_SETUP(reg) -#define BACKOFF_SPIN(reg, tmp, label) +#define BACKOFF_SPIN(reg, tmp, label) \ + ba,pt %xcc, label; \ + nop; #endif |