Changes in kernel/arch/amd64/include/atomic.h [ba371e1:c00589d] in mainline

File:

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

kernel/arch/amd64/include/atomic.h

@@ -40 +40 @@
 #include <preemption.h>
 
-static inline void atomic_inc(atomic_t *val)
-{
+static inline void atomic_inc(atomic_t *val) {
 #ifdef CONFIG_SMP
         asm volatile (
@@ -55 +54 @@
 }
 
-static inline void atomic_dec(atomic_t *val)
-{
+static inline void atomic_dec(atomic_t *val) {
 #ifdef CONFIG_SMP
         asm volatile (
@@ -70 +68 @@
 }
 
-static inline atomic_count_t atomic_postinc(atomic_t *val)
+static inline long atomic_postinc(atomic_t *val) 
 {
-        atomic_count_t r = 1;
+        long r = 1;
         
         asm volatile (
                 "lock xaddq %[r], %[count]\n"
-                : [count] "+m" (val->count),
-                  [r] "+r" (r)
+                : [count] "+m" (val->count), [r] "+r" (r)
         );
         
@@ -83 +80 @@
 }
 
-static inline atomic_count_t atomic_postdec(atomic_t *val)
+static inline long atomic_postdec(atomic_t *val) 
 {
-        atomic_count_t r = -1;
+        long r = -1;
         
         asm volatile (
                 "lock xaddq %[r], %[count]\n"
-                : [count] "+m" (val->count),
-                  [r] "+r" (r)
+                : [count] "+m" (val->count), [r] "+r" (r)
         );
         
@@ -99 +95 @@
 #define atomic_predec(val)  (atomic_postdec(val) - 1)
 
-static inline atomic_count_t test_and_set(atomic_t *val)
-{
-        atomic_count_t v = 1;
+static inline uint64_t test_and_set(atomic_t *val) {
+        uint64_t v;
         
         asm volatile (
+                "movq $1, %[v]\n"
                 "xchgq %[v], %[count]\n"
-                : [v] "+r" (v),
-                  [count] "+m" (val->count)
+                : [v] "=r" (v), [count] "+m" (val->count)
         );
         
@@ -112 +107 @@
 }
 
+
 /** amd64 specific fast spinlock */
 static inline void atomic_lock_arch(atomic_t *val)
 {
-        atomic_count_t tmp;
+        uint64_t tmp;
         
         preemption_disable();
@@ -129 +125 @@
                 "testq %[tmp], %[tmp]\n"
                 "jnz 0b\n"
-                : [count] "+m" (val->count),
-                  [tmp] "=&r" (tmp)
+                : [count] "+m" (val->count), [tmp] "=&r" (tmp)
         );
-        
         /*
          * Prevent critical section code from bleeding out this way up.