diff --git a/[refs] b/[refs]
index 6306a2a391e1..eac547fc458e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe194d3e100dea323d7b2de96d3b44d0c067ba7a
+refs/heads/master: 0474a60ec704324577782b1057d05b574388d552
diff --git a/trunk/mm/memory-failure.c b/trunk/mm/memory-failure.c
index 2d5f1223bf4d..ded1d387b4c5 100644
--- a/trunk/mm/memory-failure.c
+++ b/trunk/mm/memory-failure.c
@@ -936,8 +936,15 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
 	 * walked by the page reclaim code, however that's not a big loss.
 	 */
 	if (!PageLRU(p))
-		lru_add_drain_all();
+		shake_page(p);
 	if (!PageLRU(p)) {
+		/*
+		 * shake_page could have turned it free.
+		 */
+		if (is_free_buddy_page(p)) {
+			action_result(pfn, "free buddy, 2nd try", DELAYED);
+			return 0;
+		}
 		action_result(pfn, "non LRU", IGNORED);
 		put_page(p);
 		return -EBUSY;