Commit 5b59a4d4 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86_64: Fix some readl/writel warnings

Fix lots of readl/writel warnings in arch/x86_64
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 863a1609
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifdef __i386__ #ifdef __i386__
#define VGABASE (__ISA_IO_base + 0xb8000) #define VGABASE (__ISA_IO_base + 0xb8000)
#else #else
#define VGABASE 0xffffffff800b8000UL #define VGABASE ((void *)0xffffffff800b8000UL)
#endif #endif
#define MAX_YPOS 25 #define MAX_YPOS 25
......
...@@ -89,7 +89,7 @@ static force_inline void do_vgettimeofday(struct timeval * tv) ...@@ -89,7 +89,7 @@ static force_inline void do_vgettimeofday(struct timeval * tv)
__vxtime.tsc_quot) >> 32; __vxtime.tsc_quot) >> 32;
/* See comment in x86_64 do_gettimeofday. */ /* See comment in x86_64 do_gettimeofday. */
} else { } else {
usec += ((readl(fix_to_virt(VSYSCALL_HPET) + 0xf0) - usec += ((readl((void *)fix_to_virt(VSYSCALL_HPET) + 0xf0) -
__vxtime.last) * __vxtime.quot) >> 32; __vxtime.last) * __vxtime.quot) >> 32;
} }
} while (read_seqretry(&__xtime_lock, sequence)); } while (read_seqretry(&__xtime_lock, sequence));
......
...@@ -36,8 +36,8 @@ struct vxtime_data { ...@@ -36,8 +36,8 @@ struct vxtime_data {
int mode; int mode;
}; };
#define hpet_readl(a) readl(fix_to_virt(FIX_HPET_BASE) + a) #define hpet_readl(a) readl((void *)fix_to_virt(FIX_HPET_BASE) + a)
#define hpet_writel(d,a) writel(d, fix_to_virt(FIX_HPET_BASE) + a) #define hpet_writel(d,a) writel(d, (void *)fix_to_virt(FIX_HPET_BASE) + a)
/* vsyscall space (readonly) */ /* vsyscall space (readonly) */
extern struct vxtime_data __vxtime; extern struct vxtime_data __vxtime;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment