X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=security%2Fsecurity.c;h=46f405ce6b0fbab600ea542a6921bea9227b0ef5;hb=35e372a3a1f016648f278aeb7b55fe347b6699da;hp=75b85fdc4e9789bde2fe59b56a29a89ee4020c28;hpb=4c12ab7e5e2e892fa94df500f96001837918a281;p=deliverable%2Flinux.git

diff --git a/security/security.c b/security/security.c
index 75b85fdc4e97..46f405ce6b0f 100644
--- a/security/security.c
+++ b/security/security.c
@@ -56,18 +56,13 @@ int __init security_init(void)
 	pr_info("Security Framework initialized\n");
 
 	/*
-	 * Always load the capability module.
+	 * Load minor LSMs, with the capability module always first.
 	 */
 	capability_add_hooks();
-#ifdef CONFIG_SECURITY_YAMA_STACKED
-	/*
-	 * If Yama is configured for stacking load it next.
-	 */
 	yama_add_hooks();
-#endif
+
 	/*
-	 * Load the chosen module if there is one.
-	 * This will also find yama if it is stacking
+	 * Load all the remaining security modules.
 	 */
 	do_security_initcalls();