Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31c435d7 authored by Chris Wright's avatar Chris Wright Committed by Thomas Gleixner
Browse files

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: default avatarChris Wright <chrisw@sous-sol.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
parent 39d0b7ba

arch/x86/kernel/hpet.c

+1 −5
Original line number Diff line number Diff line
@@ -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);

}

include/asm-x86/hpet.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

include/asm-x86/vsyscall.h

+0 −3
Original line number Diff line number Diff line
@@ -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;