forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

of/sparc: Remove sparc-local declaration of allnodes and devtree_lock

Browse source 
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>
This commit is contained in:
Grant Likely 2010-02-14 14:13:57 -07:00
commit 0d351c3e93
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,9 +4,6 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <asm/prom.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 * prom_early_alloc(unsigned long size);
extern void irq_trans_init(struct device_node *dp); extern void irq_trans_init(struct device_node *dp);

2
include/linux/of.h
View file

@ -19,6 +19,7 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <linux/spinlock.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
@ -67,6 +68,7 @@ struct device_node {
/* Pointer for first entry in chain of all nodes. */ /* Pointer for first entry in chain of all nodes. */
extern struct device_node *allnodes; extern struct device_node *allnodes;
extern struct device_node *of_chosen; 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) static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
{ {