On 6/3/22 09:49, Andrew Morton wrote: > The patch titled > Subject: mm-hwpoison-hugetlb-introduce-subpage_index_hwpoison-to-save-raw-error-page-fix > has been added to the -mm mm-unstable branch. Its filename is > mm-hwpoison-hugetlb-introduce-subpage_index_hwpoison-to-save-raw-error-page-fix.patch > > This patch will shortly appear at > https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-hwpoison-hugetlb-introduce-subpage_index_hwpoison-to-save-raw-error-page-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: Naoya Horiguchi <naoya.horiguchi@xxxxxxx> > Subject: mm-hwpoison-hugetlb-introduce-subpage_index_hwpoison-to-save-raw-error-page-fix > Date: Fri, 3 Jun 2022 02:10:43 +0000 > > build fix > > __get_huge_page_for_hwpoison() is not needed when CONFIG_HUGETLB_PAGE is > n, so extending "#ifdef CONFIG_HUGETLB_PAG" to cover > __get_huge_page_for_hwpoison() would be a simple resolution. > > Reported-by: kernel test robot <lkp@xxxxxxxxx> > Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> > Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Tested-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Thanks. > --- > > mm/memory-failure.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/mm/memory-failure.c~mm-hwpoison-hugetlb-introduce-subpage_index_hwpoison-to-save-raw-error-page-fix > +++ a/mm/memory-failure.c > @@ -1496,6 +1496,7 @@ static int try_to_split_thp_page(struct > return 0; > } > > +#ifdef CONFIG_HUGETLB_PAGE > /* > * Called from hugetlb code with hugetlb_lock held. > * > @@ -1544,7 +1545,6 @@ out: > return ret; > } > > -#ifdef CONFIG_HUGETLB_PAGE > /* > * Taking refcount of hugetlb pages needs extra care about race conditions > * with basic operations like hugepage allocation/free/demotion. > _ > > Patches currently in -mm which might be from naoya.horiguchi@xxxxxxx are > > mm-hwpoison-hugetlb-introduce-subpage_index_hwpoison-to-save-raw-error-page.patch > mm-hwpoison-hugetlb-introduce-subpage_index_hwpoison-to-save-raw-error-page-fix.patch > mmhwpoison-set-pg_hwpoison-for-busy-hugetlb-pages.patch > mm-hwpoison-make-__page_handle_poison-returns-int.patch > mm-hwpoison-skip-raw-hwpoison-page-in-freeing-1gb-hugepage.patch > mm-hwpoison-enable-memory-error-handling-on-1gb-hugepage.patch > -- ~Randy
