Skip to contentSkip to conversation

firmware_loader: fix build without sysctl

PATCH In review Matteo Croce 3 participants 6 messages May 31, 2019 – Jun 1, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 firmware_loader: fix build without sysctl

firmware_config_table has references to the sysctl code which triggers a build failure when CONFIG_PROC_SYSCTL is not set:

    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x30): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x38): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x70): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x78): undefined reference to `sysctl_vals'

Put the firmware_config_table struct under #ifdef CONFIG_PROC_SYSCTL.

Fixes 6a33853c5773 ("proc/sysctl: add shared variables for range check")
---
 drivers/base/firmware_loader/fallback_table.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/base/firmware_loader/fallback_table.c +4 -0
index 58d4a1263480..18d646777fb9 100644
@@ -23,6 +23,8 @@ struct firmware_fallback_config fw_fallback_config = {
 };
 EXPORT_SYMBOL_GPL(fw_fallback_config);
 
+#ifdef CONFIG_PROC_SYSCTL
+
 struct ctl_table firmware_config_table[] = {
 	{
 		.procname	= "force_sysfs_fallback",
@@ -45,3 +47,5 @@ struct ctl_table firmware_config_table[] = {
 	{ }
 };
 EXPORT_SYMBOL_GPL(firmware_config_table);
+
+#endif
Signature · 1 line
2.21.0
#1 lore raw

Hi all,

[Just cc'ing Andrew who is currently carrying the patch that this fixes.]

Quoted 40 lines · On Fri, 31 May 2019 03:26:49 +0200 Matteo Croce <[email protected]> wrote:

firmware_config_table has references to the sysctl code which triggers a build failure when CONFIG_PROC_SYSCTL is not set:

    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x30): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x38): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x70): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x78): undefined reference to `sysctl_vals'

Put the firmware_config_table struct under #ifdef CONFIG_PROC_SYSCTL.

Fixes 6a33853c5773 ("proc/sysctl: add shared variables for range check")
---
 drivers/base/firmware_loader/fallback_table.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/base/firmware_loader/fallback_table.c +4 -0
index 58d4a1263480..18d646777fb9 100644
@@ -23,6 +23,8 @@ struct firmware_fallback_config fw_fallback_config = {
 };
 EXPORT_SYMBOL_GPL(fw_fallback_config);
 
+#ifdef CONFIG_PROC_SYSCTL
+
 struct ctl_table firmware_config_table[] = {
 	{
 		.procname	= "force_sysfs_fallback",
@@ -45,3 +47,5 @@ struct ctl_table firmware_config_table[] = {
 	{ }
 };
 EXPORT_SYMBOL_GPL(firmware_config_table);
+
+#endif
Signature · 1 line
2.21.0
Signature · 2 lines
Cheers,
Stephen Rothwell
#2 lore raw
In reply to Matteo Croce

Hi all,

Quoted 9 lines · On Fri, 31 May 2019 03:26:49 +0200 Matteo Croce <[email protected]> wrote:

firmware_config_table has references to the sysctl code which triggers a build failure when CONFIG_PROC_SYSCTL is not set:

    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x30): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x38): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x70): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x78): undefined reference to `sysctl_vals'
Quoted 5 lines

Put the firmware_config_table struct under #ifdef CONFIG_PROC_SYSCTL.

Fixes 6a33853c5773 ("proc/sysctl: add shared variables for range check")

I have added this to linux-next today.

Signature · 2 lines
Cheers,
Stephen Rothwell
Acked-by on v1 1/1
#3 lore raw
In reply to Matteo Croce
Quoted 8 lines · Matteo Croce

firmware_config_table has references to the sysctl code which triggers a build failure when CONFIG_PROC_SYSCTL is not set:

    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x30): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x38): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x70): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x78): undefined reference to `sysctl_vals'
Quoted 5 lines

Put the firmware_config_table struct under #ifdef CONFIG_PROC_SYSCTL.

Fixes 6a33853c5773 ("proc/sysctl: add shared variables for range check")

Works for me.

Thanks.

Quoted 24 lines
---
 drivers/base/firmware_loader/fallback_table.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/base/firmware_loader/fallback_table.c +4 -0
index 58d4a1263480..18d646777fb9 100644
@@ -23,6 +23,8 @@ struct firmware_fallback_config fw_fallback_config = {
 };
 EXPORT_SYMBOL_GPL(fw_fallback_config);
 
+#ifdef CONFIG_PROC_SYSCTL
+
 struct ctl_table firmware_config_table[] = {
 	{
 		.procname	= "force_sysfs_fallback",
@@ -45,3 +47,5 @@ struct ctl_table firmware_config_table[] = {
 	{ }
 };
 EXPORT_SYMBOL_GPL(firmware_config_table);
+
+#endif
Signature · 1 line
~Randy
#4 lore raw
Quoted 34 lines · Randy Dunlap
Quoted 8 lines · Matteo Croce

firmware_config_table has references to the sysctl code which triggers a build failure when CONFIG_PROC_SYSCTL is not set:

    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x30): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x38): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x70): undefined reference to `sysctl_vals'
    ld: drivers/base/firmware_loader/fallback_table.o:(.data+0x78): undefined reference to `sysctl_vals'
Quoted 5 lines

Put the firmware_config_table struct under #ifdef CONFIG_PROC_SYSCTL.

Fixes 6a33853c5773 ("proc/sysctl: add shared variables for range check")

Works for me.

Thanks.

Quoted 12 lines
---
 drivers/base/firmware_loader/fallback_table.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/base/firmware_loader/fallback_table.c +0 -0
index 58d4a1263480..18d646777fb9 100644
@@ -23,6 +23,8 @@ struct firmware_fallback_config fw_fallback_config = {
 };
 EXPORT_SYMBOL_GPL(fw_fallback_config);
 
Quoted 16 lines

drivers/base/firmware_loader/fallback_table.c struct ctl_table firmware_config_table[] = { · line 51

Quoted 12 lines
drivers/base/firmware_loader/fallback_table.c +4 -0
+#ifdef CONFIG_PROC_SYSCTL
+
 struct ctl_table firmware_config_table[] = {
      {
              .procname       = "force_sysfs_fallback",
@@ -45,3 +47,5 @@ struct ctl_table firmware_config_table[] = {
      { }
 };
 EXPORT_SYMBOL_GPL(firmware_config_table);
+
+#endif

--
~Randy

Hi,

please correct the Fixes tag if possible.
It seems that the hash of the offending commit now is d91bff3011cf

Regards,

Signature · 2 lines
Matteo Croce
per aspera ad upstream
#5 lore raw

Hi Matteo,

Quoted 3 lines · On Fri, 31 May 2019 11:12:39 +0200 Matteo Croce <[email protected]> wrote:

please correct the Fixes tag if possible.
It seems that the hash of the offending commit now is d91bff3011cf

Unfortunately, these hashes will keep changing for things in Andrew's patch queue until they are sent to Linus. In the end Andrew will probably just squash this fix into the original patch.

Cheers,
Stephen Rothwell