Merge tag 'drm-intel-next-2016-10-24' of git://anongit.freedesktop.org/drm-intel...

[linux-2.6-block.git] / drivers / gpu / drm / i915 / i915_gem.c

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 9bb72e503a30792ed0b476e00d0fb4c9f84554c8..8ed8e24025aca7f6f7e8520c2789c1042a9eabe6 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -860,7 +860,7 @@ i915_gem_gtt_pread(struct drm_device *dev,
 
        mutex_unlock(&dev->struct_mutex);
        if (likely(!i915.prefault_disable)) {
-               ret = fault_in_multipages_writeable(user_data, remain);
+               ret = fault_in_pages_writeable(user_data, remain);
                if (ret) {
                        mutex_lock(&dev->struct_mutex);
                        goto out_unpin;
@@ -982,7 +982,7 @@ i915_gem_shmem_pread(struct drm_device *dev,
                mutex_unlock(&dev->struct_mutex);
 
                if (likely(!i915.prefault_disable) && !prefaulted) {
-                       ret = fault_in_multipages_writeable(user_data, remain);
+                       ret = fault_in_pages_writeable(user_data, remain);
                        /* Userspace is tricking us, but we've already clobbered
                         * its pages with the prefault and promised to write the
                         * data up to the first fault. Hence ignore any errors
@@ -1429,7 +1429,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
                return -EFAULT;
 
        if (likely(!i915.prefault_disable)) {
-               ret = fault_in_multipages_readable(u64_to_user_ptr(args->data_ptr),
+               ret = fault_in_pages_readable(u64_to_user_ptr(args->data_ptr),
                                                   args->size);
                if (ret)
                        return -EFAULT;