From 7e8eb7f12b36fffa255b3cdb82eecdc62630b3c3 Mon Sep 17 00:00:00 2001 From: Yasuaki Ishimatsu Date: Fri, 22 Feb 2013 16:33:35 -0800 Subject: [PATCH] --- yaml --- r: 356533 b: refs/heads/master c: 4d59a75125d5a4717e57e9fc62c64b3d346e603e h: refs/heads/master i: 356531: 58860ed3da27ad2b0a8da77213557770c5bdb5f3 v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/numa.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 318af8c7d85d..1862c431b0d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa00d89c2780d72d082a015e8cbb751e65fb30ee +refs/heads/master: 4d59a75125d5a4717e57e9fc62c64b3d346e603e diff --git a/trunk/arch/x86/mm/numa.c b/trunk/arch/x86/mm/numa.c index a713d081b59c..e3963f52aaea 100644 --- a/trunk/arch/x86/mm/numa.c +++ b/trunk/arch/x86/mm/numa.c @@ -213,10 +213,9 @@ static void __init setup_node_data(int nid, u64 start, u64 end) * Allocate node data. Try node-local memory and then any node. * Never allocate in DMA zone. */ - nd_pa = memblock_alloc_nid(nd_size, SMP_CACHE_BYTES, nid); + nd_pa = memblock_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid); if (!nd_pa) { - pr_err("Cannot find %zu bytes in node %d\n", - nd_size, nid); + pr_err("Cannot find %zu bytes in any node\n", nd_size); return; } nd = __va(nd_pa);