From d8006f44928eed712b8fc150e45dca11376f8546 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Jan 2012 10:19:41 -0800
Subject: [PATCH] --- yaml --- r: 285927 b: refs/heads/master c:
 951880e634a79884236a575b896abf55c39ae0bf h: refs/heads/master i:   285925:
 bf79b11da4b5255243a6a3508d227d82b9f9f36d   285923:
 c5b7ad102079020c591d3541bab263c2c715a6f8   285919:
 694b1a26899090d205f756feab9755834606c3d3 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/capability.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5d8a9dd97999..94c11ffbc5cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2bc3a316a7281f67e36b34dac2802cbe36a9128
+refs/heads/master: 951880e634a79884236a575b896abf55c39ae0bf
diff --git a/trunk/kernel/capability.c b/trunk/kernel/capability.c
index 0fcf1c14a297..3f1adb6c6470 100644
--- a/trunk/kernel/capability.c
+++ b/trunk/kernel/capability.c
@@ -384,7 +384,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
 		BUG();
 	}
 
-	if (has_ns_capability(current, ns, cap)) {
+	if (security_capable(current_cred(), ns, cap) == 0) {
 		current->flags |= PF_SUPERPRIV;
 		return true;
 	}