aboutsummaryrefslogtreecommitdiffstats
path: root/mm/memory-failure.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/memory-failure.c')
-rw-r--r--mm/memory-failure.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 757f6b0accfe..5c7158a11592 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -698,6 +698,7 @@ static int me_swapcache_clean(struct page *p, unsigned long pfn)
698 */ 698 */
699static int me_huge_page(struct page *p, unsigned long pfn) 699static int me_huge_page(struct page *p, unsigned long pfn)
700{ 700{
701 int res = 0;
701 struct page *hpage = compound_head(p); 702 struct page *hpage = compound_head(p);
702 /* 703 /*
703 * We can safely recover from error on free or reserved (i.e. 704 * We can safely recover from error on free or reserved (i.e.
@@ -710,8 +711,9 @@ static int me_huge_page(struct page *p, unsigned long pfn)
710 * so there is no race between isolation and mapping/unmapping. 711 * so there is no race between isolation and mapping/unmapping.
711 */ 712 */
712 if (!(page_mapping(hpage) || PageAnon(hpage))) { 713 if (!(page_mapping(hpage) || PageAnon(hpage))) {
713 __isolate_hwpoisoned_huge_page(hpage); 714 res = dequeue_hwpoisoned_huge_page(hpage);
714 return RECOVERED; 715 if (!res)
716 return RECOVERED;
715 } 717 }
716 return DELAYED; 718 return DELAYED;
717} 719}