---

yaml --- r: 98680 b: refs/heads/master c: 7a36a75 h: refs/heads/master v: v3
git-mirror · Jul 4, 2008 · c13b868 · c13b868
1 parent 68311c9
commit c13b868
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;