diff options
Diffstat (limited to 'arch/mips/include/asm/bitops.h')
-rw-r--r-- | arch/mips/include/asm/bitops.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h index 71305a8b3d78..6a65d49e2c0d 100644 --- a/arch/mips/include/asm/bitops.h +++ b/arch/mips/include/asm/bitops.h | |||
@@ -79,7 +79,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr) | |||
79 | 79 | ||
80 | if (kernel_uses_llsc && R10000_LLSC_WAR) { | 80 | if (kernel_uses_llsc && R10000_LLSC_WAR) { |
81 | __asm__ __volatile__( | 81 | __asm__ __volatile__( |
82 | " .set mips3 \n" | 82 | " .set arch=r4000 \n" |
83 | "1: " __LL "%0, %1 # set_bit \n" | 83 | "1: " __LL "%0, %1 # set_bit \n" |
84 | " or %0, %2 \n" | 84 | " or %0, %2 \n" |
85 | " " __SC "%0, %1 \n" | 85 | " " __SC "%0, %1 \n" |
@@ -101,7 +101,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr) | |||
101 | } else if (kernel_uses_llsc) { | 101 | } else if (kernel_uses_llsc) { |
102 | do { | 102 | do { |
103 | __asm__ __volatile__( | 103 | __asm__ __volatile__( |
104 | " .set mips3 \n" | 104 | " .set arch=r4000 \n" |
105 | " " __LL "%0, %1 # set_bit \n" | 105 | " " __LL "%0, %1 # set_bit \n" |
106 | " or %0, %2 \n" | 106 | " or %0, %2 \n" |
107 | " " __SC "%0, %1 \n" | 107 | " " __SC "%0, %1 \n" |
@@ -131,7 +131,7 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr) | |||
131 | 131 | ||
132 | if (kernel_uses_llsc && R10000_LLSC_WAR) { | 132 | if (kernel_uses_llsc && R10000_LLSC_WAR) { |
133 | __asm__ __volatile__( | 133 | __asm__ __volatile__( |
134 | " .set mips3 \n" | 134 | " .set arch=r4000 \n" |
135 | "1: " __LL "%0, %1 # clear_bit \n" | 135 | "1: " __LL "%0, %1 # clear_bit \n" |
136 | " and %0, %2 \n" | 136 | " and %0, %2 \n" |
137 | " " __SC "%0, %1 \n" | 137 | " " __SC "%0, %1 \n" |
@@ -153,7 +153,7 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr) | |||
153 | } else if (kernel_uses_llsc) { | 153 | } else if (kernel_uses_llsc) { |
154 | do { | 154 | do { |
155 | __asm__ __volatile__( | 155 | __asm__ __volatile__( |
156 | " .set mips3 \n" | 156 | " .set arch=r4000 \n" |
157 | " " __LL "%0, %1 # clear_bit \n" | 157 | " " __LL "%0, %1 # clear_bit \n" |
158 | " and %0, %2 \n" | 158 | " and %0, %2 \n" |
159 | " " __SC "%0, %1 \n" | 159 | " " __SC "%0, %1 \n" |
@@ -197,7 +197,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) | |||
197 | unsigned long temp; | 197 | unsigned long temp; |
198 | 198 | ||
199 | __asm__ __volatile__( | 199 | __asm__ __volatile__( |
200 | " .set mips3 \n" | 200 | " .set arch=r4000 \n" |
201 | "1: " __LL "%0, %1 # change_bit \n" | 201 | "1: " __LL "%0, %1 # change_bit \n" |
202 | " xor %0, %2 \n" | 202 | " xor %0, %2 \n" |
203 | " " __SC "%0, %1 \n" | 203 | " " __SC "%0, %1 \n" |
@@ -211,7 +211,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr) | |||
211 | 211 | ||
212 | do { | 212 | do { |
213 | __asm__ __volatile__( | 213 | __asm__ __volatile__( |
214 | " .set mips3 \n" | 214 | " .set arch=r4000 \n" |
215 | " " __LL "%0, %1 # change_bit \n" | 215 | " " __LL "%0, %1 # change_bit \n" |
216 | " xor %0, %2 \n" | 216 | " xor %0, %2 \n" |
217 | " " __SC "%0, %1 \n" | 217 | " " __SC "%0, %1 \n" |
@@ -244,7 +244,7 @@ static inline int test_and_set_bit(unsigned long nr, | |||
244 | unsigned long temp; | 244 | unsigned long temp; |
245 | 245 | ||
246 | __asm__ __volatile__( | 246 | __asm__ __volatile__( |
247 | " .set mips3 \n" | 247 | " .set arch=r4000 \n" |
248 | "1: " __LL "%0, %1 # test_and_set_bit \n" | 248 | "1: " __LL "%0, %1 # test_and_set_bit \n" |
249 | " or %2, %0, %3 \n" | 249 | " or %2, %0, %3 \n" |
250 | " " __SC "%2, %1 \n" | 250 | " " __SC "%2, %1 \n" |
@@ -260,7 +260,7 @@ static inline int test_and_set_bit(unsigned long nr, | |||
260 | 260 | ||
261 | do { | 261 | do { |
262 | __asm__ __volatile__( | 262 | __asm__ __volatile__( |
263 | " .set mips3 \n" | 263 | " .set arch=r4000 \n" |
264 | " " __LL "%0, %1 # test_and_set_bit \n" | 264 | " " __LL "%0, %1 # test_and_set_bit \n" |
265 | " or %2, %0, %3 \n" | 265 | " or %2, %0, %3 \n" |
266 | " " __SC "%2, %1 \n" | 266 | " " __SC "%2, %1 \n" |
@@ -298,7 +298,7 @@ static inline int test_and_set_bit_lock(unsigned long nr, | |||
298 | unsigned long temp; | 298 | unsigned long temp; |
299 | 299 | ||
300 | __asm__ __volatile__( | 300 | __asm__ __volatile__( |
301 | " .set mips3 \n" | 301 | " .set arch=r4000 \n" |
302 | "1: " __LL "%0, %1 # test_and_set_bit \n" | 302 | "1: " __LL "%0, %1 # test_and_set_bit \n" |
303 | " or %2, %0, %3 \n" | 303 | " or %2, %0, %3 \n" |
304 | " " __SC "%2, %1 \n" | 304 | " " __SC "%2, %1 \n" |
@@ -314,7 +314,7 @@ static inline int test_and_set_bit_lock(unsigned long nr, | |||
314 | 314 | ||
315 | do { | 315 | do { |
316 | __asm__ __volatile__( | 316 | __asm__ __volatile__( |
317 | " .set mips3 \n" | 317 | " .set arch=r4000 \n" |
318 | " " __LL "%0, %1 # test_and_set_bit \n" | 318 | " " __LL "%0, %1 # test_and_set_bit \n" |
319 | " or %2, %0, %3 \n" | 319 | " or %2, %0, %3 \n" |
320 | " " __SC "%2, %1 \n" | 320 | " " __SC "%2, %1 \n" |
@@ -353,7 +353,7 @@ static inline int test_and_clear_bit(unsigned long nr, | |||
353 | unsigned long temp; | 353 | unsigned long temp; |
354 | 354 | ||
355 | __asm__ __volatile__( | 355 | __asm__ __volatile__( |
356 | " .set mips3 \n" | 356 | " .set arch=r4000 \n" |
357 | "1: " __LL "%0, %1 # test_and_clear_bit \n" | 357 | "1: " __LL "%0, %1 # test_and_clear_bit \n" |
358 | " or %2, %0, %3 \n" | 358 | " or %2, %0, %3 \n" |
359 | " xor %2, %3 \n" | 359 | " xor %2, %3 \n" |
@@ -386,7 +386,7 @@ static inline int test_and_clear_bit(unsigned long nr, | |||
386 | 386 | ||
387 | do { | 387 | do { |
388 | __asm__ __volatile__( | 388 | __asm__ __volatile__( |
389 | " .set mips3 \n" | 389 | " .set arch=r4000 \n" |
390 | " " __LL "%0, %1 # test_and_clear_bit \n" | 390 | " " __LL "%0, %1 # test_and_clear_bit \n" |
391 | " or %2, %0, %3 \n" | 391 | " or %2, %0, %3 \n" |
392 | " xor %2, %3 \n" | 392 | " xor %2, %3 \n" |
@@ -427,7 +427,7 @@ static inline int test_and_change_bit(unsigned long nr, | |||
427 | unsigned long temp; | 427 | unsigned long temp; |
428 | 428 | ||
429 | __asm__ __volatile__( | 429 | __asm__ __volatile__( |
430 | " .set mips3 \n" | 430 | " .set arch=r4000 \n" |
431 | "1: " __LL "%0, %1 # test_and_change_bit \n" | 431 | "1: " __LL "%0, %1 # test_and_change_bit \n" |
432 | " xor %2, %0, %3 \n" | 432 | " xor %2, %0, %3 \n" |
433 | " " __SC "%2, %1 \n" | 433 | " " __SC "%2, %1 \n" |
@@ -443,7 +443,7 @@ static inline int test_and_change_bit(unsigned long nr, | |||
443 | 443 | ||
444 | do { | 444 | do { |
445 | __asm__ __volatile__( | 445 | __asm__ __volatile__( |
446 | " .set mips3 \n" | 446 | " .set arch=r4000 \n" |
447 | " " __LL "%0, %1 # test_and_change_bit \n" | 447 | " " __LL "%0, %1 # test_and_change_bit \n" |
448 | " xor %2, %0, %3 \n" | 448 | " xor %2, %0, %3 \n" |
449 | " " __SC "\t%2, %1 \n" | 449 | " " __SC "\t%2, %1 \n" |