From c70d619110ba5a9ebb5ab0b4fc9c0be53ffd5432 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 5 Dec 2008 00:50:22 -0800
Subject: [PATCH] --- yaml --- r: 123369 b: refs/heads/master c:
 e5ff0fe31d69e716f2599bcfb297ca3757e957c5 h: refs/heads/master i:   123367:
 e6ed837d6bab6d5dee77fc8ef4fbddaab2e20ca4 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sparc/kernel/prom.h        | 2 ++
 trunk/arch/sparc/kernel/prom_32.c     | 6 ++----
 trunk/arch/sparc/kernel/prom_64.c     | 6 ++----
 trunk/arch/sparc/kernel/prom_common.c | 1 +
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 00ef1b25e7ef..08cf84e341a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fce09c6f636449d6df971971af1bd4328a21890
+refs/heads/master: e5ff0fe31d69e716f2599bcfb297ca3757e957c5
diff --git a/trunk/arch/sparc/kernel/prom.h b/trunk/arch/sparc/kernel/prom.h
index 49925101f8f8..2575cdbbed6f 100644
--- a/trunk/arch/sparc/kernel/prom.h
+++ b/trunk/arch/sparc/kernel/prom.h
@@ -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 */
diff --git a/trunk/arch/sparc/kernel/prom_32.c b/trunk/arch/sparc/kernel/prom_32.c
index ba3c55186823..c34888a21b2d 100644
--- a/trunk/arch/sparc/kernel/prom_32.c
+++ b/trunk/arch/sparc/kernel/prom_32.c
@@ -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);
 
diff --git a/trunk/arch/sparc/kernel/prom_64.c b/trunk/arch/sparc/kernel/prom_64.c
index d745b9f44d2d..61cc967b149d 100644
--- a/trunk/arch/sparc/kernel/prom_64.c
+++ b/trunk/arch/sparc/kernel/prom_64.c
@@ -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);
diff --git a/trunk/arch/sparc/kernel/prom_common.c b/trunk/arch/sparc/kernel/prom_common.c
index ded8c628811f..a23180801014 100644
--- a/trunk/arch/sparc/kernel/prom_common.c
+++ b/trunk/arch/sparc/kernel/prom_common.c
@@ -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;