The patch titled
Subject: mm-memory-failure-add-unmap_posioned_folio-fix
has been added to the -mm mm-unstable branch. Its filename is
mm-memory-failure-add-unmap_posioned_folio-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-memory-failure-add-unmap_posioned_folio-fix.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: mm-memory-failure-add-unmap_posioned_folio-fix
Date: Wed Aug 21 02:55:01 PM PDT 2024
s/unmap_posioned_folio/unmap_posioned_folio/, per Miaohe Lin
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Cc: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
Cc: Miaohe Lin <linmiaohe@xxxxxxxxxx>
Cc: Naoya Horiguchi <nao.horiguchi@xxxxxxxxx>
Cc: Oscar Salvador <osalvador@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/internal.h | 4 ++--
mm/memory-failure.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--- a/mm/internal.h~mm-memory-failure-add-unmap_posioned_folio-fix
+++ a/mm/internal.h
@@ -1049,7 +1049,7 @@ static inline int find_next_best_node(in
* mm/memory-failure.c
*/
#ifdef CONFIG_MEMORY_FAILURE
-int unmap_posioned_folio(struct folio *folio, enum ttu_flags ttu);
+int unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu);
void shake_folio(struct folio *folio);
extern int hwpoison_filter(struct page *p);
@@ -1071,7 +1071,7 @@ void add_to_kill_ksm(struct task_struct
unsigned long page_mapped_in_vma(struct page *page, struct vm_area_struct *vma);
#else
-static inline int unmap_posioned_folio(struct folio *folio, enum ttu_flags ttu)
+static inline int unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu)
{
return 0;
}
--- a/mm/memory-failure.c~mm-memory-failure-add-unmap_posioned_folio-fix
+++ a/mm/memory-failure.c
@@ -1554,7 +1554,7 @@ static int get_hwpoison_page(struct page
return ret;
}
-int unmap_posioned_folio(struct folio *folio, enum ttu_flags ttu)
+int unmap_poisoned_folio(struct folio *folio, enum ttu_flags ttu)
{
if (folio_test_hugetlb(folio) && !folio_test_anon(folio)) {
struct address_space *mapping;
@@ -1639,7 +1639,7 @@ static bool hwpoison_user_mappings(struc
*/
collect_procs(folio, p, &tokill, flags & MF_ACTION_REQUIRED);
- if (unmap_posioned_folio(folio, ttu))
+ if (unmap_poisoned_folio(folio, ttu))
pr_info("%#lx: could not lock mapping for mapped huge page\n", pfn);
unmap_success = !folio_mapped(folio);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
include-linux-mmzoneh-clean-up-watermark-accessors.patch
mm-remove-legacy-install_special_mapping-code-checkpatch-fixes.patch
mm-memory_hotplug-remove-head-variable-in-do_migrate_range-fix.patch
mm-memory-failure-add-unmap_posioned_folio-fix.patch
mm-memory_hotplug-check-hwpoisoned-page-firstly-in-do_migrate_range-fix.patch
mm-memory_hotplug-check-hwpoisoned-page-firstly-in-do_migrate_range-fix.patch
selftests-mm-add-more-mseal-traversal-tests-fix.patch
fault-inject-improve-build-for-config_fault_injection=n-fix.patch
fault-inject-improve-build-for-config_fault_injection=n-fix-2.patch
fault-inject-improve-build-for-config_fault_injection=n-fix-3.patch
