The patch titled
reduce MAX_NR_ZONES: make display of highmem counters conditional on CONFIG_HIGHMEM
has been added to the -mm tree. Its filename is
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: reduce MAX_NR_ZONES: make display of highmem counters conditional on CONFIG_HIGHMEM
From: Christoph Lameter <clameter@xxxxxxx>
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.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/base/node.c | 4 ++++
fs/proc/proc_misc.c | 4 ++++
mm/page_alloc.c | 4 ++++
3 files changed, 12 insertions(+)
diff -puN drivers/base/node.c~reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem drivers/base/node.c
--- a/drivers/base/node.c~reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem
+++ a/drivers/base/node.c
@@ -54,10 +54,12 @@ static ssize_t node_read_meminfo(struct
"Node %d MemUsed: %8lu kB\n"
"Node %d Active: %8lu kB\n"
"Node %d Inactive: %8lu kB\n"
+#ifdef CONFIG_HIGHMEM
"Node %d HighTotal: %8lu kB\n"
"Node %d HighFree: %8lu kB\n"
"Node %d LowTotal: %8lu kB\n"
"Node %d LowFree: %8lu kB\n"
+#endif
"Node %d Dirty: %8lu kB\n"
"Node %d Writeback: %8lu kB\n"
"Node %d FilePages: %8lu kB\n"
@@ -72,10 +74,12 @@ static ssize_t node_read_meminfo(struct
nid, K(i.totalram - i.freeram),
nid, K(active),
nid, K(inactive),
+#ifdef CONFIG_HIGHMEM
nid, K(i.totalhigh),
nid, K(i.freehigh),
nid, K(i.totalram - i.totalhigh),
nid, K(i.freeram - i.freehigh),
+#endif
nid, K(node_page_state(nid, NR_FILE_DIRTY)),
nid, K(node_page_state(nid, NR_WRITEBACK)),
nid, K(node_page_state(nid, NR_FILE_PAGES)),
diff -puN fs/proc/proc_misc.c~reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem fs/proc/proc_misc.c
--- a/fs/proc/proc_misc.c~reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem
+++ a/fs/proc/proc_misc.c
@@ -157,10 +157,12 @@ static int meminfo_read_proc(char *page,
"SwapCached: %8lu kB\n"
"Active: %8lu kB\n"
"Inactive: %8lu kB\n"
+#ifdef CONFIG_HIGHMEM
"HighTotal: %8lu kB\n"
"HighFree: %8lu kB\n"
"LowTotal: %8lu kB\n"
"LowFree: %8lu kB\n"
+#endif
"SwapTotal: %8lu kB\n"
"SwapFree: %8lu kB\n"
"Dirty: %8lu kB\n"
@@ -183,10 +185,12 @@ static int meminfo_read_proc(char *page,
K(total_swapcache_pages),
K(active),
K(inactive),
+#ifdef CONFIG_HIGHMEM
K(i.totalhigh),
K(i.freehigh),
K(i.totalram-i.totalhigh),
K(i.freeram-i.freehigh),
+#endif
K(i.totalswap),
K(i.freeswap),
K(global_page_state(NR_FILE_DIRTY)),
diff -puN mm/page_alloc.c~reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem mm/page_alloc.c
--- a/mm/page_alloc.c~reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem
+++ a/mm/page_alloc.c
@@ -1281,9 +1281,13 @@ void show_free_areas(void)
get_zone_counts(&active, &inactive, &free);
+#ifdef CONFIG_HIGHMEM
printk("Free pages: %11ukB (%ukB HighMem)\n",
K(nr_free_pages()),
K(nr_free_highpages()));
+#else
+ printk("Free pages: %11ukB\n", K(nr_free_pages()));
+#endif
printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu "
"unstable:%lu free:%u slab:%lu mapped:%lu pagetables:%lu\n",
_
Patches currently in -mm which might be from clameter@xxxxxxx are
zvc-add-__inc_zone_state-for-smp-configuration.patch
reduce-max_nr_zones-remove-two-strange-uses-of-max_nr_zones.patch
reduce-max_nr_zones-fix-max_nr_zones-array-initializations.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem.patch
reduce-max_nr_zones-move-highmem-counters-into-highmemc-h.patch
reduce-max_nr_zones-page-allocator-zone_highmem-cleanup.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment.patch
reduce-max_nr_zones-make-zone_dma32-optional.patch
reduce-max_nr_zones-make-zone_highmem-optional.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones.patch
reduce-max_nr_zones-fix-i386-srat-check-for-max_nr_zones.patch
reduce-max_nr_zones-swap_prefetch-remove-incorrect-use-of-zone_highmem.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
