Subject: + mm-memory_hotplugc-rename-the-function-is_memblock_offlined_cb.patch added to -mm tree To: qiuxishi@xxxxxxxxxx,isimatu.yasuaki@xxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Thu, 19 Sep 2013 15:38:42 -0700 The patch titled Subject: mm/memory_hotplug.c: rename the function is_memblock_offlined_cb() has been added to the -mm tree. Its filename is mm-memory_hotplugc-rename-the-function-is_memblock_offlined_cb.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-memory_hotplugc-rename-the-function-is_memblock_offlined_cb.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-memory_hotplugc-rename-the-function-is_memblock_offlined_cb.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/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Xishi Qiu <qiuxishi@xxxxxxxxxx> Subject: mm/memory_hotplug.c: rename the function is_memblock_offlined_cb() A is_memblock_offlined() return or 1 means memory block is offlined, but is_memblock_offlined_cb() returning 1 means memory block is not offlined, this will confuse somebody, so rename the function. Signed-off-by: Xishi Qiu <qiuxishi@xxxxxxxxxx> Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory_hotplug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/memory_hotplug.c~mm-memory_hotplugc-rename-the-function-is_memblock_offlined_cb mm/memory_hotplug.c --- a/mm/memory_hotplug.c~mm-memory_hotplugc-rename-the-function-is_memblock_offlined_cb +++ a/mm/memory_hotplug.c @@ -1701,7 +1701,7 @@ int walk_memory_range(unsigned long star } #ifdef CONFIG_MEMORY_HOTREMOVE -static int is_memblock_offlined_cb(struct memory_block *mem, void *arg) +static int check_memblock_offlined_cb(struct memory_block *mem, void *arg) { int ret = !is_memblock_offlined(mem); @@ -1853,7 +1853,7 @@ void __ref remove_memory(int nid, u64 st * if this is not the case. */ ret = walk_memory_range(PFN_DOWN(start), PFN_UP(start + size - 1), NULL, - is_memblock_offlined_cb); + check_memblock_offlined_cb); if (ret) { unlock_memory_hotplug(); BUG(); _ Patches currently in -mm which might be from qiuxishi@xxxxxxxxxx are mm-arch-use-__free_reserved_page-to-simplify-the-code.patch drivers-video-acornfbc-use-__free_reserved_page-to-simplify-the-code.patch mm-use-pgdat_end_pfn-to-simplify-the-code-in-arch.patch mm-use-pgdat_end_pfn-to-simplify-the-code-in-others.patch mm-use-populated_zone-instead-of-ifzone-present_pages.patch mm-memory_hotplugc-rename-the-function-is_memblock_offlined_cb.patch mm-memory_hotplugc-use-pfn_to_nid-instead-of-page_to_nidpfn_to_page.patch documentation-dma-attributestxt-fix-typo.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