Change HIGHMEM dependent texts

There are a lot of strings displayed that are dependent on Highmem.
Remove those strings and remove the display of zero highmem values if
CONFIG_HIGHMEM is not set.

Signed-off-by: Christoph Lameter <clameter@sgi.com>

Index: linux-2.6.17/drivers/base/node.c
===================================================================
--- linux-2.6.17.orig/drivers/base/node.c	2006-07-03 12:49:08.000000000 -0700
+++ linux-2.6.17/drivers/base/node.c	2006-07-03 12:50:29.000000000 -0700
@@ -54,10 +54,15 @@
 		       "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"
+#else
+		       "Node %d Total:        %8lu kB\n"
+		       "Node %d Free:         %8lu kB\n"
+#endif
 		       "Node %d Dirty:        %8lu kB\n"
 		       "Node %d Writeback:    %8lu kB\n"
 		       "Node %d FilePages:    %8lu kB\n"
@@ -72,8 +77,10 @@
 		       nid, K(i.totalram - i.freeram),
 		       nid, K(active),
 		       nid, K(inactive),
+#ifdef CONFIG_HIGHMEM
 		       nid, K(i.totalhigh),
 		       nid, K(i.freehigh),
+#endif
 		       nid, K(i.totalram - i.totalhigh),
 		       nid, K(i.freeram - i.freehigh),
 		       nid, K(node_page_state(nid, NR_FILE_DIRTY)),
Index: linux-2.6.17/fs/proc/proc_misc.c
===================================================================
--- linux-2.6.17.orig/fs/proc/proc_misc.c	2006-07-03 12:49:24.000000000 -0700
+++ linux-2.6.17/fs/proc/proc_misc.c	2006-07-03 12:50:29.000000000 -0700
@@ -157,10 +157,16 @@
 		"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"
+#else
+		"Total:        %8lu kB\n"
+		"Free:         %8lu kB\n"
+#endif
+
 		"SwapTotal:    %8lu kB\n"
 		"SwapFree:     %8lu kB\n"
 		"Dirty:        %8lu kB\n"
@@ -183,8 +189,10 @@
 		K(total_swapcache_pages),
 		K(active),
 		K(inactive),
+#ifdef CONFIG_HIGHMEM
 		K(i.totalhigh),
 		K(i.freehigh),
+#endif
 		K(i.totalram-i.totalhigh),
 		K(i.freeram-i.freehigh),
 		K(i.totalswap),
Index: linux-2.6.17/mm/page_alloc.c
===================================================================
--- linux-2.6.17.orig/mm/page_alloc.c	2006-07-03 12:49:47.000000000 -0700
+++ linux-2.6.17/mm/page_alloc.c	2006-07-03 12:50:29.000000000 -0700
@@ -1394,9 +1394,16 @@
 
 	get_zone_counts(&active, &inactive, &free);
 
-	printk("Free pages: %11ukB (%ukB HighMem)\n",
+	printk("Free pages: %11ukB"
+#ifdef CONFIG_HIGHMEM
+		" (%ukB HighMem)"
+#endif
+		"\n",
 		K(nr_free_pages()),
-		K(nr_free_highpages()));
+#ifdef CONFIG_HIGHMEM
+		, K(nr_free_highpages())
+#endif
+	);
 
 	printk("Active:%lu inactive:%lu dirty:%lu writeback:%lu "
 		"unstable:%lu free:%u slab:%lu mapped:%lu pagetables:%lu\n",