Merge branch 'drm-armada-devel' of git://git.armlinux.org.uk/~rmk/linux-arm into...

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / armada / armada_gem.c

diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c
index fd92446f9cce682964e50c45494fafe24f07555f..768087ddb046d1b483eb2eebafcd1298b80541fa 100644 (file)
--- a/drivers/gpu/drm/armada/armada_gem.c
+++ b/drivers/gpu/drm/armada/armada_gem.c
@@ -387,7 +387,7 @@ int armada_gem_pwrite_ioctl(struct drm_device *dev, void *data,
        if (!access_ok(VERIFY_READ, ptr, args->size))
                return -EFAULT;
 
-       ret = fault_in_multipages_readable(ptr, args->size);
+       ret = fault_in_pages_readable(ptr, args->size);
        if (ret)
                return ret;
 
@@ -547,7 +547,7 @@ armada_gem_prime_export(struct drm_device *dev, struct drm_gem_object *obj,
        exp_info.flags = O_RDWR;
        exp_info.priv = obj;
 
-       return dma_buf_export(&exp_info);
+       return drm_gem_dmabuf_export(dev, &exp_info);
 }
 
 struct drm_gem_object *