diff --git a/[refs] b/[refs]
index 6c2079b9976a..bcd3ed6dd6f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49fcc7b16f23167f0ee945228bd811a1a2728c77
+refs/heads/master: 54d756ed1a6498f403980ece028b61719cfbe813
diff --git a/trunk/arch/blackfin/include/asm/spinlock.h b/trunk/arch/blackfin/include/asm/spinlock.h
index 47d5a0b1465a..1f286e71c21f 100644
--- a/trunk/arch/blackfin/include/asm/spinlock.h
+++ b/trunk/arch/blackfin/include/asm/spinlock.h
@@ -67,6 +67,8 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
 	__raw_read_lock_asm(&rw->lock);
 }
 
+#define arch_read_lock_flags(lock, flags) arch_read_lock(lock)
+
 static inline int arch_read_trylock(arch_rwlock_t *rw)
 {
 	return __raw_read_trylock_asm(&rw->lock);
@@ -82,6 +84,8 @@ static inline void arch_write_lock(arch_rwlock_t *rw)
 	__raw_write_lock_asm(&rw->lock);
 }
 
+#define arch_write_lock_flags(lock, flags) arch_write_lock(lock)
+
 static inline int arch_write_trylock(arch_rwlock_t *rw)
 {
 	return __raw_write_trylock_asm(&rw->lock);