summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Blackwood <john.blackwood@ccur.com>2008-07-04 10:00:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-04 10:40:09 -0700
commit2d5c1be8870383622809c25935fff00d2630c7a5 (patch)
tree66ba595a593da124d77fb0baf2f7d12d79d6165c
parentacb7669c125676e63cf96582455509216c39745e (diff)
downloadop-kernel-dev-2d5c1be8870383622809c25935fff00d2630c7a5.zip
op-kernel-dev-2d5c1be8870383622809c25935fff00d2630c7a5.tar.gz
mm: switch node meminfo Active & Inactive pages to Kbytes
There is a bug in the output of /sys/devices/system/node/node[n]/meminfo where the Active and Inactive values are in pages instead of Kbytes. Looks like this occurred back in 2.6.20 when the code was changed over to use node_page_state(). Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/base/node.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 39f3d1b..0f867a0 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -84,8 +84,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, node_page_state(nid, NR_ACTIVE),
- nid, node_page_state(nid, NR_INACTIVE),
+ nid, K(node_page_state(nid, NR_ACTIVE)),
+ nid, K(node_page_state(nid, NR_INACTIVE)),
#ifdef CONFIG_HIGHMEM
nid, K(i.totalhigh),
nid, K(i.freehigh),
OpenPOWER on IntegriCloud