diff options
| author | Andreas Larsson <andreas@gaisler.com> | 2012-11-06 00:12:03 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-09 16:30:50 -0800 |
| commit | 0bce04be442cf4d6e4ba9dac2f0a4c5ee88af5c5 (patch) | |
| tree | 97c771cc2cafbad347b0ef71eafd957ca06357a9 /include/linux | |
| parent | 20424d85f8a07090fd32c6fad343f91b63c730b0 (diff) | |
| download | linux-3.10-0bce04be442cf4d6e4ba9dac2f0a4c5ee88af5c5.tar.gz linux-3.10-0bce04be442cf4d6e4ba9dac2f0a4c5ee88af5c5.tar.bz2 linux-3.10-0bce04be442cf4d6e4ba9dac2f0a4c5ee88af5c5.zip | |
of/address: sparc: Declare of_address_to_resource() as an extern function for sparc again
This bug-fix makes sure that of_address_to_resource is defined extern for sparc
so that the sparc-specific implementation of of_address_to_resource() is once
again used when including include/linux/of_address.h in a sparc context. A
number of drivers in mainline relies on this function working for sparc.
The bug was introduced in a850a7554442f08d3e910c6eeb4ee216868dda1e, "of/address:
add empty static inlines for !CONFIG_OF". Contrary to that commit title, the
static inlines are added for !CONFIG_OF_ADDRESS, and CONFIG_OF_ADDRESS is never
defined for sparc. This is good behavior for the other functions in
include/linux/of_address.h, as the extern functions defined in
drivers/of/address.c only gets linked when OF_ADDRESS is configured. However,
for of_address_to_resource there exists a sparc-specific implementation in
arch/sparc/arch/sparc/kernel/of_device_common.c
Solution suggested by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of_address.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/of_address.h b/include/linux/of_address.h index a1984dd037d..e20e3af68fb 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -28,11 +28,13 @@ static inline unsigned long pci_address_to_pio(phys_addr_t addr) { return -1; } #endif #else /* CONFIG_OF_ADDRESS */ +#ifndef of_address_to_resource static inline int of_address_to_resource(struct device_node *dev, int index, struct resource *r) { return -EINVAL; } +#endif static inline struct device_node *of_find_matching_node_by_address( struct device_node *from, const struct of_device_id *matches, |