[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-9f51e24ee8b5a1595b6a5ac0c2be278a16488e75@git.kernel.org>
Date: Sun, 9 Aug 2009 20:30:39 GMT
From: tip-bot for Marcin Slusarz <marcin.slusarz@...il.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
marcin.slusarz@...il.com, tglx@...utronix.de, mingo@...e.hu
Subject: [tip:x86/cleanups] x86: Use printk_once()
Commit-ID: 9f51e24ee8b5a1595b6a5ac0c2be278a16488e75
Gitweb: http://git.kernel.org/tip/9f51e24ee8b5a1595b6a5ac0c2be278a16488e75
Author: Marcin Slusarz <marcin.slusarz@...il.com>
AuthorDate: Sun, 9 Aug 2009 21:54:00 +0200
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Sun, 9 Aug 2009 22:28:34 +0200
x86: Use printk_once()
Signed-off-by: Marcin Slusarz <marcin.slusarz@...il.com>
Cc: "H. Peter Anvin" <hpa@...or.com>
LKML-Reference: <1249847649-11631-6-git-send-email-marcin.slusarz@...il.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/kernel/irq_32.c | 5 ++---
arch/x86/kvm/x86.c | 7 +------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index 3b09634..7d35d0f 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -218,7 +218,6 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
void fixup_irqs(void)
{
unsigned int irq;
- static int warned;
struct irq_desc *desc;
for_each_irq_desc(irq, desc) {
@@ -236,8 +235,8 @@ void fixup_irqs(void)
}
if (desc->chip->set_affinity)
desc->chip->set_affinity(irq, affinity);
- else if (desc->action && !(warned++))
- printk("Cannot set affinity for irq %i\n", irq);
+ else if (desc->action)
+ printk_once("Cannot set affinity for irq %i\n", irq);
}
#if 0
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fe5474a..0572c90 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2261,12 +2261,7 @@ static int emulator_cmpxchg_emulated(unsigned long addr,
unsigned int bytes,
struct kvm_vcpu *vcpu)
{
- static int reported;
-
- if (!reported) {
- reported = 1;
- printk(KERN_WARNING "kvm: emulating exchange as write\n");
- }
+ printk_once(KERN_WARNING "kvm: emulating exchange as write\n");
#ifndef CONFIG_X86_64
/* guests cmpxchg8b have to be emulated atomically */
if (bytes == 8) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists