diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-28 12:50:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-28 12:50:11 -0400 |
| commit | a1865769254dd4eefbc1e857d17bc2a77d5f8580 (patch) | |
| tree | 0e323458d99e2e1222da0157e80fc44e4313f5e2 /arch/x86/kvm/i8254.h | |
| parent | 0d8762c9ee40cf83d5dbf3a22843bc566912b592 (diff) | |
| parent | e45948b071d8be59044ac232d99a2ca83fd93266 (diff) | |
Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
* 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
KVM: ia64: Makefile fix for forcing to re-generate asm-offsets.h
KVM: Future-proof device assignment ABI
KVM: ia64: Fix halt emulation logic
KVM: Fix guest shared interrupt with in-kernel irqchip
KVM: MMU: sync root on paravirt TLB flush
Diffstat (limited to 'arch/x86/kvm/i8254.h')
| -rw-r--r-- | arch/x86/kvm/i8254.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h index e436d4983aa..4178022b97a 100644 --- a/arch/x86/kvm/i8254.h +++ b/arch/x86/kvm/i8254.h | |||
| @@ -44,6 +44,7 @@ struct kvm_pit { | |||
| 44 | struct kvm_io_device speaker_dev; | 44 | struct kvm_io_device speaker_dev; |
| 45 | struct kvm *kvm; | 45 | struct kvm *kvm; |
| 46 | struct kvm_kpit_state pit_state; | 46 | struct kvm_kpit_state pit_state; |
| 47 | int irq_source_id; | ||
| 47 | }; | 48 | }; |
| 48 | 49 | ||
| 49 | #define KVM_PIT_BASE_ADDRESS 0x40 | 50 | #define KVM_PIT_BASE_ADDRESS 0x40 |