aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-10-17 16:01:50 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2014-10-17 16:40:54 -0400
commit951a18c6fee5d2f6f5d7b5118776bf787bf9c351 (patch)
treee0fb3de34ac40d7626a980f878037ef9ea341e33
parentcba0fdbcff8b54c206c8e18898a55456959ed51a (diff)
x86, msr: Convert printk to pr_foo()
Also define pr_fmt. Signed-off-by: Fabian Frederick <fabf@skynet.be> Link: http://lkml.kernel.org/r/1413576110-27103-1-git-send-email-fabf@skynet.be Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--arch/x86/kernel/msr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
index 6e4f77fb6514..826c8b0cc099 100644
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
@@ -22,6 +22,8 @@
22 * an SMP box will direct the access to CPU %d. 22 * an SMP box will direct the access to CPU %d.
23 */ 23 */
24 24
25#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
26
25#include <linux/module.h> 27#include <linux/module.h>
26 28
27#include <linux/types.h> 29#include <linux/types.h>
@@ -248,8 +250,7 @@ static int __init msr_init(void)
248 i = 0; 250 i = 0;
249 251
250 if (__register_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr", &msr_fops)) { 252 if (__register_chrdev(MSR_MAJOR, 0, NR_CPUS, "cpu/msr", &msr_fops)) {
251 printk(KERN_ERR "msr: unable to get major %d for msr\n", 253 pr_err("unable to get major %d for msr\n", MSR_MAJOR);
252 MSR_MAJOR);
253 err = -EBUSY; 254 err = -EBUSY;
254 goto out; 255 goto out;
255 } 256 }