Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

[linux-2.6-block.git] / security / security.c

diff --git a/security/security.c b/security/security.c
index d17e4a6d269c5a4399cb6b377173ccf51d3cbb0f..709569305d329c6e7742e4e0d0513e9d9110b4a3 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -60,6 +60,7 @@ int __init security_init(void)
         */
        capability_add_hooks();
        yama_add_hooks();
+       loadpin_add_hooks();
 
        /*
         * Load all the remaining security modules.
@@ -1848,7 +1849,6 @@ struct security_hook_heads security_hook_heads = {
        .tun_dev_attach =
                LIST_HEAD_INIT(security_hook_heads.tun_dev_attach),
        .tun_dev_open = LIST_HEAD_INIT(security_hook_heads.tun_dev_open),
-       .skb_owned_by = LIST_HEAD_INIT(security_hook_heads.skb_owned_by),
 #endif /* CONFIG_SECURITY_NETWORK */
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
        .xfrm_policy_alloc_security =