diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-02 17:07:14 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-02 17:07:14 -0800 |
| commit | 12d7d4e0ed8fecf7f74c89483b55b300be6e5901 (patch) | |
| tree | f573761ac752ff04ec445e23aef50adadda49790 /mm/migrate.c | |
| parent | aca6ad073ea820776bf5bdb87cf82eace35042c8 (diff) | |
| parent | 790ab7e92bec24aee3939b300d36b99ab2e3f3ca (diff) | |
| download | olio-linux-3.10-12d7d4e0ed8fecf7f74c89483b55b300be6e5901.tar.xz olio-linux-3.10-12d7d4e0ed8fecf7f74c89483b55b300be6e5901.zip | |
Merge branch 'devel-cleanup' into omap-for-linus
Conflicts:
arch/arm/mach-omap2/timer-gp.c
Diffstat (limited to 'mm/migrate.c')
| -rw-r--r-- | mm/migrate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 76611525380..352de555626 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1287,14 +1287,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages, return -EPERM; /* Find the mm_struct */ - read_lock(&tasklist_lock); + rcu_read_lock(); task = pid ? find_task_by_vpid(pid) : current; if (!task) { - read_unlock(&tasklist_lock); + rcu_read_unlock(); return -ESRCH; } mm = get_task_mm(task); - read_unlock(&tasklist_lock); + rcu_read_unlock(); if (!mm) return -EINVAL; |