---

yaml --- r: 287214 b: refs/heads/master c: 99f02ef h: refs/heads/master v: v3
git-mirror · Feb 4, 2012 · a986118 · a986118
1 parent 1dd40c6
commit a986118
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82b3f2a7171731cce62f25058d25afb91a14710c
+refs/heads/master: 99f02ef1f18631eb0a4e0ea0a3d56878dbcb4b90
diff --git a/trunk/mm/filemap_xip.c b/trunk/mm/filemap_xip.c
@@ -263,7 +263,12 @@ static int xip_file_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 							xip_pfn);
 		if (err == -ENOMEM)
 			return VM_FAULT_OOM;
-		BUG_ON(err);
+		/*
+		 * err == -EBUSY is fine, we've raced against another thread
+		 * that faulted-in the same page
+		 */
+		if (err != -EBUSY)
+			BUG_ON(err);
 		return VM_FAULT_NOPAGE;
 	} else {
 		int err, ret = VM_FAULT_OOM;