summaryrefslogtreecommitdiffstats
path: root/include/asm-alpha
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-02-04 22:30:02 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 09:44:21 -0800
commit26a6e661b118b95422ccfcd10c9997db5967df58 (patch)
tree949c2a205da22372c603f125e8d1d7c1eaaa67dc /include/asm-alpha
parente820ce72d3aaadb8b53455cbdf213d3439f6c280 (diff)
downloadop-kernel-dev-26a6e661b118b95422ccfcd10c9997db5967df58.zip
op-kernel-dev-26a6e661b118b95422ccfcd10c9997db5967df58.tar.gz
alpha: atomic_add_return() should return int
Prevents stuff like drivers/crypto/hifn_795x.c:2443: warning: format '%d' expects type 'int', but argument 4 has type 'long int' drivers/crypto/hifn_795x.c:2443: warning: format '%d' expects type 'int', but argument 4 has type 'long int' (at least). Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-alpha')
-rw-r--r--include/asm-alpha/atomic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-alpha/atomic.h b/include/asm-alpha/atomic.h
index f5cb7b8..ca88e54 100644
--- a/include/asm-alpha/atomic.h
+++ b/include/asm-alpha/atomic.h
@@ -100,7 +100,7 @@ static __inline__ void atomic64_sub(long i, atomic64_t * v)
/*
* Same as above, but return the result value
*/
-static __inline__ long atomic_add_return(int i, atomic_t * v)
+static inline int atomic_add_return(int i, atomic_t *v)
{
long temp, result;
smp_mb();
OpenPOWER on IntegriCloud