Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 7 insertions, 0 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index 5e71a6bf6f6b..5efa2f978032 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -356,6 +356,13 @@ retry:
                 if (bh1 != bh2)
                         spin_unlock(&bh2->lock);
 
+#ifndef CONFIG_MMU
+                /* we don't get EFAULT from MMU faults if we don't have an MMU,
+                 * but we might get them from range checking */
+                ret = op_ret;
+                goto out;
+#endif
+
                 if (unlikely(op_ret != -EFAULT)) {
                         ret = op_ret;
                         goto out;