Changeset bf29fe5 in mainline for kernel/arch/sparc64/include/atomic.h

Timestamp:

2008-08-31T09:08:53Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

43b7b35

Parents:

42a0607

Message:

Add the missing preemption_disable() call to sparc64 atomic_lock_arch().
Thanks to Pavel Rimsky for noticing this.

File:

• kernel/arch/sparc64/include/atomic.h (modified) (4 diffs)

kernel/arch/sparc64/include/atomic.h

@@ -38 +38 @@
 #include <arch/barrier.h>
 #include <arch/types.h>
+#include <preemption.h>
 
 /** Atomic add operation.
@@ -57 +58 @@
                 a = *((uint64_t *) x);
                 b = a + i;
-                asm volatile ("casx %0, %2, %1\n" : "+m" (*((uint64_t *)x)), "+r" (b) : "r" (a));
+                asm volatile ("casx %0, %2, %1\n" : "+m" (*((uint64_t *)x)),
+                    "+r" (b) : "r" (a));
         } while (a != b);
 
@@ -98 +100 @@
         volatile uintptr_t x = (uint64_t) &val->count;
 
-        asm volatile ("casx %0, %2, %1\n" : "+m" (*((uint64_t *) x)), "+r" (v) : "r" (0));
+        asm volatile ("casx %0, %2, %1\n" : "+m" (*((uint64_t *) x)),
+            "+r" (v) : "r" (0));
 
         return v;
@@ -109 +112 @@
 
         volatile uintptr_t x = (uint64_t) &val->count;
+
+        preemption_disable();
 
         asm volatile (