---

yaml --- r: 334708 b: refs/heads/master c: a7c2e1a h: refs/heads/master v: v3
git-mirror · Oct 17, 2012 · 0f3bc7f · 0f3bc7f
1 parent 0239aa1
commit 0f3bc7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b06fbda328490ec471e72659a9bf69f16a1c8dc9
+refs/heads/master: a7c2e1aad6c846f316641bbaa54cf999aeaa7ebc
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1408,8 +1408,10 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 		return VM_FAULT_NOPAGE;
 	case -ENOMEM:
 		return VM_FAULT_OOM;
+	case -ENOSPC:
+		return VM_FAULT_SIGBUS;
 	default:
-		WARN_ON_ONCE(ret);
+		WARN_ONCE(ret, "unhandled error in i915_gem_fault: %i\n", ret);
 		return VM_FAULT_SIGBUS;
 	}
 }