From ce866b34ae1b7f1ce60234cf65855886ac7e7d30 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Fri, 30 Jun 2006 01:55:40 -0700 Subject: [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 Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/base/node.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/base/node.c') diff --git a/drivers/base/node.c b/drivers/base/node.c index 6fed520d00f..a7b3dcbbdfc 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)), -- cgit v1.2.3