diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:33:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:33:09 +0200 |
| commit | 69dd89fd2b9406603d218cab8996cfb232d5b8b9 (patch) | |
| tree | 467a65877d0c550ae7c937bc658abd313958122f /security/security.c | |
| parent | 8c1d843460f42417d6b9553147a1a04ca1470602 (diff) | |
| parent | c159a85013afbb8283f0c7272812952e04d5c3a1 (diff) | |
| download | op-kernel-dev-69dd89fd2b9406603d218cab8996cfb232d5b8b9.zip op-kernel-dev-69dd89fd2b9406603d218cab8996cfb232d5b8b9.tar.gz | |
Merge tag 'asoc-v3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Final updates for v3.15 merge window
A few more updates from last week - use of the tdm_slot mapping from
Xiubo plus a few smaller fixes and cleanups.
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index 15b6928..919cad9 100644 --- a/security/security.c +++ b/security/security.c @@ -1317,9 +1317,11 @@ void security_skb_owned_by(struct sk_buff *skb, struct sock *sk) #ifdef CONFIG_SECURITY_NETWORK_XFRM -int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_user_sec_ctx *sec_ctx) +int security_xfrm_policy_alloc(struct xfrm_sec_ctx **ctxp, + struct xfrm_user_sec_ctx *sec_ctx, + gfp_t gfp) { - return security_ops->xfrm_policy_alloc_security(ctxp, sec_ctx); + return security_ops->xfrm_policy_alloc_security(ctxp, sec_ctx, gfp); } EXPORT_SYMBOL(security_xfrm_policy_alloc); |
