From 85c4550202d8ffe8ed0ed86401c7746d9d6f462a Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Thu, 2 Jul 2009 20:02:15 -0300
Subject: [PATCH] --- yaml --- r: 156582 b: refs/heads/master c:
 0ff77873b1318fc2d77a85e70690d3cd6cafbd41 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/kvm/i8254.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 665fd61d2a7a..289c8f9a35c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e125e7b6944898831b56739a5448e705578bf7e2
+refs/heads/master: 0ff77873b1318fc2d77a85e70690d3cd6cafbd41
diff --git a/trunk/arch/x86/kvm/i8254.c b/trunk/arch/x86/kvm/i8254.c
index 4d6f0d293ee2..21f68e00524f 100644
--- a/trunk/arch/x86/kvm/i8254.c
+++ b/trunk/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