[PATCH] Properly handle forced elision in pthread_mutex_trylock

[Ondřej Bílka]

Any comments beside that

On Thu, Sep 11, 2014 at 11:06:14AM +0200, Andreas Schwab wrote:
> 	[BZ #16657]
> 	* nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock): Use
> 	FORCE_ELISION instead of DO_ELISION.
> 	* sysdeps/unix/sysv/linux/x86/force-elision.h (DO_ELISION):
> 	Remove.
> 	* sysdeps/unix/sysv/linux/s390/force-elision.h (DO_ELISION):
> 	Likewise.
> ---
>  nptl/pthread_mutex_trylock.c                 | 7 +++----
>  sysdeps/unix/sysv/linux/s390/force-elision.h | 5 -----
>  sysdeps/unix/sysv/linux/x86/force-elision.h  | 5 -----
>  3 files changed, 3 insertions(+), 14 deletions(-)
> 
> diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
> index 0867b06..6c4594a 100644
> --- a/nptl/pthread_mutex_trylock.c
> +++ b/nptl/pthread_mutex_trylock.c
> @@ -26,8 +26,8 @@
>  #define lll_trylock_elision(a,t) lll_trylock(a)
>  #endif
>  
> -#ifndef DO_ELISION
> -#define DO_ELISION(m) 0
> +#ifndef FORCE_ELISION
> +#define FORCE_ELISION(m, s)
>  #endif
>  
>  /* We don't force elision in trylock, because this can lead to inconsistent

This comment should be updated.