2 files changed, 6 insertions, 2 deletions

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 7fef5ebfaf13..a09ca3b1cf9c 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -78,6 +78,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/module.h>
+#include <linux/nsproxy.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/compat.h>
@@ -940,7 +941,8 @@ asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
 
         /* Find the mm_struct */
         read_lock(&tasklist_lock);
-        task = pid ? find_task_by_pid(pid) : current;
+        task = pid ?
+                find_task_by_pid_ns(pid, current->nsproxy->pid_ns) : current;
         if (!task) {
                 read_unlock(&tasklist_lock);
                 return -ESRCH;
diff --git a/mm/migrate.c b/mm/migrate.c
index 06d0877a66ef..c479357b5480 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -19,6 +19,7 @@
 #include <linux/pagemap.h>
 #include <linux/buffer_head.h>
 #include <linux/mm_inline.h>
+#include <linux/nsproxy.h>
 #include <linux/pagevec.h>
 #include <linux/rmap.h>
 #include <linux/topology.h>
@@ -924,7 +925,8 @@ asmlinkage long sys_move_pages(pid_t pid, unsigned long nr_pages,
 
         /* Find the mm_struct */
         read_lock(&tasklist_lock);
-        task = pid ? find_task_by_pid(pid) : current;
+        task = pid ?
+                find_task_by_pid_ns(pid, current->nsproxy->pid_ns) : current;
         if (!task) {
                 read_unlock(&tasklist_lock);
                 return -ESRCH;