aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/include/asm/atomic.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
index 4e1948447a00..446881439675 100644
--- a/arch/ia64/include/asm/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
@@ -41,7 +41,7 @@ ia64_atomic_add (int i, atomic_t *v)
41 return new; 41 return new;
42} 42}
43 43
44static __inline__ int 44static __inline__ long
45ia64_atomic64_add (__s64 i, atomic64_t *v) 45ia64_atomic64_add (__s64 i, atomic64_t *v)
46{ 46{
47 __s64 old, new; 47 __s64 old, new;
@@ -69,7 +69,7 @@ ia64_atomic_sub (int i, atomic_t *v)
69 return new; 69 return new;
70} 70}
71 71
72static __inline__ int 72static __inline__ long
73ia64_atomic64_sub (__s64 i, atomic64_t *v) 73ia64_atomic64_sub (__s64 i, atomic64_t *v)
74{ 74{
75 __s64 old, new; 75 __s64 old, new;
@@ -107,7 +107,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
107 107
108#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) 108#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
109 109
110static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u) 110static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u)
111{ 111{
112 long c, old; 112 long c, old;
113 c = atomic64_read(v); 113 c = atomic64_read(v);
@@ -158,7 +158,7 @@ atomic_add_negative (int i, atomic_t *v)
158 return atomic_add_return(i, v) < 0; 158 return atomic_add_return(i, v) < 0;
159} 159}
160 160
161static __inline__ int 161static __inline__ long
162atomic64_add_negative (__s64 i, atomic64_t *v) 162atomic64_add_negative (__s64 i, atomic64_t *v)
163{ 163{
164 return atomic64_add_return(i, v) < 0; 164 return atomic64_add_return(i, v) < 0;