dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

sparc: Match sparc32's build_tree() up to sparc64's 

Sparc64 uses a non-recursive sibling traversal algorithm
that never got propagated into the sparc32 copy of this
code.

Sync them up.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-12-05 01:12:32 -08:00
parent 7d9439d50b
commit 4aef8c53fe
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arch/sparc/kernel/prom_32.c
View File

@ -198,23 +198,33 @@ static char * __init build_full_name(struct device_node *dp)
static struct device_node * __init build_tree(struct device_node *parent, phandle node, struct device_node ***nextp)
{
struct device_node *ret = NULL, *prev_sibling = NULL;
struct device_node *dp;
dp = create_node(node, parent);
if (dp) {
while (1) {
dp = create_node(node, parent);
if (!dp)
break;
if (prev_sibling)
prev_sibling->sibling = dp;
if (!ret)
ret = dp;
prev_sibling = dp;
*(*nextp) = dp;
*nextp = &dp->allnext;
dp->parent = parent;
dp->path_component_name = build_path_component(dp);
dp->full_name = build_full_name(dp);
dp->child = build_tree(dp, prom_getchild(node), nextp);
dp->sibling = build_tree(parent, prom_getsibling(node), nextp);
node = prom_getsibling(node);
}
return dp;
return ret;
}
struct device_node *of_console_device;