summaryrefslogtreecommitdiff
path: root/security/capability.c
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-04-14 05:23:14 +0400
committerJames Morris <james.l.morris@oracle.com>2014-04-14 05:23:14 +0400
commitecd740c6f2f092b90b95fa35f757973589eaaca2 (patch)
treece02b1e18c4fc5729699251460cd8be7604d8401 /security/capability.c
parentf64410ec665479d7b4b77b7519e814253ed0f686 (diff)
parent455c6fdbd219161bd09b1165f11699d6d73de11c (diff)
downloadlinux-ecd740c6f2f092b90b95fa35f757973589eaaca2.tar.xz
Merge commit 'v3.14' into next
Diffstat (limited to 'security/capability.c')
-rw-r--r--security/capability.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c
index 9323bbeba296..ad0d4de69944 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -757,7 +757,8 @@ static void cap_skb_owned_by(struct sk_buff *skb, struct sock *sk)
#ifdef CONFIG_SECURITY_NETWORK_XFRM
static int cap_xfrm_policy_alloc_security(struct xfrm_sec_ctx **ctxp,
- struct xfrm_user_sec_ctx *sec_ctx)
+ struct xfrm_user_sec_ctx *sec_ctx,
+ gfp_t gfp)
{
return 0;
}