Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6] / include / asm-ia64 / mutex.h

diff --git a/include/asm-ia64/mutex.h b/include/asm-ia64/mutex.h
index 5a3224f6af380aaa89aeb71f081ff6909304d9de..bed73a643a56e3c0169a4fd43b705fcba491f5c8 100644 (file)
--- a/include/asm-ia64/mutex.h
+++ b/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;
 }