Merge branch 'next-queue' into next

This commit is contained in:
James Morris 2010-03-09 12:46:47 +11:00
commit c43a752347
9 changed files with 9 additions and 18 deletions

View file

@ -117,7 +117,7 @@ int __init security_module_enable(struct security_operations *ops)
* If there is already a security module registered with the kernel,
* an error will be returned. Otherwise %0 is returned on success.
*/
int register_security(struct security_operations *ops)
int __init register_security(struct security_operations *ops)
{
if (verify(ops)) {
printk(KERN_DEBUG "%s could not verify "