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 /include/asm-x86 | |
| parent | 39d0b7ba7b9c0a2c594073400cde1d0beffa0bea (diff) | |
| download | blackbird-op-linux-31c435d75e7d15a5f965c5eb0e33fe0e236f49a4.tar.gz blackbird-op-linux-31c435d75e7d15a5f965c5eb0e33fe0e236f49a4.zip | |
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 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/hpet.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/vsyscall.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h index e2976ed30b70..64446a9577dc 100644 --- a/include/asm-x86/hpet.h +++ b/include/asm-x86/hpet.h @@ -65,6 +65,7 @@ extern unsigned long hpet_address; extern int is_hpet_enabled(void); extern int hpet_enable(void); +extern unsigned long hpet_readl(unsigned long a); #ifdef CONFIG_HPET_EMULATE_RTC @@ -84,6 +85,7 @@ extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id); #else static inline int hpet_enable(void) { return 0; } +static inline unsigned long hpet_readl(unsigned long a) { return 0; } #endif /* CONFIG_HPET_TIMER */ #endif /* ASM_X86_HPET_H */ diff --git a/include/asm-x86/vsyscall.h b/include/asm-x86/vsyscall.h index 3b8ceb4af2cf..f01c49f5d108 100644 --- a/include/asm-x86/vsyscall.h +++ b/include/asm-x86/vsyscall.h @@ -29,9 +29,6 @@ enum vsyscall_num { #define VGETCPU_RDTSCP 1 #define VGETCPU_LSL 2 -#define hpet_readl(a) readl((const void __iomem *)fix_to_virt(FIX_HPET_BASE) + a) -#define hpet_writel(d,a) writel(d, (void __iomem *)fix_to_virt(FIX_HPET_BASE) + a) - extern int __vgetcpu_mode; extern volatile unsigned long __jiffies; |
