diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:03:38 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:03:38 -0500 |
| commit | 90accd6fabf9b2fa2705945a4c601877a75d43bf (patch) | |
| tree | d393cb54f0228b1313139e4e14adf4f5cf236b59 /arch/x86/include/asm/kvm_host.h | |
| parent | b43d196c4d3fe46d6dda7c987c47792612b80b1b (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/memory-corruption-check
Diffstat (limited to 'arch/x86/include/asm/kvm_host.h')
| -rw-r--r-- | arch/x86/include/asm/kvm_host.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 65679d006337..8346be87cfa1 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h | |||
| @@ -364,6 +364,9 @@ struct kvm_arch{ | |||
| 364 | 364 | ||
| 365 | struct page *ept_identity_pagetable; | 365 | struct page *ept_identity_pagetable; |
| 366 | bool ept_identity_pagetable_done; | 366 | bool ept_identity_pagetable_done; |
| 367 | |||
| 368 | unsigned long irq_sources_bitmap; | ||
| 369 | unsigned long irq_states[KVM_IOAPIC_NUM_PINS]; | ||
| 367 | }; | 370 | }; |
| 368 | 371 | ||
| 369 | struct kvm_vm_stat { | 372 | struct kvm_vm_stat { |