From c13b8684610c545da0df74440a513c23f18d95a0 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Fri, 4 Jul 2008 09:59:28 -0700
Subject: [PATCH] --- yaml --- r: 98680 b: refs/heads/master c:
 7a36a752d006f6874049da510297eeb7f09d92a7 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e19b5dfa17c3..7071f372ab75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ca796f492a11f9408e661c8f22cd8c4f486b8e5
+refs/heads/master: 7a36a752d006f6874049da510297eeb7f09d92a7
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 350e646032f5..2302d228fe04 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -1151,7 +1151,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 			 * be processed until returning to user space.
 			 */
 			if (unlikely(test_tsk_thread_flag(tsk, TIF_MEMDIE)))
-				return -ENOMEM;
+				return i ? i : -ENOMEM;
 
 			if (write)
 				foll_flags |= FOLL_WRITE;