Merge tag 'pinctrl-v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[linux.git] / security / tomoyo / load_policy.c

diff --git a/security/tomoyo/load_policy.c b/security/tomoyo/load_policy.c
index 81b95165205119fb41c6508044c2729e2c48a2b6..3445ae6fd4794eaf430384ec63622004bc93f8fb 100644 (file)
--- a/security/tomoyo/load_policy.c
+++ b/security/tomoyo/load_policy.c
@@ -37,11 +37,12 @@ __setup("TOMOYO_loader=", tomoyo_loader_setup);
 static bool tomoyo_policy_loader_exists(void)
 {
        struct path path;
+
        if (!tomoyo_loader)
                tomoyo_loader = CONFIG_SECURITY_TOMOYO_POLICY_LOADER;
        if (kern_path(tomoyo_loader, LOOKUP_FOLLOW, &path)) {
-               printk(KERN_INFO "Not activating Mandatory Access Control "
-                      "as %s does not exist.\n", tomoyo_loader);
+               pr_info("Not activating Mandatory Access Control as %s does not exist.\n",
+                       tomoyo_loader);
                return false;
        }
        path_put(&path);
@@ -96,8 +97,7 @@ void tomoyo_load_policy(const char *filename)
        if (!tomoyo_policy_loader_exists())
                return;
        done = true;
-       printk(KERN_INFO "Calling %s to load policy. Please wait.\n",
-              tomoyo_loader);
+       pr_info("Calling %s to load policy. Please wait.\n", tomoyo_loader);
        argv[0] = (char *) tomoyo_loader;
        argv[1] = NULL;
        envp[0] = "HOME=/";