From 196bab45388c8180ee3ad73c118a1da04d12c4f7 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 10 May 2007 00:53:29 -0700 Subject: [PATCH] --- yaml --- r: 55835 b: refs/heads/master c: aa5242e78f8667ba771e4c0d44bf45871abceb7e h: refs/heads/master i: 55833: 982aba96743be93c1ff35406b9738ade2cfd9d92 55831: ba266d77d792b2186d82b6b2173ae0f4c44edfa9 v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/prom.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d76c0c1d4dff..ca285d8857c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7cc5c8559c62289d027812bfdd4eb6a28c5769b6 +refs/heads/master: aa5242e78f8667ba771e4c0d44bf45871abceb7e diff --git a/trunk/arch/sparc64/kernel/prom.c b/trunk/arch/sparc64/kernel/prom.c index c54d4d8af014..b7976b14d0ba 100644 --- a/trunk/arch/sparc64/kernel/prom.c +++ b/trunk/arch/sparc64/kernel/prom.c @@ -1636,10 +1636,21 @@ static struct device_node * __init create_node(phandle node, struct device_node 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; @@ -1648,10 +1659,10 @@ static struct device_node * __init build_tree(struct device_node *parent, phandl 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; } void __init prom_build_devicetree(void)