Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 22948
b: refs/heads/master
c: c08888c
h: refs/heads/master
v: v3
  • Loading branch information
Nathan Lynch authored and Paul Mackerras committed Mar 22, 2006
1 parent 97f65a9 commit 919bde8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1d7aac5b3bce34c8b5fcec8ca577a4d3af880fd3
refs/heads/master: c08888cf3c80fe07bfd176113c390ca31d3ba5c2
6 changes: 3 additions & 3 deletions trunk/arch/powerpc/mm/numa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 919bde8

Please sign in to comment.