Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / security / integrity / evm / evm_main.c

diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c
index bab1c39ffcaf234f4889587b8a69afd1432f5af3..6e0bd933b6a9a8a815f5d57c147f1d18dfbfec36 100644 (file)
--- a/security/integrity/evm/evm_main.c
+++ b/security/integrity/evm/evm_main.c
@@ -14,6 +14,8 @@
  *     evm_inode_removexattr, and evm_verifyxattr
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/crypto.h>
 #include <linux/audit.h>
@@ -432,7 +434,7 @@ static int __init init_evm(void)
 
        error = evm_init_secfs();
        if (error < 0) {
-               printk(KERN_INFO "EVM: Error registering secfs\n");
+               pr_info("Error registering secfs\n");
                goto err;
        }
 
@@ -449,7 +451,7 @@ static int __init evm_display_config(void)
        char **xattrname;
 
        for (xattrname = evm_config_xattrnames; *xattrname != NULL; xattrname++)
-               printk(KERN_INFO "EVM: %s\n", *xattrname);
+               pr_info("%s\n", *xattrname);
        return 0;
 }