Changes in kernel/arch/ppc32/include/atomic.h [df4ed85:7a0359b] in mainline

File:

• kernel/arch/ppc32/include/atomic.h (modified) (5 diffs)

kernel/arch/ppc32/include/atomic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32   
+/** @addtogroup ppc32
  * @{
  */
@@ -36 +36 @@
 #define KERN_ppc32_ATOMIC_H_
 
-static inline void atomic_inc(atomic_t *val)
+#include <trace.h>
+
+NO_TRACE static inline void atomic_inc(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"
-                "bne- 1b"
-                : "=&r" (tmp), "=m" (val->count)
-                : "r" (&val->count), "m" (val->count)
+                "       lwarx %[tmp], 0, %[count_ptr]\n"
+                "       addic %[tmp], %[tmp], 1\n"
+                "       stwcx. %[tmp], 0, %[count_ptr]\n"
+                "       bne- 1b"
+                : [tmp] "=&r" (tmp),
+                  "=m" (val->count)
+                : [count_ptr] "r" (&val->count),
+                  "m" (val->count)
                 : "cc"
         );
 }
 
-static inline void atomic_dec(atomic_t *val)
+NO_TRACE 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"
-                "bne- 1b"
-                : "=&r" (tmp), "=m" (val->count)
-                : "r" (&val->count), "m" (val->count)
+                "       lwarx %[tmp], 0, %[count_ptr]\n"
+                "       addic %[tmp], %[tmp], -1\n"
+                "       stwcx. %[tmp], 0, %[count_ptr]\n"
+                "       bne- 1b"
+                : [tmp] "=&r" (tmp),
+                  "=m" (val->count)
+                : [count_ptr] "r" (&val->count),
+                  "m" (val->count)
                 : "cc"
         );
 }
 
-static inline long atomic_postinc(atomic_t *val)
+NO_TRACE static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
         atomic_inc(val);
@@ -74 +80 @@
 }
 
-static inline long atomic_postdec(atomic_t *val)
+NO_TRACE static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
         atomic_dec(val);
@@ -80 +86 @@
 }
 
-static inline long atomic_preinc(atomic_t *val)
+NO_TRACE static inline atomic_count_t atomic_preinc(atomic_t *val)
 {
         atomic_inc(val);
@@ -86 +92 @@
 }
 
-static inline long atomic_predec(atomic_t *val)
+NO_TRACE static inline atomic_count_t atomic_predec(atomic_t *val)
 {
         atomic_dec(val);