diff options
| author | Andy Lutomirski <luto@amacapital.net> | 2014-05-05 12:19:36 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-05 13:19:01 -0700 |
| commit | f40c330091c7aa9956ab66f97a3abc8a68b67240 (patch) | |
| tree | b0c03dce9bf67eb15c98980a7323ca35122d10df /arch/x86/kernel/hpet.c | |
| parent | 18d0a6fd227177fd243993179c90e454d0638b06 (diff) | |
| download | blackbird-op-linux-f40c330091c7aa9956ab66f97a3abc8a68b67240.tar.gz blackbird-op-linux-f40c330091c7aa9956ab66f97a3abc8a68b67240.zip | |
x86, vdso: Move the vvar and hpet mappings next to the 64-bit vDSO
This makes the 64-bit and x32 vdsos use the same mechanism as the
32-bit vdso. Most of the churn is deleting all the old fixmap code.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/8af87023f57f6bb96ec8d17fce3f88018195b49b.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/hpet.c')
| -rw-r--r-- | arch/x86/kernel/hpet.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 8d80ae011603..bbc15a0362d2 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -74,9 +74,6 @@ static inline void hpet_writel(unsigned int d, unsigned int a) static inline void hpet_set_mapping(void) { hpet_virt_address = ioremap_nocache(hpet_address, HPET_MMAP_SIZE); -#ifdef CONFIG_X86_64 - __set_fixmap(VSYSCALL_HPET, hpet_address, PAGE_KERNEL_VVAR_NOCACHE); -#endif } static inline void hpet_clear_mapping(void) |
