---

yaml --- r: 209805 b: refs/heads/master c: 161c481 h: refs/heads/master i: 209803: 0d58a78 v: v3
git-mirror · Aug 19, 2010 · 1c27ecc · 1c27ecc
1 parent ac65a95
commit 1c27ecc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f50eae75b13e037e11f49128ea44a1a9a9535cb
+refs/heads/master: 161c48100236916e98d33a9c8b5fc8eae6decd15
diff --git a/trunk/drivers/gpu/drm/drm_vm.c b/trunk/drivers/gpu/drm/drm_vm.c
@@ -138,7 +138,7 @@ static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 				break;
 		}
 
-		if (!agpmem)
+		if (&agpmem->head == &dev->agp->memory)
 			goto vm_fault_error;
 
 		/*
-Original file line number
+Diff line change
@@ Expand Up @@
     				break;
     		}
-    		if (!agpmem)
+    		if (&agpmem->head == &dev->agp->memory)
     			goto vm_fault_error;
     		/*
@@ Expand Down @@