git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: OMAP3: PM: remove access to PRM_VOLTCTRL register
[pandora-kernel.git]
/
mm
/
filemap_xip.c
diff --git
a/mm/filemap_xip.c
b/mm/filemap_xip.c
index
93356cd
..
a4eb311
100644
(file)
--- a/
mm/filemap_xip.c
+++ b/
mm/filemap_xip.c
@@
-10,7
+10,7
@@
#include <linux/fs.h>
#include <linux/pagemap.h>
#include <linux/fs.h>
#include <linux/pagemap.h>
-#include <linux/
module
.h>
+#include <linux/
export
.h>
#include <linux/uio.h>
#include <linux/rmap.h>
#include <linux/mmu_notifier.h>
#include <linux/uio.h>
#include <linux/rmap.h>
#include <linux/mmu_notifier.h>
@@
-263,7
+263,12
@@
found:
xip_pfn);
if (err == -ENOMEM)
return VM_FAULT_OOM;
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;
return VM_FAULT_NOPAGE;
} else {
int err, ret = VM_FAULT_OOM;