From 210ef584369b44684afb900bd56cf67cd97070f3 Mon Sep 17 00:00:00 2001
From: john stultz <johnstul@us.ibm.com>
Date: Mon, 12 Dec 2005 22:17:13 -0800
Subject: [PATCH] --- yaml --- r: 15097 b: refs/heads/master c:
 fd4954714e8e7db9f6eb5878fa6111c46445ca81 h: refs/heads/master i:   15095:
 3032e57139a070cdbac413c0f7ed4f8525155841 v: v3

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

diff --git a/[refs] b/[refs]
index 744fe8b90900..3448a56f5769 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df818a52fb5e64c72b21029fb9ba80583106932c
+refs/heads/master: fd4954714e8e7db9f6eb5878fa6111c46445ca81
diff --git a/trunk/arch/x86_64/kernel/time.c b/trunk/arch/x86_64/kernel/time.c
index 4434e154f596..74102796e5c0 100644
--- a/trunk/arch/x86_64/kernel/time.c
+++ b/trunk/arch/x86_64/kernel/time.c
@@ -915,7 +915,7 @@ void __init time_init(void)
 		cpu_khz = hpet_calibrate_tsc();
 		timename = "HPET";
 #ifdef CONFIG_X86_PM_TIMER
-	} else if (pmtmr_ioport) {
+	} else if (pmtmr_ioport && !vxtime.hpet_address) {
 		vxtime_hz = PM_TIMER_FREQUENCY;
 		timename = "PM";
 		pit_init();