2014-10-17 20:01:55

by Fabian Frédérick

Subject: [PATCH 3/4 linux-next] x86, msr: convert printk to pr_foo()

Also define pr_fmt.

Signed-off-by: Fabian Frederick <[email protected]>
---
arch/x86/kernel/msr.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 5b14dac..1c66cd0 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -22,6 +22,8 @@
* an SMP box will direct the access to CPU %d.
*/

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>

#include <linux/types.h>
@@ -248,8 +250,7 @@ static int __init msr_init(void)
i = 0;

if (__register_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr", &msr_fops)) {
- printk(KERN_ERR "msr: unable to get major %d for msr\n",
- MSR_MAJOR);
+ pr_err("unable to get major %d for msr\n", MSR_MAJOR);
err = -EBUSY;
goto out;
}
--
1.9.3

2014-10-17 20:47:26

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/cleanups] x86, msr: Convert printk to pr_foo()

Commit-ID: 951a18c6fee5d2f6f5d7b5118776bf787bf9c351
Gitweb: http://git.kernel.org/tip/951a18c6fee5d2f6f5d7b5118776bf787bf9c351
Author: Fabian Frederick <[email protected]>
AuthorDate: Fri, 17 Oct 2014 22:01:50 +0200
Committer: H. Peter Anvin <[email protected]>
CommitDate: Fri, 17 Oct 2014 13:40:54 -0700

x86, msr: Convert printk to pr_foo()

Also define pr_fmt.

Signed-off-by: Fabian Frederick <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: H. Peter Anvin <[email protected]>
---
arch/x86/kernel/msr.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 6e4f77f..826c8b0 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -22,6 +22,8 @@
* an SMP box will direct the access to CPU %d.
*/

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>

#include <linux/types.h>
@@ -248,8 +250,7 @@ static int __init msr_init(void)
i = 0;

if (__register_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr", &msr_fops)) {
- printk(KERN_ERR "msr: unable to get major %d for msr\n",
- MSR_MAJOR);
+ pr_err("unable to get major %d for msr\n", MSR_MAJOR);
err = -EBUSY;
goto out;
}