From 276ad089b0b661e969ff49e095da4849b78fa893 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Fri, 20 Mar 2009 14:16:33 -0700 Subject: [PATCH] --- yaml --- r: 139837 b: refs/heads/master c: 959b887cf42fd63cf10e28a7f26126f78aa1c0b0 h: refs/heads/master i: 139835: 6f8be822d5e2a10bad9628a9b21a4f4d4e215abe v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 722e4d82aa4d..dd08a45ea29f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d7773a32d8aa723030712b0a500a4a402a21c85 +refs/heads/master: 959b887cf42fd63cf10e28a7f26126f78aa1c0b0 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 0abccb761121..9f4eceb8093d 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -1072,6 +1072,7 @@ int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) case -EAGAIN: return VM_FAULT_OOM; case -EFAULT: + case -EINVAL: return VM_FAULT_SIGBUS; default: return VM_FAULT_NOPAGE;