Commit ae51801b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 7d3628b2 4cfea5a7

include/asm-sparc64/backoff.h

+2 −1
Original line number Diff line number Diff line
@@ -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; \