[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1359538872-29910-1-git-send-email-thierry.reding@avionic-design.de>
Date: Wed, 30 Jan 2013 10:41:12 +0100
From: Thierry Reding <thierry.reding@...onic-design.de>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Shaohua Li <shli@...ionio.com>, linux-mm@...ck.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] mm/nommu: Use get_nr_swap_pages()
This fixes a build failure introduced by commit ac07b1f ("swap: add per-
partition lock for swapfile") which changed the access pattern of the
nr_swap_pages variable but failed to update the no-MMU case.
Signed-off-by: Thierry Reding <thierry.reding@...onic-design.de>
---
mm/nommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/nommu.c b/mm/nommu.c
index b7fdaa7..bf74898 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1906,7 +1906,7 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin)
*/
free -= global_page_state(NR_SHMEM);
- free += nr_swap_pages;
+ free += get_nr_swap_pages();
/*
* Any slabs which are created with the
--
1.8.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists