diff options
author | john stultz <johnstul@us.ibm.com> | 2007-02-16 04:28:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 11:14:00 -0500 |
commit | 2d0c87c3bc49c60ab5bbac401fb1ef37ff10bbe2 (patch) | |
tree | 4d32459045a40e655aa490305018a449e2891a32 /include/asm-x86_64 | |
parent | acc9a9dcdd0dd1d295c2f2ee02c27c761bd63cb1 (diff) |
[PATCH] time: x86_64: hpet_address cleanup
In preparation for supporting generic timekeeping, this patch cleans up
x86-64's use of vxtime.hpet_address, changing it to just hpet_address as is
also used in i386. This is necessary since the vxtime structure will be going
away.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r-- | include/asm-x86_64/hpet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86_64/hpet.h b/include/asm-x86_64/hpet.h index b39098408b69..60d51274fcf9 100644 --- a/include/asm-x86_64/hpet.h +++ b/include/asm-x86_64/hpet.h | |||
@@ -58,6 +58,7 @@ extern int hpet_rtc_timer_init(void); | |||
58 | extern int apic_is_clustered_box(void); | 58 | extern int apic_is_clustered_box(void); |
59 | 59 | ||
60 | extern int hpet_use_timer; | 60 | extern int hpet_use_timer; |
61 | extern unsigned long hpet_address; | ||
61 | 62 | ||
62 | #ifdef CONFIG_HPET_EMULATE_RTC | 63 | #ifdef CONFIG_HPET_EMULATE_RTC |
63 | extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask); | 64 | extern int hpet_mask_rtc_irq_bit(unsigned long bit_mask); |