From e9382cf26eeead52e7ab3622307ea96600a8a8ea Mon Sep 17 00:00:00 2001 From: Bob Picco Date: Wed, 28 Jun 2006 12:54:55 -0400 Subject: [PATCH] --- yaml --- r: 33127 b: refs/heads/master c: 921eea1cdf6ce7f0db88e4579474a04b1fb0fe6d h: refs/heads/master i: 33125: 7a9b5da700751d1e8ba0e5bd0b69738a02319b16 33123: 1042b18193768afebc006fc812f3e843a89fa2af 33119: 009a80c32eeda29703dbb516a0b94014ff652ff9 v: v3 --- [refs] | 2 +- trunk/arch/ia64/mm/contig.c | 3 ++- trunk/arch/ia64/mm/discontig.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4578601e02af..95340d204438 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a69ca91be2b36f99a48daacd1f12d9d49ecaf87 +refs/heads/master: 921eea1cdf6ce7f0db88e4579474a04b1fb0fe6d diff --git a/trunk/arch/ia64/mm/contig.c b/trunk/arch/ia64/mm/contig.c index 2a88cdd6d924..8919fed9666a 100644 --- a/trunk/arch/ia64/mm/contig.c +++ b/trunk/arch/ia64/mm/contig.c @@ -277,7 +277,8 @@ paging_init (void) /* allocate virtual_mem_map */ - map_size = PAGE_ALIGN(max_low_pfn * sizeof(struct page)); + map_size = PAGE_ALIGN(ALIGN(max_low_pfn, MAX_ORDER_NR_PAGES) * + sizeof(struct page)); vmalloc_end -= map_size; vmem_map = (struct page *) vmalloc_end; efi_memmap_walk(create_mem_map_page_table, NULL); diff --git a/trunk/arch/ia64/mm/discontig.c b/trunk/arch/ia64/mm/discontig.c index 99bd9e30db96..8eeb669917fa 100644 --- a/trunk/arch/ia64/mm/discontig.c +++ b/trunk/arch/ia64/mm/discontig.c @@ -751,7 +751,8 @@ void __init paging_init(void) efi_memmap_walk(filter_rsvd_memory, count_node_pages); #ifdef CONFIG_VIRTUAL_MEM_MAP - vmalloc_end -= PAGE_ALIGN(max_low_pfn * sizeof(struct page)); + vmalloc_end -= PAGE_ALIGN(ALIGN(max_low_pfn, MAX_ORDER_NR_PAGES) * + sizeof(struct page)); vmem_map = (struct page *) vmalloc_end; efi_memmap_walk(create_mem_map_page_table, NULL); printk("Virtual mem_map starts at 0x%p\n", vmem_map);