The patch titled Subject: memory-hotplug-remove-memmap-of-sparse-vmemmap-fix has been removed from the -mm tree. Its filename was memory-hotplug-remove-memmap-of-sparse-vmemmap-fix.patch This patch was dropped because it was folded into memory-hotplug-remove-memmap-of-sparse-vmemmap.patch ------------------------------------------------------ From: Michal Hocko <mhocko@xxxxxxx> Subject: memory-hotplug-remove-memmap-of-sparse-vmemmap-fix Defconfig for x86_64 complains: arch/x86/mm/init_64.c: In function `vmemmap_free': arch/x86/mm/init_64.c:1317: error: implicit declaration of function `remove_pagetable' vmemmap_free is only used for CONFIG_MEMORY_HOTPLUG so let's move it inside ifdef Signed-off-by: Michal Hocko <mhocko@xxxxxxx> Tested-by: Lin Feng <linfeng@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/mm/init_64.c | 16 ++++++++-------- include/linux/mm.h | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff -puN arch/x86/mm/init_64.c~memory-hotplug-remove-memmap-of-sparse-vmemmap-fix arch/x86/mm/init_64.c --- a/arch/x86/mm/init_64.c~memory-hotplug-remove-memmap-of-sparse-vmemmap-fix +++ a/arch/x86/mm/init_64.c @@ -1011,6 +1011,14 @@ remove_pagetable(unsigned long start, un flush_tlb_all(); } +void __ref vmemmap_free(struct page *memmap, unsigned long nr_pages) +{ + unsigned long start = (unsigned long)memmap; + unsigned long end = (unsigned long)(memmap + nr_pages); + + remove_pagetable(start, end, false); +} + static void __meminit kernel_physical_mapping_remove(unsigned long start, unsigned long end) { @@ -1348,14 +1356,6 @@ vmemmap_populate(struct page *start_page return 0; } -void __ref vmemmap_free(struct page *memmap, unsigned long nr_pages) -{ - unsigned long start = (unsigned long)memmap; - unsigned long end = (unsigned long)(memmap + nr_pages); - - remove_pagetable(start, end, false); -} - #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HAVE_BOOTMEM_INFO_NODE) void register_page_bootmem_memmap(unsigned long section_nr, struct page *start_page, unsigned long size) diff -puN include/linux/mm.h~memory-hotplug-remove-memmap-of-sparse-vmemmap-fix include/linux/mm.h --- a/include/linux/mm.h~memory-hotplug-remove-memmap-of-sparse-vmemmap-fix +++ a/include/linux/mm.h @@ -1720,7 +1720,9 @@ int vmemmap_populate_basepages(struct pa unsigned long pages, int node); int vmemmap_populate(struct page *start_page, unsigned long pages, int node); void vmemmap_populate_print_last(void); +#ifdef CONFIG_MEMORY_HOTPLUG void vmemmap_free(struct page *memmap, unsigned long nr_pages); +#endif void register_page_bootmem_memmap(unsigned long section_nr, struct page *map, unsigned long size); _ Patches currently in -mm which might be from mhocko@xxxxxxx are origin.patch memcg-oom-provide-more-precise-dump-info-while-memcg-oom-happening.patch mm-memcontrolc-convert-printkkern_foo-to-pr_foo.patch mm-hugetlbc-convert-to-pr_foo.patch mm-memcg-only-evict-file-pages-when-we-have-plenty.patch mm-vmscan-save-work-scanning-almost-empty-lru-lists.patch mm-vmscan-clarify-how-swappiness-highest-priority-memcg-interact.patch mm-vmscan-improve-comment-on-low-page-cache-handling.patch mm-vmscan-clean-up-get_scan_count.patch mm-vmscan-compaction-works-against-zones-not-lruvecs.patch mm-reduce-rmap-overhead-for-ex-ksm-page-copies-created-on-swap-faults.patch mm-page_allocc-__setup_per_zone_wmarks-make-min_pages-unsigned-long.patch mm-vmscanc-__zone_reclaim-replace-max_t-with-max.patch mmksm-use-new-hashtable-implementation.patch memcgvmscan-do-not-break-out-targeted-reclaim-without-reclaimed-pages.patch memory-hotplug-implement-register_page_bootmem_info_section-of-sparse-vmemmap.patch memory-hotplug-remove-memmap-of-sparse-vmemmap.patch acpi-memory-hotplug-parse-srat-before-memblock-is-ready-fix.patch mm-use-zone-present_pages-instead-of-zone-managed_pages-where-appropriate.patch mm-set-zone-present_pages-to-number-of-existing-pages-in-the-zone.patch mm-increase-totalram_pages-when-free-pages-allocated-by-bootmem-allocator.patch mm-teach-mm-by-current-context-info-to-not-do-i-o-during-memory-allocation.patch pm-runtime-introduce-pm_runtime_set_memalloc_noio.patch block-genhdc-apply-pm_runtime_set_memalloc_noio-on-block-devices.patch net-core-apply-pm_runtime_set_memalloc_noio-on-network-devices.patch pm-runtime-force-memory-allocation-with-no-i-o-during-runtime-pm-callbcack.patch usb-forbid-memory-allocation-with-i-o-during-bus-reset.patch memcg-do-not-create-memsw-files-if-swap-accounting-is-disabled.patch memcg-clean-up-swap-accounting-initialization-code.patch memcg-reduce-the-size-of-struct-memcg-244-fold.patch memcg-reduce-the-size-of-struct-memcg-244-fold-fix.patch memcg-prevent-changes-to-move_charge_at_immigrate-during-task-attach.patch memcg-split-part-of-memcg-creation-to-css_online.patch memcg-fast-hierarchy-aware-child-test.patch memcg-fast-hierarchy-aware-child-test-fix.patch memcg-fast-hierarchy-aware-child-test-fix-fix.patch memcg-replace-cgroup_lock-with-memcg-specific-memcg_lock.patch memcg-replace-cgroup_lock-with-memcg-specific-memcg_lock-fix.patch memcg-increment-static-branch-right-after-limit-set.patch memcg-avoid-dangling-reference-count-in-creation-failure.patch mm-refactor-inactive_file_is_low-to-use-get_lru_size.patch memcg-move-mem_cgroup_soft_limit_tree_init-to-mem_cgroup_init.patch memcg-move-memcg_stock-initialization-to-mem_cgroup_init.patch memcg-cleanup-mem_cgroup_init-comment.patch memcg-stop-warning-on-memcg_propagate_kmem.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