diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-05-07 19:27:46 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-07 19:27:46 -0400 |
| commit | 9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7 (patch) | |
| tree | 5c56e4a208dbe7e985e59911e1a421a7c1ee024c /arch/mips/lib | |
| parent | 3d39019a1655d195a60a86ebf38f9da30bd83d03 (diff) | |
| parent | 1cd1c049271233deccfcc75123afa7f39a607f5a (diff) | |
Merge branch 'mips-next-3.10' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
Diffstat (limited to 'arch/mips/lib')
| -rw-r--r-- | arch/mips/lib/bitops.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/lib/bitops.c b/arch/mips/lib/bitops.c index a64daee740ee..3b2a1e78a543 100644 --- a/arch/mips/lib/bitops.c +++ b/arch/mips/lib/bitops.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | void __mips_set_bit(unsigned long nr, volatile unsigned long *addr) | 20 | void __mips_set_bit(unsigned long nr, volatile unsigned long *addr) |
| 21 | { | 21 | { |
| 22 | volatile unsigned long *a = addr; | 22 | unsigned long *a = (unsigned long *)addr; |
| 23 | unsigned bit = nr & SZLONG_MASK; | 23 | unsigned bit = nr & SZLONG_MASK; |
| 24 | unsigned long mask; | 24 | unsigned long mask; |
| 25 | unsigned long flags; | 25 | unsigned long flags; |
| @@ -41,7 +41,7 @@ EXPORT_SYMBOL(__mips_set_bit); | |||
| 41 | */ | 41 | */ |
| 42 | void __mips_clear_bit(unsigned long nr, volatile unsigned long *addr) | 42 | void __mips_clear_bit(unsigned long nr, volatile unsigned long *addr) |
| 43 | { | 43 | { |
| 44 | volatile unsigned long *a = addr; | 44 | unsigned long *a = (unsigned long *)addr; |
| 45 | unsigned bit = nr & SZLONG_MASK; | 45 | unsigned bit = nr & SZLONG_MASK; |
| 46 | unsigned long mask; | 46 | unsigned long mask; |
| 47 | unsigned long flags; | 47 | unsigned long flags; |
| @@ -63,7 +63,7 @@ EXPORT_SYMBOL(__mips_clear_bit); | |||
| 63 | */ | 63 | */ |
| 64 | void __mips_change_bit(unsigned long nr, volatile unsigned long *addr) | 64 | void __mips_change_bit(unsigned long nr, volatile unsigned long *addr) |
| 65 | { | 65 | { |
| 66 | volatile unsigned long *a = addr; | 66 | unsigned long *a = (unsigned long *)addr; |
| 67 | unsigned bit = nr & SZLONG_MASK; | 67 | unsigned bit = nr & SZLONG_MASK; |
| 68 | unsigned long mask; | 68 | unsigned long mask; |
| 69 | unsigned long flags; | 69 | unsigned long flags; |
| @@ -86,7 +86,7 @@ EXPORT_SYMBOL(__mips_change_bit); | |||
| 86 | int __mips_test_and_set_bit(unsigned long nr, | 86 | int __mips_test_and_set_bit(unsigned long nr, |
| 87 | volatile unsigned long *addr) | 87 | volatile unsigned long *addr) |
| 88 | { | 88 | { |
| 89 | volatile unsigned long *a = addr; | 89 | unsigned long *a = (unsigned long *)addr; |
| 90 | unsigned bit = nr & SZLONG_MASK; | 90 | unsigned bit = nr & SZLONG_MASK; |
| 91 | unsigned long mask; | 91 | unsigned long mask; |
| 92 | unsigned long flags; | 92 | unsigned long flags; |
| @@ -112,7 +112,7 @@ EXPORT_SYMBOL(__mips_test_and_set_bit); | |||
| 112 | int __mips_test_and_set_bit_lock(unsigned long nr, | 112 | int __mips_test_and_set_bit_lock(unsigned long nr, |
| 113 | volatile unsigned long *addr) | 113 | volatile unsigned long *addr) |
| 114 | { | 114 | { |
| 115 | volatile unsigned long *a = addr; | 115 | unsigned long *a = (unsigned long *)addr; |
| 116 | unsigned bit = nr & SZLONG_MASK; | 116 | unsigned bit = nr & SZLONG_MASK; |
| 117 | unsigned long mask; | 117 | unsigned long mask; |
| 118 | unsigned long flags; | 118 | unsigned long flags; |
| @@ -137,7 +137,7 @@ EXPORT_SYMBOL(__mips_test_and_set_bit_lock); | |||
| 137 | */ | 137 | */ |
| 138 | int __mips_test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) | 138 | int __mips_test_and_clear_bit(unsigned long nr, volatile unsigned long *addr) |
| 139 | { | 139 | { |
| 140 | volatile unsigned long *a = addr; | 140 | unsigned long *a = (unsigned long *)addr; |
| 141 | unsigned bit = nr & SZLONG_MASK; | 141 | unsigned bit = nr & SZLONG_MASK; |
| 142 | unsigned long mask; | 142 | unsigned long mask; |
| 143 | unsigned long flags; | 143 | unsigned long flags; |
| @@ -162,7 +162,7 @@ EXPORT_SYMBOL(__mips_test_and_clear_bit); | |||
| 162 | */ | 162 | */ |
| 163 | int __mips_test_and_change_bit(unsigned long nr, volatile unsigned long *addr) | 163 | int __mips_test_and_change_bit(unsigned long nr, volatile unsigned long *addr) |
| 164 | { | 164 | { |
| 165 | volatile unsigned long *a = addr; | 165 | unsigned long *a = (unsigned long *)addr; |
| 166 | unsigned bit = nr & SZLONG_MASK; | 166 | unsigned bit = nr & SZLONG_MASK; |
| 167 | unsigned long mask; | 167 | unsigned long mask; |
| 168 | unsigned long flags; | 168 | unsigned long flags; |