The patch titled Subject: mem-hotunplug-fix-kfree-of-bootmem-memory-fix has been removed from the -mm tree. Its filename was mem-hotunplug-fix-kfree-of-bootmem-memory-fix.patch This patch was dropped because it was folded into mem-hotunplug-fix-kfree-of-bootmem-memory.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mem-hotunplug-fix-kfree-of-bootmem-memory-fix s/get_resource/alloc_resource/ Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Ram Pai <linuxram@xxxxxxxxxx> Cc: Toshi Kani <toshi.kani@xxxxxx> Cc: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/resource.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff -puN kernel/resource.c~mem-hotunplug-fix-kfree-of-bootmem-memory-fix kernel/resource.c --- a/kernel/resource.c~mem-hotunplug-fix-kfree-of-bootmem-memory-fix +++ a/kernel/resource.c @@ -175,7 +175,7 @@ static void free_resource(struct resourc } } -static struct resource *get_resource(gfp_t flags) +static struct resource *alloc_resource(gfp_t flags) { struct resource *res = NULL; @@ -814,7 +814,7 @@ static void __init __reserve_region_with { struct resource *parent = root; struct resource *conflict; - struct resource *res = get_resource(GFP_ATOMIC); + struct resource *res = alloc_resource(GFP_ATOMIC); struct resource *next_res = NULL; if (!res) @@ -849,7 +849,7 @@ static void __init __reserve_region_with end = res->end; res->end = conflict->start - 1; if (conflict->end < end) { - next_res = get_resource(GFP_ATOMIC); + next_res = alloc_resource(GFP_ATOMIC); if (!next_res) { free_resource(res); break; @@ -941,7 +941,7 @@ struct resource * __request_region(struc const char *name, int flags) { DECLARE_WAITQUEUE(wait, current); - struct resource *res = get_resource(GFP_KERNEL); + struct resource *res = alloc_resource(GFP_KERNEL); if (!res) return NULL; @@ -1097,8 +1097,8 @@ int release_mem_region_adjustable(struct if ((start < parent->start) || (end > parent->end)) return ret; - /* The get_resource() result gets checked later */ - new_res = get_resource(GFP_KERNEL); + /* The alloc_resource() result gets checked later */ + new_res = alloc_resource(GFP_KERNEL); p = &parent->child; write_lock(&resource_lock); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch auditsc-use-kzalloc-instead-of-kmallocmemset.patch kernel-audit_treec-tree-will-leak-memory-when-failure-occurs-in-audit_trim_trees.patch mm-shmemc-remove-an-ifdef.patch memcg-relax-memcg-iter-caching.patch mm-hugetlb-add-more-arch-defined-huge_pte-functions.patch mm-make-snapshotting-pages-for-stable-writes-a-per-bio-operation.patch kexec-vmalloc-export-additional-vmalloc-layer-information.patch mm-hugetlb-include-hugepages-in-meminfo.patch mm-speedup-in-__early_pfn_to_nid.patch include-linux-memoryh-implement-register_hotmemory_notifier.patch ipc-utilc-use-register_hotmemory_notifier.patch mm-slubc-use-register_hotmemory_notifier.patch drivers-base-nodec-switch-to-register_hotmemory_notifier.patch fs-proc-kcorec-use-register_hotmemory_notifier.patch kernel-cpusetc-use-register_hotmemory_notifier.patch mm-limit-growth-of-3%-hardcoded-other-user-reserve.patch mm-replace-hardcoded-3%-with-admin_reserve_pages-knob.patch mm-reinititalise-user-and-admin-reserves-if-memory-is-added-or-removed.patch resource-add-release_mem_region_adjustable.patch mm-madvise-complete-input-validation-before-taking-lock.patch clear_refs-sanitize-accepted-commands-declaration.patch memcg-add-memorypressure_level-events.patch mm-thp-add-split-tail-pages-to-shrink-page-list-in-page-reclaim.patch thp-fix-huge-zero-page-logic-for-page-with-pfn-==-0.patch mm-swap-mark-swap-pages-writeback-before-queueing-for-direct-io.patch mem-hotunplug-fix-kfree-of-bootmem-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