Cc'ing stable since this should go into previous kernels too.

g.


Grant Likely [off-list ref] wrote:

On Fri, 23 Nov 2012 14:21:10 -0500 (EST), David Miller
[off-list ref] wrote:

quoted

From: Andreas Larsson <andreas@gaisler.com>
Date: Fri, 23 Nov 2012 12:24:09 +0100

quoted

This bug-fix makes sure that of_iomap is defined extern for sparc

so that the

quoted

quoted

sparc-specific implementation of_iomap is once again used when

including

quoted

quoted

include/linux/of_address.h in a sparc context. OF_GPIO that is now

available for

quoted

quoted

sparc relies on this.

The bug was inadvertently introduced in a850a75, "of/address: add

empty static

quoted

quoted

inlines for !CONFIG_OF", that added a static dummy inline for

of_iomap when

quoted

quoted

!CONFIG_OF_ADDRESS. However, CONFIG_OF_ADDRESS is never defined for

sparc, but

quoted

quoted

there is a sparc-specific implementation

/arch/sparc/kernel/of_device_common.c.

quoted

quoted

This fix takes the same approach as 0bce04b that solved the

equivalent problem

quoted

quoted

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.

-- 
Grant Likely, P.Eng.
Secret Lab Technologies Ltd.