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

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

[akpm]

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

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

------------------------------------------------------
From: Arnd Bergmann <arnd@arndb.de>
Subject: swap: fix "add per-partition lock for swapfile" for nommu

The patch "swap: add per-partition lock for swapfile" made the
nr_swap_pages variable unaccessible but forgot to change the
mm/nommu.c file that uses it. This does the trivial conversion
to let us build nommu kernels again

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Shaohua Li <shli@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

diff -puN mm/nommu.c~swap-add-per-partition-lock-for-swapfile-fix-for-nommu mm/nommu.c
--- a/mm/nommu.c~swap-add-per-partition-lock-for-swapfile-fix-for-nommu
+++ a/mm/nommu.c
@@ -1907,7 +1907,7 @@ int __vm_enough_memory(struct mm_struct 
 		 */
 		free -= global_page_state(NR_SHMEM);
 
-		free += nr_swap_pages;
+		free += get_nr_swap_pages();
 
 		/*
 		 * Any slabs which are created with the
_

Patches currently in -mm which might be from arnd@arndb.de are

origin.patch
swap-add-per-partition-lock-for-swapfile.patch