Commit 83c36ccfe4d849f482ea0a62402c7624f4e59f0e
1 parent
ec4a162af3
Exists in
master
and in
20 other branches
Revert "ima: remove ACPI dependency"
This reverts commit a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae. Previous revert was a prereq. Signed-off-by: James Morris <jmorris@namei.org>
Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff
security/integrity/ima/Kconfig
| ... | ... | @@ -2,14 +2,15 @@ |
| 2 | 2 | # |
| 3 | 3 | config IMA |
| 4 | 4 | bool "Integrity Measurement Architecture(IMA)" |
| 5 | + depends on ACPI | |
| 5 | 6 | depends on SECURITY |
| 6 | 7 | select SECURITYFS |
| 7 | 8 | select CRYPTO |
| 8 | 9 | select CRYPTO_HMAC |
| 9 | 10 | select CRYPTO_MD5 |
| 10 | 11 | select CRYPTO_SHA1 |
| 11 | - select TCG_TPM if !S390 | |
| 12 | - select TCG_TIS if TCG_TPM | |
| 12 | + select TCG_TPM | |
| 13 | + select TCG_TIS | |
| 13 | 14 | help |
| 14 | 15 | The Trusted Computing Group(TCG) runtime Integrity |
| 15 | 16 | Measurement Architecture(IMA) maintains a list of hash |