Merge branch 'akpm' (Andrew's patch-bomb)
[linux-3.10.git] / arch / mips / mm / fault.c
index 7a19957..ddcec1e 100644 (file)
@@ -171,6 +171,7 @@ good_area:
                }
                if (fault & VM_FAULT_RETRY) {
                        flags &= ~FAULT_FLAG_ALLOW_RETRY;
+                       flags |= FAULT_FLAG_TRIED;
 
                        /*
                         * No need to up_read(&mm->mmap_sem) as we would