diff mbox series

[v2,1/2] firmware_loader: revert removal of the fw_fallback_config export

Message ID 20200424184916.22843-1-mcgrof@kernel.org (mailing list archive)
State Not Applicable
Delegated to: Johannes Berg
Headers show
Series [v2,1/2] firmware_loader: revert removal of the fw_fallback_config export | expand

Commit Message

Luis Chamberlain April 24, 2020, 6:49 p.m. UTC 
From: Luis Chamberlain <mcgrof@kernel.org>

Christoph's patch removed two unsused exported symbols, however, one
symbol is used by the firmware_loader itself.  If CONFIG_FW_LOADER=m so
the firmware_loader is modular but CONFIG_FW_LOADER_USER_HELPER=y we fail
the build at mostpost.

ERROR: modpost: "fw_fallback_config" [drivers/base/firmware_loader/firmware_class.ko] undefined!

This happens because the variable fw_fallback_config is built into the
kernel if CONFIG_FW_LOADER_USER_HELPER=y always, so we need to grant
access to the firmware loader module by exporting it.

Revert only one hunk from his patch.

Fixes: 739604734bd8e4ad71 ("firmware_loader: remove unused exports")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 drivers/base/firmware_loader/fallback_table.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Greg Kroah-Hartman April 25, 2020, 8:14 a.m. UTC | #1 
On Fri, Apr 24, 2020 at 06:49:15PM +0000, Luis R. Rodriguez wrote:
> From: Luis Chamberlain <mcgrof@kernel.org>
> 
> Christoph's patch removed two unsused exported symbols, however, one
> symbol is used by the firmware_loader itself.  If CONFIG_FW_LOADER=m so
> the firmware_loader is modular but CONFIG_FW_LOADER_USER_HELPER=y we fail
> the build at mostpost.
> 
> ERROR: modpost: "fw_fallback_config" [drivers/base/firmware_loader/firmware_class.ko] undefined!
> 
> This happens because the variable fw_fallback_config is built into the
> kernel if CONFIG_FW_LOADER_USER_HELPER=y always, so we need to grant
> access to the firmware loader module by exporting it.
> 
> Revert only one hunk from his patch.
> 
> Fixes: 739604734bd8e4ad71 ("firmware_loader: remove unused exports")

Fixes: 739604734bd8 ("firmware_loader: remove unused exports")

No need to be over-eager with the number of digits...

I'll fix this up when I apply it, thanks.

greg k-h
diff mbox series

Patch

diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c
index 0a737349f78f..a182e318bd09 100644
--- a/drivers/base/firmware_loader/fallback_table.c
+++ b/drivers/base/firmware_loader/fallback_table.c
@@ -21,6 +21,7 @@  struct firmware_fallback_config fw_fallback_config = {
 	.loading_timeout = 60,
 	.old_timeout = 60,
 };
+EXPORT_SYMBOL_GPL(fw_fallback_config);
 
 #ifdef CONFIG_SYSCTL
 struct ctl_table firmware_config_table[] = {