4 files changed, 15 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig
index bf129f87de7e..bb244774e9d7 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -135,6 +135,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR
 source security/selinux/Kconfig
 source security/smack/Kconfig
+source security/tomoyo/Kconfig
 source security/integrity/ima/Kconfig
diff --git a/security/Makefile b/security/Makefile
index 595536cbffb2..35f50c585e2b 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -5,6 +5,7 @@
 obj-$(CONFIG_KEYS)                      += keys/
 subdir-$(CONFIG_SECURITY_SELINUX)       += selinux
 subdir-$(CONFIG_SECURITY_SMACK)         += smack
+subdir-$(CONFIG_SECURITY_TOMOYO)        += tomoyo
 # always enable default capabilities
 obj-y           += commoncap.o
@@ -17,6 +18,7 @@ obj-$(CONFIG_SECURITY_SELINUX)		+= selinux/built-in.o
 obj-$(CONFIG_SECURITY_SMACK)            += smack/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
diff --git a/security/tomoyo/Kconfig b/security/tomoyo/Kconfig
new file mode 100644
index 000000000000..c8f385793235
--- /dev/null
+++ b/security/tomoyo/Kconfig
@@ -0,0 +1,11 @@
+config SECURITY_TOMOYO
+        bool "TOMOYO Linux Support"
+        depends on SECURITY
+        select SECURITYFS
+        select SECURITY_PATH
+        default n
+        help
+          This selects TOMOYO Linux, pathname-based access control.
+          Required userspace tools and further information may be
+          found at <http://tomoyo.sourceforge.jp/>.
+          If you are unsure how to answer this question, answer N.
diff --git a/security/tomoyo/Makefile b/security/tomoyo/Makefile
new file mode 100644
index 000000000000..10ccd686b290
--- /dev/null
+++ b/security/tomoyo/Makefile
@@ -0,0 +1 @@
+obj-y = common.o realpath.o tomoyo.o domain.o file.o