diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-09-26 02:31:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:51 -0400 |
commit | 972d1a7b140569084439a81265a0f15b74e924e0 (patch) | |
tree | e86e676e407503ef3d98020a88bb925235f11434 /mm/nommu.c | |
parent | 8417bba4b151346ed475fcc923693c9e3be89063 (diff) |
[PATCH] ZVC: Support NR_SLAB_RECLAIMABLE / NR_SLAB_UNRECLAIMABLE
Remove the atomic counter for slab_reclaim_pages and replace the counter
and NR_SLAB with two ZVC counter that account for unreclaimable and
reclaimable slab pages: NR_SLAB_RECLAIMABLE and NR_SLAB_UNRECLAIMABLE.
Change the check in vmscan.c to refer to to NR_SLAB_RECLAIMABLE. The
intend seems to be to check for slab pages that could be freed.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/nommu.c')
-rw-r--r-- | mm/nommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index c576df71e3bb..d99dea31e443 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
@@ -1133,7 +1133,7 @@ int __vm_enough_memory(long pages, int cap_sys_admin) | |||
1133 | * which are reclaimable, under pressure. The dentry | 1133 | * which are reclaimable, under pressure. The dentry |
1134 | * cache and most inode caches should fall into this | 1134 | * cache and most inode caches should fall into this |
1135 | */ | 1135 | */ |
1136 | free += atomic_read(&slab_reclaim_pages); | 1136 | free += global_page_state(NR_SLAB_RECLAIMABLE); |
1137 | 1137 | ||
1138 | /* | 1138 | /* |
1139 | * Leave the last 3% for root | 1139 | * Leave the last 3% for root |