[folded-merged] swap-add-per-partition-lock-for-swapfile-fix-fix.patch removed from -mm tree

[folded-merged] swap-add-per-partition-lock-for-swapfile-fix-fix.patch removed from -mm tree

[akpm]

The patch titled
     Subject: swap-add-per-partition-lock-for-swapfile-fix-fix
has been removed from the -mm tree.  Its filename was
     swap-add-per-partition-lock-for-swapfile-fix-fix.patch

This patch was dropped because it was folded into swap-add-per-partition-lock-for-swapfile.patch

------------------------------------------------------
From: Shaohua Li <shli@kernel.org>
Subject: swap-add-per-partition-lock-for-swapfile-fix-fix

> 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')
>

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/sparc/mm/init_32.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/sparc/mm/init_32.c~swap-add-per-partition-lock-for-swapfile-fix-fix arch/sparc/mm/init_32.c
--- a/arch/sparc/mm/init_32.c~swap-add-per-partition-lock-for-swapfile-fix-fix
+++ a/arch/sparc/mm/init_32.c
@@ -57,7 +57,7 @@ void show_mem(unsigned int filter)
 	printk("Mem-info:\n");
 	show_free_areas(filter);
 	printk("Free swap:       %6ldkB\n",
-	       nr_swap_pages << (PAGE_SHIFT-10));
+	       get_nr_swap_pages() << (PAGE_SHIFT-10));
 	printk("%ld pages of RAM\n", totalram_pages);
 	printk("%ld free pages\n", nr_free_pages());
 }
_

Patches currently in -mm which might be from shli@kernel.org 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-for-nommu.patch
swap-add-per-partition-lock-for-swapfile-fix-fix-fix.patch
swap-add-per-partition-lock-for-swapfile-fix-fix-fix-fix.patch
swap-add-per-partition-lock-for-swapfile-fix-fix-fix-fix-fix.patch