[folded-merged] mm-hwpoison-fix-condition-in-free-hugetlb-page-path-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: mm-hwpoison-fix-condition-in-free-hugetlb-page-path-fix
has been removed from the -mm tree.  Its filename was
     mm-hwpoison-fix-condition-in-free-hugetlb-page-path-fix.patch

This patch was dropped because it was folded into mm-hwpoison-fix-condition-in-free-hugetlb-page-path.patch

------------------------------------------------------
From: Naoya Horiguchi <naoya.horiguchi@xxxxxxxxx>
Subject: mm-hwpoison-fix-condition-in-free-hugetlb-page-path-fix

fix "HardwareCorrupted" counter

Link: https://lkml.kernel.org/r/20211220084851.GA1460264@u2004
Cc: Fei Luo <luofei@xxxxxxxxxxxx>
Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/memory-failure.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- a/mm/memory-failure.c~mm-hwpoison-fix-condition-in-free-hugetlb-page-path-fix
+++ a/mm/memory-failure.c
@@ -1478,9 +1478,11 @@ static int memory_failure_hugetlb(unsign
 				return 0;
 			}
 			unlock_page(head);
-			res = MF_RECOVERED;
-			if (!page_handle_poison(p, true, false))
-				res = MF_FAILED;
+			res = MF_FAILED;
+			if (__page_handle_poison(p)) {
+				page_ref_inc(p);
+				res = MF_RECOVERED;
+			}
 			action_result(pfn, MF_MSG_FREE_HUGE, res);
 			return res == MF_RECOVERED ? 0 : -EBUSY;
 		} else if (res < 0) {
_

Patches currently in -mm which might be from naoya.horiguchi@xxxxxxxxx are

mm-hwpoison-fix-condition-in-free-hugetlb-page-path.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux