diff --git a/[refs] b/[refs]
index 2c9bed366f85..45f4b6b0a266 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0355b3e039c621d15321fd0d5cf72d8bdb8f723d
+refs/heads/master: 8e34703b9315688305306d26148088b0a8292563
diff --git a/trunk/include/asm-arm/spinlock.h b/trunk/include/asm-arm/spinlock.h
index 406ca97a8ab2..e2f1d75171df 100644
--- a/trunk/include/asm-arm/spinlock.h
+++ b/trunk/include/asm-arm/spinlock.h
@@ -199,7 +199,21 @@ static inline void __raw_read_unlock(raw_rwlock_t *rw)
 	: "cc");
 }
 
-#define __raw_read_trylock(lock) generic__raw_read_trylock(lock)
+static inline int __raw_read_trylock(raw_rwlock_t *rw)
+{
+	unsigned long tmp tmp2 = 1;
+
+	__asm__ __volatile__(
+"1:	ldrex	%0, [%2]\n"
+"	adds	%0, %0, #1\n"
+"	strexpl	%1, %0, [%2]\n"
+	: "=&r" (tmp), "+r" (tmp2)
+	: "r" (&rw->lock)
+	: "cc");
+
+	smp_mb();
+	return tmp2 == 0;
+}
 
 /* read_can_lock - would read_trylock() succeed? */
 #define __raw_read_can_lock(x)		((x)->lock < 0x80000000)