From: Minoru Usui Date: Wed, 30 Jan 2008 12:33:35 +0000 (+0100) Subject: x86: fix NUMA emulation on 64-bit X-Git-Tag: v2.6.25-rc1~1143^2~182 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9a1b62fe858ba6780a9aeb4ab5f7751038a6c15d;p=linux-2.6-omap-h63xx.git x86: fix NUMA emulation on 64-bit I found a small bug of NUMA emulation code for x86_64. (CONFIG_NUMA_EMU) If machine is non-NUMA, find_node_by_addr() should return NUMA_NO_NODE, but current implementation code returns existent maximum NUMA node number + 1. This is not existent NUMA node number. However, this behaviour does not affect NUMA emulation fortunately, because acpi_fake_nodes() that is caller of find_node_by_addr() gets pxm (proximity domain) by node_to_pxm() from non-existent NUMA node number that was returned by find_node_by_addr(). node_to_pxm() returns PXM_INVAL that means illegal or non-existent NUMA node number. Signed-off-by: Minoru Usui Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 4aed38fa4a6..37308d6bb5d 100644 --- a/arch/x86/mm/srat_64.c +++ b/arch/x86/mm/srat_64.c @@ -416,7 +416,7 @@ static int __init find_node_by_addr(unsigned long addr) break; } } - return i; + return ret; } /*