X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=security%2FKconfig;h=a42bb65b6b73b60df5f9eb1167632999067d4b94;hb=d5d937a9e25de0320c401bd751d5d197d8adf5b1;hp=ccc61f8006b29364ce0a212de9a4861dbae64382;hpb=39f86a608a3e0f0164bd1540acf87696cfdfb5bb;p=cascardo%2Flinux.git

diff --git a/security/Kconfig b/security/Kconfig
index ccc61f8006b2..a42bb65b6b73 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -188,6 +188,7 @@ source security/smack/Kconfig
 source security/tomoyo/Kconfig
 source security/apparmor/Kconfig
 source security/yama/Kconfig
+source security/chromiumos/Kconfig
 
 source security/integrity/Kconfig
 
@@ -198,6 +199,7 @@ choice
 	default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO
 	default DEFAULT_SECURITY_APPARMOR if SECURITY_APPARMOR
 	default DEFAULT_SECURITY_YAMA if SECURITY_YAMA
+	default DEFAULT_SECURITY_CHROMIUMOS if SECURITY_CHROMIUMOS
 	default DEFAULT_SECURITY_DAC
 
 	help
@@ -219,6 +221,9 @@ choice
 	config DEFAULT_SECURITY_YAMA
 		bool "Yama" if SECURITY_YAMA=y
 
+	config DEFAULT_SECURITY_CHROMIUMOS
+		bool "Chromium OS" if SECURITY_CHROMIUMOS=y
+
 	config DEFAULT_SECURITY_DAC
 		bool "Unix Discretionary Access Controls"
 
@@ -231,6 +236,7 @@ config DEFAULT_SECURITY
 	default "tomoyo" if DEFAULT_SECURITY_TOMOYO
 	default "apparmor" if DEFAULT_SECURITY_APPARMOR
 	default "yama" if DEFAULT_SECURITY_YAMA
+	default "chromiumos" if DEFAULT_SECURITY_CHROMIUMOS
 	default "" if DEFAULT_SECURITY_DAC
 
 endmenu