Changeset 0b9ac3c in mainline for kernel/arch/mips32/include/atomic.h

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/mips32/include/atomic.h (modified) (6 diffs)

kernel/arch/mips32/include/atomic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup mips32  
+/** @addtogroup mips32
  * @{
  */
@@ -51 +51 @@
  *
  * @return Value after addition.
+ *
  */
-static inline long atomic_add(atomic_t *val, int i)
+static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i)
 {
-        long tmp, v;
+        atomic_count_t tmp;
+        atomic_count_t v;
         
         asm volatile (
@@ -64 +66 @@
                 "       beq %0, %4, 1b\n"   /* if the atomic operation failed, try again */
                 "       nop\n"
-                : "=&r" (tmp), "+m" (val->count), "=&r" (v)
-                : "r" (i), "i" (0)
+                : "=&r" (tmp),
+                  "+m" (val->count),
+                  "=&r" (v)
+                : "r" (i),
+                  "i" (0)
         );
         
@@ -71 +76 @@
 }
 
-static inline uint32_t test_and_set(atomic_t *val) {
-        uint32_t tmp, v;
+static inline atomic_count_t test_and_set(atomic_t *val)
+{
+        atomic_count_t tmp;
+        atomic_count_t v;
         
         asm volatile (
@@ -82 +89 @@
                 "       beqz %0, 1b\n"
                 "2:\n"
-                : "=&r" (tmp), "+m" (val->count), "=&r" (v)
+                : "=&r" (tmp),
+                  "+m" (val->count),
+                  "=&r" (v)
                 : "i" (1)
         );
@@ -89 +98 @@
 }
 
-static inline void atomic_lock_arch(atomic_t *val) {
+static inline void atomic_lock_arch(atomic_t *val)
+{
         do {
-                while (val->count)
-                        ;
+                while (val->count);
         } while (test_and_set(val));
 }