redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

sparc: Move 'unique_id' into prom_common.c and rename to 'prom_unique_id'

Browse source 
This will be used in a subsequent changeset.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-12-05 00:50:22 -08:00
parent 5fce09c6f6
commit e5ff0fe31d
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc/kernel/prom.h
View file

@ -13,4 +13,6 @@ extern void * prom_early_alloc(unsigned long size);
extern void irq_trans_init(struct device_node *dp);
#endif
extern unsigned int prom_unique_id;
#endif /* __PROM_H */

6
arch/sparc/kernel/prom_32.c
View file

@ -196,8 +196,6 @@ static char * __init build_full_name(struct device_node *dp)
return n;
}
static unsigned int unique_id;
static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)
{
static struct property *tmp = NULL;
@ -211,7 +209,7 @@ static struct property * __init build_one_prop(phandle node, char *prev, char *s
tmp = NULL;
} else {
p = prom_early_alloc(sizeof(struct property) + 32);
p->unique_id = unique_id++;
p->unique_id = prom_unique_id++;
}
p->name = (char *) (p + 1);
@ -286,7 +284,7 @@ static struct device_node * __init create_node(phandle node)
return NULL;
dp = prom_early_alloc(sizeof(*dp));
dp->unique_id = unique_id++;
dp->unique_id = prom_unique_id++;
kref_init(&dp->kref);

6
arch/sparc/kernel/prom_64.c
View file

@ -399,8 +399,6 @@ static char * __init build_full_name(struct device_node *dp)
return n;
}
static unsigned int unique_id;
static struct property * __init build_one_prop(phandle node, char *prev, char *special_name, void *special_val, int special_len)
{
static struct property *tmp = NULL;
@ -412,7 +410,7 @@ static struct property * __init build_one_prop(phandle node, char *prev, char *s
tmp = NULL;
} else {
p = prom_early_alloc(sizeof(struct property) + 32);
p->unique_id = unique_id++;
p->unique_id = prom_unique_id++;
}
p->name = (char *) (p + 1);
@ -483,7 +481,7 @@ static struct device_node * __init create_node(phandle node, struct device_node
return NULL;
dp = prom_early_alloc(sizeof(*dp));
dp->unique_id = unique_id++;
dp->unique_id = prom_unique_id++;
dp->parent = parent;
kref_init(&dp->kref);

1
arch/sparc/kernel/prom_common.c
View file

@ -119,3 +119,4 @@ int of_find_in_proplist(const char *list, const char *match, int len)
}
EXPORT_SYMBOL(of_find_in_proplist);
unsigned int prom_unique_id;