Changes in kernel/arch/arm32/include/atomic.h [228666c:4702bde] in mainline

File:

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

kernel/arch/arm32/include/atomic.h

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