From 8137b6f7ec001038295097cafe181bc671efd491 Mon Sep 17 00:00:00 2001
From: Robin Holt <holt@sgi.com>
Date: Fri, 10 Aug 2007 13:00:43 -0700
Subject: [PATCH] --- yaml --- r: 63839 b: refs/heads/master c:
 b291aa7a6564e859af144e1bd14ffa463519b198 h: refs/heads/master i:   63837:
 8d0e61bf13d3bc43b00c1d339d05be87efedb8ff   63835:
 1dab66be6e757bbded118269a106e32eddebe06a   63831:
 dc5cd8a409a63407302a5c167d2563e6596f33eb   63823:
 2893a6e218bebd19309fd4542c11be1751b9c131   63807:
 e20f6fecc5466c3be0923e6fa89ec3445d285e67 v: v3

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

diff --git a/[refs] b/[refs]
index 6f4856ee3e31..79fe3659fc77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d31c5ab147e0b17b9ec0daa5e4d1fc0bd6b19974
+refs/heads/master: b291aa7a6564e859af144e1bd14ffa463519b198
diff --git a/trunk/arch/x86_64/kernel/apic.c b/trunk/arch/x86_64/kernel/apic.c
index 900ff38d68de..925758dbca0c 100644
--- a/trunk/arch/x86_64/kernel/apic.c
+++ b/trunk/arch/x86_64/kernel/apic.c
@@ -791,10 +791,8 @@ static void setup_APIC_timer(unsigned int clocks)
 
 	/* wait for irq slice */
 	if (hpet_address && hpet_use_timer) {
-		int trigger = hpet_readl(HPET_T0_CMP);
-		while (hpet_readl(HPET_COUNTER) >= trigger)
-			/* do nothing */ ;
-		while (hpet_readl(HPET_COUNTER) <  trigger)
+		u32 trigger = hpet_readl(HPET_T0_CMP);
+		while (hpet_readl(HPET_T0_CMP) == trigger)
 			/* do nothing */ ;
 	} else {
 		int c1, c2;