Changeset 0b9ac3c in mainline for kernel/arch/ia64/include/atomic.h

Timestamp:

2010-02-23T19:03:28Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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/ia64/include/atomic.h (modified) (8 diffs)

kernel/arch/ia64/include/atomic.h

@@ -36 +36 @@
 #define KERN_ia64_ATOMIC_H_
 
-static inline uint64_t test_and_set(atomic_t *val)
+static inline atomic_count_t test_and_set(atomic_t *val)
 {
-        uint64_t v;
-                
+        atomic_count_t v;
+        
         asm volatile (
                 "movl %[v] = 0x1;;\n"
@@ -53 +53 @@
 {
         do {
-                while (val->count)
-                        ;
+                while (val->count);
         } while (test_and_set(val));
 }
@@ -60 +59 @@
 static inline void atomic_inc(atomic_t *val)
 {
-        long v;
+        atomic_count_t v;
         
         asm volatile (
@@ -71 +70 @@
 static inline void atomic_dec(atomic_t *val)
 {
-        long v;
+        atomic_count_t v;
         
         asm volatile (
@@ -80 +79 @@
 }
 
-static inline long atomic_preinc(atomic_t *val)
+static inline atomic_count_t atomic_preinc(atomic_t *val)
 {
-        long v;
+        atomic_count_t v;
         
         asm volatile (
@@ -93 +92 @@
 }
 
-static inline long atomic_predec(atomic_t *val)
+static inline atomic_count_t atomic_predec(atomic_t *val)
 {
-        long v;
+        atomic_count_t v;
         
         asm volatile (
@@ -106 +105 @@
 }
 
-static inline long atomic_postinc(atomic_t *val)
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
-        long v;
+        atomic_count_t v;
         
         asm volatile (
@@ -119 +118 @@
 }
 
-static inline long atomic_postdec(atomic_t *val)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
-        long v;
+        atomic_count_t v;
         
         asm volatile (