Changes in kernel/arch/amd64/include/atomic.h [7a0359b:d99c1d2] in mainline

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>
 
-NO_TRACE static inline void atomic_inc(atomic_t *val)
+static inline void atomic_inc(atomic_t *val)
 {
 #ifdef CONFIG_SMP
@@ -56 +55 @@
 }
 
-NO_TRACE static inline void atomic_dec(atomic_t *val)
+static inline void atomic_dec(atomic_t *val)
 {
 #ifdef CONFIG_SMP
@@ -71 +70 @@
 }
 
-NO_TRACE static inline atomic_count_t atomic_postinc(atomic_t *val)
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
         atomic_count_t r = 1;
@@ -84 +83 @@
 }
 
-NO_TRACE static inline atomic_count_t atomic_postdec(atomic_t *val)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
         atomic_count_t r = -1;
@@ -100 +99 @@
 #define atomic_predec(val)  (atomic_postdec(val) - 1)
 
-NO_TRACE static inline atomic_count_t test_and_set(atomic_t *val)
+static inline atomic_count_t test_and_set(atomic_t *val)
 {
         atomic_count_t v = 1;
@@ -114 +113 @@
 
 /** amd64 specific fast spinlock */
-NO_TRACE static inline void atomic_lock_arch(atomic_t *val)
+static inline void atomic_lock_arch(atomic_t *val)
 {
         atomic_count_t tmp;
@@ -121 +120 @@
         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)