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@xxxxxxxx> 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@xxxxxxxx> Cc: Shaohua Li <shli@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- 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@xxxxxxxx are origin.patch swap-add-per-partition-lock-for-swapfile.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