From 114338e1cb5513d6dfddf07ae89b5a3319ac0b18 Mon Sep 17 00:00:00 2001
From: Dmitry Kasatkin <dmitry.kasatkin@intel.com>
Date: Mon, 3 Sep 2012 17:11:56 +0300
Subject: [PATCH] --- yaml --- r: 352836 b: refs/heads/master c:
 e90805656d4683f84d360276102ae63adc777a38 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/security/integrity/evm/evm.h       | 1 -
 trunk/security/integrity/evm/evm_main.c  | 9 ---------
 trunk/security/integrity/evm/evm_secfs.c | 6 ------
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index d7a27ec4d6c3..9506d9c6f113 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7163a993840f0906d4ce1e3f193575c99dac21e1
+refs/heads/master: e90805656d4683f84d360276102ae63adc777a38
diff --git a/trunk/security/integrity/evm/evm.h b/trunk/security/integrity/evm/evm.h
index c885247ebcf7..3eb30c6db419 100644
--- a/trunk/security/integrity/evm/evm.h
+++ b/trunk/security/integrity/evm/evm.h
@@ -45,6 +45,5 @@ extern int evm_calc_hash(struct dentry *dentry, const char *req_xattr_name,
 extern int evm_init_hmac(struct inode *inode, const struct xattr *xattr,
 			 char *hmac_val);
 extern int evm_init_secfs(void);
-extern void evm_cleanup_secfs(void);
 
 #endif
diff --git a/trunk/security/integrity/evm/evm_main.c b/trunk/security/integrity/evm/evm_main.c
index eb5484504f50..a78a5e21ef70 100644
--- a/trunk/security/integrity/evm/evm_main.c
+++ b/trunk/security/integrity/evm/evm_main.c
@@ -427,15 +427,6 @@ static int __init init_evm(void)
 	return error;
 }
 
-static void __exit cleanup_evm(void)
-{
-	evm_cleanup_secfs();
-	if (hmac_tfm)
-		crypto_free_shash(hmac_tfm);
-	if (hash_tfm)
-		crypto_free_shash(hash_tfm);
-}
-
 /*
  * evm_display_config - list the EVM protected security extended attributes
  */
diff --git a/trunk/security/integrity/evm/evm_secfs.c b/trunk/security/integrity/evm/evm_secfs.c
index ac7629950578..30f670ad6ac3 100644
--- a/trunk/security/integrity/evm/evm_secfs.c
+++ b/trunk/security/integrity/evm/evm_secfs.c
@@ -100,9 +100,3 @@ int __init evm_init_secfs(void)
 		error = -EFAULT;
 	return error;
 }
-
-void __exit evm_cleanup_secfs(void)
-{
-	if (evm_init_tpm)
-		securityfs_remove(evm_init_tpm);
-}