Changeset 0b9ac3c in mainline for kernel/arch/ppc32/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/ppc32/include/atomic.h (modified) (7 diffs)

kernel/arch/ppc32/include/atomic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32   
+/** @addtogroup ppc32
  * @{
  */
@@ -38 +38 @@
 static inline void atomic_inc(atomic_t *val)
 {
-        long tmp;
-
+        atomic_count_t tmp;
+        
         asm volatile (
                 "1:\n"
@@ -46 +46 @@
                 "stwcx. %0, 0, %2\n"
                 "bne- 1b"
-                : "=&r" (tmp), "=m" (val->count)
-                : "r" (&val->count), "m" (val->count)
+                : "=&r" (tmp),
+                  "=m" (val->count)
+                : "r" (&val->count),
+                  "m" (val->count)
                 : "cc"
         );
@@ -54 +56 @@
 static inline void atomic_dec(atomic_t *val)
 {
-        long tmp;
-
+        atomic_count_t tmp;
+        
         asm volatile (
                 "1:\n"
                 "lwarx %0, 0, %2\n"
                 "addic %0, %0, -1\n"
-                "stwcx. %0, 0, %2\n"
+                "stwcx. %0, 0, %2\n"
                 "bne- 1b"
-                : "=&r" (tmp), "=m" (val->count)
-                : "r" (&val->count), "m" (val->count)
+                : "=&r" (tmp),
+                  "=m" (val->count)
+                : "r" (&val->count),
+                  "m" (val->count)
                 : "cc"
         );
 }
 
-static inline long atomic_postinc(atomic_t *val)
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
         atomic_inc(val);
@@ -74 +78 @@
 }
 
-static inline long atomic_postdec(atomic_t *val)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
         atomic_dec(val);
@@ -80 +84 @@
 }
 
-static inline long atomic_preinc(atomic_t *val)
+static inline atomic_count_t atomic_preinc(atomic_t *val)
 {
         atomic_inc(val);
@@ -86 +90 @@
 }
 
-static inline long atomic_predec(atomic_t *val)
+static inline atomic_count_t atomic_predec(atomic_t *val)
 {
         atomic_dec(val);