The patch titled Subject: mm/memory-failure: remove stub function has been added to the -mm tree. Its filename is mmhwpoison-refactor-soft_offline_huge_page-and-__soft_offline_page-fix-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mmhwpoison-refactor-soft_offline_huge_page-and-__soft_offline_page-fix-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mmhwpoison-refactor-soft_offline_huge_page-and-__soft_offline_page-fix-fix.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: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Subject: mm/memory-failure: remove stub function This stub is no longer needed since the function is no longer inside an #ifdef/#endif block. Fixes this build error: ../mm/memory-failure.c:180:13: error: redefinition of `page_handle_poison' Link: http://lkml.kernel.org/r/adb60490-484f-a154-e163-725e35a821dc@xxxxxxxxxxxxx Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Oscar Salvador <osalvador@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory-failure.c | 4 ---- 1 file changed, 4 deletions(-) --- a/mm/memory-failure.c~mmhwpoison-refactor-soft_offline_huge_page-and-__soft_offline_page-fix-fix +++ a/mm/memory-failure.c @@ -169,10 +169,6 @@ int hwpoison_filter(struct page *p) return 0; } -static bool page_handle_poison(struct page *page, bool hugepage_or_freepage, bool release) -{ - return true; -} #endif EXPORT_SYMBOL_GPL(hwpoison_filter); _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxxx are mmhwpoison-rework-soft-offline-for-free-pages-fix.patch mmhwpoison-refactor-soft_offline_huge_page-and-__soft_offline_page-fix-fix.patch