Changeset 89c57b6 in mainline for kernel/arch/abs32le/include/atomic.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/abs32le/include/atomic.h (modified) (6 diffs)

kernel/arch/abs32le/include/atomic.h

@@ -40 +40 @@
 #include <preemption.h>
 #include <verify.h>
+#include <trace.h>
 
-ATOMIC static inline void atomic_inc(atomic_t *val)
+NO_TRACE ATOMIC static inline void atomic_inc(atomic_t *val)
     WRITES(&val->count)
     REQUIRES_EXTENT_MUTABLE(val)
@@ -52 +53 @@
 }
 
-ATOMIC static inline void atomic_dec(atomic_t *val)
+NO_TRACE ATOMIC static inline void atomic_dec(atomic_t *val)
     WRITES(&val->count)
     REQUIRES_EXTENT_MUTABLE(val)
@@ -63 +64 @@
 }
 
-ATOMIC static inline atomic_count_t atomic_postinc(atomic_t *val)
+NO_TRACE ATOMIC static inline atomic_count_t atomic_postinc(atomic_t *val)
     WRITES(&val->count)
     REQUIRES_EXTENT_MUTABLE(val)
@@ -78 +79 @@
 }
 
-ATOMIC static inline atomic_count_t atomic_postdec(atomic_t *val)
+NO_TRACE ATOMIC static inline atomic_count_t atomic_postdec(atomic_t *val)
     WRITES(&val->count)
     REQUIRES_EXTENT_MUTABLE(val)
@@ -96 +97 @@
 #define atomic_predec(val)  (atomic_postdec(val) - 1)
 
-ATOMIC static inline atomic_count_t test_and_set(atomic_t *val)
+NO_TRACE ATOMIC static inline atomic_count_t test_and_set(atomic_t *val)
     WRITES(&val->count)
     REQUIRES_EXTENT_MUTABLE(val)
@@ -109 +110 @@
 }
 
-static inline void atomic_lock_arch(atomic_t *val)
+NO_TRACE static inline void atomic_lock_arch(atomic_t *val)
     WRITES(&val->count)
     REQUIRES_EXTENT_MUTABLE(val)