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

File:

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

kernel/arch/ia64/include/atomic.h

@@ -36 +36 @@
 #define KERN_ia64_ATOMIC_H_
 
-#include <trace.h>
-
-NO_TRACE static inline atomic_count_t test_and_set(atomic_t *val)
+static inline uint64_t test_and_set(atomic_t *val)
 {
-        atomic_count_t v;
-        
+        uint64_t v;
+                
         asm volatile (
                 "movl %[v] = 0x1;;\n"
@@ -52 +50 @@
 }
 
-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;
+        long v;
         
         asm volatile (
@@ -70 +69 @@
 }
 
-NO_TRACE static inline void atomic_dec(atomic_t *val)
+static inline void atomic_dec(atomic_t *val)
 {
-        atomic_count_t v;
+        long v;
         
         asm volatile (
@@ -81 +80 @@
 }
 
-NO_TRACE static inline atomic_count_t atomic_preinc(atomic_t *val)
+static inline long atomic_preinc(atomic_t *val)
 {
-        atomic_count_t v;
+        long v;
         
         asm volatile (
@@ -94 +93 @@
 }
 
-NO_TRACE static inline atomic_count_t atomic_predec(atomic_t *val)
+static inline long atomic_predec(atomic_t *val)
 {
-        atomic_count_t v;
+        long v;
         
         asm volatile (
@@ -107 +106 @@
 }
 
-NO_TRACE static inline atomic_count_t atomic_postinc(atomic_t *val)
+static inline long atomic_postinc(atomic_t *val)
 {
-        atomic_count_t v;
+        long v;
         
         asm volatile (
@@ -120 +119 @@
 }
 
-NO_TRACE static inline atomic_count_t atomic_postdec(atomic_t *val)
+static inline long atomic_postdec(atomic_t *val)
 {
-        atomic_count_t v;
+        long v;
         
         asm volatile (