diff options
author | Dean Nelson <dnelson@redhat.com> | 2011-10-31 20:09:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 20:30:49 -0400 |
commit | dd73e85f6d8f721d66bcbd2734a5f4bc3d3cd768 (patch) | |
tree | a39776b9025de8baf6a346a43db1aee9bbafad08 | |
parent | 72a2ebd8bc62e6658513d3b2a1119e91c3ea6810 (diff) |
HWPOISON: convert pr_debug()s to pr_info()s
Commit fb46e73520940b ("HWPOISON: Convert pr_debugs to pr_info) authored
by Andi Kleen converted a number of pr_debug()s to pr_info()s.
About the same time additional code with pr_debug()s was added by two
other commits 8c6c2ecb4466 ("HWPOSION, hugetlb: recover from free hugepage
error when !MF_COUNT_INCREASED") and d950b95882f3d ("HWPOISON, hugetlb:
soft offlining for hugepage"). And these pr_debug()s failed to get
converted to pr_info()s.
This patch converts them as well. And does some minor related whitespace
cleanup.
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Reviewed-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | mm/memory-failure.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 2b43ba051ac9..edc388db730a 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c | |||
@@ -1310,7 +1310,7 @@ int unpoison_memory(unsigned long pfn) | |||
1310 | * to the end. | 1310 | * to the end. |
1311 | */ | 1311 | */ |
1312 | if (PageHuge(page)) { | 1312 | if (PageHuge(page)) { |
1313 | pr_debug("MCE: Memory failure is now running on free hugepage %#lx\n", pfn); | 1313 | pr_info("MCE: Memory failure is now running on free hugepage %#lx\n", pfn); |
1314 | return 0; | 1314 | return 0; |
1315 | } | 1315 | } |
1316 | if (TestClearPageHWPoison(p)) | 1316 | if (TestClearPageHWPoison(p)) |
@@ -1419,7 +1419,7 @@ static int soft_offline_huge_page(struct page *page, int flags) | |||
1419 | 1419 | ||
1420 | if (PageHWPoison(hpage)) { | 1420 | if (PageHWPoison(hpage)) { |
1421 | put_page(hpage); | 1421 | put_page(hpage); |
1422 | pr_debug("soft offline: %#lx hugepage already poisoned\n", pfn); | 1422 | pr_info("soft offline: %#lx hugepage already poisoned\n", pfn); |
1423 | return -EBUSY; | 1423 | return -EBUSY; |
1424 | } | 1424 | } |
1425 | 1425 | ||
@@ -1433,8 +1433,8 @@ static int soft_offline_huge_page(struct page *page, int flags) | |||
1433 | list_for_each_entry_safe(page1, page2, &pagelist, lru) | 1433 | list_for_each_entry_safe(page1, page2, &pagelist, lru) |
1434 | put_page(page1); | 1434 | put_page(page1); |
1435 | 1435 | ||
1436 | pr_debug("soft offline: %#lx: migration failed %d, type %lx\n", | 1436 | pr_info("soft offline: %#lx: migration failed %d, type %lx\n", |
1437 | pfn, ret, page->flags); | 1437 | pfn, ret, page->flags); |
1438 | if (ret > 0) | 1438 | if (ret > 0) |
1439 | ret = -EIO; | 1439 | ret = -EIO; |
1440 | return ret; | 1440 | return ret; |
@@ -1505,7 +1505,7 @@ int soft_offline_page(struct page *page, int flags) | |||
1505 | } | 1505 | } |
1506 | if (!PageLRU(page)) { | 1506 | if (!PageLRU(page)) { |
1507 | pr_info("soft_offline: %#lx: unknown non LRU page type %lx\n", | 1507 | pr_info("soft_offline: %#lx: unknown non LRU page type %lx\n", |
1508 | pfn, page->flags); | 1508 | pfn, page->flags); |
1509 | return -EIO; | 1509 | return -EIO; |
1510 | } | 1510 | } |
1511 | 1511 | ||
@@ -1566,7 +1566,7 @@ int soft_offline_page(struct page *page, int flags) | |||
1566 | } | 1566 | } |
1567 | } else { | 1567 | } else { |
1568 | pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n", | 1568 | pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n", |
1569 | pfn, ret, page_count(page), page->flags); | 1569 | pfn, ret, page_count(page), page->flags); |
1570 | } | 1570 | } |
1571 | if (ret) | 1571 | if (ret) |
1572 | return ret; | 1572 | return ret; |