projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v3.14' into next
[linux-2.6-block.git]
/
security
/
capability.c
diff --git
a/security/capability.c
b/security/capability.c
index 9323bbeba296b28e53667ab5bdb6b3c9508aa5d2..ad0d4de6994474aba384955e240c73b88a03398e 100644
(file)
--- 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;
}