Skip to contentSkip to conversation

Incorrect return types for atomic64 functions in IA64 atomic.h

PATCH Jerry Feldman 2 participants 4 messages Apr 29, 2005

lore
Share & tools
lore
#0 lore raw

The return values for the atomic64 functions in /usr/include/asm/atomic.h are defined as int and should be __s64 to match the type of the input parameter and local variable returned. My patch follows:
----------------------------------------

atomic.h 2005-04-29 14:32:57.533791322 -0400 renamed from atomic.h.orig 2005-04-29 14:30:34.660126000 -0400 +3 -3
@@ -48,7 +48,7 @@ ia64_atomic_add (int i, atomic_t *v)
        return new;
 }
 
-static __inline__ int
+static __inline__ __s64
 ia64_atomic64_add (__s64 i, atomic64_t *v)
 {
        __s64 old, new;
@@ -76,7 +76,7 @@ ia64_atomic_sub (int i, atomic_t *v)
        return new;
 }
 
-static __inline__ int
+static __inline__ __s64
 ia64_atomic64_sub (__s64 i, atomic64_t *v)
 {
        __s64 old, new;
@@ -124,7 +124,7 @@ atomic_add_negative (int i, atomic_t *v)
        return atomic_add_return(i, v) < 0;
 }
 
-static __inline__ int
+static __inline__ __s64
 atomic64_add_negative (__s64 i, atomic64_t *v)
 {
        return atomic64_add_return(i, v) < 0;

-------------------------------------------------------

Signature · 6 lines
Jerry Feldman <[email protected]>
Partner Technology Access Center (contractor) (PTAC-MA)
Hewlett-Packard Co.
550 King Street LKG2a-X2
Littleton, Ma. 01460
 (978)506-5243
#1 lore raw

atomic.h 2005-04-29 14:32:57.533791322 -0400 atomic_add_negative (int i, atomic_t *v) · line 130

Quoted 9 lines · Jerry Feldman
atomic.h 2005-04-29 14:32:57.533791322 -0400 renamed from atomic.h.orig 2005-04-29 14:30:34.660126000 -0400 +1 -1
@@ -124,7 +124,7 @@ atomic_add_negative (int i, atomic_t *v)
        return atomic_add_return(i, v) < 0;
 }
 
-static __inline__ int
+static __inline__ __s64
 atomic64_add_negative (__s64 i, atomic64_t *v)
 {
        return atomic64_add_return(i, v) < 0;

This is wrong. The return value is a boolean.

Andreas.

Signature · 4 lines
Andreas Schwab, SuSE Labs, [email protected]
SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
#2 lore raw
In reply to Jerry Feldman
Quoted 5 lines · Andreas Schwab
Quoted 4 lines · Jerry Feldman
atomic.h 2005-04-29 14:32:57.533791322 -0400 renamed from atomic.h.orig 2005-04-29 14:30:34.660126000 -0400 +0 -0
@@ -124,7 +124,7 @@ atomic_add_negative (int i, atomic_t *v)
        return atomic_add_return(i, v) < 0;
 }
 
Quoted 7 lines

atomic.h 2005-04-29 14:32:57.533791322 -0400 atomic_add_negative (int i, atomic_t *v) · line 130

Quoted 5 lines
atomic.h 2005-04-29 14:32:57.533791322 -0400 renamed from atomic.h.orig 2005-04-29 14:30:34.660126000 -0400 +1 -1
-static __inline__ int
+static __inline__ __s64
 atomic64_add_negative (__s64 i, atomic64_t *v)
 {
        return atomic64_add_return(i, v) < 0;

This is wrong. The return value is a boolean.

I agree. Should I resubmit the patch corrected, or will someone else do it.

Signature · 6 lines
Jerry Feldman <[email protected]>
Partner Technology Access Center (contractor) (PTAC-MA)
Hewlett-Packard Co.
550 King Street LKG2a-X2
Littleton, Ma. 01460
 (978)506-5243
#3 lore raw

Incorrect return types for atomic64 functions in IA64 atomic.h (corrected)

In reply to Jerry Feldman

The return values for the atomic64 functions in /usr/include/asm/atomic.h are defined as int and should be __s64 to match the type of the input parameter and local variable returned. My patch follows:
----------------------------------------

atomic.h 2005-04-29 15:40:34.265825617 -0400 renamed from atomic.h.orig 2005-04-29 14:30:34.660126000 -0400 +2 -2
@@ -48,7 +48,7 @@ ia64_atomic_add (int i, atomic_t *v)
        return new;
 }
 
-static __inline__ int
+static __inline__ __s64
 ia64_atomic64_add (__s64 i, atomic64_t *v)
 {
        __s64 old, new;
@@ -76,7 +76,7 @@ ia64_atomic_sub (int i, atomic_t *v)
        return new;
 }
 
-static __inline__ int
+static __inline__ __s64
 ia64_atomic64_sub (__s64 i, atomic64_t *v)
 {
        __s64 old, new;

-------------------------------------------------------

Signature · 6 lines
Jerry Feldman <[email protected]>
Partner Technology Access Center (contractor) (PTAC-MA)
Hewlett-Packard Co.
550 King Street LKG2a-X2
Littleton, Ma. 01460
 (978)506-5243