From: Randy Dunlap <rdunlap@xenotime.net>
Date: Fri, 24 Feb 2012 19:28:05 +0000 (-0800)
Subject: security: fix ima kconfig warning
X-Git-Tag: firefly_0821_release~3680^2~3326^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a69f15890292b5449f9056b4bb322b044e6ce0c6;p=firefly-linux-kernel-4.4.55.git

security: fix ima kconfig warning

Fix IMA kconfig warning on non-X86 architectures:

warning: (IMA) selects TCG_TIS which has unmet direct dependencies
(TCG_TPM && X86)

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
Signed-off-by: James Morris <james.l.morris@oracle.com>
---

diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index 063298a797e8..35664fe6daa1 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -10,7 +10,7 @@ config IMA
 	select CRYPTO_MD5
 	select CRYPTO_SHA1
 	select TCG_TPM if HAS_IOMEM && !UML
-	select TCG_TIS if TCG_TPM
+	select TCG_TIS if TCG_TPM && X86
 	help
 	  The Trusted Computing Group(TCG) runtime Integrity
 	  Measurement Architecture(IMA) maintains a list of hash