diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /include/asm-sh/bitops.h | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'include/asm-sh/bitops.h')
| -rw-r--r-- | include/asm-sh/bitops.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-sh/bitops.h b/include/asm-sh/bitops.h index e34f82508568..1c16792cee1d 100644 --- a/include/asm-sh/bitops.h +++ b/include/asm-sh/bitops.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | /* For __swab32 */ | 6 | /* For __swab32 */ |
| 7 | #include <asm/byteorder.h> | 7 | #include <asm/byteorder.h> |
| 8 | 8 | ||
| 9 | static __inline__ void set_bit(int nr, volatile void * addr) | 9 | static inline void set_bit(int nr, volatile void * addr) |
| 10 | { | 10 | { |
| 11 | int mask; | 11 | int mask; |
| 12 | volatile unsigned int *a = addr; | 12 | volatile unsigned int *a = addr; |
| @@ -24,7 +24,7 @@ static __inline__ void set_bit(int nr, volatile void * addr) | |||
| 24 | */ | 24 | */ |
| 25 | #define smp_mb__before_clear_bit() barrier() | 25 | #define smp_mb__before_clear_bit() barrier() |
| 26 | #define smp_mb__after_clear_bit() barrier() | 26 | #define smp_mb__after_clear_bit() barrier() |
| 27 | static __inline__ void clear_bit(int nr, volatile void * addr) | 27 | static inline void clear_bit(int nr, volatile void * addr) |
| 28 | { | 28 | { |
| 29 | int mask; | 29 | int mask; |
| 30 | volatile unsigned int *a = addr; | 30 | volatile unsigned int *a = addr; |
| @@ -37,7 +37,7 @@ static __inline__ void clear_bit(int nr, volatile void * addr) | |||
| 37 | local_irq_restore(flags); | 37 | local_irq_restore(flags); |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | static __inline__ void change_bit(int nr, volatile void * addr) | 40 | static inline void change_bit(int nr, volatile void * addr) |
| 41 | { | 41 | { |
| 42 | int mask; | 42 | int mask; |
| 43 | volatile unsigned int *a = addr; | 43 | volatile unsigned int *a = addr; |
| @@ -50,7 +50,7 @@ static __inline__ void change_bit(int nr, volatile void * addr) | |||
| 50 | local_irq_restore(flags); | 50 | local_irq_restore(flags); |
| 51 | } | 51 | } |
| 52 | 52 | ||
| 53 | static __inline__ int test_and_set_bit(int nr, volatile void * addr) | 53 | static inline int test_and_set_bit(int nr, volatile void * addr) |
| 54 | { | 54 | { |
| 55 | int mask, retval; | 55 | int mask, retval; |
| 56 | volatile unsigned int *a = addr; | 56 | volatile unsigned int *a = addr; |
| @@ -66,7 +66,7 @@ static __inline__ int test_and_set_bit(int nr, volatile void * addr) | |||
| 66 | return retval; | 66 | return retval; |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | static __inline__ int test_and_clear_bit(int nr, volatile void * addr) | 69 | static inline int test_and_clear_bit(int nr, volatile void * addr) |
| 70 | { | 70 | { |
| 71 | int mask, retval; | 71 | int mask, retval; |
| 72 | volatile unsigned int *a = addr; | 72 | volatile unsigned int *a = addr; |
| @@ -82,7 +82,7 @@ static __inline__ int test_and_clear_bit(int nr, volatile void * addr) | |||
| 82 | return retval; | 82 | return retval; |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | static __inline__ int test_and_change_bit(int nr, volatile void * addr) | 85 | static inline int test_and_change_bit(int nr, volatile void * addr) |
| 86 | { | 86 | { |
| 87 | int mask, retval; | 87 | int mask, retval; |
| 88 | volatile unsigned int *a = addr; | 88 | volatile unsigned int *a = addr; |
| @@ -100,7 +100,7 @@ static __inline__ int test_and_change_bit(int nr, volatile void * addr) | |||
| 100 | 100 | ||
| 101 | #include <asm-generic/bitops/non-atomic.h> | 101 | #include <asm-generic/bitops/non-atomic.h> |
| 102 | 102 | ||
| 103 | static __inline__ unsigned long ffz(unsigned long word) | 103 | static inline unsigned long ffz(unsigned long word) |
| 104 | { | 104 | { |
| 105 | unsigned long result; | 105 | unsigned long result; |
| 106 | 106 | ||
| @@ -120,7 +120,7 @@ static __inline__ unsigned long ffz(unsigned long word) | |||
| 120 | * | 120 | * |
| 121 | * Undefined if no bit exists, so code should check against 0 first. | 121 | * Undefined if no bit exists, so code should check against 0 first. |
| 122 | */ | 122 | */ |
| 123 | static __inline__ unsigned long __ffs(unsigned long word) | 123 | static inline unsigned long __ffs(unsigned long word) |
| 124 | { | 124 | { |
| 125 | unsigned long result; | 125 | unsigned long result; |
| 126 | 126 | ||