diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-03-12 16:33:48 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-03-12 16:33:48 +1100 |
| commit | 33b25335184b33dafddb4a83c27270947e525641 (patch) | |
| tree | 537e9498c9faebd46f513598a212d06fb1c32a23 /security/integrity/evm/evm_main.c | |
| parent | d4a141c8e77043bd674dd6aa0b40bc3675cb7b1d (diff) | |
| parent | a3aef94b312ec51b5dfc199ef884924e60ad1b75 (diff) | |
Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'security/integrity/evm/evm_main.c')
| -rw-r--r-- | security/integrity/evm/evm_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index 336b3ddfe63f..996092f21b64 100644 --- 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; } |