diff options
Diffstat (limited to 'include/asm-mips/bitops.h')
-rw-r--r-- | include/asm-mips/bitops.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index 148bc79557f1..899357a72ac4 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h | |||
@@ -19,14 +19,14 @@ | |||
19 | #include <asm/sgidefs.h> | 19 | #include <asm/sgidefs.h> |
20 | #include <asm/war.h> | 20 | #include <asm/war.h> |
21 | 21 | ||
22 | #if (_MIPS_SZLONG == 32) | 22 | #if _MIPS_SZLONG == 32 |
23 | #define SZLONG_LOG 5 | 23 | #define SZLONG_LOG 5 |
24 | #define SZLONG_MASK 31UL | 24 | #define SZLONG_MASK 31UL |
25 | #define __LL "ll " | 25 | #define __LL "ll " |
26 | #define __SC "sc " | 26 | #define __SC "sc " |
27 | #define __INS "ins " | 27 | #define __INS "ins " |
28 | #define __EXT "ext " | 28 | #define __EXT "ext " |
29 | #elif (_MIPS_SZLONG == 64) | 29 | #elif _MIPS_SZLONG == 64 |
30 | #define SZLONG_LOG 6 | 30 | #define SZLONG_LOG 6 |
31 | #define SZLONG_MASK 63UL | 31 | #define SZLONG_MASK 63UL |
32 | #define __LL "lld " | 32 | #define __LL "lld " |
@@ -461,7 +461,7 @@ static inline int __ilog2(unsigned long x) | |||
461 | int lz; | 461 | int lz; |
462 | 462 | ||
463 | if (sizeof(x) == 4) { | 463 | if (sizeof(x) == 4) { |
464 | __asm__ ( | 464 | __asm__( |
465 | " .set push \n" | 465 | " .set push \n" |
466 | " .set mips32 \n" | 466 | " .set mips32 \n" |
467 | " clz %0, %1 \n" | 467 | " clz %0, %1 \n" |
@@ -474,7 +474,7 @@ static inline int __ilog2(unsigned long x) | |||
474 | 474 | ||
475 | BUG_ON(sizeof(x) != 8); | 475 | BUG_ON(sizeof(x) != 8); |
476 | 476 | ||
477 | __asm__ ( | 477 | __asm__( |
478 | " .set push \n" | 478 | " .set push \n" |
479 | " .set mips64 \n" | 479 | " .set mips64 \n" |
480 | " dclz %0, %1 \n" | 480 | " dclz %0, %1 \n" |
@@ -508,7 +508,7 @@ static inline unsigned long __ffs(unsigned long word) | |||
508 | */ | 508 | */ |
509 | static inline int fls(int word) | 509 | static inline int fls(int word) |
510 | { | 510 | { |
511 | __asm__ ("clz %0, %1" : "=r" (word) : "r" (word)); | 511 | __asm__("clz %0, %1" : "=r" (word) : "r" (word)); |
512 | 512 | ||
513 | return 32 - word; | 513 | return 32 - word; |
514 | } | 514 | } |
@@ -516,7 +516,7 @@ static inline int fls(int word) | |||
516 | #if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPS64) | 516 | #if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPS64) |
517 | static inline int fls64(__u64 word) | 517 | static inline int fls64(__u64 word) |
518 | { | 518 | { |
519 | __asm__ ("dclz %0, %1" : "=r" (word) : "r" (word)); | 519 | __asm__("dclz %0, %1" : "=r" (word) : "r" (word)); |
520 | 520 | ||
521 | return 64 - word; | 521 | return 64 - word; |
522 | } | 522 | } |