diff options
-rw-r--r-- | mm/mempolicy.c | 2 | ||||
-rw-r--r-- | mm/page_alloc.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index c2aec0e1090d..259a706bd83e 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c | |||
@@ -105,7 +105,7 @@ static struct kmem_cache *sn_cache; | |||
105 | 105 | ||
106 | /* Highest zone. An specific allocation for a zone below that is not | 106 | /* Highest zone. An specific allocation for a zone below that is not |
107 | policied. */ | 107 | policied. */ |
108 | enum zone_type policy_zone = ZONE_DMA; | 108 | enum zone_type policy_zone = 0; |
109 | 109 | ||
110 | struct mempolicy default_policy = { | 110 | struct mempolicy default_policy = { |
111 | .refcnt = ATOMIC_INIT(1), /* never free it */ | 111 | .refcnt = ATOMIC_INIT(1), /* never free it */ |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 940444c99703..6cff13840c6d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -2619,11 +2619,11 @@ static void __meminit free_area_init_core(struct pglist_data *pgdat, | |||
2619 | " %s zone: %lu pages exceeds realsize %lu\n", | 2619 | " %s zone: %lu pages exceeds realsize %lu\n", |
2620 | zone_names[j], memmap_pages, realsize); | 2620 | zone_names[j], memmap_pages, realsize); |
2621 | 2621 | ||
2622 | /* Account for reserved DMA pages */ | 2622 | /* Account for reserved pages */ |
2623 | if (j == ZONE_DMA && realsize > dma_reserve) { | 2623 | if (j == 0 && realsize > dma_reserve) { |
2624 | realsize -= dma_reserve; | 2624 | realsize -= dma_reserve; |
2625 | printk(KERN_DEBUG " DMA zone: %lu pages reserved\n", | 2625 | printk(KERN_DEBUG " %s zone: %lu pages reserved\n", |
2626 | dma_reserve); | 2626 | zone_names[0], dma_reserve); |
2627 | } | 2627 | } |
2628 | 2628 | ||
2629 | if (!is_highmem_idx(j)) | 2629 | if (!is_highmem_idx(j)) |