summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-06-30 10:55:38 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 20:25:35 +0200
commit9a865ffa34b6117a5e0b67640a084d8c2e198c93 (patch)
treec295d5a0831df81eeeded3834f32f513b9ae05c7 /drivers/base
parent[PATCH] zoned vm counters: zone_reclaim: remove /proc/sys/vm/zone_reclaim_int... (diff)
downloadlinux-9a865ffa34b6117a5e0b67640a084d8c2e198c93.tar.xz
linux-9a865ffa34b6117a5e0b67640a084d8c2e198c93.zip
[PATCH] zoned vm counters: conversion of nr_slab to per zone counter
- Allows reclaim to access counter without looping over processor counts. - Allows accurate statistics on how many pages are used in a zone by the slab. This may become useful to balance slab allocations over various zones. [akpm@osdl.org: bugfix] 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 'drivers/base')
-rw-r--r--drivers/base/node.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c
index c3bf05158c6d..db116a8791c8 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -54,8 +54,6 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
ps.nr_dirty = 0;
if ((long)ps.nr_writeback < 0)
ps.nr_writeback = 0;
- if ((long)ps.nr_slab < 0)
- ps.nr_slab = 0;
n = sprintf(buf, "\n"
"Node %d MemTotal: %8lu kB\n"
@@ -87,7 +85,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
nid, K(node_page_state(nid, NR_FILE_PAGES)),
nid, K(node_page_state(nid, NR_FILE_MAPPED)),
nid, K(node_page_state(nid, NR_ANON_PAGES)),
- nid, K(ps.nr_slab));
+ nid, K(node_page_state(nid, NR_SLAB)));
n += hugetlb_report_node_meminfo(nid, buf + n);
return n;
}