Commit cf02d5a4 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds

[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: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 692c5544
...@@ -420,17 +420,22 @@ void __init zone_sizes_init(void) ...@@ -420,17 +420,22 @@ void __init zone_sizes_init(void)
void __init set_highmem_pages_init(int bad_ppro) void __init set_highmem_pages_init(int bad_ppro)
{ {
#ifdef CONFIG_HIGHMEM #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; unsigned long node_pfn, node_high_size, zone_start_pfn;
struct page * zone_mem_map; struct page * zone_mem_map;
node_high_size = NODE_DATA(nid)->node_zones[ZONE_HIGHMEM].spanned_pages; if (!is_highmem(zone))
zone_mem_map = NODE_DATA(nid)->node_zones[ZONE_HIGHMEM].zone_mem_map; continue;
zone_start_pfn = NODE_DATA(nid)->node_zones[ZONE_HIGHMEM].zone_start_pfn;
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++) { for (node_pfn = 0; node_pfn < node_high_size; node_pfn++) {
one_highpage_init((struct page *)(zone_mem_map + node_pfn), one_highpage_init((struct page *)(zone_mem_map + node_pfn),
zone_start_pfn + node_pfn, bad_ppro); zone_start_pfn + node_pfn, bad_ppro);
......
...@@ -1402,7 +1402,7 @@ void __init memmap_init_zone(struct page *start, unsigned long size, int nid, ...@@ -1402,7 +1402,7 @@ void __init memmap_init_zone(struct page *start, unsigned long size, int nid,
INIT_LIST_HEAD(&page->lru); INIT_LIST_HEAD(&page->lru);
#ifdef WANT_PAGE_VIRTUAL #ifdef WANT_PAGE_VIRTUAL
/* The shift won't overflow because ZONE_NORMAL is below 4G. */ /* 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)); set_page_address(page, __va(start_pfn << PAGE_SHIFT));
#endif #endif
start_pfn++; start_pfn++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment