diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-10 15:18:15 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-10 15:18:15 (GMT) |
| commit | 2cbd1883881ac490d93514324b947a0267c5ca96 (patch) | |
| tree | 79211d70db535cfb838f3e79d31dd2ceaf6d22c1 /arch/x86/kvm/i8254.c | |
| parent | 5993fe31c0e9646233ff4ecea32e3c899036eda9 (diff) | |
| parent | ee73f656a604d5aa9df86a97102e4e462dd79924 (diff) | |
| download | linux-2cbd1883881ac490d93514324b947a0267c5ca96.tar.xz | |
Merge branch 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm
* 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: PIT: control word is write-only
kvmclock: count total_sleep_time when updating guest clock
Export the symbol of getboottime and mmonotonic_to_bootbased
Diffstat (limited to 'arch/x86/kvm/i8254.c')
| -rw-r--r-- | arch/x86/kvm/i8254.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index 296aba4..15578f1 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c @@ -467,6 +467,9 @@ static int pit_ioport_read(struct kvm_io_device *this, return -EOPNOTSUPP; addr &= KVM_PIT_CHANNEL_MASK; + if (addr == 3) + return 0; + s = &pit_state->channels[addr]; mutex_lock(&pit_state->lock); |