From 06f3c016023b25655a67b0140057ad66d28fac45 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 27 Jul 2005 11:44:02 -0700 Subject: [PATCH] --- yaml --- r: 5133 b: refs/heads/master c: 12b1c5f382194d3f656e78fb5c9c8f2bfbe8ed8a h: refs/heads/master i: 5131: 8b9f285cf13b29dc73a2c9ad2cd198c2b69d7ceb v: v3 --- [refs] | 2 +- trunk/mm/page_alloc.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b91d0e175d6d..7ca1c8ef64f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 165cd40235732644b1856a5ed5e158c9b93f6010 +refs/heads/master: 12b1c5f382194d3f656e78fb5c9c8f2bfbe8ed8a diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 1d6ba6a4b594..42bccfb8464d 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1861,7 +1861,6 @@ static void __init free_area_init_core(struct pglist_data *pgdat, unsigned long *zones_size, unsigned long *zholes_size) { unsigned long i, j; - const unsigned long zone_required_alignment = 1UL << (MAX_ORDER-1); int cpu, nid = pgdat->node_id; unsigned long zone_start_pfn = pgdat->node_start_pfn; @@ -1934,9 +1933,6 @@ static void __init free_area_init_core(struct pglist_data *pgdat, zone->zone_mem_map = pfn_to_page(zone_start_pfn); zone->zone_start_pfn = zone_start_pfn; - if ((zone_start_pfn) & (zone_required_alignment-1)) - printk(KERN_CRIT "BUG: wrong zone alignment, it will crash\n"); - memmap_init(size, nid, j, zone_start_pfn); zonetable_add(zone, nid, j, zone_start_pfn, size);