diff options
| author | Dmitry Kasatkin <dmitry.kasatkin@intel.com> | 2012-06-25 05:18:10 -0400 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2012-07-02 16:43:30 -0400 |
| commit | c7de7adc18241a0eb10a6e1fed7cb1e01f53c85a (patch) | |
| tree | 2b79a44399e29c7d20397ec5188b42528f8c90d5 /security | |
| parent | 0ea4f8ae416a9e8d15f4e20680879358f620e8b8 (diff) | |
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>
Diffstat (limited to 'security')
| -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 3fccc065a0fb..38477c9c3415 100644 --- a/security/integrity/ima/ima_fs.c +++ b/security/integrity/ima/ima_fs.c | |||
| @@ -375,13 +375,3 @@ out: | |||
| 375 | securityfs_remove(ima_policy); | 375 | securityfs_remove(ima_policy); |
| 376 | return -1; | 376 | return -1; |
| 377 | } | 377 | } |
| 378 | |||
| 379 | void __exit ima_fs_cleanup(void) | ||
| 380 | { | ||
| 381 | securityfs_remove(violations); | ||
| 382 | securityfs_remove(runtime_measurements_count); | ||
| 383 | securityfs_remove(ascii_runtime_measurements); | ||
| 384 | securityfs_remove(binary_runtime_measurements); | ||
| 385 | securityfs_remove(ima_dir); | ||
| 386 | securityfs_remove(ima_policy); | ||
| 387 | } | ||
diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c index 17f1f060306f..b5dfd534f13d 100644 --- a/security/integrity/ima/ima_init.c +++ b/security/integrity/ima/ima_init.c | |||
| @@ -90,8 +90,3 @@ int __init ima_init(void) | |||
| 90 | 90 | ||
| 91 | return ima_fs_init(); | 91 | return ima_fs_init(); |
| 92 | } | 92 | } |
| 93 | |||
| 94 | void __exit ima_cleanup(void) | ||
| 95 | { | ||
| 96 | ima_fs_cleanup(); | ||
| 97 | } | ||
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index a0e631a19058..5b0548d75561 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) | |||
| 262 | return error; | 262 | return error; |
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | static void __exit cleanup_ima(void) | ||
| 266 | { | ||
| 267 | ima_cleanup(); | ||
| 268 | } | ||
| 269 | |||
| 270 | late_initcall(init_ima); /* Start IMA after the TPM is available */ | 265 | late_initcall(init_ima); /* Start IMA after the TPM is available */ |
| 271 | 266 | ||
| 272 | MODULE_DESCRIPTION("Integrity Measurement Architecture"); | 267 | MODULE_DESCRIPTION("Integrity Measurement Architecture"); |
