selinux: change handling of invalid classes (Was: Re: 2.6.26-rc5-mm1 selinux whine)

[safe/jmp/linux-2.6] / security / Makefile

diff --git a/security/Makefile b/security/Makefile
index 197cc2f..7ef1107 100644 (file)
--- a/security/Makefile
+++ b/security/Makefile
@@ -4,6 +4,7 @@
 
 obj-$(CONFIG_KEYS)                     += keys/
 subdir-$(CONFIG_SECURITY_SELINUX)      += selinux
+subdir-$(CONFIG_SECURITY_SMACK)                += smack
 
 # if we don't select a security model, use the default capabilities
 ifneq ($(CONFIG_SECURITY),y)
@@ -11,9 +12,10 @@ obj-y                += commoncap.o
 endif
 
 # Object file lists
-obj-$(CONFIG_SECURITY)                 += security.o dummy.o
+obj-$(CONFIG_SECURITY)                 += security.o dummy.o inode.o
 # Must precede capability.o in order to stack properly.
 obj-$(CONFIG_SECURITY_SELINUX)         += selinux/built-in.o
+obj-$(CONFIG_SECURITY_SMACK)           += commoncap.o smack/built-in.o
 obj-$(CONFIG_SECURITY_CAPABILITIES)    += commoncap.o capability.o
 obj-$(CONFIG_SECURITY_ROOTPLUG)                += commoncap.o root_plug.o
-obj-$(CONFIG_SECURITY_SECLVL)          += seclvl.o
+obj-$(CONFIG_CGROUP_DEVICE)            += device_cgroup.o