1 files changed, 13 insertions, 8 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index 5c3f45d07c53..a12425051ee9 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -346,15 +346,20 @@ static int futex_handle_fault(unsigned long address,
         vma = find_vma(mm, address);
         if (vma && address >= vma->vm_start &&
             (vma->vm_flags & VM_WRITE)) {
-                switch (handle_mm_fault(mm, vma, address, 1)) {
-                case VM_FAULT_MINOR:
-                        ret = 0;
-                        current->min_flt++;
-                        break;
-                case VM_FAULT_MAJOR:
+                int fault;
+                fault = handle_mm_fault(mm, vma, address, 1);
+                if (unlikely((fault & VM_FAULT_ERROR))) {
+#if 0
+                        /* XXX: let's do this when we verify it is OK */
+                        if (ret & VM_FAULT_OOM)
+                                ret = -ENOMEM;
+#endif
+                } else {
                         ret = 0;
-                        current->maj_flt++;
-                        break;
+                        if (fault & VM_FAULT_MAJOR)
+                                current->maj_flt++;
+                        else
+                                current->min_flt++;
                 }
         }
         if (!fshared)