From: Andrew Morton <akpm@osdl.org>

Cc: John Stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/x86_64/kernel/hpet.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.20-rc6-mm/arch/x86_64/kernel/hpet.c
===================================================================
--- linux-2.6.20-rc6-mm.orig/arch/x86_64/kernel/hpet.c
+++ linux-2.6.20-rc6-mm/arch/x86_64/kernel/hpet.c
@@ -460,7 +460,7 @@ static cycle_t read_hpet(void)
 
 static cycle_t __vsyscall_fn vread_hpet(void)
 {
-	return (cycle_t)readl((void *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
+	return readl((void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
 }
 
 struct clocksource clocksource_hpet = {