diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-11 20:31:19 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-11 20:32:44 +0000 |
| commit | bed636abeaa3d8e8279e95380cb10ecb20d1b276 (patch) | |
| tree | ebbd4a435ffcf0d553441bc1e78d23bd8f949335 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 9db4a9c7b2a3bd5b4952846bc0c2f58daa80ddd7 (diff) | |
| download | kernel_samsung_smdk4412-bed636abeaa3d8e8279e95380cb10ecb20d1b276.zip kernel_samsung_smdk4412-bed636abeaa3d8e8279e95380cb10ecb20d1b276.tar.gz kernel_samsung_smdk4412-bed636abeaa3d8e8279e95380cb10ecb20d1b276.tar.bz2 | |
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/gpu/drm/i915/i915_gem.c')
| -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 9297143..a8768e2 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1230,6 +1230,7 @@ out: set_need_resched(); case 0: case -ERESTARTSYS: + case -EINTR: return VM_FAULT_NOPAGE; case -ENOMEM: return VM_FAULT_OOM; |