---

yaml --- r: 177619 b: refs/heads/master c: 71f7252 h: refs/heads/master i: 177617: 3f105b0 177615: abed373 v: v3
git-mirror · Dec 16, 2009 · dad62c5 · dad62c5
1 parent 0323218
commit dad62c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db0480b3a61bd6ad86ead3b8bbad094ab0996932
+refs/heads/master: 71f72525dfaaec012e23089c73331654ea7b12d3
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
@@ -2553,6 +2553,10 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
 		ret = VM_FAULT_MAJOR;
 		count_vm_event(PGMAJFAULT);
 	} else if (PageHWPoison(page)) {
+		/*
+		 * hwpoisoned dirty swapcache pages are kept for killing
+		 * owner processes (which may be unknown at hwpoison time)
+		 */
 		ret = VM_FAULT_HWPOISON;
 		delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
 		goto out_release;