diff --git a/[refs] b/[refs] index 2d481b07d653..f85e46b151b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5634708b5fce807bdf2091cfafc2fb24d791f0c8 +refs/heads/master: ff9724a3f7a69f7b443c05981f84e28017c2fc5a diff --git a/trunk/fs/proc/base.c b/trunk/fs/proc/base.c index 13e3ab99eb74..7169a713da1b 100644 --- a/trunk/fs/proc/base.c +++ b/trunk/fs/proc/base.c @@ -1167,7 +1167,6 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b struct dentry *de; struct vfsmount *mnt = NULL; - lock_kernel(); if (current->fsuid != inode->i_uid && !capable(CAP_DAC_OVERRIDE)) goto out; @@ -1183,7 +1182,6 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b dput(de); mntput(mnt); out: - unlock_kernel(); return error; }