The patch titled Subject: mm/hwpoison: fix some obsolete comments has been added to the -mm tree. Its filename is mm-hwpoison-fix-some-obsolete-comments.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-hwpoison-fix-some-obsolete-comments.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-hwpoison-fix-some-obsolete-comments.patch 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 and is updated there every 3-4 working days ------------------------------------------------------ From: Miaohe Lin <linmiaohe@xxxxxxxxxx> Subject: mm/hwpoison: fix some obsolete comments Since commit cb731d6c62bb ("vmscan: per memory cgroup slab shrinkers"), shrink_node_slabs is renamed to drop_slab_node. And doit argument is changed to forcekill since commit 6751ed65dc66 ("x86/mce: Fix siginfo_t->si_addr value for non-recoverable memory faults"). Link: https://lkml.kernel.org/r/20210814105131.48814-5-linmiaohe@xxxxxxxxxx Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx> Cc: Naoya Horiguchi <naoya.horiguchi@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory-failure.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/mm/memory-failure.c~mm-hwpoison-fix-some-obsolete-comments +++ a/mm/memory-failure.c @@ -296,7 +296,7 @@ void shake_page(struct page *p, int acce } /* - * Only call shrink_node_slabs here (which would also shrink + * Only call drop_slab_node here (which would also shrink * other caches) if access is not potentially fatal. */ if (access) @@ -391,8 +391,8 @@ static void add_to_kill(struct task_stru /* * Kill the processes that have been collected earlier. * - * Only do anything when DOIT is set, otherwise just free the list - * (this is used for clean pages which do not need killing) + * Only do anything when FORCEKILL is set, otherwise just free the + * list (this is used for clean pages which do not need killing) * Also when FAIL is set do a force kill because something went * wrong earlier. */ _ Patches currently in -mm which might be from linmiaohe@xxxxxxxxxx are mm-gup-remove-set-but-unused-local-variable-major.patch mm-gup-remove-unneed-local-variable-orig_refs.patch mm-gup-remove-useless-bug_on-in-__get_user_pages.patch mm-gup-fix-potential-pgmap-refcnt-leak-in-__gup_device_huge.patch mm-gup-use-helper-page_aligned-in-populate_vma_page_range.patch shmem-remove-unneeded-variable-ret.patch shmem-remove-unneeded-header-file.patch shmem-remove-unneeded-function-forward-declaration.patch shmem-include-header-file-to-declare-swap_info.patch mm-memcg-remove-unused-functions.patch mm-memcg-save-some-atomic-ops-when-flush-is-already-true.patch mm-hwpoison-remove-unneeded-variable-unmap_success.patch mm-hwpoison-fix-potential-pte_unmap_unlock-pte-error.patch mm-hwpoison-change-argument-struct-page-hpagep-to-hpage.patch mm-hwpoison-fix-some-obsolete-comments.patch mm-vmscan-remove-the-pagedirty-check-after-madv_free-pages-are-page_ref_freezed.patch mm-vmscan-remove-misleading-setting-to-sc-priority.patch mm-vmscan-remove-unneeded-return-value-of-kswapd_run.patch mm-vmscan-add-else-to-remove-check_pending-label.patch mm-vmstat-correct-some-wrong-comments.patch mm-vmstat-simplify-the-array-size-calculation.patch mm-vmstat-remove-unneeded-return-value.patch mm-zsmallocc-close-race-window-between-zs_pool_dec_isolated-and-zs_unregister_migration.patch mm-zsmallocc-combine-two-atomic-ops-in-zs_pool_dec_isolated.patch