diff options
| author | Christoph Lameter <clameter@sgi.com> | 2007-02-10 01:43:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 10:51:18 -0800 |
| commit | 05a0416be2b88d859efcbc4a4290555a04d169a1 (patch) | |
| tree | da7216a3a04625a45b952ea21f817d5cdb199530 /drivers | |
| parent | 9195481d2f869a2707a272057f3f8664fd277534 (diff) | |
| download | blackbird-op-linux-05a0416be2b88d859efcbc4a4290555a04d169a1.tar.gz blackbird-op-linux-05a0416be2b88d859efcbc4a4290555a04d169a1.zip | |
[PATCH] Drop __get_zone_counts()
Values are readily available via ZVC per node and global sums.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/node.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 001e6f6b9c1b..475e33f76e0d 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -40,13 +40,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) int n; int nid = dev->id; struct sysinfo i; - unsigned long inactive; - unsigned long active; - unsigned long free; si_meminfo_node(&i, nid); - __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid)); - n = sprintf(buf, "\n" "Node %d MemTotal: %8lu kB\n" @@ -74,8 +69,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) nid, K(i.totalram), nid, K(i.freeram), nid, K(i.totalram - i.freeram), - nid, K(active), - nid, K(inactive), + nid, node_page_state(nid, NR_ACTIVE), + nid, node_page_state(nid, NR_INACTIVE), #ifdef CONFIG_HIGHMEM nid, K(i.totalhigh), nid, K(i.freehigh), |
