aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-09-26 02:31:10 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 11:48:46 -0400
commit182e8e237349e7b6354f45aee4780b6423fd6a50 (patch)
treea1b9fc186a514e547eb257803616d67ba7b69976 /drivers/base
parentf06a96844a577c43249fce25809a4fae07407f46 (diff)
[PATCH] reduce MAX_NR_ZONES: make display of highmem counters conditional on CONFIG_HIGHMEM
Do not display HIGHMEM memory sizes if CONFIG_HIGHMEM is not set. Make HIGHMEM dependent texts and make display of highmem counters optional Some texts are depending on CONFIG_HIGHMEM. Remove those strings and remove the display of highmem counter values if CONFIG_HIGHMEM is not set. [akpm@osdl.org: remove some ifdefs] Signed-off-by: Christoph Lameter <clameter@sgi.com> 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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c
index e9b0957f15d1..e09f5c2c11ee 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -54,10 +54,12 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
54 "Node %d MemUsed: %8lu kB\n" 54 "Node %d MemUsed: %8lu kB\n"
55 "Node %d Active: %8lu kB\n" 55 "Node %d Active: %8lu kB\n"
56 "Node %d Inactive: %8lu kB\n" 56 "Node %d Inactive: %8lu kB\n"
57#ifdef CONFIG_HIGHMEM
57 "Node %d HighTotal: %8lu kB\n" 58 "Node %d HighTotal: %8lu kB\n"
58 "Node %d HighFree: %8lu kB\n" 59 "Node %d HighFree: %8lu kB\n"
59 "Node %d LowTotal: %8lu kB\n" 60 "Node %d LowTotal: %8lu kB\n"
60 "Node %d LowFree: %8lu kB\n" 61 "Node %d LowFree: %8lu kB\n"
62#endif
61 "Node %d Dirty: %8lu kB\n" 63 "Node %d Dirty: %8lu kB\n"
62 "Node %d Writeback: %8lu kB\n" 64 "Node %d Writeback: %8lu kB\n"
63 "Node %d FilePages: %8lu kB\n" 65 "Node %d FilePages: %8lu kB\n"
@@ -72,10 +74,12 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
72 nid, K(i.totalram - i.freeram), 74 nid, K(i.totalram - i.freeram),
73 nid, K(active), 75 nid, K(active),
74 nid, K(inactive), 76 nid, K(inactive),
77#ifdef CONFIG_HIGHMEM
75 nid, K(i.totalhigh), 78 nid, K(i.totalhigh),
76 nid, K(i.freehigh), 79 nid, K(i.freehigh),
77 nid, K(i.totalram - i.totalhigh), 80 nid, K(i.totalram - i.totalhigh),
78 nid, K(i.freeram - i.freehigh), 81 nid, K(i.freeram - i.freehigh),
82#endif
79 nid, K(node_page_state(nid, NR_FILE_DIRTY)), 83 nid, K(node_page_state(nid, NR_FILE_DIRTY)),
80 nid, K(node_page_state(nid, NR_WRITEBACK)), 84 nid, K(node_page_state(nid, NR_WRITEBACK)),
81 nid, K(node_page_state(nid, NR_FILE_PAGES)), 85 nid, K(node_page_state(nid, NR_FILE_PAGES)),