x86: Convert per-cpu counter icr_read_retry_count into a member of irq_stat

LAPIC related statistics are grouped inside the per-cpu
structure irq_stat, so there is no need for icr_read_retry_count
to be a standalone per-cpu variable.

This patch moves icr_read_retry_count to where it belongs.

Suggested-y: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Cc: Jörn Engel <joern@logfs.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 4bbf1627905b..ef54ed4e307d 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -76,7 +76,7 @@ int arch_show_interrupts(struct seq_file *p, int prec)
         seq_printf(p, "  IRQ work interrupts\n");
         seq_printf(p, "%*s: ", prec, "RTR");
         for_each_online_cpu(j)
-                seq_printf(p, "%10u ", per_cpu(icr_read_retry_count, 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) {
@@ -140,7 +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 += per_cpu(icr_read_retry_count, cpu);
+        sum += irq_stats(cpu)->icr_read_retry_count;
 #endif
         if (x86_platform_ipi_callback)
                 sum += irq_stats(cpu)->x86_platform_ipis;