From 6ac0a8000ba1cef8cd3ec170c39c4b8ef32d059b Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 27 Feb 2010 09:29:38 -0800 Subject: [PATCH] --- yaml --- r: 185143 b: refs/heads/master c: 81d0d950e5037a26b71e568ff235ff9e998f4ab3 h: refs/heads/master i: 185141: 3ff4ed253e16b35ba080a3646143f3334107c71a 185139: b43c623632be2bf0a70aaf49d521e61781a629c0 185135: d877f1ecf7c14ce01553a37abc57eb60d60f25f8 v: v3 --- [refs] | 2 +- trunk/mm/sparse.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8a94ba5594db..495d3020518f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb90ef93df654f2678933efbbf864adac0ae490e +refs/heads/master: 81d0d950e5037a26b71e568ff235ff9e998f4ab3 diff --git a/trunk/mm/sparse.c b/trunk/mm/sparse.c index 9b6b93a4d78d..22896d589133 100644 --- a/trunk/mm/sparse.c +++ b/trunk/mm/sparse.c @@ -439,6 +439,7 @@ void __init sparse_mem_maps_populate_node(struct page **map_map, } #endif /* !CONFIG_SPARSEMEM_VMEMMAP */ +#ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER static void __init sparse_early_mem_maps_alloc_node(struct page **map_map, unsigned long pnum_begin, unsigned long pnum_end, @@ -447,8 +448,7 @@ static void __init sparse_early_mem_maps_alloc_node(struct page **map_map, sparse_mem_maps_populate_node(map_map, pnum_begin, pnum_end, map_count, nodeid); } - -#ifndef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER +#else static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum) { struct page *map; @@ -478,14 +478,17 @@ void __init sparse_init(void) { unsigned long pnum; struct page *map; - struct page **map_map; unsigned long *usemap; unsigned long **usemap_map; - int size, size2; + int size; int nodeid_begin = 0; unsigned long pnum_begin = 0; unsigned long usemap_count; +#ifdef CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER unsigned long map_count; + int size2; + struct page **map_map; +#endif /* * map is using big page (aka 2M in x86 64 bit)