diff options
| author | James Morris <jmorris@namei.org> | 2010-03-08 20:46:47 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-08 20:46:47 -0500 |
| commit | c43a7523470dc2d9947fa114a0b54317975d4c04 (patch) | |
| tree | 30a72ed1e9079f19b814263197761820f57c39ce /security/security.c | |
| parent | eaa5eec739637f32f8733d528ff0b94fd62b1214 (diff) | |
| parent | 634a539e16bd7a1ba31c3f832baa725565cc9f96 (diff) | |
Merge branch 'next-queue' into next
Diffstat (limited to 'security/security.c')
| -rw-r--r-- | security/security.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/security.c b/security/security.c index 687c6fd14bb6..b98334b0a576 100644 --- a/security/security.c +++ b/security/security.c | |||
| @@ -117,7 +117,7 @@ int __init security_module_enable(struct security_operations *ops) | |||
| 117 | * If there is already a security module registered with the kernel, | 117 | * If there is already a security module registered with the kernel, |
| 118 | * an error will be returned. Otherwise %0 is returned on success. | 118 | * an error will be returned. Otherwise %0 is returned on success. |
| 119 | */ | 119 | */ |
| 120 | int register_security(struct security_operations *ops) | 120 | int __init register_security(struct security_operations *ops) |
| 121 | { | 121 | { |
| 122 | if (verify(ops)) { | 122 | if (verify(ops)) { |
| 123 | printk(KERN_DEBUG "%s could not verify " | 123 | printk(KERN_DEBUG "%s could not verify " |