diff options
Diffstat (limited to 'arch/x86/kernel/hpet.c')
-rw-r--r-- | arch/x86/kernel/hpet.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 0f4b0651cd3f..4aecc54236a9 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
@@ -72,7 +72,7 @@ static inline void hpet_set_mapping(void) | |||
72 | { | 72 | { |
73 | hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE); | 73 | hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE); |
74 | #ifdef CONFIG_X86_64 | 74 | #ifdef CONFIG_X86_64 |
75 | __set_fixmap(VSYSCALL_HPET, hpet_address, PAGE_KERNEL_VSYSCALL_NOCACHE); | 75 | __set_fixmap(VSYSCALL_HPET, hpet_address, PAGE_KERNEL_VVAR_NOCACHE); |
76 | #endif | 76 | #endif |
77 | } | 77 | } |
78 | 78 | ||
@@ -739,13 +739,6 @@ static cycle_t read_hpet(struct clocksource *cs) | |||
739 | return (cycle_t)hpet_readl(HPET_COUNTER); | 739 | return (cycle_t)hpet_readl(HPET_COUNTER); |
740 | } | 740 | } |
741 | 741 | ||
742 | #ifdef CONFIG_X86_64 | ||
743 | static cycle_t __vsyscall_fn vread_hpet(void) | ||
744 | { | ||
745 | return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0); | ||
746 | } | ||
747 | #endif | ||
748 | |||
749 | static struct clocksource clocksource_hpet = { | 742 | static struct clocksource clocksource_hpet = { |
750 | .name = "hpet", | 743 | .name = "hpet", |
751 | .rating = 250, | 744 | .rating = 250, |
@@ -754,7 +747,7 @@ static struct clocksource clocksource_hpet = { | |||
754 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 747 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
755 | .resume = hpet_resume_counter, | 748 | .resume = hpet_resume_counter, |
756 | #ifdef CONFIG_X86_64 | 749 | #ifdef CONFIG_X86_64 |
757 | .vread = vread_hpet, | 750 | .archdata = { .vclock_mode = VCLOCK_HPET }, |
758 | #endif | 751 | #endif |
759 | }; | 752 | }; |
760 | 753 | ||