diff options
| author | Chris Wright <chrisw@sous-sol.org> | 2007-10-12 23:04:23 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-12 23:04:23 +0200 |
| commit | 31c435d75e7d15a5f965c5eb0e33fe0e236f49a4 (patch) | |
| tree | 800c8fe9722e34bfbf3ba52c2393b22264ba4bed /arch/x86/kernel | |
| parent | 39d0b7ba7b9c0a2c594073400cde1d0beffa0bea (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')
| -rw-r--r-- | arch/x86/kernel/hpet.c | 6 |
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 @@ unsigned long hpet_address; static void __iomem *hpet_virt_address; -/* Temporary hack. Cleanup after x86_64 clock events conversion */ -#undef hpet_readl -#undef hpet_writel - -static inline unsigned long hpet_readl(unsigned long a) +unsigned long hpet_readl(unsigned long a) { return readl(hpet_virt_address + a); } |