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

Commit c8f30ae5 authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds
Browse files

mips: fix bitops 



Documentation/atomic_ops.txt defines these primitives must contain a memory
barrier both before and after their memory operation.  This is consistent with
the atomic ops implementation on mips.

Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 87371e4f

include/asm-mips/bitops.h

+6 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ static inline int test_and_set_bit(unsigned long nr, 
	unsigned short bit = nr & SZLONG_MASK;

	unsigned long res;



	smp_llsc_mb();



	if (cpu_has_llsc && R10000_LLSC_WAR) {

		unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);

		unsigned long temp;
@@ -308,6 +310,8 @@ static inline int test_and_clear_bit(unsigned long nr, 
	unsigned short bit = nr & SZLONG_MASK;

	unsigned long res;



	smp_llsc_mb();



	if (cpu_has_llsc && R10000_LLSC_WAR) {

		unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);

		unsigned long temp;
@@ -396,6 +400,8 @@ static inline int test_and_change_bit(unsigned long nr, 
	unsigned short bit = nr & SZLONG_MASK;

	unsigned long res;



	smp_llsc_mb();



	if (cpu_has_llsc && R10000_LLSC_WAR) {

		unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);

		unsigned long temp;