> From: Jeremy Huddleston <[email protected]> > Date: Wed, 02 Nov 2011 09:52:24 -0700 > > memType is a uint64_t on powerpc. Using memType only really makes > sense for *physical* addresses, which can be 64-bit for 32-bit > systems running on 64-bit hardware. > > However, unmapVidMem() only deals with *virtual* addresses, which > are guaranteed to fit into an uintptr_t. > > Signed-off-by: Jeremy Huddleston <[email protected]>
Reviewed-by: Mark Kettenis <[email protected]> If you guys trust such a thing for a Linux-only diff from me ;). > --- > hw/xfree86/os-support/linux/lnx_video.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hw/xfree86/os-support/linux/lnx_video.c > b/hw/xfree86/os-support/linux/lnx_video.c > index 3d45511..d71d634 100644 > --- a/hw/xfree86/os-support/linux/lnx_video.c > +++ b/hw/xfree86/os-support/linux/lnx_video.c > @@ -469,11 +469,11 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned > long Size, int flags) > static void > unmapVidMem(int ScreenNum, pointer Base, unsigned long Size) > { > - memType alignOff = (memType)Base > - - ((memType)Base & ~(getpagesize() - 1)); > + uintptr_t alignOff = (uintptr_t)Base > + - ((uintptr_t)Base & ~(getpagesize() - 1)); > > - DebugF("alignment offset: %lx\n",alignOff); > - munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff)); > + DebugF("alignment offset: %lx\n", (unsigned long)alignOff); > + munmap((void *)((uintptr_t)Base - alignOff), (Size + alignOff)); > } _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
