diff --git a/[refs] b/[refs]
index c2a831745d24..82456b6b7bbb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d79b6f4de5db0103ceb4734e42ad101d836d61d9
+refs/heads/master: c2f980500a81006173daf3048284b28832858616
diff --git a/trunk/fs/proc/inode.c b/trunk/fs/proc/inode.c
index 445a02bcaab3..afcda8588e1c 100644
--- a/trunk/fs/proc/inode.c
+++ b/trunk/fs/proc/inode.c
@@ -231,9 +231,9 @@ static long proc_reg_unlocked_ioctl(struct file *file, unsigned int cmd, unsigne
 		if (rv == -ENOIOCTLCMD)
 			rv = -EINVAL;
 	} else if (ioctl) {
-		lock_kernel();
+		WARN_ONCE(1, "Procfs ioctl handlers must use unlocked_ioctl, "
+			  "%pf will be called without the Bkl held\n", ioctl);
 		rv = ioctl(file->f_path.dentry->d_inode, file, cmd, arg);
-		unlock_kernel();
 	}
 
 	pde_users_dec(pde);