Messages in this thread | | | Date | Wed, 21 Nov 2012 14:46:11 +0900 | From | Yasuaki Ishimatsu <> | Subject | Re: [PATCH 1/5] x86: Get pg_data_t's memory from other node |
| |
Hi Tang,
2012/11/19 23:27, Tang Chen wrote: > From: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> > > If system can create movable node which all memory of the > node is allocated as ZONE_MOVABLE, setup_node_data() cannot > allocate memory for the node's pg_data_t. > So when memblock_alloc_nid() fails, setup_node_data() retries > memblock_alloc(). > > Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com> > Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> > Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com> > Reviewed-by: Wen Congyang <wency@cn.fujitsu.com> > Tested-by: Lin Feng <linfeng@cn.fujitsu.com> > --- > arch/x86/mm/numa.c | 9 +++++++-- > 1 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c > index 2d125be..ae2e76e 100644 > --- a/arch/x86/mm/numa.c > +++ b/arch/x86/mm/numa.c > @@ -224,9 +224,14 @@ static void __init setup_node_data(int nid, u64 start, u64 end) > } else { > nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid); > if (!nd_pa) { > - pr_err("Cannot find %zu bytes in node %d\n",
> + printk(KERN_WARNING "Cannot find %zu bytes in node %d\n", > nd_size, nid)
Please change to use pr_warn().
Thanks, Yasuaki Ishimatsu
> - return; > + nd_pa = memblock_alloc(nd_size, SMP_CACHE_BYTES); > + if (!nd_pa) { > + pr_err("Cannot find %zu bytes in other node\n", > + nd_size); > + return; > + } > } > nd = __va(nd_pa); > } >
| |