aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/hpet.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/hpet.c')
-rw-r--r--arch/x86/kernel/hpet.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 0e07257bb389..d10cc009845f 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -738,13 +738,6 @@ static cycle_t read_hpet(struct clocksource *cs)
738 return (cycle_t)hpet_readl(HPET_COUNTER); 738 return (cycle_t)hpet_readl(HPET_COUNTER);
739} 739}
740 740
741#ifdef CONFIG_X86_64
742static cycle_t __vsyscall_fn vread_hpet(void)
743{
744 return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
745}
746#endif
747
748static struct clocksource clocksource_hpet = { 741static struct clocksource clocksource_hpet = {
749 .name = "hpet", 742 .name = "hpet",
750 .rating = 250, 743 .rating = 250,
@@ -753,7 +746,7 @@ static struct clocksource clocksource_hpet = {
753 .flags = CLOCK_SOURCE_IS_CONTINUOUS, 746 .flags = CLOCK_SOURCE_IS_CONTINUOUS,
754 .resume = hpet_resume_counter, 747 .resume = hpet_resume_counter,
755#ifdef CONFIG_X86_64 748#ifdef CONFIG_X86_64
756 .archdata = { .vread = vread_hpet }, 749 .archdata = { .vclock_mode = VCLOCK_HPET },
757#endif 750#endif
758}; 751};
759 752