From a2c14b874a1e93cb72ce39bbccb8c977f4874ffa Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw@sous-sol.org>
Date: Fri, 12 Oct 2007 23:04:23 +0200
Subject: [PATCH] --- yaml --- r: 67771 b: refs/heads/master c:
 31c435d75e7d15a5f965c5eb0e33fe0e236f49a4 h: refs/heads/master i:   67769:
 051426ccbf10c1b003b83e62f5bfb89270a2edfd   67767:
 4c52bb0ba873c4d967413c92608e2b7608e67b7b v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/hpet.c     | 6 +-----
 trunk/include/asm-x86/hpet.h     | 2 ++
 trunk/include/asm-x86/vsyscall.h | 3 ---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e8c86f46175d..f17ebbd27d34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39d0b7ba7b9c0a2c594073400cde1d0beffa0bea
+refs/heads/master: 31c435d75e7d15a5f965c5eb0e33fe0e236f49a4
diff --git a/trunk/arch/x86/kernel/hpet.c b/trunk/arch/x86/kernel/hpet.c
index dbe0e1d44113..078dbc6d80ec 100644
--- a/trunk/arch/x86/kernel/hpet.c
+++ b/trunk/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/trunk/include/asm-x86/hpet.h b/trunk/include/asm-x86/hpet.h
index e2976ed30b70..64446a9577dc 100644
--- a/trunk/include/asm-x86/hpet.h
+++ b/trunk/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/trunk/include/asm-x86/vsyscall.h b/trunk/include/asm-x86/vsyscall.h
index 3b8ceb4af2cf..f01c49f5d108 100644
--- a/trunk/include/asm-x86/vsyscall.h
+++ b/trunk/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;