From 92acdb0c384ed5d6c26143d143894fa6662f33b2 Mon Sep 17 00:00:00 2001
From: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Date: Mon, 25 Jun 2012 12:18:10 +0300
Subject: [PATCH] --- yaml --- r: 313612 b: refs/heads/master c:
 c7de7adc18241a0eb10a6e1fed7cb1e01f53c85a h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/security/integrity/ima/ima_fs.c   | 10 ----------
 trunk/security/integrity/ima/ima_init.c |  5 -----
 trunk/security/integrity/ima/ima_main.c |  5 -----
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 6bce5d829151..926b23d3467d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ea4f8ae416a9e8d15f4e20680879358f620e8b8
+refs/heads/master: c7de7adc18241a0eb10a6e1fed7cb1e01f53c85a
diff --git a/trunk/security/integrity/ima/ima_fs.c b/trunk/security/integrity/ima/ima_fs.c
index 3fccc065a0fb..38477c9c3415 100644
--- a/trunk/security/integrity/ima/ima_fs.c
+++ b/trunk/security/integrity/ima/ima_fs.c
@@ -375,13 +375,3 @@ int __init ima_fs_init(void)
 	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/trunk/security/integrity/ima/ima_init.c b/trunk/security/integrity/ima/ima_init.c
index 17f1f060306f..b5dfd534f13d 100644
--- a/trunk/security/integrity/ima/ima_init.c
+++ b/trunk/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/trunk/security/integrity/ima/ima_main.c b/trunk/security/integrity/ima/ima_main.c
index a0e631a19058..5b0548d75561 100644
--- a/trunk/security/integrity/ima/ima_main.c
+++ b/trunk/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");