Merge tag 'v3.15' into next

Linux 3.15

1 files changed, 4 insertions, 2 deletions

diff --git a/security/integrity/evm/evm_secfs.c b/security/integrity/evm/evm_secfs.c
index 30f670ad6ac3..cf12a04717d3 100644
--- a/security/integrity/evm/evm_secfs.c
+++ b/security/integrity/evm/evm_secfs.c
@@ -13,6 +13,8 @@
  *      - Get the key and enable EVM
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/uaccess.h>
 #include <linux/module.h>
 #include "evm.h"
@@ -79,9 +81,9 @@ static ssize_t evm_write_key(struct file *file, const char __user *buf,
         error = evm_init_key();
         if (!error) {
                 evm_initialized = 1;
-                pr_info("EVM: initialized\n");
+                pr_info("initialized\n");
         } else
-                pr_err("EVM: initialization failed\n");
+                pr_err("initialization failed\n");
         return count;
 }