From 919bde8e39e621d0d7da2dc889fa3ca81e01ec15 Mon Sep 17 00:00:00 2001 From: Nathan Lynch Date: Mon, 20 Mar 2006 18:34:15 -0600 Subject: [PATCH] --- yaml --- r: 22948 b: refs/heads/master c: c08888cf3c80fe07bfd176113c390ca31d3ba5c2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/numa.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c171406afbbe..cfadd43e2536 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d7aac5b3bce34c8b5fcec8ca577a4d3af880fd3 +refs/heads/master: c08888cf3c80fe07bfd176113c390ca31d3ba5c2 diff --git a/trunk/arch/powerpc/mm/numa.c b/trunk/arch/powerpc/mm/numa.c index da5280f8cf42..dc6392ce2530 100644 --- a/trunk/arch/powerpc/mm/numa.c +++ b/trunk/arch/powerpc/mm/numa.c @@ -375,7 +375,7 @@ static int __init parse_numa_properties(void) { struct device_node *cpu = NULL; struct device_node *memory = NULL; - int max_domain; + int max_domain = 0; unsigned long i; if (numa_enabled == 0) { @@ -389,8 +389,6 @@ static int __init parse_numa_properties(void) if (min_common_depth < 0) return min_common_depth; - max_domain = numa_setup_cpu(boot_cpuid); - /* * Even though we connect cpus to numa domains later in SMP init, * we need to know the maximum node id now. This is because each @@ -469,6 +467,8 @@ static int __init parse_numa_properties(void) for (i = 0; i <= max_domain; i++) node_set_online(i); + max_domain = numa_setup_cpu(boot_cpuid); + return 0; }