diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/tomoyo/tomoyo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c index a2ee362546ab..f0b756e27fed 100644 --- a/security/tomoyo/tomoyo.c +++ b/security/tomoyo/tomoyo.c | |||
@@ -536,7 +536,7 @@ static struct security_operations tomoyo_security_ops = { | |||
536 | }; | 536 | }; |
537 | 537 | ||
538 | /* Lock for GC. */ | 538 | /* Lock for GC. */ |
539 | struct srcu_struct tomoyo_ss; | 539 | DEFINE_SRCU(tomoyo_ss); |
540 | 540 | ||
541 | /** | 541 | /** |
542 | * tomoyo_init - Register TOMOYO Linux as a LSM module. | 542 | * tomoyo_init - Register TOMOYO Linux as a LSM module. |
@@ -550,8 +550,7 @@ static int __init tomoyo_init(void) | |||
550 | if (!security_module_enable(&tomoyo_security_ops)) | 550 | if (!security_module_enable(&tomoyo_security_ops)) |
551 | return 0; | 551 | return 0; |
552 | /* register ourselves with the security framework */ | 552 | /* register ourselves with the security framework */ |
553 | if (register_security(&tomoyo_security_ops) || | 553 | if (register_security(&tomoyo_security_ops)) |
554 | init_srcu_struct(&tomoyo_ss)) | ||
555 | panic("Failure registering TOMOYO Linux"); | 554 | panic("Failure registering TOMOYO Linux"); |
556 | printk(KERN_INFO "TOMOYO Linux initialized\n"); | 555 | printk(KERN_INFO "TOMOYO Linux initialized\n"); |
557 | cred->security = &tomoyo_kernel_domain; | 556 | cred->security = &tomoyo_kernel_domain; |