diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-21 11:04:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-21 11:04:28 -0400 |
| commit | ae51801ba5ca27c2c571eb508daa99b392e79bd4 (patch) | |
| tree | 07f9c2a4cad33791c87211fb43553bf42f6fa4b5 /include | |
| parent | 7d3628b230ecbdc29566c18bc7800ff8ed66a71f (diff) | |
| parent | 4cfea5a7dfcc2766251e50ca30271a782d5004ad (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix atomic backoff limit.
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc64/backoff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-sparc64/backoff.h b/include/asm-sparc64/backoff.h index dadd6c385c6c..fa1fdf67e350 100644 --- a/include/asm-sparc64/backoff.h +++ b/include/asm-sparc64/backoff.h | |||
| @@ -12,7 +12,8 @@ | |||
| 12 | mov reg, tmp; \ | 12 | mov reg, tmp; \ |
| 13 | 88: brnz,pt tmp, 88b; \ | 13 | 88: brnz,pt tmp, 88b; \ |
| 14 | sub tmp, 1, tmp; \ | 14 | sub tmp, 1, tmp; \ |
| 15 | cmp reg, BACKOFF_LIMIT; \ | 15 | set BACKOFF_LIMIT, tmp; \ |
| 16 | cmp reg, tmp; \ | ||
| 16 | bg,pn %xcc, label; \ | 17 | bg,pn %xcc, label; \ |
| 17 | nop; \ | 18 | nop; \ |
| 18 | ba,pt %xcc, label; \ | 19 | ba,pt %xcc, label; \ |