diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2010-05-04 18:16:30 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-05 10:00:06 +1000 |
| commit | a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae (patch) | |
| tree | 4f2b0d0b89310cc93e9ae9377cdbba80b0554814 /security | |
| parent | b89e66e1e396f7b5436af154e58209320cc08aed (diff) | |
| download | kernel_samsung_aries-a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae.zip kernel_samsung_aries-a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae.tar.gz kernel_samsung_aries-a674fa46c79ffa37995bd1c8e4daa2b3be5a95ae.tar.bz2 | |
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>
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig index 3d7846d..b6ecfd4 100644 --- a/security/integrity/ima/Kconfig +++ b/security/integrity/ima/Kconfig @@ -2,15 +2,14 @@ # config IMA bool "Integrity Measurement Architecture(IMA)" - depends on ACPI depends on SECURITY select SECURITYFS select CRYPTO select CRYPTO_HMAC select CRYPTO_MD5 select CRYPTO_SHA1 - select TCG_TPM - select TCG_TIS + select TCG_TPM if !S390 + select TCG_TIS if TCG_TPM help The Trusted Computing Group(TCG) runtime Integrity Measurement Architecture(IMA) maintains a list of hash |