Re: [PATCH 01/26] x86-64, NUMA: Make dummy node initialization pathsimilar to non-dummy ones

[Yinghai Lu]

On 02/12/2011 09:10 AM, Tejun Heo wrote:
> Dummy node initialization in initmem_init() didn't initialize apicid
> to node mapping and set cpu to node mapping directly by caling
> numa_set_node(), which is different from non-dummy init paths.
> 
> Update it such that they behave similarly.  Initialize apicid to node
> mapping and call numa_init_array().  The actual cpu to node mapping is
> handled by init_cpu_to_node() later.
> 
> Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
> Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
> Cc: Brian Gerst <brgerst@xxxxxxxxx>
> Cc: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
> Cc: Shaohui Zheng <shaohui.zheng@xxxxxxxxx>
> Cc: David Rientjes <rientjes@xxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxx>
> Cc: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
> ---
>  arch/x86/mm/numa_64.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
> index f548fbf..ea5dd48 100644
> --- a/arch/x86/mm/numa_64.c
> +++ b/arch/x86/mm/numa_64.c
> @@ -623,10 +623,11 @@ void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn,
>  	memnodemap[0] = 0;
>  	node_set_online(0);
>  	node_set(0, node_possible_map);
> -	for (i = 0; i < nr_cpu_ids; i++)
> -		numa_set_node(i, 0);
> +	for (i = 0; i < MAX_LOCAL_APIC; i++)
> +		set_apicid_to_node(i, NUMA_NO_NODE);
>  	memblock_x86_register_active_regions(0, start_pfn, last_pfn);
>  	setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT);
> +	numa_init_array();
>  }
>  
>  unsigned long __init numa_free_all_bootmem(void)

Acked-by: Yinghai Lu <yinghai@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/