lkml.org 
[lkml]   [2007]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/10] atomic.h : Add atomic64 cmpxchg, xchg and add_unless to parisc
    Date
    atomic.h : Add atomic64 cmpxchg, xchg and add_unless to parisc

    Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>

    --- a/include/asm-parisc/atomic.h
    +++ b/include/asm-parisc/atomic.h
    @@ -6,7 +6,6 @@
    #define _ASM_PARISC_ATOMIC_H_

    #include <linux/types.h>
    -#include <asm/system.h>

    /*
    * Atomic operations that C can't guarantee us. Useful for
    @@ -163,7 +162,7 @@ static __inline__ int atomic_read(const atomic_t *v)
    }

    /* exported interface */
    -#define atomic_cmpxchg(v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n)))
    +#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
    #define atomic_xchg(v, new) (xchg(&((v)->counter), new))

    /**
    @@ -177,7 +176,7 @@ static __inline__ int atomic_read(const atomic_t *v)
    */
    #define atomic_add_unless(v, a, u) \
    ({ \
    - int c, old; \
    + __typeof__((v)->counter) c, old; \
    c = atomic_read(v); \
    while (c != (u) && (old = atomic_cmpxchg((v), c, c + (a))) != c) \
    c = old; \
    @@ -270,6 +269,31 @@ atomic64_read(const atomic64_t *v)
    #define atomic64_dec_and_test(v) (atomic64_dec_return(v) == 0)
    #define atomic64_sub_and_test(i,v) (atomic64_sub_return((i),(v)) == 0)

    +/* exported interface */
    +#define atomic64_cmpxchg(v, o, n) \
    + ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
    +#define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
    +
    +/**
    + * atomic64_add_unless - add unless the number is a given value
    + * @v: pointer of type atomic64_t
    + * @a: the amount to add to v...
    + * @u: ...unless v is equal to u.
    + *
    + * Atomically adds @a to @v, so long as it was not @u.
    + * Returns non-zero if @v was not @u, and zero otherwise.
    + */
    +#define atomic64_add_unless(v, a, u) \
    +({ \
    + __typeof__((v)->counter) c, old; \
    + c = atomic64_read(v); \
    + while (c != (u) && (old = atomic64_cmpxchg((v), c, c + (a))) != c) \
    + c = old; \
    + c != (u); \
    +})
    +#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
    +
    +
    #endif /* __LP64__ */

    #include <asm-generic/atomic.h>
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-02-11 20:27    [W:0.022 / U:95.600 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site