From: Nathan Fontenot <nfont@austin•ibm.com>
To: devicetree-discuss@lists•ozlabs.org, linuxppc-dev@ozlabs•org,
microblaze-uclinux@itee•uq.edu.au
Subject: [RFC PATCH 1/5] Move devtree_lock and allnodes declaration to of.h
Date: Wed, 04 Nov 2009 16:14:42 -0600 [thread overview]
Message-ID: <4AF1FCD2.9060307@austin.ibm.com> (raw)
In-Reply-To: <4AF1FB29.50905@austin.ibm.com>
Move the declaration of devtree_lock and allnodes from powerpc/microblaze
asm/prom.h to linux/of.h
Signed-off-by: Nathan Fontenot <nfont@austin•ibm.com>
---
Index: linux-next/include/linux/of.h
===================================================================
--- linux-next.orig/include/linux/of.h 2009-11-02 13:39:46.000000000 -0600
+++ linux-next/include/linux/of.h 2009-11-02 14:17:29.000000000 -0600
@@ -19,6 +19,7 @@
#include <linux/bitops.h>
#include <linux/kref.h>
#include <linux/mod_devicetable.h>
+#include <linux/spinlock.h>
typedef u32 phandle;
typedef u32 ihandle;
@@ -63,6 +64,9 @@
#endif
};
+extern rwlock_t devtree_lock;
+extern struct device_node *allnodes;
+
static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
{
return test_bit(flag, &n->_flags);
Index: linux-next/arch/powerpc/kernel/prom.c
===================================================================
--- linux-next.orig/arch/powerpc/kernel/prom.c 2009-11-02 13:39:40.000000000 -0600
+++ linux-next/arch/powerpc/kernel/prom.c 2009-11-02 14:07:43.000000000 -0600
@@ -32,6 +32,7 @@
#include <linux/debugfs.h>
#include <linux/irq.h>
#include <linux/lmb.h>
+#include <linux/of.h>
#include <asm/prom.h>
#include <asm/rtas.h>
@@ -79,10 +80,6 @@
struct boot_param_header *initial_boot_params;
#endif
-extern struct device_node *allnodes; /* temporary while merging */
-
-extern rwlock_t devtree_lock; /* temporary while merging */
-
/* export that to outside world */
struct device_node *of_chosen;
Index: linux-next/arch/microblaze/include/asm/prom.h
===================================================================
--- linux-next.orig/arch/microblaze/include/asm/prom.h 2009-11-02 13:39:39.000000000 -0600
+++ linux-next/arch/microblaze/include/asm/prom.h 2009-11-02 14:10:13.000000000 -0600
@@ -23,6 +23,7 @@
#include <linux/of_fdt.h>
#include <linux/proc_fs.h>
#include <linux/platform_device.h>
+#include <linux/of.h>
#include <asm/irq.h>
#include <asm/atomic.h>
@@ -37,9 +38,6 @@
#define HAVE_ARCH_DEVTREE_FIXUPS
-extern struct device_node *allnodes; /* temporary while merging */
-extern rwlock_t devtree_lock; /* temporary while merging */
-
/* For updating the device tree at runtime */
extern void of_attach_node(struct device_node *);
extern void of_detach_node(struct device_node *);
Index: linux-next/arch/sparc/kernel/prom.h
===================================================================
--- linux-next.orig/arch/sparc/kernel/prom.h 2009-11-02 13:39:40.000000000 -0600
+++ linux-next/arch/sparc/kernel/prom.h 2009-11-02 14:12:46.000000000 -0600
@@ -2,11 +2,9 @@
#define __PROM_H
#include <linux/spinlock.h>
+#include <linux/of.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);
next prev parent reply other threads:[~2009-11-04 22:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-04 22:07 [RFC PATCH 0/5] Merge common dynamic OF device tree code Nathan Fontenot
2009-11-04 22:14 ` Nathan Fontenot [this message]
2009-11-04 22:16 ` [RFC PATCH 2/5] Merge dynamic OF code to of_dynamic.c Nathan Fontenot
2009-11-05 7:55 ` Grant Likely
2009-11-05 16:59 ` Nathan Fontenot
2009-11-04 22:18 ` [RFC PATCH 3/5] powerpc and pseries updates for new OF dynamic code Nathan Fontenot
2009-11-04 22:19 ` [RFC PATCH 4/5] Microblaze updates for " Nathan Fontenot
2009-11-04 22:20 ` [RFC PATCH 5/5] powerpc/iseries updates for new " Nathan Fontenot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4AF1FCD2.9060307@austin.ibm.com \
--to=nfont@austin$(echo .)ibm.com \
--cc=devicetree-discuss@lists$(echo .)ozlabs.org \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=microblaze-uclinux@itee$(echo .)uq.edu.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox