The patch titled Subject: mmmemory_hotplug-allocate-memmap-from-the-added-memory-range-fix has been removed from the -mm tree. Its filename was mmmemory_hotplug-allocate-memmap-from-the-added-memory-range-fix.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mmmemory_hotplug-allocate-memmap-from-the-added-memory-range-fix typo & code cleanup, per David Cc: Anshuman Khandual <anshuman.khandual@xxxxxxx> Cc: David Hildenbrand <david@xxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxxxx> Cc: Oscar Salvador <osalvador@xxxxxxx> Cc: Pavel Tatashin <pasha.tatashin@xxxxxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory_hotplug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/memory_hotplug.c~mmmemory_hotplug-allocate-memmap-from-the-added-memory-range-fix +++ a/mm/memory_hotplug.c @@ -1097,7 +1097,7 @@ bool mhp_supports_memmap_on_memory(unsig * Besides having arch support and the feature enabled at runtime, we * need a few more assumptions to hold true: * - * a) We span a single memory block: memory onlining/offlinin;g happens + * a) We span a single memory block: memory onlining/offlining happens * in memory block granularity. We don't want the vmemmap of online * memory blocks to reside on offline memory blocks. In the future, * we might want to support variable-sized memory blocks to make the @@ -1123,7 +1123,7 @@ bool mhp_supports_memmap_on_memory(unsig IS_ENABLED(CONFIG_MHP_MEMMAP_ON_MEMORY) && size == memory_block_size_bytes() && IS_ALIGNED(vmemmap_size, PMD_SIZE) && - IS_ALIGNED(remaining_size, (pageblock_nr_pages << PAGE_SHIFT)); + IS_ALIGNED(remaining_size, pageblock_nr_pages << PAGE_SHIFT); } /* _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are scripts-a-new-script-for-checking-duplicate-struct-declaration-fix.patch mm.patch mm-memcontrol-switch-to-rstat-fix.patch mm-vmalloc-remove-unmap_kernel_range-fix-fix.patch mm-page_alloc-add-an-array-based-interface-to-the-bulk-page-allocator-fix.patch mm-vmscan-add-shrinker_info_protected-helper-fix.patch mm-drop-redundant-arch_enable__migration-fix.patch mm-drop-redundant-arch_enable__migration-fix-fix.patch linux-next-rejects.patch linux-next-git-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch