From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 11 Feb 2011 20:31:19 +0000 (+0000)
Subject: drm/i915: i915_mutex_interruptible() returns -EINTR
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bed636abeaa3d8e8279e95380cb10ecb20d1b276;p=linux-beck.git

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>
---

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:
 		set_need_resched();
 	case 0:
 	case -ERESTARTSYS:
+	case -EINTR:
 		return VM_FAULT_NOPAGE;
 	case -ENOMEM:
 		return VM_FAULT_OOM;