This patch is for ia64. Add HOLES_IN_ZONE macro definition and align vmemmap with ia64's granule size. Kame === for arch/ia64 =============== This patch is for ia64 kernel. This defines HOLES_IN_ZONE in asm-ia64/page.h And makes vmemmap aligned with IA64_GRANULE_SIZE in arch/ia64/mm/init.c. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Dave Hansen --- memhotplug-dave/arch/ia64/mm/init.c | 3 ++- memhotplug-dave/include/asm-ia64/page.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff -puN arch/ia64/mm/init.c~B2-no_buddy_bitmap_patch_-_for_ia64_2-of-2 arch/ia64/mm/init.c --- memhotplug/arch/ia64/mm/init.c~B2-no_buddy_bitmap_patch_-_for_ia64_2-of-2 2004-10-08 00:14:49.000000000 -0700 +++ memhotplug-dave/arch/ia64/mm/init.c 2004-10-08 00:14:49.000000000 -0700 @@ -410,7 +410,8 @@ virtual_memmap_init (u64 start, u64 end, struct page *map_start, *map_end; args = (struct memmap_init_callback_data *) arg; - + start = GRANULEROUNDDOWN(start); + end = GRANULEROUNDUP(end); map_start = vmem_map + (__pa(start) >> PAGE_SHIFT); map_end = vmem_map + (__pa(end) >> PAGE_SHIFT); diff -puN include/asm-ia64/page.h~B2-no_buddy_bitmap_patch_-_for_ia64_2-of-2 include/asm-ia64/page.h --- memhotplug/include/asm-ia64/page.h~B2-no_buddy_bitmap_patch_-_for_ia64_2-of-2 2004-10-08 00:14:49.000000000 -0700 +++ memhotplug-dave/include/asm-ia64/page.h 2004-10-08 00:14:49.000000000 -0700 @@ -79,6 +79,7 @@ do { \ #ifdef CONFIG_VIRTUAL_MEM_MAP extern int ia64_pfn_valid (unsigned long pfn); +#define HOLES_IN_ZONE 1 #else # define ia64_pfn_valid(pfn) 1 #endif _