From: Chen Gang Date: Thu, 10 Oct 2013 02:31:22 +0000 (+0800) Subject: s390/atomic: use 'unsigned int' instead of 'unsigned long' for atomic_*_mask() X-Git-Tag: next-20131017~94^2~13 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d7dc17681aa55f0bd6cf7c89e0d38d00cdf3f42d;p=karo-tx-linux.git s390/atomic: use 'unsigned int' instead of 'unsigned long' for atomic_*_mask() The type of 'v->counter' is always 'int', and related inline assembly code also process 'int', so use 'unsigned int' instead of 'unsigned long' for the 'mask'. Signed-off-by: Chen Gang Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h index a62ed2d6b17a..12c5ec156502 100644 --- a/arch/s390/include/asm/atomic.h +++ b/arch/s390/include/asm/atomic.h @@ -113,12 +113,12 @@ static inline void atomic_add(int i, atomic_t *v) #define atomic_dec_return(_v) atomic_sub_return(1, _v) #define atomic_dec_and_test(_v) (atomic_sub_return(1, _v) == 0) -static inline void atomic_clear_mask(unsigned long mask, atomic_t *v) +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v) { __ATOMIC_LOOP(v, ~mask, __ATOMIC_AND); } -static inline void atomic_set_mask(unsigned long mask, atomic_t *v) +static inline void atomic_set_mask(unsigned int mask, atomic_t *v) { __ATOMIC_LOOP(v, mask, __ATOMIC_OR); }