Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 272153
b: refs/heads/master
c: dd73e85
h: refs/heads/master
i:
  272151: 3c3387e
v: v3
  • Loading branch information
Dean Nelson authored and Linus Torvalds committed Nov 1, 2011
1 parent 1325285 commit fd9b478
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 72a2ebd8bc62e6658513d3b2a1119e91c3ea6810
refs/heads/master: dd73e85f6d8f721d66bcbd2734a5f4bc3d3cd768
12 changes: 6 additions & 6 deletions trunk/mm/memory-failure.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit fd9b478

Please sign in to comment.