tg3: Restore likely() check in tg3_poll_msix()

[net-next-2.6.git] / kernel / capability.c

diff --git a/kernel/capability.c b/kernel/capability.c
index 7f876e60521f0f3f5cda063db39be0177bf50f3f..9e4697e9b276e7429fed888b76c8e4ee19562e4c 100644 (file)
--- a/kernel/capability.c
+++ b/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);