Re: [PATCH] proc/sysctl: make firmware loader table conditional

[Matteo Croce]

On Mon, Jun 17, 2019 at 3:00 PM Arnd Bergmann <arnd@xxxxxxxx> wrote:
>
> 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.
>
> Fixes: c81c506545f4 ("proc/sysctl: add shared variables for range check")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> ---
>  drivers/base/firmware_loader/fallback_table.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c
> index 58d4a1263480..ba9d30b28edc 100644
> --- a/drivers/base/firmware_loader/fallback_table.c
> +++ b/drivers/base/firmware_loader/fallback_table.c
> @@ -23,6 +23,7 @@ struct firmware_fallback_config fw_fallback_config = {
>  };
>  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
> --
> 2.20.0
>

Hi Arnd,

I think I've posted a similar patch before, I don't know if it's
already in linux-next:

https://lore.kernel.org/linux-next/20190531012649.31797-1-mcroce@xxxxxxxxxx/

Regards,
-- 
Matteo Croce
per aspera ad upstream