diff options
| author | Dmitry Kasatkin <dmitry.kasatkin@intel.com> | 2012-06-25 12:18:10 +0300 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2012-07-02 16:43:30 -0400 |
| commit | c7de7adc18241a0eb10a6e1fed7cb1e01f53c85a (patch) | |
| tree | 2b79a44399e29c7d20397ec5188b42528f8c90d5 | |
| parent | 0ea4f8ae416a9e8d15f4e20680879358f620e8b8 (diff) | |
| download | op-kernel-dev-c7de7adc18241a0eb10a6e1fed7cb1e01f53c85a.zip op-kernel-dev-c7de7adc18241a0eb10a6e1fed7cb1e01f53c85a.tar.gz | |
ima: remove unused cleanup functions
IMA cannot be used as module and does not need __exit functions.
Removed them.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
| -rw-r--r-- | security/integrity/ima/ima_fs.c | 10 | ||||
| -rw-r--r-- | security/integrity/ima/ima_init.c | 5 | ||||
| -rw-r--r-- | security/integrity/ima/ima_main.c | 5 |
3 files changed, 0 insertions, 20 deletions
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c index 3fccc06..38477c9 100644 --- a/security/integrity/ima/ima_fs.c +++ b/security/integrity/ima/ima_fs.c @@ -375,13 +375,3 @@ out: securityfs_remove(ima_policy); return -1; } - -void __exit ima_fs_cleanup(void) -{ - securityfs_remove(violations); - securityfs_remove(runtime_measurements_count); - securityfs_remove(ascii_runtime_measurements); - securityfs_remove(binary_runtime_measurements); - securityfs_remove(ima_dir); - securityfs_remove(ima_policy); -} diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c index 17f1f06..b5dfd53 100644 --- a/security/integrity/ima/ima_init.c +++ b/security/integrity/ima/ima_init.c @@ -90,8 +90,3 @@ int __init ima_init(void) return ima_fs_init(); } - -void __exit ima_cleanup(void) -{ - ima_fs_cleanup(); -} diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index a0e631a..5b0548d 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -262,11 +262,6 @@ static int __init init_ima(void) return error; } -static void __exit cleanup_ima(void) -{ - ima_cleanup(); -} - late_initcall(init_ima); /* Start IMA after the TPM is available */ MODULE_DESCRIPTION("Integrity Measurement Architecture"); |
