diff --git a/[refs] b/[refs] index de429993b26f..7eb62056265d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0681226661754a99de711cda2c2bd12ff9cd2c3b +refs/heads/master: cfab9d0e1da8e08a39759d0fc3bf5e40f0ac2d55 diff --git a/trunk/include/asm-ia64/mutex.h b/trunk/include/asm-ia64/mutex.h index 5a3224f6af38..bed73a643a56 100644 --- a/trunk/include/asm-ia64/mutex.h +++ b/trunk/include/asm-ia64/mutex.h @@ -84,7 +84,7 @@ __mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *)) static inline int __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *)) { - if (likely(cmpxchg_acq(count, 1, 0)) == 1) + if (cmpxchg_acq(count, 1, 0) == 1) return 1; return 0; }