diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-11 15:31:19 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-11 15:32:44 -0500 |
commit | bed636abeaa3d8e8279e95380cb10ecb20d1b276 (patch) | |
tree | ebbd4a435ffcf0d553441bc1e78d23bd8f949335 /drivers | |
parent | 9db4a9c7b2a3bd5b4952846bc0c2f58daa80ddd7 (diff) |
drm/i915: i915_mutex_interruptible() returns -EINTR
... so we handle that for i915_gem_fault() in the same manner as
ERESTARTSYS, or we send a SIGBUS to the faulting application.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 9297143447cf..a8768e2bbebc 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -1230,6 +1230,7 @@ out: | |||
1230 | set_need_resched(); | 1230 | set_need_resched(); |
1231 | case 0: | 1231 | case 0: |
1232 | case -ERESTARTSYS: | 1232 | case -ERESTARTSYS: |
1233 | case -EINTR: | ||
1233 | return VM_FAULT_NOPAGE; | 1234 | return VM_FAULT_NOPAGE; |
1234 | case -ENOMEM: | 1235 | case -ENOMEM: |
1235 | return VM_FAULT_OOM; | 1236 | return VM_FAULT_OOM; |