| Message ID | 20100213160258.4767.22371.stgit@angua (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 22d5579e66101162fd1119f2e7f4f999ca8b48c7 |
| Headers | show |
On Sat, 2010-02-13 at 09:02 -0700, Grant Likely wrote: > Neither the powerpc nor the microblaze code use devtree_lock anymore. > Remove the extern reference. > > Signed-off-by: Grant Likely <grant.likely@secretlab.ca> > --- Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > arch/microblaze/include/asm/prom.h | 2 -- > arch/powerpc/kernel/prom.c | 2 -- > 2 files changed, 0 insertions(+), 4 deletions(-) > > diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h > index ddc5c57..8b1ebd3 100644 > --- a/arch/microblaze/include/asm/prom.h > +++ b/arch/microblaze/include/asm/prom.h > @@ -30,8 +30,6 @@ extern struct device_node *of_chosen; > > #define HAVE_ARCH_DEVTREE_FIXUPS > > -extern rwlock_t devtree_lock; /* temporary while merging */ > - > /* Other Prototypes */ > extern int early_uartlite_console(void); > > diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c > index 5bbbdb2..4869c93 100644 > --- a/arch/powerpc/kernel/prom.c > +++ b/arch/powerpc/kernel/prom.c > @@ -67,8 +67,6 @@ int __initdata iommu_force_on; > unsigned long tce_alloc_start, tce_alloc_end; > #endif > > -extern rwlock_t devtree_lock; /* temporary while merging */ > - > /* export that to outside world */ > struct device_node *of_chosen; > > > -- > 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/
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index ddc5c57..8b1ebd3 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h @@ -30,8 +30,6 @@ extern struct device_node *of_chosen; #define HAVE_ARCH_DEVTREE_FIXUPS -extern rwlock_t devtree_lock; /* temporary while merging */ - /* Other Prototypes */ extern int early_uartlite_console(void); diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 5bbbdb2..4869c93 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -67,8 +67,6 @@ int __initdata iommu_force_on; unsigned long tce_alloc_start, tce_alloc_end; #endif -extern rwlock_t devtree_lock; /* temporary while merging */ - /* export that to outside world */ struct device_node *of_chosen;
Neither the powerpc nor the microblaze code use devtree_lock anymore. Remove the extern reference. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> --- arch/microblaze/include/asm/prom.h | 2 -- arch/powerpc/kernel/prom.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-)