1 files changed, 8 insertions, 3 deletions

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 429e0c92924e..7943e0c21bde 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -74,6 +74,10 @@ int arch_show_interrupts(struct seq_file *p, int prec)
         for_each_online_cpu(j)
                 seq_printf(p, "%10u ", irq_stats(j)->apic_irq_work_irqs);
         seq_printf(p, "  IRQ work interrupts\n");
+        seq_printf(p, "%*s: ", prec, "RTR");
+        for_each_online_cpu(j)
+                seq_printf(p, "%10u ", irq_stats(j)->icr_read_retry_count);
+        seq_printf(p, "  APIC ICR read retries\n");
 #endif
         if (x86_platform_ipi_callback) {
                 seq_printf(p, "%*s: ", prec, "PLT");
@@ -136,6 +140,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
         sum += irq_stats(cpu)->irq_spurious_count;
         sum += irq_stats(cpu)->apic_perf_irqs;
         sum += irq_stats(cpu)->apic_irq_work_irqs;
+        sum += irq_stats(cpu)->icr_read_retry_count;
 #endif
         if (x86_platform_ipi_callback)
                 sum += irq_stats(cpu)->x86_platform_ipis;
@@ -181,8 +186,8 @@ unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
         unsigned vector = ~regs->orig_ax;
         unsigned irq;
 
-        exit_idle();
         irq_enter();
+        exit_idle();
 
         irq = __this_cpu_read(vector_irq[vector]);
 
@@ -209,10 +214,10 @@ void smp_x86_platform_ipi(struct pt_regs *regs)
 
         ack_APIC_irq();
 
-        exit_idle();
-
         irq_enter();
 
+        exit_idle();
+
         inc_irq_stat(x86_platform_ipis);
 
         if (x86_platform_ipi_callback)