From 29cc5708972305320198d2aca421c5b7b3171ab8 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 25 Mar 2006 16:29:31 +0100
Subject: [PATCH] --- yaml --- r: 23800 b: refs/heads/master c:
 9ede6b0945223d1e353501f41b988a3db56b4e27 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86_64/kernel/time.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 74680f45d5ab..ddb1fcb2707d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51f62e186b78f8743246a349b09be370c8735479
+refs/heads/master: 9ede6b0945223d1e353501f41b988a3db56b4e27
diff --git a/trunk/arch/x86_64/kernel/time.c b/trunk/arch/x86_64/kernel/time.c
index ee5ce3d3cbc3..86039baaaf18 100644
--- a/trunk/arch/x86_64/kernel/time.c
+++ b/trunk/arch/x86_64/kernel/time.c
@@ -354,7 +354,7 @@ void main_timer_handler(struct pt_regs *regs)
 {
 	static unsigned long rtc_update = 0;
 	unsigned long tsc;
-	int delay, offset = 0, lost = 0;
+	int delay = 0, offset = 0, lost = 0;
 
 /*
  * Here we are in the timer irq handler. We have irqs locally disabled (so we
@@ -375,7 +375,7 @@ void main_timer_handler(struct pt_regs *regs)
 		 */
 		offset = hpet_readl(HPET_T0_CMP) - hpet_tick;
 		delay = hpet_readl(HPET_COUNTER) - offset;
-	} else {
+	} else if (!pmtmr_ioport) {
 		spin_lock(&i8253_lock);
 		outb_p(0x00, 0x43);
 		delay = inb_p(0x40);