2.6.10-rc4-mm1 hpet compile fix for AMD64

From: Badari Pulavarty
Date: Wed Oct 27 2004 - 17:36:06 EST


Hi Andrew,

Here is the HPET compile fix for AMD64. Without this, you
get following link error. (without HPET)

arch/x86_64/kernel/built-in.o(.text+0x6426): In function `timer_resume':
arch/x86_64/kernel/time.c:971: undefined reference to `is_hpet_enabled'


Thanks,
Badari


--- linux.org/arch/x86_64/kernel/time.c 2004-10-27 15:33:22.369395312 -0700
+++ linux/arch/x86_64/kernel/time.c 2004-10-27 15:36:09.458993832 -0700
@@ -968,8 +968,10 @@ static int timer_resume(struct sys_devic
unsigned long flags;
unsigned long sec;

+#ifdef CONFIG_HPET_EMULATE_RTC
if (is_hpet_enabled())
hpet_reenable();
+#endif

sec = get_cmos_time() + clock_cmos_diff;
write_seqlock_irqsave(&xtime_lock,flags);