Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 638944ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix bug in atomic_sub_if_positive.
parents 3ea9eed4 50952026

include/asm-mips/atomic.h

+2 −2
Original line number Diff line number Diff line
@@ -283,10 +283,10 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) 
		"	beqz	%0, 2f					\n"

		"	 subu	%0, %1, %3				\n"

		"	.set	reorder					\n"

		"1:							\n"

		"	.subsection 2					\n"

		"2:	b	1b					\n"

		"	.previous					\n"

		"1:							\n"

		"	.set	mips0					\n"

		: "=&r" (result), "=&r" (temp), "=m" (v->counter)

		: "Ir" (i), "m" (v->counter)
@@ -664,10 +664,10 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) 
		"	beqz	%0, 2f					\n"

		"	 dsubu	%0, %1, %3				\n"

		"	.set	reorder					\n"

		"1:							\n"

		"	.subsection 2					\n"

		"2:	b	1b					\n"

		"	.previous					\n"

		"1:							\n"

		"	.set	mips0					\n"

		: "=&r" (result), "=&r" (temp), "=m" (v->counter)

		: "Ir" (i), "m" (v->counter)