Skip to content

Commit

Permalink
of/sparc: Remove sparc-local declaration of allnodes and devtree_lock
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Grant Likely committed Feb 14, 2010
1 parent fc0bdae commit 0d351c3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 0 additions & 3 deletions arch/sparc/kernel/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 2 additions & 0 deletions include/linux/of.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit 0d351c3

Please sign in to comment.