diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-05-10 00:53:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-10 00:53:29 -0700 |
| commit | aa5242e78f8667ba771e4c0d44bf45871abceb7e (patch) | |
| tree | 75ec694e3347e7634a01227c0e431617df07153e | |
| parent | 7cc5c8559c62289d027812bfdd4eb6a28c5769b6 (diff) | |
| download | op-kernel-dev-aa5242e78f8667ba771e4c0d44bf45871abceb7e.zip op-kernel-dev-aa5242e78f8667ba771e4c0d44bf45871abceb7e.tar.gz | |
[SPARC64]: Fix recursion in PROM tree building.
Use iteration for scanning of PROM node siblings.
Based upon a patch by Greg Onufer, who found this bug.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc64/kernel/prom.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c index c54d4d8..b7976b1 100644 --- a/arch/sparc64/kernel/prom.c +++ b/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) |
