Changeset 10c071e in mainline for arch/ia64/include/atomic.h

Timestamp:

2005-12-15T16:57:48Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6c68b97

Parents:

b4cad8b2

Message:

Fix ia64 and sparc64 to compile with new atomic_t.
Fix rwlock test #5 and semaphore test #1 to compile with new atomic_t.

sparc64 work.
TBA must be set before a function call when MMU is switched off.

File:

• arch/ia64/include/atomic.h (modified) (2 diffs)

arch/ia64/include/atomic.h

@@ -34 +34 @@
 typedef struct { volatile __u64 count; } atomic_t;
 
-static inline atomic_t atomic_add(atomic_t *val, int imm)
+/** Atomic addition.
+ *
+ * @param val Atomic value.
+ * @param imm Value to add.
+ *
+ * @return Value after addition.
+ */
+static inline count_t atomic_add(atomic_t *val, int imm)
 {
-        atomic_t v;
+        count_t v;
 
-        
         __asm__ volatile ("fetchadd8.rel %0 = %1, %2\n" : "=r" (v), "+m" (val->count) : "i" (imm));
  
@@ -57 +63 @@
 static inline void atomic_dec(atomic_t *val) { atomic_add(val, -1); }
 
+static inline count_t atomic_inc_pre(atomic_t *val) { return atomic_add(val, 1); }
+static inline count_t atomic_dec_pre(atomic_t *val) { return atomic_add(val, -1); }
 
-static inline atomic_t atomic_inc_pre(atomic_t *val) { return atomic_add(val, 1); }
-static inline atomic_t atomic_dec_pre(atomic_t *val) { return atomic_add(val, -1); }
-
-
-static inline atomic_t atomic_inc_post(atomic_t *val) { return atomic_add(val, 1) + 1; }
-static inline atomic_t atomic_dec_post(atomic_t *val) { return atomic_add(val, -1) - 1; }
+static inline count_t atomic_inc_post(atomic_t *val) { return atomic_add(val, 1) + 1; }
+static inline count_t atomic_dec_post(atomic_t *val) { return atomic_add(val, -1) - 1; }
 
 #endif