---

yaml --- r: 15097 b: refs/heads/master c: fd49547 h: refs/heads/master i: 15095: 3032e57 v: v3
git-mirror · Dec 13, 2005 · 210ef58 · 210ef58
1 parent ebf042a
commit 210ef58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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();