Merge branch 'linus' into perfcounters/core-v2

[linux-drm-fsl-dcu.git] / arch / x86 / include / asm / hardirq.h

diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h
index 46ebed797e4f307e8503603e0ef104e4464c3219..25454427ceea9029a04006677796fd63cb9fe879 100644 (file)
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -12,6 +12,7 @@ typedef struct {
        unsigned int apic_timer_irqs;   /* arch dependent */
        unsigned int irq_spurious_count;
 #endif
+       unsigned int generic_irqs;      /* arch dependent */
        unsigned int apic_perf_irqs;
 #ifdef CONFIG_SMP
        unsigned int irq_resched_count;