diff options
| -rw-r--r-- | arch/x86/kernel/hpet.c | 6 | ||||
| -rw-r--r-- | include/asm-x86/hpet.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/vsyscall.h | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index dbe0e1d..078dbc6 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); } diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h index e2976ed30..64446a9 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 3b8ceb4..f01c49f 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; |
