---

yaml --- r: 167750 b: refs/heads/master c: 6a7b954 h: refs/heads/master v: v3
git-mirror · Oct 29, 2009 · 3b10ba3 · 3b10ba3
1 parent fd1507d
commit 3b10ba3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b05ca7385a2848abdc72051f832722641daed8b0
+refs/heads/master: 6a7b95481d49f73991d3dbf8c1e696a24684ac05
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
@@ -544,6 +544,16 @@ void putback_lru_page(struct page *page)
 		 */
 		lru = LRU_UNEVICTABLE;
 		add_page_to_unevictable_list(page);
+		/*
+		 * When racing with an mlock clearing (page is
+		 * unlocked), make sure that if the other thread does
+		 * not observe our setting of PG_lru and fails
+		 * isolation, we see PG_mlocked cleared below and move
+		 * the page back to the evictable list.
+		 *
+		 * The other side is TestClearPageMlocked().
+		 */
+		smp_mb();
 	}
 
 	/*