xf86-video-intel: src/sna/kgem.c

[Chris Wilson]

 src/sna/kgem.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4850bbbccfc86ce36fae103038e91d5034dc517
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Sep 23 11:54:47 2013 +0100

    sna: Fix cast from u64 to pointer for 32-bit hosts
    
    Missing chunk from
    
    commit 42330fbae862cda9ca17ec62eb0d2e4fb86032b8
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Sun Sep 22 14:39:57 2013 +0100
    
        sna: Track CPU/GTT maps independently
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index ce89658..b0e0477 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -5063,7 +5063,7 @@ retry:
 	VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo)));
 
 	DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle));
-	return bo->map__cpu = (void *)(mmap_arg.addr_ptr);
+	return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr;
 }
 
 uint32_t kgem_bo_flink(struct kgem *kgem, struct kgem_bo *bo)