diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-06-08 09:51:30 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-13 07:20:09 -0400 |
commit | f9ee3ab81c222219ad4467b75b406efe2616d8a4 (patch) | |
tree | 1ca12ff109dfe667917459eec5e8c520e88cd0fd /arch/blackfin/include/asm/atomic.h | |
parent | 82bd1d7d45a69c54fb6beedb78ccb1c7d308dd93 (diff) |
Blackfin: fix flag storage for irq funcs
The IRQ functions take an "unsigned long" flags variable, not any other
type, so fix the places where we use "int" or "long".
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/include/asm/atomic.h')
-rw-r--r-- | arch/blackfin/include/asm/atomic.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h index 7bbf44e4ddf9..b1d92f13ef96 100644 --- a/arch/blackfin/include/asm/atomic.h +++ b/arch/blackfin/include/asm/atomic.h | |||
@@ -90,7 +90,7 @@ static inline int atomic_test_mask(int mask, atomic_t *v) | |||
90 | 90 | ||
91 | static inline void atomic_add(int i, atomic_t *v) | 91 | static inline void atomic_add(int i, atomic_t *v) |
92 | { | 92 | { |
93 | long flags; | 93 | unsigned long flags; |
94 | 94 | ||
95 | local_irq_save_hw(flags); | 95 | local_irq_save_hw(flags); |
96 | v->counter += i; | 96 | v->counter += i; |
@@ -99,7 +99,7 @@ static inline void atomic_add(int i, atomic_t *v) | |||
99 | 99 | ||
100 | static inline void atomic_sub(int i, atomic_t *v) | 100 | static inline void atomic_sub(int i, atomic_t *v) |
101 | { | 101 | { |
102 | long flags; | 102 | unsigned long flags; |
103 | 103 | ||
104 | local_irq_save_hw(flags); | 104 | local_irq_save_hw(flags); |
105 | v->counter -= i; | 105 | v->counter -= i; |
@@ -110,7 +110,7 @@ static inline void atomic_sub(int i, atomic_t *v) | |||
110 | static inline int atomic_add_return(int i, atomic_t *v) | 110 | static inline int atomic_add_return(int i, atomic_t *v) |
111 | { | 111 | { |
112 | int __temp = 0; | 112 | int __temp = 0; |
113 | long flags; | 113 | unsigned long flags; |
114 | 114 | ||
115 | local_irq_save_hw(flags); | 115 | local_irq_save_hw(flags); |
116 | v->counter += i; | 116 | v->counter += i; |
@@ -124,7 +124,7 @@ static inline int atomic_add_return(int i, atomic_t *v) | |||
124 | static inline int atomic_sub_return(int i, atomic_t *v) | 124 | static inline int atomic_sub_return(int i, atomic_t *v) |
125 | { | 125 | { |
126 | int __temp = 0; | 126 | int __temp = 0; |
127 | long flags; | 127 | unsigned long flags; |
128 | 128 | ||
129 | local_irq_save_hw(flags); | 129 | local_irq_save_hw(flags); |
130 | v->counter -= i; | 130 | v->counter -= i; |
@@ -136,7 +136,7 @@ static inline int atomic_sub_return(int i, atomic_t *v) | |||
136 | 136 | ||
137 | static inline void atomic_inc(volatile atomic_t *v) | 137 | static inline void atomic_inc(volatile atomic_t *v) |
138 | { | 138 | { |
139 | long flags; | 139 | unsigned long flags; |
140 | 140 | ||
141 | local_irq_save_hw(flags); | 141 | local_irq_save_hw(flags); |
142 | v->counter++; | 142 | v->counter++; |
@@ -145,7 +145,7 @@ static inline void atomic_inc(volatile atomic_t *v) | |||
145 | 145 | ||
146 | static inline void atomic_dec(volatile atomic_t *v) | 146 | static inline void atomic_dec(volatile atomic_t *v) |
147 | { | 147 | { |
148 | long flags; | 148 | unsigned long flags; |
149 | 149 | ||
150 | local_irq_save_hw(flags); | 150 | local_irq_save_hw(flags); |
151 | v->counter--; | 151 | v->counter--; |
@@ -154,7 +154,7 @@ static inline void atomic_dec(volatile atomic_t *v) | |||
154 | 154 | ||
155 | static inline void atomic_clear_mask(unsigned int mask, atomic_t *v) | 155 | static inline void atomic_clear_mask(unsigned int mask, atomic_t *v) |
156 | { | 156 | { |
157 | long flags; | 157 | unsigned long flags; |
158 | 158 | ||
159 | local_irq_save_hw(flags); | 159 | local_irq_save_hw(flags); |
160 | v->counter &= ~mask; | 160 | v->counter &= ~mask; |
@@ -163,7 +163,7 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v) | |||
163 | 163 | ||
164 | static inline void atomic_set_mask(unsigned int mask, atomic_t *v) | 164 | static inline void atomic_set_mask(unsigned int mask, atomic_t *v) |
165 | { | 165 | { |
166 | long flags; | 166 | unsigned long flags; |
167 | 167 | ||
168 | local_irq_save_hw(flags); | 168 | local_irq_save_hw(flags); |
169 | v->counter |= mask; | 169 | v->counter |= mask; |