| Message ID | 1468419538-2737-1-git-send-email-czuzu@bitdefender.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 13 Jul 2016, Corneliu ZUZU wrote: > Place atomic_inc_and_test() implementation after atomic_inc(). > Also remove unneeded empty line and add a needed one. > > Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com> For the ARM bit, even though it is a bit embarassing acking a one-liner empty line addition: Acked-by: Stefano Stabellini <sstabellini@kernel.org> > xen/include/asm-arm/atomic.h | 1 + > xen/include/asm-x86/atomic.h | 39 +++++++++++++++++++-------------------- > 2 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h > index 41d1b6c..19a87a5 100644 > --- a/xen/include/asm-arm/atomic.h > +++ b/xen/include/asm-arm/atomic.h > @@ -150,6 +150,7 @@ static inline void _atomic_set(atomic_t *v, int i) > #define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0) > > #endif /* __ARCH_ARM_ATOMIC__ */ > + > /* > * Local variables: > * mode: C > diff --git a/xen/include/asm-x86/atomic.h b/xen/include/asm-x86/atomic.h > index d246b70..5f9f2dd 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 > @@ -217,6 +216,25 @@ static inline void atomic_inc(atomic_t *v) > } > > /** > + * 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 > * > @@ -250,25 +268,6 @@ static inline int atomic_dec_and_test(atomic_t *v) > } > > /** > - * 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 > * @i: integer value to add > -- > 2.5.0 >
diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h index 41d1b6c..19a87a5 100644 --- a/xen/include/asm-arm/atomic.h +++ b/xen/include/asm-arm/atomic.h @@ -150,6 +150,7 @@ static inline void _atomic_set(atomic_t *v, int i) #define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0) #endif /* __ARCH_ARM_ATOMIC__ */ + /* * Local variables: * mode: C diff --git a/xen/include/asm-x86/atomic.h b/xen/include/asm-x86/atomic.h index d246b70..5f9f2dd 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 @@ -217,6 +216,25 @@ static inline void atomic_inc(atomic_t *v) } /** + * 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 * @@ -250,25 +268,6 @@ static inline int atomic_dec_and_test(atomic_t *v) } /** - * 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 * @i: integer value to add
Place atomic_inc_and_test() implementation after atomic_inc(). Also remove unneeded empty line and add a needed one. Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com> --- xen/include/asm-arm/atomic.h | 1 + xen/include/asm-x86/atomic.h | 39 +++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 20 deletions(-)