From 65c395a8ddd50d6d8e3f8291baf38596d219b831 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Sun, 21 Aug 2005 00:14:07 +0000 Subject: [PATCH] - remove redundant merge conflict --- mm/memory.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 0e6ce2af9..dcd0d5259 100644 --- 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? -- 2.47.0