From: James Morris Date: Thu, 12 Feb 2009 05:29:04 +0000 (+1100) Subject: security: change link order of LSMs so security=tomoyo works X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=42d5aaa2d826f54924e260b58a8e410e59d54163;p=linux-beck.git 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 --- diff --git a/security/Makefile b/security/Makefile index 35f50c585e2b..fa77021d9778 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