From 9ddc7ccd1f41dc403f49368c83cba38d6a3485d2 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Sat, 10 Feb 2007 01:43:07 -0800 Subject: [PATCH] --- yaml --- r: 47408 b: refs/heads/master c: 6267276f3fdda9ad0d5ca451bdcbdf42b802d64b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/mempolicy.c | 2 +- trunk/mm/page_alloc.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d25188270cb0..7d7a536a49af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65e458d43dff872ee560e721fb0fdb367bb5adb0 +refs/heads/master: 6267276f3fdda9ad0d5ca451bdcbdf42b802d64b diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c index c2aec0e1090d..259a706bd83e 100644 --- a/trunk/mm/mempolicy.c +++ b/trunk/mm/mempolicy.c @@ -105,7 +105,7 @@ static struct kmem_cache *sn_cache; /* Highest zone. An specific allocation for a zone below that is not policied. */ -enum zone_type policy_zone = ZONE_DMA; +enum zone_type policy_zone = 0; struct mempolicy default_policy = { .refcnt = ATOMIC_INIT(1), /* never free it */ diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 940444c99703..6cff13840c6d 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -2619,11 +2619,11 @@ static void __meminit free_area_init_core(struct pglist_data *pgdat, " %s zone: %lu pages exceeds realsize %lu\n", zone_names[j], memmap_pages, realsize); - /* Account for reserved DMA pages */ - if (j == ZONE_DMA && realsize > dma_reserve) { + /* Account for reserved pages */ + if (j == 0 && realsize > dma_reserve) { realsize -= dma_reserve; - printk(KERN_DEBUG " DMA zone: %lu pages reserved\n", - dma_reserve); + printk(KERN_DEBUG " %s zone: %lu pages reserved\n", + zone_names[0], dma_reserve); } if (!is_highmem_idx(j))