X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Ffutex.c;h=5efa2f978032d1f20955c5f99eb24bf0e1051c51;hb=7fd105e758c8d746d57ab7e77f100e096bf153c8;hp=5e71a6bf6f6b47fb9b93cc1540e0632b5dd5b4e7;hpb=fed8bf19ec20efc0641740b2d10aa589dbd6d1ab;p=linux-2.6

diff --git a/kernel/futex.c b/kernel/futex.c
index 5e71a6bf6f..5efa2f9780 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;