Commit aac8aa77 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files

Enable a suitable ISA for the assembler around ll/sc so that code 


builds even for processors that don't support the instructions.
Plus minor formatting fixes.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent fded2e50

arch/mips/kernel/semaphore.c

+8 −4
Original line number Diff line number Diff line
@@ -42,24 +42,28 @@ static inline int __sem_update_count(struct semaphore *sem, int incr) 


	if (cpu_has_llsc && R10000_LLSC_WAR) {

		__asm__ __volatile__(

		"1:	ll	%0, %2					\n"

		"	.set	mips2					\n"

		"1:	ll	%0, %2		# __sem_update_count	\n"

		"	sra	%1, %0, 31				\n"

		"	not	%1					\n"

		"	and	%1, %0, %1				\n"

		"	add	%1, %1, %3				\n"

		"	addu	%1, %1, %3				\n"

		"	sc	%1, %2					\n"

		"	beqzl	%1, 1b					\n"

		"	.set	mips0					\n"

		: "=&r" (old_count), "=&r" (tmp), "=m" (sem->count)

		: "r" (incr), "m" (sem->count));

	} else if (cpu_has_llsc) {

		__asm__ __volatile__(

		"1:	ll	%0, %2					\n"

		"	.set	mips2					\n"

		"1:	ll	%0, %2		# __sem_update_count	\n"

		"	sra	%1, %0, 31				\n"

		"	not	%1					\n"

		"	and	%1, %0, %1				\n"

		"	add	%1, %1, %3				\n"

		"	addu	%1, %1, %3				\n"

		"	sc	%1, %2					\n"

		"	beqz	%1, 1b					\n"

		"	.set	mips0					\n"

		: "=&r" (old_count), "=&r" (tmp), "=m" (sem->count)

		: "r" (incr), "m" (sem->count));

	} else {

include/asm-mips/atomic.h

+40 −0
Original line number Diff line number Diff line
@@ -62,20 +62,24 @@ static __inline__ void atomic_add(int i, atomic_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%0, %1		# atomic_add		\n"

		"	addu	%0, %2					\n"

		"	sc	%0, %1					\n"

		"	beqzl	%0, 1b					\n"

		"	.set	mips0					\n"

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

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

	} else if (cpu_has_llsc) {

		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%0, %1		# atomic_add		\n"

		"	addu	%0, %2					\n"

		"	sc	%0, %1					\n"

		"	beqz	%0, 1b					\n"

		"	.set	mips0					\n"

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

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

	} else {
@@ -100,20 +104,24 @@ static __inline__ void atomic_sub(int i, atomic_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%0, %1		# atomic_sub		\n"

		"	subu	%0, %2					\n"

		"	sc	%0, %1					\n"

		"	beqzl	%0, 1b					\n"

		"	.set	mips0					\n"

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

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

	} else if (cpu_has_llsc) {

		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%0, %1		# atomic_sub		\n"

		"	subu	%0, %2					\n"

		"	sc	%0, %1					\n"

		"	beqz	%0, 1b					\n"

		"	.set	mips0					\n"

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

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

	} else {
@@ -136,12 +144,14 @@ static __inline__ int atomic_add_return(int i, atomic_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%1, %2		# atomic_add_return	\n"

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

		"	sc	%0, %2					\n"

		"	beqzl	%0, 1b					\n"

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

		"	sync						\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -149,12 +159,14 @@ static __inline__ int atomic_add_return(int i, atomic_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%1, %2		# atomic_add_return	\n"

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

		"	sc	%0, %2					\n"

		"	beqz	%0, 1b					\n"

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

		"	sync						\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -179,12 +191,14 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%1, %2		# atomic_sub_return	\n"

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

		"	sc	%0, %2					\n"

		"	beqzl	%0, 1b					\n"

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

		"	sync						\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -192,12 +206,14 @@ static __inline__ int atomic_sub_return(int i, atomic_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%1, %2		# atomic_sub_return	\n"

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

		"	sc	%0, %2					\n"

		"	beqz	%0, 1b					\n"

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

		"	sync						\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -229,6 +245,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%1, %2		# atomic_sub_if_positive\n"

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

		"	bltz	%0, 1f					\n"
@@ -236,6 +253,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) 
		"	beqzl	%0, 1b					\n"

		"	sync						\n"

		"1:							\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -243,6 +261,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%1, %2		# atomic_sub_if_positive\n"

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

		"	bltz	%0, 1f					\n"
@@ -250,6 +269,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) 
		"	beqz	%0, 1b					\n"

		"	sync						\n"

		"1:							\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -367,20 +387,24 @@ static __inline__ void atomic64_add(long i, atomic64_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%0, %1		# atomic64_add		\n"

		"	addu	%0, %2					\n"

		"	scd	%0, %1					\n"

		"	beqzl	%0, 1b					\n"

		"	.set	mips0					\n"

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

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

	} else if (cpu_has_llsc) {

		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%0, %1		# atomic64_add		\n"

		"	addu	%0, %2					\n"

		"	scd	%0, %1					\n"

		"	beqz	%0, 1b					\n"

		"	.set	mips0					\n"

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

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

	} else {
@@ -405,20 +429,24 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%0, %1		# atomic64_sub		\n"

		"	subu	%0, %2					\n"

		"	scd	%0, %1					\n"

		"	beqzl	%0, 1b					\n"

		"	.set	mips0					\n"

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

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

	} else if (cpu_has_llsc) {

		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%0, %1		# atomic64_sub		\n"

		"	subu	%0, %2					\n"

		"	scd	%0, %1					\n"

		"	beqz	%0, 1b					\n"

		"	.set	mips0					\n"

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

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

	} else {
@@ -441,12 +469,14 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%1, %2		# atomic64_add_return	\n"

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

		"	scd	%0, %2					\n"

		"	beqzl	%0, 1b					\n"

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

		"	sync						\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -454,12 +484,14 @@ static __inline__ long atomic64_add_return(long i, atomic64_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%1, %2		# atomic64_add_return	\n"

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

		"	scd	%0, %2					\n"

		"	beqz	%0, 1b					\n"

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

		"	sync						\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -484,12 +516,14 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%1, %2		# atomic64_sub_return	\n"

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

		"	scd	%0, %2					\n"

		"	beqzl	%0, 1b					\n"

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

		"	sync						\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -497,12 +531,14 @@ static __inline__ long atomic64_sub_return(long i, atomic64_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%1, %2		# atomic64_sub_return	\n"

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

		"	scd	%0, %2					\n"

		"	beqz	%0, 1b					\n"

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

		"	sync						\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -534,6 +570,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%1, %2		# atomic64_sub_if_positive\n"

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

		"	bltz	%0, 1f					\n"
@@ -541,6 +578,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) 
		"	beqzl	%0, 1b					\n"

		"	sync						\n"

		"1:							\n"

		"	.set	mips0					\n"

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

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

		: "memory");
@@ -548,6 +586,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) 
		unsigned long temp;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%1, %2		# atomic64_sub_if_positive\n"

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

		"	bltz	%0, 1f					\n"
@@ -555,6 +594,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) 
		"	beqz	%0, 1b					\n"

		"	sync						\n"

		"1:							\n"

		"	.set	mips0					\n"

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

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

		: "memory");

include/asm-mips/bitops.h

+50 −24
Original line number Diff line number Diff line
@@ -20,12 +20,14 @@ 
#define SZLONG_MASK 31UL

#define __LL		"ll	"

#define __SC		"sc	"

#define __SET_MIPS	".set	mips2	"

#define cpu_to_lelongp(x) cpu_to_le32p((__u32 *) (x))

#elif (_MIPS_SZLONG == 64)

#define SZLONG_LOG 6

#define SZLONG_MASK 63UL

#define __LL		"lld	"

#define __SC		"scd	"

#define __SET_MIPS	".set	mips3	"

#define cpu_to_lelongp(x) cpu_to_le64p((__u64 *) (x))

#endif
@@ -72,18 +74,22 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr) 


	if (cpu_has_llsc && R10000_LLSC_WAR) {

		__asm__ __volatile__(

		"	" __SET_MIPS "					\n"

		"1:	" __LL "%0, %1			# set_bit	\n"

		"	or	%0, %2					\n"

		"	" __SC	"%0, %1					\n"

		"	beqzl	%0, 1b					\n"

		"	.set	mips0					\n"

		: "=&r" (temp), "=m" (*m)

		: "ir" (1UL << (nr & SZLONG_MASK)), "m" (*m));

	} else if (cpu_has_llsc) {

		__asm__ __volatile__(

		"	" __SET_MIPS "					\n"

		"1:	" __LL "%0, %1			# set_bit	\n"

		"	or	%0, %2					\n"

		"	" __SC	"%0, %1					\n"

		"	beqz	%0, 1b					\n"

		"	.set	mips0					\n"

		: "=&r" (temp), "=m" (*m)

		: "ir" (1UL << (nr & SZLONG_MASK)), "m" (*m));

	} else {
@@ -132,18 +138,22 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr) 


	if (cpu_has_llsc && R10000_LLSC_WAR) {

		__asm__ __volatile__(

		"	" __SET_MIPS "					\n"

		"1:	" __LL "%0, %1			# clear_bit	\n"

		"	and	%0, %2					\n"

		"	" __SC "%0, %1					\n"

		"	beqzl	%0, 1b					\n"

		"	.set	mips0					\n"

		: "=&r" (temp), "=m" (*m)

		: "ir" (~(1UL << (nr & SZLONG_MASK))), "m" (*m));

	} else if (cpu_has_llsc) {

		__asm__ __volatile__(

		"	" __SET_MIPS "					\n"

		"1:	" __LL "%0, %1			# clear_bit	\n"

		"	and	%0, %2					\n"

		"	" __SC "%0, %1					\n"

		"	beqz	%0, 1b					\n"

		"	.set	mips0					\n"

		: "=&r" (temp), "=m" (*m)

		: "ir" (~(1UL << (nr & SZLONG_MASK))), "m" (*m));

	} else {
@@ -191,10 +201,12 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) 
		unsigned long temp;



		__asm__ __volatile__(

		"	" __SET_MIPS "				\n"

		"1:	" __LL "%0, %1		# change_bit	\n"

		"	xor	%0, %2				\n"

		"	" __SC	"%0, %1				\n"

		"	beqzl	%0, 1b				\n"

		"	.set	mips0				\n"

		: "=&r" (temp), "=m" (*m)

		: "ir" (1UL << (nr & SZLONG_MASK)), "m" (*m));

	} else if (cpu_has_llsc) {
@@ -202,10 +214,12 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) 
		unsigned long temp;



		__asm__ __volatile__(

		"	" __SET_MIPS "				\n"

		"1:	" __LL "%0, %1		# change_bit	\n"

		"	xor	%0, %2				\n"

		"	" __SC	"%0, %1				\n"

		"	beqz	%0, 1b				\n"

		"	.set	mips0				\n"

		: "=&r" (temp), "=m" (*m)

		: "ir" (1UL << (nr & SZLONG_MASK)), "m" (*m));

	} else {
@@ -253,6 +267,7 @@ static inline int test_and_set_bit(unsigned long nr, 
		unsigned long temp, res;



		__asm__ __volatile__(

		"	" __SET_MIPS "					\n"

		"1:	" __LL "%0, %1		# test_and_set_bit	\n"

		"	or	%2, %0, %3				\n"

		"	" __SC	"%2, %1					\n"
@@ -261,6 +276,7 @@ static inline int test_and_set_bit(unsigned long nr, 
#ifdef CONFIG_SMP

		"	sync						\n"

#endif

		"	.set	mips0					\n"

		: "=&r" (temp), "=m" (*m), "=&r" (res)

		: "r" (1UL << (nr & SZLONG_MASK)), "m" (*m)

		: "memory");
@@ -271,8 +287,10 @@ static inline int test_and_set_bit(unsigned long nr, 
		unsigned long temp, res;



		__asm__ __volatile__(

		"	.set	noreorder	# test_and_set_bit	\n"

		"1:	" __LL "%0, %1					\n"

		"	.set	push					\n"

		"	.set	noreorder				\n"

		"	" __SET_MIPS "					\n"

		"1:	" __LL "%0, %1		# test_and_set_bit	\n"

		"	or	%2, %0, %3				\n"

		"	" __SC	"%2, %1					\n"

		"	beqz	%2, 1b					\n"
@@ -280,7 +298,7 @@ static inline int test_and_set_bit(unsigned long nr, 
#ifdef CONFIG_SMP

		"	sync						\n"

#endif

		".set\treorder"

		"	.set	pop					\n"

		: "=&r" (temp), "=m" (*m), "=&r" (res)

		: "r" (1UL << (nr & SZLONG_MASK)), "m" (*m)

		: "memory");
@@ -343,15 +361,17 @@ static inline int test_and_clear_bit(unsigned long nr, 
		unsigned long temp, res;



		__asm__ __volatile__(

		"	" __SET_MIPS "					\n"

		"1:	" __LL	"%0, %1		# test_and_clear_bit	\n"

		"	or	%2, %0, %3				\n"

		"	xor	%2, %3					\n"

			__SC 	"%2, %1					\n"

		"	" __SC 	"%2, %1					\n"

		"	beqzl	%2, 1b					\n"

		"	and	%2, %0, %3				\n"

#ifdef CONFIG_SMP

		"	sync						\n"

#endif

		"	.set	mips0					\n"

		: "=&r" (temp), "=m" (*m), "=&r" (res)

		: "r" (1UL << (nr & SZLONG_MASK)), "m" (*m)

		: "memory");
@@ -362,17 +382,19 @@ static inline int test_and_clear_bit(unsigned long nr, 
		unsigned long temp, res;



		__asm__ __volatile__(

		"	.set	noreorder	# test_and_clear_bit	\n"

		"1:	" __LL	"%0, %1					\n"

		"	.set	push					\n"

		"	.set	noreorder				\n"

		"	" __SET_MIPS "					\n"

		"1:	" __LL	"%0, %1		# test_and_clear_bit	\n"

		"	or	%2, %0, %3				\n"

		"	xor	%2, %3					\n"

			__SC 	"%2, %1					\n"

		"	" __SC 	"%2, %1					\n"

		"	beqz	%2, 1b					\n"

		"	 and	%2, %0, %3				\n"

#ifdef CONFIG_SMP

		"	sync						\n"

#endif

		"	.set	reorder					\n"

		"	.set	pop					\n"

		: "=&r" (temp), "=m" (*m), "=&r" (res)

		: "r" (1UL << (nr & SZLONG_MASK)), "m" (*m)

		: "memory");
@@ -435,6 +457,7 @@ static inline int test_and_change_bit(unsigned long nr, 
		unsigned long temp, res;



		__asm__ __volatile__(

		"	" __SET_MIPS "					\n"

		"1:	" __LL	"%0, %1		# test_and_change_bit	\n"

		"	xor	%2, %0, %3				\n"

		"	" __SC	"%2, %1					\n"
@@ -443,6 +466,7 @@ static inline int test_and_change_bit(unsigned long nr, 
#ifdef CONFIG_SMP

		"	sync						\n"

#endif

		"	.set	mips0					\n"

		: "=&r" (temp), "=m" (*m), "=&r" (res)

		: "r" (1UL << (nr & SZLONG_MASK)), "m" (*m)

		: "memory");
@@ -453,8 +477,10 @@ static inline int test_and_change_bit(unsigned long nr, 
		unsigned long temp, res;



		__asm__ __volatile__(

		"	.set	noreorder	# test_and_change_bit	\n"

		"1:	" __LL	" %0, %1				\n"

		"	.set	push					\n"

		"	.set	noreorder				\n"

		"	" __SET_MIPS "					\n"

		"1:	" __LL	"%0, %1		# test_and_change_bit	\n"

		"	xor	%2, %0, %3				\n"

		"	" __SC	"\t%2, %1				\n"

		"	beqz	%2, 1b					\n"
@@ -462,7 +488,7 @@ static inline int test_and_change_bit(unsigned long nr, 
#ifdef CONFIG_SMP

		"	sync						\n"

#endif

		"	.set	reorder					\n"

		"	.set	pop					\n"

		: "=&r" (temp), "=m" (*m), "=&r" (res)

		: "r" (1UL << (nr & SZLONG_MASK)), "m" (*m)

		: "memory");

include/asm-mips/system.h

+20 −4
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ static inline unsigned long __xchg_u32(volatile int * m, unsigned int val) 
		unsigned long dummy;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%0, %3			# xchg_u32	\n"

		"	move	%2, %z4					\n"

		"	sc	%2, %1					\n"
@@ -184,6 +185,7 @@ static inline unsigned long __xchg_u32(volatile int * m, unsigned int val) 
#ifdef CONFIG_SMP

		"	sync						\n"

#endif

		"	.set	mips0					\n"

		: "=&r" (retval), "=m" (*m), "=&r" (dummy)

		: "R" (*m), "Jr" (val)

		: "memory");
@@ -191,6 +193,7 @@ static inline unsigned long __xchg_u32(volatile int * m, unsigned int val) 
		unsigned long dummy;



		__asm__ __volatile__(

		"	.set	mips2					\n"

		"1:	ll	%0, %3			# xchg_u32	\n"

		"	move	%2, %z4					\n"

		"	sc	%2, %1					\n"
@@ -198,6 +201,7 @@ static inline unsigned long __xchg_u32(volatile int * m, unsigned int val) 
#ifdef CONFIG_SMP

		"	sync						\n"

#endif

		"	.set	mips0					\n"

		: "=&r" (retval), "=m" (*m), "=&r" (dummy)

		: "R" (*m), "Jr" (val)

		: "memory");
@@ -222,6 +226,7 @@ static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val) 
		unsigned long dummy;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%0, %3			# xchg_u64	\n"

		"	move	%2, %z4					\n"

		"	scd	%2, %1					\n"
@@ -230,6 +235,7 @@ static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val) 
#ifdef CONFIG_SMP

		"	sync						\n"

#endif

		"	.set	mips0					\n"

		: "=&r" (retval), "=m" (*m), "=&r" (dummy)

		: "R" (*m), "Jr" (val)

		: "memory");
@@ -237,6 +243,7 @@ static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val) 
		unsigned long dummy;



		__asm__ __volatile__(

		"	.set	mips3					\n"

		"1:	lld	%0, %3			# xchg_u64	\n"

		"	move	%2, %z4					\n"

		"	scd	%2, %1					\n"
@@ -244,6 +251,7 @@ static inline __u64 __xchg_u64(volatile __u64 * m, __u64 val) 
#ifdef CONFIG_SMP

		"	sync						\n"

#endif

		"	.set	mips0					\n"

		: "=&r" (retval), "=m" (*m), "=&r" (dummy)

		: "R" (*m), "Jr" (val)

		: "memory");
@@ -291,7 +299,9 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old, 


	if (cpu_has_llsc && R10000_LLSC_WAR) {

		__asm__ __volatile__(

		"	.set	push					\n"

		"	.set	noat					\n"

		"	.set	mips2					\n"

		"1:	ll	%0, %2			# __cmpxchg_u32	\n"

		"	bne	%0, %z3, 2f				\n"

		"	move	$1, %z4					\n"
@@ -302,13 +312,15 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old, 
		"	sync						\n"

#endif

		"2:							\n"

		"	.set	at					\n"

		"	.set	pop					\n"

		: "=&r" (retval), "=m" (*m)

		: "R" (*m), "Jr" (old), "Jr" (new)

		: "memory");

	} else if (cpu_has_llsc) {

		__asm__ __volatile__(

		"	.set	push					\n"

		"	.set	noat					\n"

		"	.set	mips2					\n"

		"1:	ll	%0, %2			# __cmpxchg_u32	\n"

		"	bne	%0, %z3, 2f				\n"

		"	move	$1, %z4					\n"
@@ -318,7 +330,7 @@ static inline unsigned long __cmpxchg_u32(volatile int * m, unsigned long old, 
		"	sync						\n"

#endif

		"2:							\n"

		"	.set	at					\n"

		"	.set	pop					\n"

		: "=&r" (retval), "=m" (*m)

		: "R" (*m), "Jr" (old), "Jr" (new)

		: "memory");
@@ -343,7 +355,9 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old, 


	if (cpu_has_llsc) {

		__asm__ __volatile__(

		"	.set	push					\n"

		"	.set	noat					\n"

		"	.set	mips3					\n"

		"1:	lld	%0, %2			# __cmpxchg_u64	\n"

		"	bne	%0, %z3, 2f				\n"

		"	move	$1, %z4					\n"
@@ -354,13 +368,15 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old, 
		"	sync						\n"

#endif

		"2:							\n"

		"	.set	at					\n"

		"	.set	pop					\n"

		: "=&r" (retval), "=m" (*m)

		: "R" (*m), "Jr" (old), "Jr" (new)

		: "memory");

	} else if (cpu_has_llsc) {

		__asm__ __volatile__(

		"	.set	push					\n"

		"	.set	noat					\n"

		"	.set	mips2					\n"

		"1:	lld	%0, %2			# __cmpxchg_u64	\n"

		"	bne	%0, %z3, 2f				\n"

		"	move	$1, %z4					\n"
@@ -370,7 +386,7 @@ static inline unsigned long __cmpxchg_u64(volatile int * m, unsigned long old, 
		"	sync						\n"

#endif

		"2:							\n"

		"	.set	at					\n"

		"	.set	pop					\n"

		: "=&r" (retval), "=m" (*m)

		: "R" (*m), "Jr" (old), "Jr" (new)

		: "memory");