From 7aa472ab7843e11926bcfb9dd71a007798a32477 Mon Sep 17 00:00:00 2001 From: Mike Travis Date: Wed, 30 Jan 2008 13:33:21 +0100 Subject: [PATCH] --- yaml --- r: 80349 b: refs/heads/master c: 0164fe16247ac2e1b697a9bf0e71df81497c4709 h: refs/heads/master i: 80347: 549e9848e646adc09af1838dd115781ab1758efa v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/srat_64.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8a3a5c4adaf2..2d944c7c44db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 834beda15ecc43c110c0a6ac39ec1aa79f891716 +refs/heads/master: 0164fe16247ac2e1b697a9bf0e71df81497c4709 diff --git a/trunk/arch/x86/mm/srat_64.c b/trunk/arch/x86/mm/srat_64.c index 04cbecaeca81..f828e6a6973d 100644 --- a/trunk/arch/x86/mm/srat_64.c +++ b/trunk/arch/x86/mm/srat_64.c @@ -382,7 +382,8 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end) setup_node_bootmem(i, nodes[i].start, nodes[i].end); for (i = 0; i < NR_CPUS; i++) { - int node = cpu_to_node(i); + int node = early_cpu_to_node(i); + if (node == NUMA_NO_NODE) continue; if (!node_isset(node, node_possible_map))