The patch titled Subject: mm/shmem.c: remove the unused gfp arg to shmem_add_to_page_cache() has been removed from the -mm tree. Its filename was mm-remove-the-unused-gfp-arg-to-shmem_add_to_page_cache.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Wang Sheng-Hui <shhuiw@xxxxxxxxx> Subject: mm/shmem.c: remove the unused gfp arg to shmem_add_to_page_cache() The gfp arg is not used in shmem_add_to_page_cache. Remove this unused arg. Signed-off-by: Wang Sheng-Hui <shhuiw@xxxxxxxxx> Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/shmem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN mm/shmem.c~mm-remove-the-unused-gfp-arg-to-shmem_add_to_page_cache mm/shmem.c --- a/mm/shmem.c~mm-remove-the-unused-gfp-arg-to-shmem_add_to_page_cache +++ a/mm/shmem.c @@ -293,7 +293,7 @@ static bool shmem_confirm_swap(struct ad */ static int shmem_add_to_page_cache(struct page *page, struct address_space *mapping, - pgoff_t index, gfp_t gfp, void *expected) + pgoff_t index, void *expected) { int error; @@ -666,7 +666,7 @@ static int shmem_unuse_inode(struct shme */ if (!error) error = shmem_add_to_page_cache(*pagep, mapping, index, - GFP_NOWAIT, radswap); + radswap); if (error != -ENOMEM) { /* * Truncation and eviction use free_swap_and_cache(), which @@ -1112,7 +1112,7 @@ repeat: gfp & GFP_RECLAIM_MASK); if (!error) { error = shmem_add_to_page_cache(page, mapping, index, - gfp, swp_to_radix_entry(swap)); + swp_to_radix_entry(swap)); /* * We already confirmed swap under page lock, and make * no memory allocation here, so usually no possibility @@ -1175,7 +1175,7 @@ repeat: error = radix_tree_maybe_preload(gfp & GFP_RECLAIM_MASK); if (!error) { error = shmem_add_to_page_cache(page, mapping, index, - gfp, NULL); + NULL); radix_tree_preload_end(); } if (error) { _ Patches currently in -mm which might be from shhuiw@xxxxxxxxx are origin.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