Changeset c2efbb4 in mainline for kernel/arch/arm32/include/atomic.h

Timestamp:

2010-02-20T20:54:53Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

721d4e85, 95c4776

Parents:

f516bc2 (diff), b03a666 (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:

Synchronize with head.

File:

• kernel/arch/arm32/include/atomic.h (modified) (8 diffs)

kernel/arch/arm32/include/atomic.h

@@ -47 +47 @@
  *
  */
-static inline long atomic_add(atomic_t *val, int i)
+static inline atomic_count_t atomic_add(atomic_t *val, atomic_count_t i)
 {
-        long ret;
-
         /*
          * This implementation is for UP pre-ARMv6 systems where we do not have
@@ -57 +55 @@
         ipl_t ipl = interrupts_disable();
         val->count += i;
-        ret = val->count;
+        atomic_count_t ret = val->count;
         interrupts_restore(ipl);
         
@@ -66 +64 @@
  *
  * @param val Variable to be incremented.
+ *
  */
 static inline void atomic_inc(atomic_t *val)
@@ -75 +74 @@
  *
  * @param val Variable to be decremented.
+ *
  */
 static inline void atomic_dec(atomic_t *val) {
@@ -84 +84 @@
  * @param val Variable to be incremented.
  * @return    Value after incrementation.
+ *
  */
-static inline long atomic_preinc(atomic_t *val)
+static inline atomic_count_t atomic_preinc(atomic_t *val)
 {
         return atomic_add(val, 1);
@@ -94 +95 @@
  * @param val Variable to be decremented.
  * @return    Value after decrementation.
+ *
  */
-static inline long atomic_predec(atomic_t *val)
+static inline atomic_count_t atomic_predec(atomic_t *val)
 {
         return atomic_add(val, -1);
@@ -104 +106 @@
  * @param val Variable to be incremented.
  * @return    Value before incrementation.
+ *
  */
-static inline long atomic_postinc(atomic_t *val)
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
         return atomic_add(val, 1) - 1;
@@ -114 +117 @@
  * @param val Variable to be decremented.
  * @return    Value before decrementation.
+ *
  */
-static inline long atomic_postdec(atomic_t *val)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
         return atomic_add(val, -1) + 1;