git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/soundcore-preclaim' into for-linus
[pandora-kernel.git]
/
arch
/
x86
/
kvm
/
i8254.c
diff --git
a/arch/x86/kvm/i8254.c
b/arch/x86/kvm/i8254.c
index
4d6f0d2
..
21f68e0
100644
(file)
--- a/
arch/x86/kvm/i8254.c
+++ b/
arch/x86/kvm/i8254.c
@@
-104,6
+104,9
@@
static s64 __kpit_elapsed(struct kvm *kvm)
ktime_t remaining;
struct kvm_kpit_state *ps = &kvm->arch.vpit->pit_state;
+ if (!ps->pit_timer.period)
+ return 0;
+
/*
* The Counter does not stop when it reaches zero. In
* Modes 0, 1, 4, and 5 the Counter ``wraps around'' to