HWPOISON: convert pr_debug()s to pr_info()s (dd73e85f) · Commits · 戴 / test

Commit ("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 ("HWPOSION, hugetlb: recover from free hugepage error when !MF_COUNT_INCREASED") and ("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>

mm/memory-failure.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -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,7 +1433,7 @@ 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",
		pr_info("soft offline: %#lx: migration failed %d, type %lx\n",
		pfn, ret, page->flags);
		if (ret > 0)
		ret = -EIO;

Admin message