From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Mon, 25 Feb 2008 07:23:09 +0000 (-0800)
Subject: x86: fix memoryless node oops during boot
X-Git-Tag: Ubuntu-5.0.0-8.9~35155^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=475613b9e374bf0c15340eb166a962da04aa02e8;p=mirror_ubuntu-disco-kernel.git

x86: fix memoryless node oops during boot

fix oops during boot reported in this thread:

  http://lkml.org/lkml/2008/2/6/65

enable booting on memoryless nodes.

Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 7637dc91c79b..f4f7ecfb898c 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -801,7 +801,7 @@ static void __cpuinit srat_detect_node(void)
 	/* Don't do the funky fallback heuristics the AMD version employs
 	   for now. */
 	node = apicid_to_node[apicid];
-	if (node == NUMA_NO_NODE)
+	if (node == NUMA_NO_NODE || !node_online(node))
 		node = first_node(node_online_map);
 	numa_set_node(cpu, node);