| Message ID | 1353669849-23697-1-git-send-email-andreas@gaisler.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
From: Andreas Larsson <andreas@gaisler.com> Date: Fri, 23 Nov 2012 12:24:09 +0100 > This bug-fix makes sure that of_iomap is defined extern for sparc so that the > sparc-specific implementation of_iomap is once again used when including > include/linux/of_address.h in a sparc context. OF_GPIO that is now available for > sparc relies on this. > > The bug was inadvertently introduced in a850a75, "of/address: add empty static > inlines for !CONFIG_OF", that added a static dummy inline for of_iomap when > !CONFIG_OF_ADDRESS. However, CONFIG_OF_ADDRESS is never defined for sparc, but > there is a sparc-specific implementation /arch/sparc/kernel/of_device_common.c. > > This fix takes the same approach as 0bce04b that solved the equivalent problem > for of_address_to_resource. > > Signed-off-by: Andreas Larsson <andreas@gaisler.com> Grant, can you possibly merge this to Linus while I'm travelling? That would help me a lot. Thanks! -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 23 Nov 2012 14:21:10 -0500 (EST), David Miller <davem@davemloft.net> wrote: > From: Andreas Larsson <andreas@gaisler.com> > Date: Fri, 23 Nov 2012 12:24:09 +0100 > > > This bug-fix makes sure that of_iomap is defined extern for sparc so that the > > sparc-specific implementation of_iomap is once again used when including > > include/linux/of_address.h in a sparc context. OF_GPIO that is now available for > > sparc relies on this. > > > > The bug was inadvertently introduced in a850a75, "of/address: add empty static > > inlines for !CONFIG_OF", that added a static dummy inline for of_iomap when > > !CONFIG_OF_ADDRESS. However, CONFIG_OF_ADDRESS is never defined for sparc, but > > there is a sparc-specific implementation /arch/sparc/kernel/of_device_common.c. > > > > This fix takes the same approach as 0bce04b that solved the equivalent problem > > for of_address_to_resource. > > > > Signed-off-by: Andreas Larsson <andreas@gaisler.com> > > Grant, can you possibly merge this to Linus while I'm travelling? > That would help me a lot. Yup, I'm doing it right now. g. -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Cc'ing stable since this should go into previous kernels too. g. Grant Likely <grant.likely@secretlab.ca> wrote: >On Fri, 23 Nov 2012 14:21:10 -0500 (EST), David Miller ><davem@davemloft.net> wrote: >> From: Andreas Larsson <andreas@gaisler.com> >> Date: Fri, 23 Nov 2012 12:24:09 +0100 >> >> > This bug-fix makes sure that of_iomap is defined extern for sparc >so that the >> > sparc-specific implementation of_iomap is once again used when >including >> > include/linux/of_address.h in a sparc context. OF_GPIO that is now >available for >> > sparc relies on this. >> > >> > The bug was inadvertently introduced in a850a75, "of/address: add >empty static >> > inlines for !CONFIG_OF", that added a static dummy inline for >of_iomap when >> > !CONFIG_OF_ADDRESS. However, CONFIG_OF_ADDRESS is never defined for >sparc, but >> > there is a sparc-specific implementation >/arch/sparc/kernel/of_device_common.c. >> > >> > This fix takes the same approach as 0bce04b that solved the >equivalent problem >> > for of_address_to_resource. >> > >> > Signed-off-by: Andreas Larsson <andreas@gaisler.com> >> >> Grant, can you possibly merge this to Linus while I'm travelling? >> That would help me a lot. > >Yup, I'm doing it right now. > >g.
On Fri, Nov 23, 2012 at 11:34:20PM +0000, Grant Likely wrote:
> Cc'ing stable since this should go into previous kernels too.
<formletter>
This is not the correct way to submit patches for inclusion in the
stable kernel tree. Please read Documentation/stable_kernel_rules.txt
for how to do this properly.
</formletter>
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h index f930031..67c6257 100644 --- a/arch/sparc/include/asm/prom.h +++ b/arch/sparc/include/asm/prom.h @@ -63,10 +63,13 @@ extern char *of_console_options; extern void irq_trans_init(struct device_node *dp); extern char *build_path_component(struct device_node *dp); -/* SPARC has a local implementation */ +/* SPARC has local implementations */ extern int of_address_to_resource(struct device_node *dev, int index, struct resource *r); #define of_address_to_resource of_address_to_resource +void __iomem *of_iomap(struct device_node *node, int index); +#define of_iomap of_iomap + #endif /* __KERNEL__ */ #endif /* _SPARC_PROM_H */ diff --git a/include/linux/of_address.h b/include/linux/of_address.h index e20e3af..0506eb5 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -42,10 +42,12 @@ static inline struct device_node *of_find_matching_node_by_address( { return NULL; } +#ifndef of_iomap static inline void __iomem *of_iomap(struct device_node *device, int index) { return NULL; } +#endif static inline const __be32 *of_get_address(struct device_node *dev, int index, u64 *size, unsigned int *flags) {
This bug-fix makes sure that of_iomap is defined extern for sparc so that the sparc-specific implementation of_iomap is once again used when including include/linux/of_address.h in a sparc context. OF_GPIO that is now available for sparc relies on this. The bug was inadvertently introduced in a850a75, "of/address: add empty static inlines for !CONFIG_OF", that added a static dummy inline for of_iomap when !CONFIG_OF_ADDRESS. However, CONFIG_OF_ADDRESS is never defined for sparc, but there is a sparc-specific implementation /arch/sparc/kernel/of_device_common.c. This fix takes the same approach as 0bce04b that solved the equivalent problem for of_address_to_resource. Signed-off-by: Andreas Larsson <andreas@gaisler.com> --- arch/sparc/include/asm/prom.h | 5 ++++- include/linux/of_address.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletions(-)