Merge 3.12-rc6 into driver-core-next

We want these fixes here too.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 947ed5413279..bf3351b5115e 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1114,8 +1114,10 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
                          * shake_page could have turned it free.
                          */
                         if (is_free_buddy_page(p)) {
-                                action_result(pfn, "free buddy, 2nd try",
-                                                DELAYED);
+                                if (flags & MF_COUNT_INCREASED)
+                                        action_result(pfn, "free buddy", DELAYED);
+                                else
+                                        action_result(pfn, "free buddy, 2nd try", DELAYED);
                                 return 0;
                         }
                         action_result(pfn, "non LRU", IGNORED);
@@ -1349,7 +1351,7 @@ int unpoison_memory(unsigned long pfn)
          * worked by memory_failure() and the page lock is not held yet.
          * In such case, we yield to memory_failure() and make unpoison fail.
          */
-        if (PageTransHuge(page)) {
+        if (!PageHuge(page) && PageTransHuge(page)) {
                 pr_info("MCE: Memory failure is now running on %#lx\n", pfn);
                         return 0;
         }