2.6.10-rc4-mm1 hpet compile fix for AMD64

2.6.10-rc4-mm1 hpet compile fix for AMD64

[Badari Pulavarty]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

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



[-- Attachment #2: hpet_compile_fix.patch --]
[-- Type: text/plain, Size: 430 bytes --]

--- 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);

Re: 2.6.10-rc4-mm1 hpet compile fix for AMD64

[Venkatesh Pallipadi]

On Wed, Oct 27, 2004 at 03:00:37PM -0700, Badari Pulavarty wrote:
> 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'
> 
> 

That would be a bug introduced by my hpet-reenabling-after-suspend-resume.patch
This should be a better fix.

Thanks,
Venki

Signed-off-by:: "Venkatesh Pallipadi" <venkatesh.pallipadi@intel.com>

--- linux-2.6.9//arch/x86_64/kernel/time.c.org	2004-10-05 15:23:44.903948384 -0700
+++ linux-2.6.9//arch/x86_64/kernel/time.c	2004-10-05 15:30:41.242655280 -0700
@@ -899,7 +899,7 @@ static int timer_resume(struct sys_devic
 	unsigned long flags;
 	unsigned long sec;
 
-	if (is_hpet_enabled())
+	if (vxtime.hpet_address)
 		hpet_reenable();
 
 	sec = get_cmos_time() + clock_cmos_diff;