diff --git a/[refs] b/[refs] index b141293840e6..030c24b01bb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53a7706d5ed8f1a53ba062b318773160cc476dde +refs/heads/master: 1e50df39f6e2c3a4a3394df62baa8a213df16c54 diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index 7ee55af8d79c..e6d351265aed 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -1310,16 +1310,13 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode, /* Find the mm_struct */ rcu_read_lock(); - read_lock(&tasklist_lock); task = pid ? find_task_by_vpid(pid) : current; if (!task) { - read_unlock(&tasklist_lock); rcu_read_unlock(); err = -ESRCH; goto out; } mm = get_task_mm(task); - read_unlock(&tasklist_lock); rcu_read_unlock(); err = -EINVAL;