[PATCH] convert uses of ZONE_HIGHMEM to is_highmem

As the comments in mmzone.h indicate is_highmem() is designed to reduce the
proliferation of the constant ZONE_HIGHMEM.  This patch updates references
to ZONE_HIGHMEM to use is_highmem().  None appear to be on critical paths.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
index 1cdeb0a11d3d373767b2ded61a947625069a903c..9eecccc5b99da1c7bcf569e599ecda54da30f6ac 100644 (file)
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
@@ -420,17 +420,22 @@ void __init zone_sizes_init(void)
 void __init set_highmem_pages_init(int bad_ppro) 
 {
 #ifdef CONFIG_HIGHMEM
-       int nid;
+       struct zone *zone;
 
-       for (nid = 0; nid < numnodes; nid++) {
+       for_each_zone(zone) {
                unsigned long node_pfn, node_high_size, zone_start_pfn;
                struct page * zone_mem_map;
                
-               node_high_size = NODE_DATA(nid)->node_zones[ZONE_HIGHMEM].spanned_pages;
-               zone_mem_map = NODE_DATA(nid)->node_zones[ZONE_HIGHMEM].zone_mem_map;
-               zone_start_pfn = NODE_DATA(nid)->node_zones[ZONE_HIGHMEM].zone_start_pfn;
+               if (!is_highmem(zone))
+                       continue;
+
+               printk("Initializing %s for node %d\n", zone->name,
+                       zone->zone_pgdat->node_id);
+
+               node_high_size = zone->spanned_pages;
+               zone_mem_map = zone->zone_mem_map;
+               zone_start_pfn = zone->zone_start_pfn;
 
-               printk("Initializing highpages for node %d\n", nid);
                for (node_pfn = 0; node_pfn < node_high_size; node_pfn++) {
                        one_highpage_init((struct page *)(zone_mem_map + node_pfn),
                                          zone_start_pfn + node_pfn, bad_ppro);

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 80ed5174fc501daadef7f8e84a5baa936a83907c..c8e9b67d7cb045797e59387e0daf4143231edc00 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1402,7 +1402,7 @@ void __init memmap_init_zone(struct page *start, unsigned long size, int nid,
                INIT_LIST_HEAD(&page->lru);
 #ifdef WANT_PAGE_VIRTUAL
                /* The shift won't overflow because ZONE_NORMAL is below 4G. */
-               if (zone != ZONE_HIGHMEM)
+               if (!is_highmem(zone))
                        set_page_address(page, __va(start_pfn << PAGE_SHIFT));
 #endif
                start_pfn++;