Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc

[karo-tx-linux.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 2b43ba051ac94f0512744707fe197d27a6d562b1..edc388db730a2cb41f6290e98853fbbc0ac04a7b 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1310,7 +1310,7 @@ int unpoison_memory(unsigned long pfn)
                 * to the end.
                 */
                if (PageHuge(page)) {
-                       pr_debug("MCE: Memory failure is now running on free hugepage %#lx\n", pfn);
+                       pr_info("MCE: Memory failure is now running on free hugepage %#lx\n", pfn);
                        return 0;
                }
                if (TestClearPageHWPoison(p))
@@ -1419,7 +1419,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
 
        if (PageHWPoison(hpage)) {
                put_page(hpage);
-               pr_debug("soft offline: %#lx hugepage already poisoned\n", pfn);
+               pr_info("soft offline: %#lx hugepage already poisoned\n", pfn);
                return -EBUSY;
        }
 
@@ -1433,8 +1433,8 @@ static int soft_offline_huge_page(struct page *page, int flags)
                list_for_each_entry_safe(page1, page2, &pagelist, lru)
                        put_page(page1);
 
-               pr_debug("soft offline: %#lx: migration failed %d, type %lx\n",
-                        pfn, ret, page->flags);
+               pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
+                       pfn, ret, page->flags);
                if (ret > 0)
                        ret = -EIO;
                return ret;
@@ -1505,7 +1505,7 @@ int soft_offline_page(struct page *page, int flags)
        }
        if (!PageLRU(page)) {
                pr_info("soft_offline: %#lx: unknown non LRU page type %lx\n",
-                               pfn, page->flags);
+                       pfn, page->flags);
                return -EIO;
        }
 
@@ -1566,7 +1566,7 @@ int soft_offline_page(struct page *page, int flags)
                }
        } else {
                pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
-                               pfn, ret, page_count(page), page->flags);
+                       pfn, ret, page_count(page), page->flags);
        }
        if (ret)
                return ret;