From 585225bb94840521507d1244de7d20174512eb98 Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Mon, 23 Feb 2009 10:57:39 -0300
Subject: [PATCH] --- yaml --- r: 146484 b: refs/heads/master c:
 5a05d54554f19a128306eca7f7f5ed31f7d7eeb9 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/kvm/i8254.c | 1 -
 trunk/arch/x86/kvm/i8254.h | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e3308bf5b350..51dd726fe26d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b95b51d580bff9376850eef29d34c3aa08c26db7
+refs/heads/master: 5a05d54554f19a128306eca7f7f5ed31f7d7eeb9
diff --git a/trunk/arch/x86/kvm/i8254.c b/trunk/arch/x86/kvm/i8254.c
index c13bb92d3157..3eddae692c05 100644
--- a/trunk/arch/x86/kvm/i8254.c
+++ b/trunk/arch/x86/kvm/i8254.c
@@ -208,7 +208,6 @@ static int __pit_timer_fn(struct kvm_kpit_state *ps)
 		wake_up_interruptible(&vcpu0->wq);
 
 	hrtimer_add_expires_ns(&pt->timer, pt->period);
-	pt->scheduled = hrtimer_get_expires_ns(&pt->timer);
 	if (pt->period)
 		ps->channels[0].count_load_time = ktime_get();
 
diff --git a/trunk/arch/x86/kvm/i8254.h b/trunk/arch/x86/kvm/i8254.h
index 6acbe4b505d5..521accf3bae7 100644
--- a/trunk/arch/x86/kvm/i8254.h
+++ b/trunk/arch/x86/kvm/i8254.h
@@ -7,7 +7,6 @@ struct kvm_kpit_timer {
 	struct hrtimer timer;
 	int irq;
 	s64 period; /* unit: ns */
-	s64 scheduled;
 	atomic_t pending;
 	bool reinject;
 };