diff --git a/[refs] b/[refs] index 555bf93ea69c..a5a97f865a62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67fa4880c5e059428392ca6f7c2f9c38e8546fea +refs/heads/master: 86fc80f16e8a2449d5827bf1a9838b7fd9f70097 diff --git a/trunk/kernel/capability.c b/trunk/kernel/capability.c index 7f876e60521f..9e4697e9b276 100644 --- a/trunk/kernel/capability.c +++ b/trunk/kernel/capability.c @@ -135,7 +135,7 @@ static inline int cap_get_target_pid(pid_t pid, kernel_cap_t *pEp, if (pid && (pid != task_pid_vnr(current))) { struct task_struct *target; - read_lock(&tasklist_lock); + rcu_read_lock(); target = find_task_by_vpid(pid); if (!target) @@ -143,7 +143,7 @@ static inline int cap_get_target_pid(pid_t pid, kernel_cap_t *pEp, else ret = security_capget(target, pEp, pIp, pPp); - read_unlock(&tasklist_lock); + rcu_read_unlock(); } else ret = security_capget(current, pEp, pIp, pPp);