The patch titled Subject: mm/memory_hotplug.c: add __meminit to grow_zone_span/grow_pgdat_span has been removed from the -mm tree. Its filename was mm-memory_hotplugc-add-__meminit-to-grow_zone_span-grow_pgdat_span.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Fabian Frederick <fabf@xxxxxxxxx> Subject: mm/memory_hotplug.c: add __meminit to grow_zone_span/grow_pgdat_span grow_zone_span and grow_pgdat_span are only called by __meminit __add_zone Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx> Cc: Toshi Kani <toshi.kani@xxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory_hotplug.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN mm/memory_hotplug.c~mm-memory_hotplugc-add-__meminit-to-grow_zone_span-grow_pgdat_span mm/memory_hotplug.c --- a/mm/memory_hotplug.c~mm-memory_hotplugc-add-__meminit-to-grow_zone_span-grow_pgdat_span +++ a/mm/memory_hotplug.c @@ -284,8 +284,8 @@ void register_page_bootmem_info_node(str } #endif /* CONFIG_HAVE_BOOTMEM_INFO_NODE */ -static void grow_zone_span(struct zone *zone, unsigned long start_pfn, - unsigned long end_pfn) +static void __meminit grow_zone_span(struct zone *zone, unsigned long start_pfn, + unsigned long end_pfn) { unsigned long old_zone_end_pfn; @@ -427,8 +427,8 @@ out_fail: return -1; } -static void grow_pgdat_span(struct pglist_data *pgdat, unsigned long start_pfn, - unsigned long end_pfn) +static void __meminit grow_pgdat_span(struct pglist_data *pgdat, unsigned long start_pfn, + unsigned long end_pfn) { unsigned long old_pgdat_end_pfn = pgdat_end_pfn(pgdat); _ Patches currently in -mm which might be from fabf@xxxxxxxxx are origin.patch fs-cifs-remove-obsolete-__constant.patch fs-cifs-filec-replace-countsize-kzalloc-by-kcalloc.patch fs-cifs-smb2filec-replace-countsize-kzalloc-by-kcalloc.patch fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch mm-zswapc-add-__init-to-zswap_entry_cache_destroy.patch fs-compatc-remove-unnecessary-test-on-unsigned-value.patch fs-efs-nameic-return-is-not-a-function.patch fs-ramfs-file-nommuc-replace-countsize-kzalloc-by-kcalloc.patch kernel-test_kprobesc-use-current-logging-functions.patch fs-befs-linuxvfsc-check-superblock-before-dump-operation.patch fs-isofs-logging-clean-up.patch fs-isofs-logging-clean-up-fix.patch fs-coda-use-linux-uaccessh.patch fs-nilfs2-superc-remove-unnecessary-test-on-unsigned-value.patch fs-ufs-convert-printk-to-pr_foo.patch fs-ufs-use-pr_fmt.patch fs-ufs-superc-use-__func__-in-logging.patch fs-ufs-superc-use-va_format-instead-of-buffer-vsnprintf.patch fs-ufs-convert-ufsd-printk-to-pr_debug.patch fs-ufs-inodec-kernel-doc-warning-fixes.patch fs-reiserfs-replace-not-standard-%lu-%ld.patch fs-reiserfs-use-linux-uaccessh.patch fs-reiserfs-xattrc-fix-blank-line-missing-after-declarations.patch fs-hpfs-dnodec-fix-suspect-code-indent.patch fs-proc-kcorec-use-page_align-instead-of-alignpage_size.patch proc-constify-seq_operations.patch fs-exofs-ore_raidc-replace-countsize-kzalloc-by-kcalloc.patch kernel-gcov-fsc-remove-unnecessary-null-test-before-debugfs_remove.patch fs-adfs-dir_fplusc-use-array_size-instead-of-sizeof-sizeof.patch fs-adfs-dir_fplusc-replace-countsize-kzalloc-by-kcalloc.patch fs-bfs-use-bfs-prefix-for-dump_imap.patch drivers-parport-parport_ip32c-use-ptr_err_or_zero.patch fs-pstore-ram_corec-replace-countsize-kmalloc-by-kmalloc_array.patch fs-cachefiles-daemonc-remove-unnecessary-tests-on-unsigned-values.patch fs-cachefiles-bindc-remove-unnecessary-assertions.patch fs-omfs-inodec-replace-countsize-kzalloc-by-kcalloc.patch fs-cramfs-convert-printk-to-pr_foo.patch fs-cramfs-use-pr_fmt.patch fs-cramfs-code-clean-up.patch fs-cramfs-inodec-use-linux-uaccessh.patch fs-romfs-superc-convert-printk-to-pr_foo.patch fs-romfs-superc-use-pr_fmt-in-logging.patch fs-romfs-superc-add-blank-line-after-declarations.patch fs-qnx6-convert-printk-to-pr_foo.patch fs-qnx6-use-pr_fmt-and-__func__-in-logging.patch fs-qnx6-update-debugging-to-current-functions.patch scripts-coccinelle-free-add-null-test-before-freeing-functions.patch scripts-coccinelle-free-ifnullfreecocci-add-copyright-information.patch fs-dlm-debug_fsc-remove-unnecessary-null-test-before-debugfs_remove.patch linux-next.patch init-mainc-code-clean-up.patch kernel-posix-timersc-code-clean-up.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch kernel-kprobesc-convert-printk-to-pr_foo.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