Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Revert "ima: remove ACPI dependency"

This reverts commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae.

Previous revert was a prereq.

Signed-off-by: James Morris <jmorris@namei.org>
James Morris 15 years ago
parent
ec4a162af3
commit
83c36ccfe4
1 changed files with 3 additions and 2 deletions
Unified View Show Diff Stats
  1. 3 2
      security/integrity/ima/Kconfig

+ 3 - 2
security/integrity/ima/Kconfig
View File 

@@ -2,14 +2,15 @@
 
 #
 
 #
 
 config IMA
 
 config IMA
 
 	bool "Integrity Measurement Architecture(IMA)"
 
 	bool "Integrity Measurement Architecture(IMA)"
 
+	depends on ACPI
 
 	depends on SECURITY
 
 	depends on SECURITY
 
 	select SECURITYFS
 
 	select SECURITYFS
 
 	select CRYPTO
 
 	select CRYPTO
 
 	select CRYPTO_HMAC
 
 	select CRYPTO_HMAC
 
 	select CRYPTO_MD5
 
 	select CRYPTO_MD5
 
 	select CRYPTO_SHA1
 
 	select CRYPTO_SHA1
 
-	select TCG_TPM if !S390
 
-	select TCG_TIS if TCG_TPM
 
+	select TCG_TPM
 
+	select TCG_TIS
 
 	help
 
 	help
 
 	  The Trusted Computing Group(TCG) runtime Integrity
 
 	  The Trusted Computing Group(TCG) runtime Integrity
 
 	  Measurement Architecture(IMA) maintains a list of hash
 
 	  Measurement Architecture(IMA) maintains a list of hash