2 files changed, 3 insertions, 9 deletions

diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index 3b09634a5153..7d35d0fe2329 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 fe5474aec41a..0572c90f0c84 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) {