diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2005-10-21 03:20:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 08:16:47 -0700 |
| commit | 7d877f3bda870ab5f001bd92528654471d5966b3 (patch) | |
| tree | 1c05b62abead153956c4ca250ffb1891887e77c9 /security | |
| parent | fd4f2df24bc23e6b8fc069765b425c7dacf52347 (diff) | |
| download | linux-3.10-7d877f3bda870ab5f001bd92528654471d5966b3.tar.gz linux-3.10-7d877f3bda870ab5f001bd92528654471d5966b3.tar.bz2 linux-3.10-7d877f3bda870ab5f001bd92528654471d5966b3.zip | |
[PATCH] gfp_t: net/*
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/dummy.c | 2 | ||||
| -rw-r--r-- | security/selinux/hooks.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/dummy.c b/security/dummy.c index 9623a61dfc7..3d34f3de7e8 100644 --- a/security/dummy.c +++ b/security/dummy.c @@ -768,7 +768,7 @@ static int dummy_socket_getpeersec(struct socket *sock, char __user *optval, return -ENOPROTOOPT; } -static inline int dummy_sk_alloc_security (struct sock *sk, int family, int priority) +static inline int dummy_sk_alloc_security (struct sock *sk, int family, gfp_t priority) { return 0; } diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index b13be15165f..447a1e0f48c 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -262,7 +262,7 @@ static void superblock_free_security(struct super_block *sb) } #ifdef CONFIG_SECURITY_NETWORK -static int sk_alloc_security(struct sock *sk, int family, int priority) +static int sk_alloc_security(struct sock *sk, int family, gfp_t priority) { struct sk_security_struct *ssec; @@ -3380,7 +3380,7 @@ out: return err; } -static int selinux_sk_alloc_security(struct sock *sk, int family, int priority) +static int selinux_sk_alloc_security(struct sock *sk, int family, gfp_t priority) { return sk_alloc_security(sk, family, priority); } |