Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d351c3e authored by Grant Likely's avatar Grant Likely
Browse files

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: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc0bdae4

arch/sparc/kernel/prom.h

+0 −3
Original line number Diff line number Diff line
@@ -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);

include/linux/of.h

+2 −0
Original line number Diff line number Diff line
@@ -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)

{