From: tip-bot for Joe Perches <joe@perches.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
joe@perches.com, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:x86/urgent] x86: i8254.c: Add pr_fmt(fmt)
Date: Thu, 10 Dec 2009 08:43:04 GMT [thread overview]
Message-ID: <tip-a78d9626f4f6fa7904bfdb071205080743125983@git.kernel.org> (raw)
In-Reply-To: <bbd4de532f18bb7c11f64ba20d224c08291cb126.1260383912.git.joe@perches.com>
Commit-ID: a78d9626f4f6fa7904bfdb071205080743125983
Gitweb: http://git.kernel.org/tip/a78d9626f4f6fa7904bfdb071205080743125983
Author: Joe Perches <joe@perches.com>
AuthorDate: Wed, 9 Dec 2009 10:45:35 -0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 10 Dec 2009 08:57:50 +0100
x86: i8254.c: Add pr_fmt(fmt)
- Add pr_fmt(fmt) "pit: " fmt
- Strip pit: prefixes from pr_debug
Signed-off-by: Joe Perches <joe@perches.com>
LKML-Reference: <bbd4de532f18bb7c11f64ba20d224c08291cb126.1260383912.git.joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kvm/i8254.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index fab7440..296aba4 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -29,6 +29,8 @@
* Based on QEMU and Xen.
*/
+#define pr_fmt(fmt) "pit: " fmt
+
#include <linux/kvm_host.h>
#include "irq.h"
@@ -262,7 +264,7 @@ void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu)
static void destroy_pit_timer(struct kvm_timer *pt)
{
- pr_debug("pit: execute del timer!\n");
+ pr_debug("execute del timer!\n");
hrtimer_cancel(&pt->timer);
}
@@ -284,7 +286,7 @@ static void create_pit_timer(struct kvm_kpit_state *ps, u32 val, int is_period)
interval = muldiv64(val, NSEC_PER_SEC, KVM_PIT_FREQ);
- pr_debug("pit: create pit timer, interval is %llu nsec\n", interval);
+ pr_debug("create pit timer, interval is %llu nsec\n", interval);
/* TODO The new value only affected after the retriggered */
hrtimer_cancel(&pt->timer);
@@ -309,7 +311,7 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)
WARN_ON(!mutex_is_locked(&ps->lock));
- pr_debug("pit: load_count val is %d, channel is %d\n", val, channel);
+ pr_debug("load_count val is %d, channel is %d\n", val, channel);
/*
* The largest possible initial count is 0; this is equivalent
@@ -395,8 +397,8 @@ static int pit_ioport_write(struct kvm_io_device *this,
mutex_lock(&pit_state->lock);
if (val != 0)
- pr_debug("pit: write addr is 0x%x, len is %d, val is 0x%x\n",
- (unsigned int)addr, len, val);
+ pr_debug("write addr is 0x%x, len is %d, val is 0x%x\n",
+ (unsigned int)addr, len, val);
if (addr == 3) {
channel = val >> 6;
next prev parent reply other threads:[~2009-12-10 8:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200912082259.nB8Mx2ih008207@hera.kernel.org>
2009-12-08 23:06 ` x86: ucode-amd: Convert printk(KERN_*...) to pr_*(...) Joe Perches
2009-12-09 6:05 ` Ingo Molnar
2009-12-09 6:30 ` [PATCH] arch/x86/kernel/microcode*: Use pr_fmt and remove duplicated KERN_ERR prefix Joe Perches
2009-12-09 7:26 ` Ingo Molnar
2009-12-09 18:45 ` [PATCH 0/5] arch/x86: Add #define pr_fmt(fmt) and use pr_<level> Joe Perches
2009-12-09 18:45 ` [PATCH 1/5] es7000_32.c: use pr_<level> and add pr_fmt(fmt) Joe Perches
2009-12-10 8:42 ` [tip:x86/urgent] x86: es7000_32.c: Use " tip-bot for Joe Perches
2009-12-09 18:45 ` [PATCH 2/5] arch/x86/kernel/setup_percpu.c: use " Joe Perches
2009-12-10 8:42 ` [tip:x86/urgent] x86: setup_percpu.c: Use " tip-bot for Joe Perches
2009-12-09 18:45 ` [PATCH 3/5] i8254.c: Add pr_fmt(fmt) Joe Perches
2009-12-10 8:43 ` tip-bot for Joe Perches [this message]
2009-12-09 18:45 ` [PATCH 4/5] kmmio.c: Add and use pr_fmt(fmt) Joe Perches
2009-12-10 8:43 ` [tip:x86/urgent] x86: " tip-bot for Joe Perches
2009-12-09 18:45 ` [PATCH 5/5] arch/x86/mm/mmio-mod.c: use pr_fmt Joe Perches
2009-12-10 8:43 ` [tip:x86/urgent] x86: mmio-mod.c: Use pr_fmt tip-bot for Joe Perches
2009-12-09 9:51 ` [tip:x86/urgent] arch/x86/kernel/microcode*: Use pr_fmt() and remove duplicated KERN_ERR prefix tip-bot for Joe Perches
2009-12-09 6:51 ` [PATCH] checkpatch.pl: Warn on pr_<level> or dev_<level> with KERN_<level> Joe Perches
2009-12-09 7:32 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-a78d9626f4f6fa7904bfdb071205080743125983@git.kernel.org \
--to=joe@perches.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox