diff options
author | David S. Miller <davem@davemloft.net> | 2018-02-27 11:01:40 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-02-27 11:01:40 -0500 |
commit | 23363b87a80a2eeb366c9b5b93248b7d73125ba8 (patch) | |
tree | 5c5d9694c45de9a34528de7e14627425acfcc4b7 /security/selinux/hooks.c | |
parent | 7f897db37b76235d50151dfea7d543568d54535a (diff) | |
parent | 3edbccf96d2de30e7b986ceae090becfc07d3573 (diff) |
Merge branch 'pernet_operations-convert-part-3'
Kirill Tkhai says:
====================
Converting pernet_operations (part #3)
This patchset continues to review and to convert pernet_operations
to async. Where it is possible, they are grouped by type of actions
init/exit methods ([1/28], for example). I hope this will make
the review a little bit easier. The changes are tree-wide: in net, fs,
drivers and security.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/selinux/hooks.c')
-rw-r--r-- | security/selinux/hooks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 8644d864e3c1..b4d7b6242a40 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -6743,6 +6743,7 @@ static void __net_exit selinux_nf_unregister(struct net *net) | |||
6743 | static struct pernet_operations selinux_net_ops = { | 6743 | static struct pernet_operations selinux_net_ops = { |
6744 | .init = selinux_nf_register, | 6744 | .init = selinux_nf_register, |
6745 | .exit = selinux_nf_unregister, | 6745 | .exit = selinux_nf_unregister, |
6746 | .async = true, | ||
6746 | }; | 6747 | }; |
6747 | 6748 | ||
6748 | static int __init selinux_nf_ip_init(void) | 6749 | static int __init selinux_nf_ip_init(void) |