Changes in kernel/arch/ia64/include/atomic.h [7a0359b:7038f55] in mainline

File:

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

kernel/arch/ia64/include/atomic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia64
+/** @addtogroup ia64    
  * @{
  */
@@ -36 +36 @@
 #define KERN_ia64_ATOMIC_H_
 
-#include <trace.h>
+/** Atomic addition.
+ *
+ * @param val           Atomic value.
+ * @param imm           Value to add.
+ *
+ * @return              Value before addition.
+ */
+static inline long atomic_add(atomic_t *val, int imm)
+{
+        long v;
 
-NO_TRACE static inline atomic_count_t test_and_set(atomic_t *val)
+        asm volatile ("fetchadd8.rel %0 = %1, %2\n" : "=r" (v),
+            "+m" (val->count) : "i" (imm));
+ 
+        return v;
+}
+
+static inline uint64_t test_and_set(atomic_t *val)
 {
-        atomic_count_t v;
-        
+        uint64_t v;
+                
         asm volatile (
-                "movl %[v] = 0x1;;\n"
-                "xchg8 %[v] = %[count], %[v];;\n"
-                : [v] "=r" (v),
-                  [count] "+m" (val->count)
+                "movl %0 = 0x1;;\n"
+                "xchg8 %0 = %1, %0;;\n"
+                : "=r" (v), "+m" (val->count)
         );
         
@@ -52 +66 @@
 }
 
-NO_TRACE 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));
 }
 
-NO_TRACE static inline void atomic_inc(atomic_t *val)
+static inline void atomic_inc(atomic_t *val)
 {
-        atomic_count_t v;
-        
-        asm volatile (
-                "fetchadd8.rel %[v] = %[count], 1\n"
-                : [v] "=r" (v),
-                  [count] "+m" (val->count)
-        );
+        atomic_add(val, 1);
 }
 
-NO_TRACE static inline void atomic_dec(atomic_t *val)
+static inline void atomic_dec(atomic_t *val)
 {
-        atomic_count_t v;
-        
-        asm volatile (
-                "fetchadd8.rel %[v] = %[count], -1\n"
-                : [v] "=r" (v),
-                  [count] "+m" (val->count)
-        );
+        atomic_add(val, -1);
 }
 
-NO_TRACE static inline atomic_count_t atomic_preinc(atomic_t *val)
+static inline long atomic_preinc(atomic_t *val)
 {
-        atomic_count_t v;
-        
-        asm volatile (
-                "fetchadd8.rel %[v] = %[count], 1\n"
-                : [v] "=r" (v),
-                  [count] "+m" (val->count)
-        );
-        
-        return (v + 1);
+        return atomic_add(val, 1) + 1;
 }
 
-NO_TRACE static inline atomic_count_t atomic_predec(atomic_t *val)
+static inline long atomic_predec(atomic_t *val)
 {
-        atomic_count_t v;
-        
-        asm volatile (
-                "fetchadd8.rel %[v] = %[count], -1\n"
-                : [v] "=r" (v),
-                  [count] "+m" (val->count)
-        );
-        
-        return (v - 1);
+        return atomic_add(val, -1) - 1;
 }
 
-NO_TRACE static inline atomic_count_t atomic_postinc(atomic_t *val)
+static inline long atomic_postinc(atomic_t *val)
 {
-        atomic_count_t v;
-        
-        asm volatile (
-                "fetchadd8.rel %[v] = %[count], 1\n"
-                : [v] "=r" (v),
-                  [count] "+m" (val->count)
-        );
-        
-        return v;
+        return atomic_add(val, 1);
 }
 
-NO_TRACE static inline atomic_count_t atomic_postdec(atomic_t *val)
+static inline long atomic_postdec(atomic_t *val)
 {
-        atomic_count_t v;
-        
-        asm volatile (
-                "fetchadd8.rel %[v] = %[count], -1\n"
-                : [v] "=r" (v),
-                  [count] "+m" (val->count)
-        );
-        
-        return v;
+        return atomic_add(val, -1);
 }