summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Blackwood <john.blackwood@ccur.com>2008-07-04 10:00:05 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-24 09:14:05 -0700
commit3ec116ffe5e2085f1a9c63a87e64d86b85e7b81e (patch)
treeb47befc90d17efbeab0d4f2c801f5a0e2a681ea8
parent84671354a49a26e169f08b35ad0884902732bacc (diff)
downloadlwn-3ec116ffe5e2085f1a9c63a87e64d86b85e7b81e.tar.gz
lwn-3ec116ffe5e2085f1a9c63a87e64d86b85e7b81e.zip
mm: switch node meminfo Active & Inactive pages to Kbytes
commit 2d5c1be8870383622809c25935fff00d2630c7a5 upstream 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(). Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-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 e59861f18ce5..8bbd21de5950 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -70,8 +70,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),