diff options
| author | James Morris <james.l.morris@oracle.com> | 2012-09-12 07:16:37 +0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2012-09-12 07:16:37 +0400 |
| commit | 9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252 (patch) | |
| tree | d0796f172c096147e1a7c0337279bf7dca6f13f2 /security/integrity/ima/Makefile | |
| parent | b25b09ecf98bf6a32f3732281c2db13be6aeb14c (diff) | |
| parent | 8606404fa555c2ee691376fcc640ab89fe752035 (diff) | |
| download | linux-9ddf6aa8cbc07764c7fe33cfdb8644ca5e828252.tar.xz | |
Merge branch 'next-ima-appraisal' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
As requested by Mimi, this adds the IMA Appraisal feature.
Diffstat (limited to 'security/integrity/ima/Makefile')
| -rw-r--r-- | security/integrity/ima/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/integrity/ima/Makefile b/security/integrity/ima/Makefile index 5f740f6971e1..3f2ca6bdc384 100644 --- a/security/integrity/ima/Makefile +++ b/security/integrity/ima/Makefile @@ -8,3 +8,4 @@ obj-$(CONFIG_IMA) += ima.o ima-y := ima_fs.o ima_queue.o ima_init.o ima_main.o ima_crypto.o ima_api.o \ ima_policy.o ima-$(CONFIG_IMA_AUDIT) += ima_audit.o +ima-$(CONFIG_IMA_APPRAISE) += ima_appraise.o |