Commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae
Committed by
James Morris
James Morris
1 parent
b89e66e1e3
Exists in
master
and in
20 other branches
ima: remove ACPI dependency
The ACPI dependency moved to the TPM, where it belongs. Although IMA per-se does not require access to the bios measurement log, verifying the IMA boot aggregate does, which requires ACPI. This patch prereq's 'TPM: ACPI/PNP dependency removal' http://lkml.org/lkml/2010/5/4/378. Signed-off-by: Mimi Zohar <zohar@us.ibm.com> Reported-by: Jean-Christophe Dubois <jcd@tribudubois.net> Acked-by: Serge Hallyn <serue@us.ibm.com> Tested-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
Showing 1 changed file with 2 additions and 3 deletions Side-by-side Diff
security/integrity/ima/Kconfig
| ... | ... | @@ -2,15 +2,14 @@ |
| 2 | 2 | # |
| 3 | 3 | config IMA |
| 4 | 4 | bool "Integrity Measurement Architecture(IMA)" |
| 5 | - depends on ACPI | |
| 6 | 5 | depends on SECURITY |
| 7 | 6 | select SECURITYFS |
| 8 | 7 | select CRYPTO |
| 9 | 8 | select CRYPTO_HMAC |
| 10 | 9 | select CRYPTO_MD5 |
| 11 | 10 | select CRYPTO_SHA1 |
| 12 | - select TCG_TPM | |
| 13 | - select TCG_TIS | |
| 11 | + select TCG_TPM if !S390 | |
| 12 | + select TCG_TIS if TCG_TPM | |
| 14 | 13 | help |
| 15 | 14 | The Trusted Computing Group(TCG) runtime Integrity |
| 16 | 15 | Measurement Architecture(IMA) maintains a list of hash |