- remove redundant merge conflict

diff --git a/mm/memory.c b/mm/memory.c
index 0e6ce2a..dcd0d52 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1868,8 +1868,6 @@ retry:
                return VM_FAULT_SIGBUS;
        if (new_page == NOPAGE_OOM)
                return VM_FAULT_OOM;
-       if (!vx_rsspages_avail(mm, 1))
-               return VM_FAULT_OOM;
 
        /*
         * Should we do an early C-O-W break?