From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sun, 21 Aug 2005 00:14:07 +0000 (+0000)
Subject: - remove redundant merge conflict
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~100
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=65c395a8ddd50d6d8e3f8291baf38596d219b831;p=linux-2.6.git

- remove redundant merge conflict
---

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?