Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 123372
b: refs/heads/master
c: 06c0db7
h: refs/heads/master
v: v3
  • Loading branch information
David S. Miller committed Dec 6, 2008
1 parent 514a40d commit d68c800
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 59966e3b4e9e6573b352301ad0ceed15196d4e2d
refs/heads/master: 06c0db7221de09cdf1d5dd2ce2780cc3361ad9f9
7 changes: 4 additions & 3 deletions trunk/arch/sparc/kernel/prom_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ static char * __init get_one_property(phandle node, const char *name)
return buf;
}

static struct device_node * __init create_node(phandle node)
static struct device_node * __init create_node(phandle node, struct device_node *parent)
{
struct device_node *dp;

Expand All @@ -219,6 +219,7 @@ static struct device_node * __init create_node(phandle node)

dp = prom_early_alloc(sizeof(*dp));
dp->unique_id = prom_unique_id++;
dp->parent = parent;

kref_init(&dp->kref);

Expand All @@ -237,7 +238,7 @@ static struct device_node * __init build_tree(struct device_node *parent, phandl
{
struct device_node *dp;

dp = create_node(node);
dp = create_node(node, parent);
if (dp) {
*(*nextp) = dp;
*nextp = &dp->allnext;
Expand Down Expand Up @@ -387,7 +388,7 @@ void __init prom_build_devicetree(void)
{
struct device_node **nextp;

allnodes = create_node(prom_root_node);
allnodes = create_node(prom_root_node, NULL);
allnodes->path_component_name = "";
allnodes->full_name = "/";

Expand Down

0 comments on commit d68c800

Please sign in to comment.