Skip to contentSkip to conversation

of/platform: Fix sparc:allmodconfig build

PATCH In review Guenter Roeck 2 participants 2 messages Mar 11, 2015 – Mar 13, 2015 Device tree

lore
Share & tools
lore

Guenter Roeck

author
#0 lore raw

PATCH 1/1 of/platform: Fix sparc:allmodconfig build

sparc:allmodconfig fails to build with:

drivers/built-in.o: In function `platform_bus_init':
(.init.text+0x3684): undefined reference to `of_platform_register_reconfig_notifier'

of_platform_register_reconfig_notifier is only declared if both OF_ADDRESS and OF_DYNAMIC are configured. Yet, the include file only declares a dummy function if OF_DYNAMIC is not configured. The sparc architecture does not configure OF_ADDRESS, but does configure OF_DYNAMIC, causing above error.

Fixes 801d728c10db ("of/reconfig: Add OF_DYNAMIC notifier for platform_bus_type")
Cc Pantelis Antoniou <[email protected]>
Signed-off-by Guenter Roeck <[email protected]>
---
 include/linux/of_platform.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/of_platform.h +1 -1
index 8a860f0..611a691 100644
@@ -84,7 +84,7 @@ static inline int of_platform_populate(struct device_node *root,
 static inline void of_platform_depopulate(struct device *parent) { }
 #endif
 
-#ifdef CONFIG_OF_DYNAMIC
+#if defined(CONFIG_OF_DYNAMIC) && defined(CONFIG_OF_ADDRESS)
 extern void of_platform_register_reconfig_notifier(void);
 #else
 static inline void of_platform_register_reconfig_notifier(void) { }
Signature · 1 line
2.1.0
#1 lore raw
Quoted 5 lines · Guenter Roeck

sparc:allmodconfig fails to build with:

drivers/built-in.o: In function `platform_bus_init':
(.init.text+0x3684): undefined reference to `of_platform_register_reconfig_notifier'

Quoted 8 lines

of_platform_register_reconfig_notifier is only declared if both OF_ADDRESS and OF_DYNAMIC are configured. Yet, the include file only declares a dummy function if OF_DYNAMIC is not configured. The sparc architecture does not configure OF_ADDRESS, but does configure OF_DYNAMIC, causing above error.

Fixes 801d728c10db ("of/reconfig: Add OF_DYNAMIC notifier for platform_bus_type")
Cc Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/[email protected]>
Signed-off-by Guenter Roeck <[email protected]>

Applied for 4.0. Thanks.

Rob

Quoted 18 lines
---
 include/linux/of_platform.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/of_platform.h +1 -2
index 8a860f0..611a691 100644
@@ -84,7 +84,7 @@ static inline int of_platform_populate(struct device_node *root,
 static inline void of_platform_depopulate(struct device *parent) { }
 #endif
 
-#ifdef CONFIG_OF_DYNAMIC
+#if defined(CONFIG_OF_DYNAMIC) && defined(CONFIG_OF_ADDRESS)
 extern void of_platform_register_reconfig_notifier(void);
 #else
 static inline void of_platform_register_reconfig_notifier(void) { }
--
Quoted 2 lines

2.1.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html