diff options
| author |   James Morris <jmorris@namei.org> | 2010-03-09 12:46:47 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-09 12:46:47 +1100 |
| commit | c43a7523470dc2d9947fa114a0b54317975d4c04 (patch) | |
| tree | 30a72ed1e9079f19b814263197761820f57c39ce /security/security.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp (diff) | |
| parent | selinux: const strings in tables (diff) | |
| download | linux-dev-c43a7523470dc2d9947fa114a0b54317975d4c04.tar.xz linux-dev-c43a7523470dc2d9947fa114a0b54317975d4c04.zip | |
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) * 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 " |