aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-x86')
-rw-r--r--include/asm-x86/hpet.h2
-rw-r--r--include/asm-x86/vsyscall.h3
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 @@
65extern unsigned long hpet_address; 65extern unsigned long hpet_address;
66extern int is_hpet_enabled(void); 66extern int is_hpet_enabled(void);
67extern int hpet_enable(void); 67extern int hpet_enable(void);
68extern unsigned long hpet_readl(unsigned long a);
68 69
69#ifdef CONFIG_HPET_EMULATE_RTC 70#ifdef CONFIG_HPET_EMULATE_RTC
70 71
@@ -84,6 +85,7 @@ extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);
84#else 85#else
85 86
86static inline int hpet_enable(void) { return 0; } 87static inline int hpet_enable(void) { return 0; }
88static inline unsigned long hpet_readl(unsigned long a) { return 0; }
87 89
88#endif /* CONFIG_HPET_TIMER */ 90#endif /* CONFIG_HPET_TIMER */
89#endif /* ASM_X86_HPET_H */ 91#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 {
29#define VGETCPU_RDTSCP 1 29#define VGETCPU_RDTSCP 1
30#define VGETCPU_LSL 2 30#define VGETCPU_LSL 2
31 31
32#define hpet_readl(a) readl((const void __iomem *)fix_to_virt(FIX_HPET_BASE) + a)
33#define hpet_writel(d,a) writel(d, (void __iomem *)fix_to_virt(FIX_HPET_BASE) + a)
34
35extern int __vgetcpu_mode; 32extern int __vgetcpu_mode;
36extern volatile unsigned long __jiffies; 33extern volatile unsigned long __jiffies;
37 34