aboutsummaryrefslogtreecommitdiff
path: root/security/Makefile
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-02-12 16:29:04 +1100
committerJames Morris <jmorris@namei.org>2009-02-12 16:29:04 +1100
commit42d5aaa2d826f54924e260b58a8e410e59d54163 (patch)
tree64e3c400671d3adf1ed40f5179e95655400ce1cc /security/Makefile
parentd74db3b22a75fac474abe711f582ffe25eacce25 (diff)
downloadlinux-42d5aaa2d826f54924e260b58a8e410e59d54163.tar.gz
security: change link order of LSMs so security=tomoyo works
LSMs need to be linked before root_plug to ensure the security= boot parameter works with them. Do this for Tomoyo. (root_plug probably needs to be taken out and shot at some point, too). Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/Makefile')
-rw-r--r--security/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/Makefile b/security/Makefile
index 35f50c585e2..fa77021d977 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -16,9 +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_SECURITY_TOMOYO) += tomoyo/built-in.o
obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o
obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o
-obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o
# Object integrity file lists
subdir-$(CONFIG_IMA) += integrity/ima