Commit c9c95862 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: fix HPET_HACK_ENABLE_DANGEROUS

From: <mg@iceni.pl>

The following patch fixes compilation of time.c with
HPET_HACK_ENABLE_DANGEROUS turned on.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 156771fc
...@@ -802,9 +802,9 @@ void __init time_init(void) ...@@ -802,9 +802,9 @@ void __init time_init(void)
outl(0x800038a0, 0xcf8); outl(0x800038a0, 0xcf8);
outl(0xff000001, 0xcfc); outl(0xff000001, 0xcfc);
outl(0x800038a0, 0xcf8); outl(0x800038a0, 0xcf8);
hpet_address = inl(0xcfc) & 0xfffffffe; vxtime.hpet_address = inl(0xcfc) & 0xfffffffe;
printk(KERN_WARNING "time.c: WARNING: Enabled HPET " printk(KERN_WARNING "time.c: WARNING: Enabled HPET "
"at %#lx.\n", hpet_address); "at %#lx.\n", vxtime.hpet_address);
} }
#endif #endif
if (nohpet) if (nohpet)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment