From a5296133212c9909abadaf98babde73b8a10d838 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Wed, 14 Dec 2011 19:25:33 +0100
Subject: [PATCH] --- yaml --- r: 282047 b: refs/heads/master c:
 a647795efbedeedf8a1dc6deded26defa23562bd h: refs/heads/master i:   282045:
 b934fd00e86c852e3b04b3b67c02729919129456   282043:
 4b8c0efe49c3383629d454f762d4f53e0a5935b9   282039:
 8a9b991adedb55842318e7b8404c7dd0a72880d8   282031:
 1849f53d3096e2c9bdbb1f0918de491a8d6fc787   282015:
 1ac73ce092711f02c7e361bed49a5ab7b08a63fa   281983:
 1d8411c930149aca4fc1d632fef306d78a958265 v: v3

---
 [refs]                     |  2 +-
 trunk/arch/x86/kvm/i8254.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index cea7b7bbdcbd..d28070d89044 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb5a798ad58996e4d666ead1016705854d5ca616
+refs/heads/master: a647795efbedeedf8a1dc6deded26defa23562bd
diff --git a/trunk/arch/x86/kvm/i8254.c b/trunk/arch/x86/kvm/i8254.c
index 405f2620392f..d68f99df690c 100644
--- a/trunk/arch/x86/kvm/i8254.c
+++ b/trunk/arch/x86/kvm/i8254.c
@@ -344,7 +344,7 @@ static void create_pit_timer(struct kvm *kvm, u32 val, int is_period)
 	struct kvm_timer *pt = &ps->pit_timer;
 	s64 interval;
 
-	if (!irqchip_in_kernel(kvm))
+	if (!irqchip_in_kernel(kvm) || ps->flags & KVM_PIT_FLAGS_HPET_LEGACY)
 		return;
 
 	interval = muldiv64(val, NSEC_PER_SEC, KVM_PIT_FREQ);
@@ -397,15 +397,11 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)
 	case 1:
         /* FIXME: enhance mode 4 precision */
 	case 4:
-		if (!(ps->flags & KVM_PIT_FLAGS_HPET_LEGACY)) {
-			create_pit_timer(kvm, val, 0);
-		}
+		create_pit_timer(kvm, val, 0);
 		break;
 	case 2:
 	case 3:
-		if (!(ps->flags & KVM_PIT_FLAGS_HPET_LEGACY)){
-			create_pit_timer(kvm, val, 1);
-		}
+		create_pit_timer(kvm, val, 1);
 		break;
 	default:
 		destroy_pit_timer(kvm->arch.vpit);