From 6bbc72b198ea7e9f8bc3d67b5d92836f3c65ffdc Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 20 Oct 2014 14:19:50 +1000 Subject: v3.18-rc1 --- drm/nouveau_nvif.c | 4 ++-- nvif/driver.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drm/nouveau_nvif.c b/drm/nouveau_nvif.c index 47ca88623..6544b84f0 100644 --- a/drm/nouveau_nvif.c +++ b/drm/nouveau_nvif.c @@ -40,12 +40,12 @@ #include "nouveau_usif.h" static void -nvkm_client_unmap(void *priv, void *ptr, u32 size) +nvkm_client_unmap(void *priv, void __iomem *ptr, u32 size) { iounmap(ptr); } -static void * +static void __iomem * nvkm_client_map(void *priv, u64 handle, u32 size) { return ioremap(handle, size); diff --git a/nvif/driver.h b/nvif/driver.h index b72a8f0c2..ac4bdb3ea 100644 --- a/nvif/driver.h +++ b/nvif/driver.h @@ -9,8 +9,8 @@ struct nvif_driver { int (*suspend)(void *priv); int (*resume)(void *priv); int (*ioctl)(void *priv, bool super, void *data, u32 size, void **hack); - void *(*map)(void *priv, u64 handle, u32 size); - void (*unmap)(void *priv, void *ptr, u32 size); + void __iomem *(*map)(void *priv, u64 handle, u32 size); + void (*unmap)(void *priv, void __iomem *ptr, u32 size); bool keep; }; -- cgit v1.2.1