From 7bd810e803f238cd222a93a4045ce85f539572e0 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Mon, 12 Mar 2012 15:48:24 -0700
Subject: [PATCH] --- yaml --- r: 306021 b: refs/heads/master c:
 b38a86eb196d9402299919456fe3f28e490c76fa h: refs/heads/master i:   306019:
 6ee3650d603e9d4c0f16c9f9a3f26a8164aababa v: v3

---
 [refs]               | 2 +-
 trunk/init/Kconfig   | 2 --
 trunk/mm/mempolicy.c | 4 ++--
 trunk/mm/migrate.c   | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 41865b4cd204..07e120853528 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14a590c3f987977d7b09ec926481ee0238c08eee
+refs/heads/master: b38a86eb196d9402299919456fe3f28e490c76fa
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index d24cc75caf65..b5dff4d1e1de 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -865,8 +865,6 @@ config UIDGID_CONVERTED
 
 	# List of kernel pieces that need user namespace work
 	# Features
-	depends on MIGRATION = n
-	depends on NUMA = n
 	depends on SYSVIPC = n
 	depends on IMA = n
 	depends on EVM = n
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
index cfb6c8678754..7b44fc8ec99c 100644
--- a/trunk/mm/mempolicy.c
+++ b/trunk/mm/mempolicy.c
@@ -1334,8 +1334,8 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
 	 * userid as the target process.
 	 */
 	tcred = __task_cred(task);
-	if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
-	    cred->uid  != tcred->suid && cred->uid  != tcred->uid &&
+	if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
+	    !uid_eq(cred->uid,  tcred->suid) && !uid_eq(cred->uid,  tcred->uid) &&
 	    !capable(CAP_SYS_NICE)) {
 		rcu_read_unlock();
 		err = -EPERM;
diff --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c
index 51c08a0c6f68..1cf5252c3b99 100644
--- a/trunk/mm/migrate.c
+++ b/trunk/mm/migrate.c
@@ -1371,8 +1371,8 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
 	 * userid as the target process.
 	 */
 	tcred = __task_cred(task);
-	if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
-	    cred->uid  != tcred->suid && cred->uid  != tcred->uid &&
+	if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
+	    !uid_eq(cred->uid,  tcred->suid) && !uid_eq(cred->uid,  tcred->uid) &&
 	    !capable(CAP_SYS_NICE)) {
 		rcu_read_unlock();
 		err = -EPERM;