Messages in this thread Patch in this message | | | Date | Sat, 23 Oct 2010 17:02:07 +0200 (CEST) | From | Thomas Gleixner <> | Subject | [GIT pull] x86 numa for 2.6.37 |
| |
Linus,
Please pull the latest x86-numa-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-numa-for-linus
Thanks,
tglx
------------------> Nikanth Karthikesan (1): x86, numa: Assign CPUs to nodes in round-robin manner on fake NUMA
arch/x86/kernel/cpu/intel.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index b438944..6d61786 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -284,9 +284,7 @@ static void __cpuinit srat_detect_node(struct cpuinfo_x86 *c) /* Don't do the funky fallback heuristics the AMD version employs for now. */ node = apicid_to_node[apicid]; - if (node == NUMA_NO_NODE) - node = first_node(node_online_map); - else if (!node_online(node)) { + if (node == NUMA_NO_NODE || !node_online(node)) { /* reuse the value from init_cpu_to_node() */ node = cpu_to_node(cpu); }
| |