diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2009-09-25 11:09:37 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-10-04 13:57:23 +0200 |
| commit | b2d83cfa3fdefe5c6573d443d099a18dc3a93c5f (patch) | |
| tree | 4833580d843369a6a16a317a93114c512bc6504d /arch | |
| parent | KVM: s390: fix memsize >= 4G (diff) | |
| download | linux-b2d83cfa3fdefe5c6573d443d099a18dc3a93c5f.tar.xz linux-b2d83cfa3fdefe5c6573d443d099a18dc3a93c5f.zip | |
KVM: fix LAPIC timer period overflow
Don't overflow when computing the 64-bit period from 32-bit registers.
Fixes sourceforge bug #2826486.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Cc: stable@kernel.org
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 1ae5ceba7eb2..7024224f0fc8 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -664,7 +664,7 @@ static void start_apic_timer(struct kvm_lapic *apic) { ktime_t now = apic->lapic_timer.timer.base->get_time(); - apic->lapic_timer.period = apic_get_reg(apic, APIC_TMICT) * + apic->lapic_timer.period = (u64)apic_get_reg(apic, APIC_TMICT) * APIC_BUS_CYCLE_NS * apic->divide_count; atomic_set(&apic->lapic_timer.pending, 0); |