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

File:

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

kernel/arch/ppc32/include/atomic.h

@@ -36 +36 @@
 #define KERN_ppc32_ATOMIC_H_
 
-#include <trace.h>
-
-NO_TRACE static inline void atomic_inc(atomic_t *val)
+static inline void atomic_inc(atomic_t *val)
 {
         atomic_count_t tmp;
@@ -44 +42 @@
         asm volatile (
                 "1:\n"
-                "       lwarx %[tmp], 0, %[count_ptr]\n"
-                "       addic %[tmp], %[tmp], 1\n"
-                "       stwcx. %[tmp], 0, %[count_ptr]\n"
-                "       bne- 1b"
-                : [tmp] "=&r" (tmp),
+                "lwarx %0, 0, %2\n"
+                "addic %0, %0, 1\n"
+                "stwcx. %0, 0, %2\n"
+                "bne- 1b"
+                : "=&r" (tmp),
                   "=m" (val->count)
-                : [count_ptr] "r" (&val->count),
+                : "r" (&val->count),
                   "m" (val->count)
                 : "cc"
@@ -56 +54 @@
 }
 
-NO_TRACE static inline void atomic_dec(atomic_t *val)
+static inline void atomic_dec(atomic_t *val)
 {
         atomic_count_t tmp;
@@ -62 +60 @@
         asm volatile (
                 "1:\n"
-                "       lwarx %[tmp], 0, %[count_ptr]\n"
-                "       addic %[tmp], %[tmp], -1\n"
-                "       stwcx. %[tmp], 0, %[count_ptr]\n"
-                "       bne- 1b"
-                : [tmp] "=&r" (tmp),
+                "lwarx %0, 0, %2\n"
+                "addic %0, %0, -1\n"
+                "stwcx. %0, 0, %2\n"
+                "bne- 1b"
+                : "=&r" (tmp),
                   "=m" (val->count)
-                : [count_ptr] "r" (&val->count),
+                : "r" (&val->count),
                   "m" (val->count)
                 : "cc"
@@ -74 +72 @@
 }
 
-NO_TRACE static inline atomic_count_t atomic_postinc(atomic_t *val)
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
         atomic_inc(val);
@@ -80 +78 @@
 }
 
-NO_TRACE static inline atomic_count_t atomic_postdec(atomic_t *val)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
         atomic_dec(val);
@@ -86 +84 @@
 }
 
-NO_TRACE static inline atomic_count_t atomic_preinc(atomic_t *val)
+static inline atomic_count_t atomic_preinc(atomic_t *val)
 {
         atomic_inc(val);
@@ -92 +90 @@
 }
 
-NO_TRACE static inline atomic_count_t atomic_predec(atomic_t *val)
+static inline atomic_count_t atomic_predec(atomic_t *val)
 {
         atomic_dec(val);