Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 182e8e23 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[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: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f06a9684

drivers/base/node.c

+4 −0
Original line number Diff line number Diff line
@@ -54,10 +54,12 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) 
		       "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 sys_device * dev, char * buf) 
		       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)),

fs/proc/proc_misc.c

+4 −0
Original line number Diff line number Diff line
@@ -157,10 +157,12 @@ static int meminfo_read_proc(char *page, char **start, off_t off, 
		"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, char **start, off_t off, 
		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)),

mm/page_alloc.c

+0 −4
Original line number Diff line number Diff line
@@ -1281,10 +1281,6 @@ void show_free_areas(void) 


	get_zone_counts(&active, &inactive, &free);



	printk("Free pages: %11ukB (%ukB HighMem)\n",

		K(nr_free_pages()),

		K(nr_free_highpages()));



	printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu "

		"unstable:%lu free:%u slab:%lu mapped:%lu pagetables:%lu\n",

		active,