The patch titled Subject: mm/page_alloc.c: add __meminit to alloc_pages_exact_nid() has been removed from the -mm tree. Its filename was mm-page_alloc-add-__meminit-to-alloc_pages_exact_nid.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Fabian Frederick <fabf@xxxxxxxxx> Subject: mm/page_alloc.c: add __meminit to alloc_pages_exact_nid() alloc_pages_exact_nid() is only called by __meminit alloc_page_cgroup() Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/gfp.h | 2 +- mm/page_alloc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN include/linux/gfp.h~mm-page_alloc-add-__meminit-to-alloc_pages_exact_nid include/linux/gfp.h --- a/include/linux/gfp.h~mm-page_alloc-add-__meminit-to-alloc_pages_exact_nid +++ a/include/linux/gfp.h @@ -360,7 +360,7 @@ extern unsigned long get_zeroed_page(gfp void *alloc_pages_exact(size_t size, gfp_t gfp_mask); void free_pages_exact(void *virt, size_t size); /* This is different from alloc_pages_exact_node !!! */ -void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask); +void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask); #define __get_free_page(gfp_mask) \ __get_free_pages((gfp_mask), 0) diff -puN mm/page_alloc.c~mm-page_alloc-add-__meminit-to-alloc_pages_exact_nid mm/page_alloc.c --- a/mm/page_alloc.c~mm-page_alloc-add-__meminit-to-alloc_pages_exact_nid +++ a/mm/page_alloc.c @@ -2962,7 +2962,7 @@ EXPORT_SYMBOL(alloc_pages_exact); * Note this is not alloc_pages_exact_node() which allocates on a specific node, * but is not exact. */ -void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) +void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) { unsigned order = get_order(size); struct page *p = alloc_pages_node(nid, gfp_mask, order); _ 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