1 files changed, 10 insertions, 2 deletions

diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h
index f4a95f20f8ec..176f058e7159 100644
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -7,14 +7,22 @@
 typedef struct {
         unsigned int __softirq_pending;
         unsigned int __nmi_count;       /* arch dependent */
-        unsigned int apic_timer_irqs;   /* arch dependent */
         unsigned int irq0_irqs;
+#ifdef CONFIG_X86_LOCAL_APIC
+        unsigned int apic_timer_irqs;   /* arch dependent */
+        unsigned int irq_spurious_count;
+#endif
+#ifdef CONFIG_SMP
         unsigned int irq_resched_count;
         unsigned int irq_call_count;
         unsigned int irq_tlb_count;
+#endif
+#ifdef CONFIG_X86_MCE
         unsigned int irq_thermal_count;
-        unsigned int irq_spurious_count;
+# ifdef CONFIG_X86_64
         unsigned int irq_threshold_count;
+# endif
+#endif
 } ____cacheline_aligned irq_cpustat_t;
 
 DECLARE_PER_CPU(irq_cpustat_t, irq_stat);