diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:43:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-10 13:43:09 -0400 |
| commit | a7144b23da073f4b3192e356ad74de12aba60e00 (patch) | |
| tree | 2b93bdf54563bfe447a167d832c43d24f56c7a95 /arch/ppc64/mm/numa.c | |
| parent | 8a60a07129fad60bba779a2a4038c7518b167fc7 (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc64/mm/numa.c')
| -rw-r--r-- | arch/ppc64/mm/numa.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/ppc64/mm/numa.c b/arch/ppc64/mm/numa.c index cafd91aef28..0b191f2de01 100644 --- a/arch/ppc64/mm/numa.c +++ b/arch/ppc64/mm/numa.c @@ -647,7 +647,12 @@ void __init do_init_bootmem(void) new_range: mem_start = read_n_cells(addr_cells, &memcell_buf); mem_size = read_n_cells(size_cells, &memcell_buf); - numa_domain = numa_enabled ? of_node_numa_domain(memory) : 0; + if (numa_enabled) { + numa_domain = of_node_numa_domain(memory); + if (numa_domain >= MAX_NUMNODES) + numa_domain = 0; + } else + numa_domain = 0; if (numa_domain != nid) continue; |