Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

ima: fix Kconfig dependencies

Fix the following build warning:
warning: (IMA) selects TCG_TPM which has unmet direct dependencies
(HAS_IOMEM && EXPERIMENTAL)

Suggested-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Fabio Estevam 13 years ago
parent
700920eb5b
commit
f4a0391dfa
2 changed files with 1 additions and 2 deletions
Unified View Show Diff Stats
  1. 0 1
      drivers/char/tpm/Kconfig
  2. 1 1
      security/integrity/ima/Kconfig

+ 0 - 1
drivers/char/tpm/Kconfig
View File 

@@ -5,7 +5,6 @@
 
 menuconfig TCG_TPM
 
 menuconfig TCG_TPM
 
 	tristate "TPM Hardware Support"
 
 	tristate "TPM Hardware Support"
 
 	depends on HAS_IOMEM
 
 	depends on HAS_IOMEM
 
-	depends on EXPERIMENTAL
 
 	select SECURITYFS
 
 	select SECURITYFS
 
 	---help---
 
 	---help---
 
 	  If you have a TPM security chip in your system, which
 
 	  If you have a TPM security chip in your system, which

+ 1 - 1
security/integrity/ima/Kconfig
View File 

@@ -9,7 +9,7 @@ config IMA
 
 	select CRYPTO_HMAC
 
 	select CRYPTO_HMAC
 
 	select CRYPTO_MD5
 
 	select CRYPTO_MD5
 
 	select CRYPTO_SHA1
 
 	select CRYPTO_SHA1
 
-	select TCG_TPM if !S390 && !UML
 
+	select TCG_TPM if HAS_IOMEM && !UML
 
 	select TCG_TIS if TCG_TPM
 
 	select TCG_TIS if TCG_TPM
 
 	help
 
 	help
 
 	  The Trusted Computing Group(TCG) runtime Integrity
 
 	  The Trusted Computing Group(TCG) runtime Integrity