Merge branch 'x86/ras' into x86/core, to fix conflicts

[linux-2.6-block.git] / arch / x86 / include / asm / hardirq.h

diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h
index db9f536f482f5fcf58923e4b00e35aa2f7673267..7178043b0e1dd69d20a6ff5ddaa37ee6c32841f8 100644 (file)
--- a/arch/x86/include/asm/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
@@ -14,6 +14,7 @@ typedef struct {
 #endif
 #ifdef CONFIG_HAVE_KVM
        unsigned int kvm_posted_intr_ipis;
+       unsigned int kvm_posted_intr_wakeup_ipis;
 #endif
        unsigned int x86_platform_ipis; /* arch dependent */
        unsigned int apic_perf_irqs;