diff options
| author | James Morris <jmorris@namei.org> | 2011-08-09 02:31:03 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-08-09 02:31:03 +0200 |
| commit | 5a2f3a02aea164f4f59c0c3497772090a411b462 (patch) | |
| tree | d3ebe03d4f97575290087843960baa01de3acd0a /security/integrity/Makefile | |
| parent | Merge branch 'next-queue' into next (diff) | |
| parent | evm: add evm_inode_setattr to prevent updating an invalid security.evm (diff) | |
| download | linux-5a2f3a02aea164f4f59c0c3497772090a411b462.tar.xz linux-5a2f3a02aea164f4f59c0c3497772090a411b462.zip | |
Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next
Conflicts:
fs/attr.c
Resolve conflict manually.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/integrity/Makefile')
| -rw-r--r-- | security/integrity/Makefile | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/security/integrity/Makefile b/security/integrity/Makefile new file mode 100644 index 000000000000..0ae44aea6516 --- /dev/null +++ b/security/integrity/Makefile @@ -0,0 +1,12 @@ +# +# Makefile for caching inode integrity data (iint) +# + +obj-$(CONFIG_INTEGRITY) += integrity.o + +integrity-y := iint.o + +subdir-$(CONFIG_IMA) += ima +obj-$(CONFIG_IMA) += ima/built-in.o +subdir-$(CONFIG_EVM) += evm +obj-$(CONFIG_EVM) += evm/built-in.o |