These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / security / yama / Kconfig

diff --git a/kernel/security/yama/Kconfig b/kernel/security/yama/Kconfig
index 3123e1d..90c605e 100644 (file)
--- a/kernel/security/yama/Kconfig
+++ b/kernel/security/yama/Kconfig
@@ -6,14 +6,7 @@ config SECURITY_YAMA
          This selects Yama, which extends DAC support with additional
          system-wide security settings beyond regular Linux discretionary
          access controls. Currently available is ptrace scope restriction.
+         Like capabilities, this security module stacks with other LSMs.
          Further information can be found in Documentation/security/Yama.txt.
 
          If you are unsure how to answer this question, answer N.
-
-config SECURITY_YAMA_STACKED
-       bool "Yama stacked with other LSMs"
-       depends on SECURITY_YAMA
-       default n
-       help
-         When Yama is built into the kernel, force it to stack with the
-         selected primary LSM.