hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Chris Wright 2007-10-12 23:04:23 +02:00 committed by Thomas Gleixner
parent 39d0b7ba7b
commit 31c435d75e
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/hpet.c
View File

@ -25,11 +25,7 @@
unsigned long hpet_address; unsigned long hpet_address;
static void __iomem *hpet_virt_address; static void __iomem *hpet_virt_address;
/* Temporary hack. Cleanup after x86_64 clock events conversion */ unsigned long hpet_readl(unsigned long a)
#undef hpet_readl
#undef hpet_writel
static inline unsigned long hpet_readl(unsigned long a)
{ {
return readl(hpet_virt_address + a); return readl(hpet_virt_address + a);
} }

2
include/asm-x86/hpet.h
View File

@ -65,6 +65,7 @@
extern unsigned long hpet_address; extern unsigned long hpet_address;
extern int is_hpet_enabled(void); extern int is_hpet_enabled(void);
extern int hpet_enable(void); extern int hpet_enable(void);
extern unsigned long hpet_readl(unsigned long a);
#ifdef CONFIG_HPET_EMULATE_RTC #ifdef CONFIG_HPET_EMULATE_RTC
@ -84,6 +85,7 @@ extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
#else #else
static inline int hpet_enable(void) { return 0; } static inline int hpet_enable(void) { return 0; }
static inline unsigned long hpet_readl(unsigned long a) { return 0; }
#endif /* CONFIG_HPET_TIMER */ #endif /* CONFIG_HPET_TIMER */
#endif /* ASM_X86_HPET_H */ #endif /* ASM_X86_HPET_H */

3
include/asm-x86/vsyscall.h
View File

@ -29,9 +29,6 @@ enum vsyscall_num {
#define VGETCPU_RDTSCP 1 #define VGETCPU_RDTSCP 1
#define VGETCPU_LSL 2 #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 int __vgetcpu_mode;
extern volatile unsigned long __jiffies; extern volatile unsigned long __jiffies;