aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-12-05 15:50:39 +1100
committerPaul Mackerras <paulus@samba.org>2006-01-09 14:51:30 +1100
commit54c233102f3680c7f08b6f06d229cc48503b79c4 (patch)
tree2c2bb4318031e7ddc1ccdbb75e5142f60eb2971f /arch/powerpc/mm
parentd2dd482bc17c3bc240045f80a7c4b4d5cea5e29c (diff)
Revert "[PATCH] powerpc: Minor numa memory code cleanup"
This reverts f1fdc0117004d343698b9830e141491d5ae320d1 commit.
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/numa.c35
1 files changed, 24 insertions, 11 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 30b5d6a1d83..ba7a3055a9f 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -254,17 +254,29 @@ static int __init find_min_common_depth(void)
return depth;
}
-static void __init get_n_mem_cells(int *n_addr_cells, int *n_size_cells)
+static int __init get_mem_addr_cells(void)
{
struct device_node *memory = NULL;
+ int rc;
memory = of_find_node_by_type(memory, "memory");
- if (memory) {
- *n_addr_cells = prom_n_addr_cells(memory);
- *n_size_cells = prom_n_size_cells(memory);
- of_node_put(memory);
- }
- /* if (!memory) we are in trouble, let other code error out */
+ if (!memory)
+ return 0; /* it won't matter */
+
+ rc = prom_n_addr_cells(memory);
+ return rc;
+}
+
+static int __init get_mem_size_cells(void)
+{
+ struct device_node *memory = NULL;
+ int rc;
+
+ memory = of_find_node_by_type(memory, "memory");
+ if (!memory)
+ return 0; /* it won't matter */
+ rc = prom_n_size_cells(memory);
+ return rc;
}
static unsigned long __init read_n_cells(int n, unsigned int **buf)
@@ -374,7 +386,7 @@ static int __init parse_numa_properties(void)
{
struct device_node *cpu = NULL;
struct device_node *memory = NULL;
- int n_addr_cells, n_size_cells;
+ int addr_cells, size_cells;
int max_domain;
unsigned long i;
@@ -413,7 +425,8 @@ static int __init parse_numa_properties(void)
}
}
- get_n_mem_cells(&n_addr_cells, &n_size_cells);
+ addr_cells = get_mem_addr_cells();
+ size_cells = get_mem_size_cells();
memory = NULL;
while ((memory = of_find_node_by_type(memory, "memory")) != NULL) {
unsigned long start;
@@ -430,8 +443,8 @@ static int __init parse_numa_properties(void)
ranges = memory->n_addrs;
new_range:
/* these are order-sensitive, and modify the buffer pointer */
- start = read_n_cells(n_addr_cells, &memcell_buf);
- size = read_n_cells(n_size_cells, &memcell_buf);
+ start = read_n_cells(addr_cells, &memcell_buf);
+ size = read_n_cells(size_cells, &memcell_buf);
numa_domain = of_node_numa_domain(memory);