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>

diff --git a/security/Makefile b/security/Makefile
index 35f50c5..fa77021 100644 (file)
--- 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