The patch titled Subject: swap-add-per-partition-lock-for-swapfile-fix-fix-fix-fix has been removed from the -mm tree. Its filename was swap-add-per-partition-lock-for-swapfile-fix-fix-fix-fix.patch This patch was dropped because it was folded into swap-add-per-partition-lock-for-swapfile.patch ------------------------------------------------------ From: Shaohua Li <shli@xxxxxxxxxx> Subject: swap-add-per-partition-lock-for-swapfile-fix-fix-fix-fix Fix building errors like: > arch/sparc/mm/init_32.c: In function 'show_mem': > arch/sparc/mm/init_32.c:60:23: error: invalid operands to binary << (have 'atomic_long_t' and 'int') Signed-off-by: Shaohua Li <shli@xxxxxxxxxxxx> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Reported-by: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/tile/mm/pgtable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/tile/mm/pgtable.c~swap-add-per-partition-lock-for-swapfile-fix-fix-fix-fix arch/tile/mm/pgtable.c --- a/arch/tile/mm/pgtable.c~swap-add-per-partition-lock-for-swapfile-fix-fix-fix-fix +++ a/arch/tile/mm/pgtable.c @@ -61,7 +61,7 @@ void show_mem(unsigned int filter) global_page_state(NR_PAGETABLE), global_page_state(NR_BOUNCE), global_page_state(NR_FILE_PAGES), - nr_swap_pages); + get_nr_swap_pages()); for_each_zone(zone) { unsigned long flags, order, total = 0, largest_order = -1; _ Patches currently in -mm which might be from shli@xxxxxxxxxx are origin.patch mm-make-madvisemadv_willneed-support-swap-file-prefetch.patch mm-dont-inline-page_mapping.patch swap-make-each-swap-partition-have-one-address_space.patch swap-add-per-partition-lock-for-swapfile.patch swap-add-per-partition-lock-for-swapfile-fix-fix-fix-fix-fix.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