The patch titled Subject: mm-vmalloc-allocate-small-pages-for-area-pages-fix has been removed from the -mm tree. Its filename was mm-vmalloc-allocate-small-pages-for-area-pages-fix.patch This patch was dropped because it was folded into mm-vmalloc-allocate-small-pages-for-area-pages.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-vmalloc-allocate-small-pages-for-area-pages-fix tweak code layout Cc: Xu Yu <xuyu@xxxxxxxxxxxxxxxxx> Cc: Uladzislau Rezki <uladzislau.rezki@xxxxxxxx> Cc: Nicholas Piggin <npiggin@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmalloc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/mm/vmalloc.c~mm-vmalloc-allocate-small-pages-for-area-pages-fix +++ a/mm/vmalloc.c @@ -2932,12 +2932,14 @@ static void *__vmalloc_area_node(struct unsigned long addr = (unsigned long)area->addr; unsigned long size = get_vm_area_size(area); unsigned long array_size; - unsigned int nr_small_pages = size >> PAGE_SHIFT; - unsigned int max_small_pages = ALIGN(size, 1UL << page_shift) >> PAGE_SHIFT; + unsigned int nr_small_pages, max_small_pages; unsigned int page_order; unsigned int flags; int ret; + nr_small_pages = size >> PAGE_SHIFT; + max_small_pages = ALIGN(size, 1UL << page_shift) >> PAGE_SHIFT; + array_size = (unsigned long)max_small_pages * sizeof(struct page *); gfp_mask |= __GFP_NOWARN; if (!(gfp_mask & (GFP_DMA | GFP_DMA32))) _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are kthread-add-the-helper-function-kthread_run_on_cpu-fix.patch kmemleak-fix-kmemleak-false-positive-report-with-hw-tag-based-kasan-enable-fix.patch mm-defer-kmemleak-object-creation-of-module_alloc-v4-fix.patch device-dax-remove-pfn-from-__dev_dax_ptepmdpud_fault-fix.patch mm-shmem-dont-truncate-page-if-memory-failure-happens-checkpatch-fixes.patch shmem-fix-a-race-between-shmem_unused_huge_shrink-and-shmem_evict_inode-checkpatch-fixes.patch memcg-add-per-memcg-vmalloc-stat-v2-fix.patch mm-remove-redundant-check-about-fault_flag_allow_retry-bit-checkpatch-fixes.patch mm-vmalloc-allocate-small-pages-for-area-pages.patch mm-page_allocc-do-not-warn-allocation-failure-on-zone-dma-if-no-managed-pages-fix.patch mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch mm-memcg-percpu-account-extra-objcg-space-to-memory-cgroups-fix.patch mm-rmap-fix-potential-batched-tlb-flush-race-fix.patch