aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/hpet.c
diff options
context:
space:
mode:
authorChris Wright <chrisw@sous-sol.org>2007-10-12 17:04:23 -0400
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-12 17:04:23 -0400
commit31c435d75e7d15a5f965c5eb0e33fe0e236f49a4 (patch)
tree800c8fe9722e34bfbf3ba52c2393b22264ba4bed /arch/x86/kernel/hpet.c
parent39d0b7ba7b9c0a2c594073400cde1d0beffa0bea (diff)
i386/x8664: cleanup the shared hpet code
Remove hpet_readl/writel from vsyscall.h, where it does not belong anyway. Use the hpet code itself. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/hpet.c')
-rw-r--r--arch/x86/kernel/hpet.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index dbe0e1d44113..078dbc6d80ec 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -25,11 +25,7 @@
25unsigned long hpet_address; 25unsigned long hpet_address;
26static void __iomem *hpet_virt_address; 26static void __iomem *hpet_virt_address;
27 27
28/* Temporary hack. Cleanup after x86_64 clock events conversion */ 28unsigned long hpet_readl(unsigned long a)
29#undef hpet_readl
30#undef hpet_writel
31
32static inline unsigned long hpet_readl(unsigned long a)
33{ 29{
34 return readl(hpet_virt_address + a); 30 return readl(hpet_virt_address + a);
35} 31}