diff --git a/[refs] b/[refs]
index 5226b91ce149..13018e6126ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a27f3113322edff36743014cc9e752a21ffc0324
+refs/heads/master: 85f651794c46e8e3faf204a767d1caa7f9f278f0
diff --git a/trunk/include/asm-m32r/spinlock.h b/trunk/include/asm-m32r/spinlock.h
index f94c1a673569..f9f90727a4a1 100644
--- a/trunk/include/asm-m32r/spinlock.h
+++ b/trunk/include/asm-m32r/spinlock.h
@@ -298,7 +298,14 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
 	);
 }
 
-#define __raw_read_trylock(lock) generic__raw_read_trylock(lock)
+static inline int __raw_read_trylock(raw_rwlock_t *lock)
+{
+	atomic_t *count = (atomic_t*)lock;
+	if (atomic_dec_return(count) >= 0)
+		return 1;
+	atomic_inc(count);
+	return 0;
+}
 
 static inline int __raw_write_trylock(raw_rwlock_t *lock)
 {