From c51b14b5548a77ec6cb67046eba7b03b6bf44540 Mon Sep 17 00:00:00 2001
From: "Chen, Kenneth W" <kenneth.w.chen@intel.com>
Date: Fri, 7 Apr 2006 17:12:54 -0700
Subject: [PATCH] --- yaml --- r: 25631 b: refs/heads/master c:
 cfab9d0e1da8e08a39759d0fc3bf5e40f0ac2d55 h: refs/heads/master i:   25629:
 28934f4a9d867752490dd38a18a66818b3f4f4b0   25627:
 6251ca5b33d418584e12fbbd67f14c73c5df61e8   25623:
 1317b206587f8eebc6cdcbad4c501e63951f6075   25615:
 fe86f0fdfce0fe7e2de127e8310d3f75f3be95fa   25599:
 e77db04c33e00d37243d60d2e82633e3bb5331ed v: v3

---
 [refs]                         | 2 +-
 trunk/include/asm-ia64/mutex.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 }