diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-17 10:50:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-17 10:50:48 +0200 |
| commit | 2257e268b1154966c5b0141b23695db1043ff39d (patch) | |
| tree | dae4b032afb9872568cf7921b39d30c79a6c3fee /arch/x86/include/asm/hardirq.h | |
| parent | 27aac20574110abfd594175a668dc58b23b2b14a (diff) | |
| parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) | |
Merge branch 'linus' into x86/boot, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/hardirq.h')
| -rw-r--r-- | arch/x86/include/asm/hardirq.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hardirq.h b/arch/x86/include/asm/hardirq.h index 9b76cd331990..ad1ed531febc 100644 --- a/arch/x86/include/asm/hardirq.h +++ b/arch/x86/include/asm/hardirq.h @@ -15,6 +15,7 @@ typedef struct { #ifdef CONFIG_HAVE_KVM unsigned int kvm_posted_intr_ipis; unsigned int kvm_posted_intr_wakeup_ipis; + unsigned int kvm_posted_intr_nested_ipis; #endif unsigned int x86_platform_ipis; /* arch dependent */ unsigned int apic_perf_irqs; |