The patch titled Subject: mm-mempool-add-else-to-split-mutually-exclusive-case-fix has been added to the -mm tree. Its filename is mm-mempool-add-else-to-split-mutually-exclusive-case-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-mempool-add-else-to-split-mutually-exclusive-case-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-mempool-add-else-to-split-mutually-exclusive-case-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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-mempool-add-else-to-split-mutually-exclusive-case-fix fix comment location Cc: Miaohe Lin <linmiaohe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/mempool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/mempool.c~mm-mempool-add-else-to-split-mutually-exclusive-case-fix +++ a/mm/mempool.c @@ -60,8 +60,8 @@ static void check_element(mempool_t *poo /* Mempools backed by slab allocator */ if (pool->free == mempool_free_slab || pool->free == mempool_kfree) { __check_element(pool, element, ksize(element)); - /* Mempools backed by page allocator */ } else if (pool->free == mempool_free_pages) { + /* Mempools backed by page allocator */ int order = (int)(long)pool->pool_data; void *addr = kmap_atomic((struct page *)element); @@ -83,8 +83,8 @@ static void poison_element(mempool_t *po /* Mempools backed by slab allocator */ if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) { __poison_element(element, ksize(element)); - /* Mempools backed by page allocator */ } else if (pool->alloc == mempool_alloc_pages) { + /* Mempools backed by page allocator */ int order = (int)(long)pool->pool_data; void *addr = kmap_atomic((struct page *)element); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm.patch mm-memory_hotplug-introduce-default-phys_to_target_node-implementation-fix.patch device-dax-make-pgmap-optional-for-instance-creation-fix.patch mm-memremap_pages-support-multiple-ranges-per-invocation-fix.patch device-dax-make-align-a-per-device-property-fix.patch powerpc-mm-move-setting-pte-specific-flags-to-pfn_pte-fix.patch mm-gup-dont-permit-users-to-call-get_user_pages-with-foll_longterm-fix.patch mm-page_allocc-clean-code-by-removing-unnecessary-initialization-fix.patch mm-mempool-add-else-to-split-mutually-exclusive-case-fix.patch memblock-make-memblock_debug-and-related-functionality-private-fix.patch arch-drivers-replace-for_each_membock-with-for_each_mem_range-fix.patch xarray-add-xa_get_order-fix.patch xarray-add-xas_split-fix.patch mm-vmstat-fix-proc-sys-vm-stat_refresh-generating-false-warnings-fix-2.patch mm-memory_hotplug-simplify-page-offlining-fix.patch checkpatch-warn-on-self-assignments-checkpatch-fixes.patch fs-binfmt_elf-use-pt_load-p_align-values-for-suitable-start-address-fix.patch linux-next-rejects.patch mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix-fix.patch mm-madvise-introduce-process_madvise-syscall-an-external-memory-hinting-api-fix-fix-fix-fix-fix-fix-fix-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch