git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-intel-next-2016-10-24' of git://anongit.freedesktop.org/drm-intel...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_gem_execbuffer.c
diff --git
a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index d7a663e6a8b263c8d0e9175a389ce2b41b52c17f..e52affdcc125d5585cc3fa45bd25c60aed540084 100644
(file)
--- a/
drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/
drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@
-1251,7
+1251,7
@@
validate_exec_list(struct drm_device *dev,
return -EFAULT;
if (likely(!i915.prefault_disable)) {
- if (fault_in_
multi
pages_readable(ptr, length))
+ if (fault_in_pages_readable(ptr, length))
return -EFAULT;
}
}