diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-04-11 11:29:29 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-04-11 11:29:29 +1000 |
| commit | 283ac2fe4d6e0e487c042cfcab60cff596d62082 (patch) | |
| tree | 10a684860ebecb4bc26c20336b691a34d082a8f9 | |
| parent | 12735746f76fd12819bfb753060f088a35f55cbd (diff) | |
| parent | 644f17412f5acf01a19af9d04a921937a2bc86c6 (diff) | |
| download | linux-next-283ac2fe4d6e0e487c042cfcab60cff596d62082.tar.gz | |
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
| -rw-r--r-- | security/integrity/ima/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index 39caeca47444..60a511c6b583 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig @@ -8,7 +8,7 @@ config IMA select CRYPTO_HMAC select CRYPTO_SHA1 select CRYPTO_HASH_INFO - select TCG_TPM if HAS_IOMEM && !UML + select TCG_TPM if HAS_IOMEM select TCG_TIS if TCG_TPM && X86 select TCG_CRB if TCG_TPM && ACPI select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES |