From: Corneliu ZUZU Date: Fri, 15 Jul 2016 10:42:07 +0000 (+0300) Subject: asm-x86/atomic.h: minor: proper atomic_inc_and_test() placement X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~753 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d2e39d6b753380bf0a73addd6429f69d772d9ad9;p=xen.git asm-x86/atomic.h: minor: proper atomic_inc_and_test() placement Place atomic_inc_and_test() implementation after atomic_inc(). Also empty line fix. Signed-off-by: Corneliu ZUZU Reviewed-by: Andrew Cooper --- diff --git a/xen/include/asm-x86/atomic.h b/xen/include/asm-x86/atomic.h index d246b70473..5f9f2dda6c 100644 --- a/xen/include/asm-x86/atomic.h +++ b/xen/include/asm-x86/atomic.h @@ -110,7 +110,6 @@ static inline int _atomic_read(atomic_t v) return v.counter; } - /** * atomic_set - set atomic variable * @v: pointer of type atomic_t @@ -216,6 +215,25 @@ static inline void atomic_inc(atomic_t *v) : "m" (*(volatile int *)&v->counter) ); } +/** + * atomic_inc_and_test - increment and test + * @v: pointer of type atomic_t + * + * Atomically increments @v by 1 + * and returns true if the result is zero, or false for all + * other cases. + */ +static inline int atomic_inc_and_test(atomic_t *v) +{ + unsigned char c; + + asm volatile ( + "lock; incl %0; sete %1" + : "=m" (*(volatile int *)&v->counter), "=qm" (c) + : "m" (*(volatile int *)&v->counter) : "memory" ); + return c != 0; +} + /** * atomic_dec - decrement atomic variable * @v: pointer of type atomic_t @@ -249,25 +267,6 @@ static inline int atomic_dec_and_test(atomic_t *v) return c != 0; } -/** - * atomic_inc_and_test - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 - * and returns true if the result is zero, or false for all - * other cases. - */ -static inline int atomic_inc_and_test(atomic_t *v) -{ - unsigned char c; - - asm volatile ( - "lock; incl %0; sete %1" - : "=m" (*(volatile int *)&v->counter), "=qm" (c) - : "m" (*(volatile int *)&v->counter) : "memory" ); - return c != 0; -} - /** * atomic_add_negative - add and test if negative * @v: pointer of type atomic_t