From: Andrew Morton <akpm@osdl.org>

Cc: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: Andi Kleen <ak@muc.de>
Cc: "Brown, Len" <len.brown@intel.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/x86_64/mm/srat.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/x86_64/mm/srat.c~x86-x86_64-ia64-unify-mapping-from-pxm-to-node-id-fix arch/x86_64/mm/srat.c
--- 25/arch/x86_64/mm/srat.c~x86-x86_64-ia64-unify-mapping-from-pxm-to-node-id-fix	2006-01-23 21:34:14.000000000 -0800
+++ 25-akpm/arch/x86_64/mm/srat.c	2006-01-23 21:34:14.000000000 -0800
@@ -26,7 +26,7 @@ static struct node nodes[MAX_NUMNODES] _
 
 static __init int setup_node(int pxm)
 {
-	acpi_map_pxm_to_node(pxm);
+	return acpi_map_pxm_to_node(pxm);
 }
 
 static __init int conflicting_nodes(unsigned long start, unsigned long end)
_