The patch titled
Subject: proc/sysctl: make firmware loader table conditional
has been removed from the -mm tree. Its filename was
proc-sysctl-add-shared-variables-for-range-check-fix-3.patch
This patch was dropped because it was folded into proc-sysctl-add-shared-variables-for-range-check.patch
------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: proc/sysctl: make firmware loader table conditional
We get a link error in the firmware loader fallback table,
which now refers to the global sysctl_vals variable:
drivers/base/firmware_loader/fallback_table.o:(.data+0x2c): undefined reference to `sysctl_vals'
drivers/base/firmware_loader/fallback_table.o:(.data+0x30): undefined reference to `sysctl_vals'
drivers/base/firmware_loader/fallback_table.o:(.data+0x50): undefined reference to `sysctl_vals'
drivers/base/firmware_loader/fallback_table.o:(.data+0x54): undefined reference to `sysctl_vals'
Add an #ifdef that only builds that table when it is being
used.
Link: http://lkml.kernel.org/r/20190617130014.1713870-1-arnd@xxxxxxxx
Fixes: c81c506545f4 ("proc/sysctl: add shared variables for range check")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Matteo Croce <mcroce@xxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/base/firmware_loader/fallback_table.c | 2 ++
1 file changed, 2 insertions(+)
--- a/drivers/base/firmware_loader/fallback_table.c~proc-sysctl-add-shared-variables-for-range-check-fix-3
+++ a/drivers/base/firmware_loader/fallback_table.c
@@ -23,6 +23,7 @@ struct firmware_fallback_config fw_fallb
};
EXPORT_SYMBOL_GPL(fw_fallback_config);
+#ifdef CONFIG_SYSCTL
struct ctl_table firmware_config_table[] = {
{
.procname = "force_sysfs_fallback",
@@ -45,3 +46,4 @@ struct ctl_table firmware_config_table[]
{ }
};
EXPORT_SYMBOL_GPL(firmware_config_table);
+#endif
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
proc-sysctl-add-shared-variables-for-range-check.patch
