From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 49DADB7E75 for ; Sun, 14 Feb 2010 17:13:29 +1100 (EST) Subject: Re: [PATCH 8/9] of/sparc: Remove sparc-local declaration of allnodes and devtree_lock From: Benjamin Herrenschmidt To: Grant Likely In-Reply-To: <20100213160309.4767.94443.stgit@angua> References: <20100213154838.4767.83881.stgit@angua> <20100213160309.4767.94443.stgit@angua> Content-Type: text/plain; charset="UTF-8" Date: Sun, 14 Feb 2010 17:13:09 +1100 Message-ID: <1266127989.16346.65.camel@pasglop> Mime-Version: 1.0 Cc: sfr@canb.auug.org.au, monstr@monstr.eu, microblaze-uclinux@itee.uq.edu.au, devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org, sparclinux@vger.kernel.org, jeremy.kerr@canonical.com, davem@davemloft.net List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Sat, 2010-02-13 at 09:03 -0700, Grant Likely wrote: > 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 Acked-by: Benjamin Herrenschmidt > --- > > arch/sparc/kernel/prom.h | 3 --- > 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 453397f..a8591ef 100644 > --- a/arch/sparc/kernel/prom.h > +++ b/arch/sparc/kernel/prom.h > @@ -4,9 +4,6 @@ > #include > #include > > -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 d34cc5d..f6d9cbc 100644 > --- a/include/linux/of.h > +++ b/include/linux/of.h > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > > #include > > @@ -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) > { > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/