summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2012-02-24 20:28:05 +0100
committerJames Morris <james.l.morris@oracle.com>2012-02-28 01:01:15 +0100
commita69f15890292b5449f9056b4bb322b044e6ce0c6 (patch)
tree7a37f3826e958787ca7d78603c9031d29558f43f
parentAppArmor: Fix the error case for chroot relative path name lookup (diff)
downloadlinux-a69f15890292b5449f9056b4bb322b044e6ce0c6.tar.xz
linux-a69f15890292b5449f9056b4bb322b044e6ce0c6.zip
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>
-rw-r--r--security/integrity/ima/Kconfig2
1 files changed, 1 insertions, 1 deletions
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