diff --git a/[refs] b/[refs]
index 305504622882..6f9dfcacdb67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7347ce4ee7c65415f84be915c018473e7076f31
+refs/heads/master: 72f98e72551fad573c6cace8e8551ef094f482dd
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index 65781de44fc0..3d185308ec88 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/fs/Kconfig
@@ -50,7 +50,6 @@ endif # BLOCK
 config FILE_LOCKING
 	bool "Enable POSIX file locking API" if EMBEDDED
 	default y
-	select BKL # while lockd still uses it.
 	help
 	  This option enables standard file locking support, required
           for filesystems like NFS and for the flock() system
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index 85fd9ce1abae..74c3df99c0e1 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -142,6 +142,7 @@ int lease_break_time = 45;
 
 static LIST_HEAD(file_lock_list);
 static LIST_HEAD(blocked_list);
+static DEFINE_SPINLOCK(file_lock_lock);
 
 /*
  * Protects the two list heads above, plus the inode->i_flock list
@@ -149,13 +150,13 @@ static LIST_HEAD(blocked_list);
  */
 void lock_flocks(void)
 {
-	lock_kernel();
+	spin_lock(&file_lock_lock);
 }
 EXPORT_SYMBOL_GPL(lock_flocks);
 
 void unlock_flocks(void)
 {
-	unlock_kernel();
+	spin_unlock(&file_lock_lock);
 }
 EXPORT_SYMBOL_GPL(unlock_flocks);