diff options
| author | James Morris <jmorris@namei.org> | 2009-07-13 10:39:36 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-13 10:39:36 +1000 |
| commit | be940d6279c30a2d7c4e8d1d5435f957f594d66d (patch) | |
| tree | 965805d563cb756879fd3595230c3ca205da76d1 /security/Makefile | |
| parent | b3a633c8527ef155b1a4e22e8f5abc58f7af54c9 (diff) | |
| download | linux-be940d6279c30a2d7c4e8d1d5435f957f594d66d.tar.bz2 | |
Revert "SELinux: Convert avc_audit to use lsm_audit.h"
This reverts commit 8113a8d80f4c6a3dc3724b39b470f3fee9c426b6.
The patch causes a stack overflow on my system during boot.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/Makefile')
| -rw-r--r-- | security/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/security/Makefile b/security/Makefile index 8dcc1fdcdc69..c67557cdaa85 100644 --- a/security/Makefile +++ b/security/Makefile @@ -16,7 +16,9 @@ obj-$(CONFIG_SECURITYFS) += inode.o # Must precede capability.o in order to stack properly. obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o -obj-$(CONFIG_AUDIT) += lsm_audit.o +ifeq ($(CONFIG_AUDIT),y) +obj-$(CONFIG_SECURITY_SMACK) += lsm_audit.o +endif obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o |