[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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index 2d03cb2e031558f164a904fb66617a556b26d1b8..e7b11d23c4cd03785a6de32f97a782cd69f07708 100644 (file)
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -802,9 +802,9 @@ void __init time_init(void)
                 outl(0x800038a0, 0xcf8);
                 outl(0xff000001, 0xcfc);
                 outl(0x800038a0, 0xcf8);
-                hpet_address = inl(0xcfc) & 0xfffffffe;
+                vxtime.hpet_address = inl(0xcfc) & 0xfffffffe;
                printk(KERN_WARNING "time.c: WARNING: Enabled HPET "
-                      "at %#lx.\n", hpet_address);
+                      "at %#lx.\n", vxtime.hpet_address);
         }
 #endif
        if (nohpet)