The patch titled Subject: mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix has been removed from the -mm tree. Its filename was mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix.patch This patch was dropped because it was folded into mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix use min_t, cleanups Cc: Lai Jiangshan <laijs@xxxxxxxxxxxxxx> Cc: Wen Congyang <wency@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/base/memory.c | 20 ++++++++++++-------- mm/memory_hotplug.c | 1 - 2 files changed, 12 insertions(+), 9 deletions(-) diff -puN drivers/base/memory.c~mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix drivers/base/memory.c --- a/drivers/base/memory.c~mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix +++ a/drivers/base/memory.c @@ -341,14 +341,18 @@ store_mem_state(struct device *dev, mem = container_of(dev, struct memory_block, dev); - if (!strncmp(buf, "online_kernel", min((int)count, 13))) - ret = memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, ONLINE_KERNEL); - else if (!strncmp(buf, "online_movable", min((int)count, 14))) - ret = memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, ONLINE_MOVABLE); - else if (!strncmp(buf, "online", min((int)count, 6))) - ret = memory_block_change_state(mem, MEM_ONLINE, MEM_OFFLINE, ONLINE_KEEP); - else if(!strncmp(buf, "offline", min((int)count, 7))) - ret = memory_block_change_state(mem, MEM_OFFLINE, MEM_ONLINE, -1); + if (!strncmp(buf, "online_kernel", min_t(int, count, 13))) + ret = memory_block_change_state(mem, MEM_ONLINE, + MEM_OFFLINE, ONLINE_KERNEL); + else if (!strncmp(buf, "online_movable", min_t(int, count, 14))) + ret = memory_block_change_state(mem, MEM_ONLINE, + MEM_OFFLINE, ONLINE_MOVABLE); + else if (!strncmp(buf, "online", min_t(int, count, 6))) + ret = memory_block_change_state(mem, MEM_ONLINE, + MEM_OFFLINE, ONLINE_KEEP); + else if(!strncmp(buf, "offline", min_t(int, count, 7))) + ret = memory_block_change_state(mem, MEM_OFFLINE, + MEM_ONLINE, -1); if (ret) return ret; diff -puN mm/memory_hotplug.c~mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix mm/memory_hotplug.c --- a/mm/memory_hotplug.c~mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory-fix +++ a/mm/memory_hotplug.c @@ -217,7 +217,6 @@ static void grow_zone_span(struct zone * static void resize_zone(struct zone *zone, unsigned long start_pfn, unsigned long end_pfn) { - zone_span_writelock(zone); zone->zone_start_pfn = start_pfn; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-introduce-mm_find_pmd.patch memory-hotplug-update-mce_bad_pages-when-removing-the-memory.patch slub-hotplug-ignore-unrelated-nodes-hot-adding-and-hot-removing.patch mmvmscan-only-evict-file-pages-when-we-have-plenty.patch dmapool-make-dmapool_debug-detect-corruption-of-free-marker.patch mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7.patch mm-check-rb_subtree_gap-correctness.patch mm-rearrange-vm_area_struct-for-fewer-cache-misses.patch mm-vm_unmapped_area-lookup-function.patch mm-use-vm_unmapped_area-in-hugetlbfs-on-i386-architecture.patch mm-use-vm_unmapped_area-on-mips-architecture.patch mm-use-vm_unmapped_area-on-arm-architecture.patch mm-use-vm_unmapped_area-on-sh-architecture.patch mm-use-vm_unmapped_area-on-sparc32-architecture.patch mm-use-vm_unmapped_area-in-hugetlbfs-on-tile-architecture.patch mm-use-vm_unmapped_area-on-sparc64-architecture.patch arch-sparc-kernel-sys_sparc_64c-s-colour-color.patch mm-introduce-a-common-interface-for-balloon-pages-mobility.patch virtio_balloon-introduce-migration-primitives-to-balloon-pages.patch bootmem-fix-wrong-call-parameter-for-free_bootmem.patch mm-memory-hotplug-dynamic-configure-movable-memory-and-portion-memory.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html