Changeset bd48f4c in mainline for kernel/arch/amd64/include/atomic.h

Timestamp:

2010-07-12T10:53:30Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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/amd64/include/atomic.h (modified) (7 diffs)

kernel/arch/amd64/include/atomic.h

@@ -39 +39 @@
 #include <arch/barrier.h>
 #include <preemption.h>
+#include <trace.h>
 
-static inline void atomic_inc(atomic_t *val)
+NO_TRACE static inline void atomic_inc(atomic_t *val)
 {
 #ifdef CONFIG_SMP
@@ -55 +56 @@
 }
 
-static inline void atomic_dec(atomic_t *val)
+NO_TRACE static inline void atomic_dec(atomic_t *val)
 {
 #ifdef CONFIG_SMP
@@ -70 +71 @@
 }
 
-static inline atomic_count_t atomic_postinc(atomic_t *val)
+NO_TRACE static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
         atomic_count_t r = 1;
@@ -83 +84 @@
 }
 
-static inline atomic_count_t atomic_postdec(atomic_t *val)
+NO_TRACE static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
         atomic_count_t r = -1;
@@ -99 +100 @@
 #define atomic_predec(val)  (atomic_postdec(val) - 1)
 
-static inline atomic_count_t test_and_set(atomic_t *val)
+NO_TRACE static inline atomic_count_t test_and_set(atomic_t *val)
 {
         atomic_count_t v = 1;
@@ -113 +114 @@
 
 /** amd64 specific fast spinlock */
-static inline void atomic_lock_arch(atomic_t *val)
+NO_TRACE static inline void atomic_lock_arch(atomic_t *val)
 {
         atomic_count_t tmp;
@@ -120 +121 @@
         asm volatile (
                 "0:\n"
-                "pause\n"
-                "mov %[count], %[tmp]\n"
-                "testq %[tmp], %[tmp]\n"
-                "jnz 0b\n"       /* lightweight looping on locked spinlock */
+                "       pause\n"
+                "       mov %[count], %[tmp]\n"
+                "       testq %[tmp], %[tmp]\n"
+                "       jnz 0b\n"       /* lightweight looping on locked spinlock */
                 
-                "incq %[tmp]\n"  /* now use the atomic operation */
-                "xchgq %[count], %[tmp]\n"
-                "testq %[tmp], %[tmp]\n"
-                "jnz 0b\n"
+                "       incq %[tmp]\n"  /* now use the atomic operation */
+                "       xchgq %[count], %[tmp]\n"
+                "       testq %[tmp], %[tmp]\n"
+                "       jnz 0b\n"
                 : [count] "+m" (val->count),
                   [tmp] "=&r" (tmp)