diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-06-30 12:55:40 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 22:25:35 +0400 |
| commit | ce866b34ae1b7f1ce60234cf65855886ac7e7d30 (patch) | |
| tree | e9a2664f0abc5221b9a92e1417d8e02b94a634c4 /drivers/base | |
| parent | b1e7a8fd854d2f895730e82137400012b509650e (diff) | |
| download | linux-ce866b34ae1b7f1ce60234cf65855886ac7e7d30.tar.xz | |
[PATCH] zoned vm counters: conversion of nr_writeback to per zone counter
Conversion of nr_writeback to per zone counter.
This removes the last page_state counter from arch/i386/mm/pgtable.c so we
drop the page_state from there.
[akpm@osdl.org: bugfix]
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
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.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 6fed520d00f4..a7b3dcbbdfc9 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -49,9 +49,6 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) get_page_state_node(&ps, nid); __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid)); - /* Check for negative values in these approximate counters */ - if ((long)ps.nr_writeback < 0) - ps.nr_writeback = 0; n = sprintf(buf, "\n" "Node %d MemTotal: %8lu kB\n" @@ -80,7 +77,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) nid, K(i.totalram - i.totalhigh), nid, K(i.freeram - i.freehigh), nid, K(node_page_state(nid, NR_FILE_DIRTY)), - nid, K(ps.nr_writeback), + nid, K(node_page_state(nid, NR_WRITEBACK)), 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)), |