diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-02-14 22:13:57 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-14 21:02:44 +0100 |
| commit | 0d351c3e932c2e155ef5e4c3f5b87223abd4eea6 (patch) | |
| tree | a1ca21dd26dbe86a131c879f6401686eb4de41b1 | |
| parent | of: move definition of of_chosen into common code. (diff) | |
| download | linux-0d351c3e932c2e155ef5e4c3f5b87223abd4eea6.tar.xz linux-0d351c3e932c2e155ef5e4c3f5b87223abd4eea6.zip | |
of/sparc: Remove sparc-local declaration of allnodes and devtree_lock
Both allnodes and devtree_lock are defined in common code. The
extern declaration should be in the common header too so that the
compiler can type check. allnodes is already in of.h, but
devtree_lock should be declared there too.
This patch removes the SPARC declarations and uses decls in of.h instead.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | arch/sparc/kernel/prom.h | 3 | ||||
| -rw-r--r-- | include/linux/of.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/sparc/kernel/prom.h b/arch/sparc/kernel/prom.h index 453397fe5e14..a8591ef2636d 100644 --- a/arch/sparc/kernel/prom.h +++ b/arch/sparc/kernel/prom.h @@ -4,9 +4,6 @@ #include <linux/spinlock.h> #include <asm/prom.h> -extern struct device_node *allnodes; /* temporary while merging */ -extern rwlock_t devtree_lock; /* temporary while merging */ - extern void * prom_early_alloc(unsigned long size); extern void irq_trans_init(struct device_node *dp); diff --git a/include/linux/of.h b/include/linux/of.h index d34cc5d9d81e..f6d9cbc39c9c 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -19,6 +19,7 @@ #include <linux/bitops.h> #include <linux/kref.h> #include <linux/mod_devicetable.h> +#include <linux/spinlock.h> #include <asm/byteorder.h> @@ -67,6 +68,7 @@ struct device_node { /* Pointer for first entry in chain of all nodes. */ extern struct device_node *allnodes; extern struct device_node *of_chosen; +extern rwlock_t devtree_lock; static inline int of_node_check_flag(struct device_node *n, unsigned long flag) { |