diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-09-26 02:31:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:46 -0400 |
commit | 182e8e237349e7b6354f45aee4780b6423fd6a50 (patch) | |
tree | a1b9fc186a514e547eb257803616d67ba7b69976 /fs/proc | |
parent | f06a96844a577c43249fce25809a4fae07407f46 (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 'fs/proc')
-rw-r--r-- | fs/proc/proc_misc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 94215622544..caa0a51560a 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
@@ -157,10 +157,12 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
157 | "SwapCached: %8lu kB\n" | 157 | "SwapCached: %8lu kB\n" |
158 | "Active: %8lu kB\n" | 158 | "Active: %8lu kB\n" |
159 | "Inactive: %8lu kB\n" | 159 | "Inactive: %8lu kB\n" |
160 | #ifdef CONFIG_HIGHMEM | ||
160 | "HighTotal: %8lu kB\n" | 161 | "HighTotal: %8lu kB\n" |
161 | "HighFree: %8lu kB\n" | 162 | "HighFree: %8lu kB\n" |
162 | "LowTotal: %8lu kB\n" | 163 | "LowTotal: %8lu kB\n" |
163 | "LowFree: %8lu kB\n" | 164 | "LowFree: %8lu kB\n" |
165 | #endif | ||
164 | "SwapTotal: %8lu kB\n" | 166 | "SwapTotal: %8lu kB\n" |
165 | "SwapFree: %8lu kB\n" | 167 | "SwapFree: %8lu kB\n" |
166 | "Dirty: %8lu kB\n" | 168 | "Dirty: %8lu kB\n" |
@@ -183,10 +185,12 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
183 | K(total_swapcache_pages), | 185 | K(total_swapcache_pages), |
184 | K(active), | 186 | K(active), |
185 | K(inactive), | 187 | K(inactive), |
188 | #ifdef CONFIG_HIGHMEM | ||
186 | K(i.totalhigh), | 189 | K(i.totalhigh), |
187 | K(i.freehigh), | 190 | K(i.freehigh), |
188 | K(i.totalram-i.totalhigh), | 191 | K(i.totalram-i.totalhigh), |
189 | K(i.freeram-i.freehigh), | 192 | K(i.freeram-i.freehigh), |
193 | #endif | ||
190 | K(i.totalswap), | 194 | K(i.totalswap), |
191 | K(i.freeswap), | 195 | K(i.freeswap), |
192 | K(global_page_state(NR_FILE_DIRTY)), | 196 | K(global_page_state(NR_FILE_DIRTY)), |