2016-04-25 23:05:54

by Arnd Bergmann

Subject: [PATCH] physmap_of: ensure versatile code is reachable

With the newly added physmap_of_versatile code, we get a build error
when physmap_of is in a module, because of_flash_probe_versatile
is not exported:

ERROR: "of_flash_probe_versatile" [drivers/mtd/maps/physmap_of.ko] undefined!

This adds the export, and changes the Makefile so that the code is
also put into a loadable module rather than built-in when physmap_of
itself is a module.

Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/mtd/maps/Makefile | 4 +++-
drivers/mtd/maps/physmap_of_versatile.c | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 188873a..644f7d3 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -18,7 +18,9 @@ obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o
obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o
obj-$(CONFIG_MTD_PHYSMAP) += physmap.o
obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of.o
-obj-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o
+ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE
+obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_of_versatile.o
+endif
obj-$(CONFIG_MTD_PISMO) += pismo.o
obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o
obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o
diff --git a/drivers/mtd/maps/physmap_of_versatile.c b/drivers/mtd/maps/physmap_of_versatile.c
index fa40539..0f39b2a 100644
--- a/drivers/mtd/maps/physmap_of_versatile.c
+++ b/drivers/mtd/maps/physmap_of_versatile.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
+#include <linux/export.h>
#include <linux/io.h>
#include <linux/of.h>
#include <linux/of_address.h>
@@ -251,3 +252,4 @@ int of_flash_probe_versatile(struct platform_device *pdev,

return 0;
}
+EXPORT_SYMBOL_GPL(of_flash_probe_versatile);
--
2.7.0

2016-04-26 14:02:53

by Linus Walleij

Subject: Re: [PATCH] physmap_of: ensure versatile code is reachable

On Tue, Apr 26, 2016 at 1:04 AM, Arnd Bergmann <[email protected]> wrote:

> With the newly added physmap_of_versatile code, we get a build error
> when physmap_of is in a module, because of_flash_probe_versatile
> is not exported:
>
> ERROR: "of_flash_probe_versatile" [drivers/mtd/maps/physmap_of.ko] undefined!
>
> This adds the export, and changes the Makefile so that the code is
> also put into a loadable module rather than built-in when physmap_of
> itself is a module.
>
> Signed-off-by: Arnd Bergmann <[email protected]>

Argh how stupid of me. Strange I didn't see it on the
build servers. Anyway:
Reviewed-by: Linus Walleij <[email protected]>

Yours,
Linus Walleij

2016-04-27 16:57:32

by Brian Norris

Subject: Re: [PATCH] physmap_of: ensure versatile code is reachable

On Tue, Apr 26, 2016 at 01:04:38AM +0200, Arnd Bergmann wrote:
> With the newly added physmap_of_versatile code, we get a build error
> when physmap_of is in a module, because of_flash_probe_versatile
> is not exported:
>
> ERROR: "of_flash_probe_versatile" [drivers/mtd/maps/physmap_of.ko] undefined!
>
> This adds the export, and changes the Makefile so that the code is
> also put into a loadable module rather than built-in when physmap_of
> itself is a module.
>
> Signed-off-by: Arnd Bergmann <[email protected]>

Acked-by: Brian Norris <[email protected]>

I presume you're taking this in arm-soc.