[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <84bc488b-5b4b-49ec-7e1a-3a88f92476f6@amd.com>
Date: Mon, 1 May 2023 21:01:19 -0700
From: Shannon Nelson <shannon.nelson@....com>
To: Jakub Kicinski <kuba@...nel.org>, Arnd Bergmann <arnd@...nel.org>
Cc: Brett Creeley <brett.creeley@....com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Paolo Abeni <pabeni@...hat.com>, Arnd Bergmann <arnd@...db.de>,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] pds_core: fix linking without CONFIG_DEBUG_FS
On 5/1/23 3:35 PM, Jakub Kicinski wrote:
> On Mon, 1 May 2023 17:06:14 +0200 Arnd Bergmann wrote:
>> From: Arnd Bergmann <arnd@...db.de>
>>
>> The debugfs.o file is only built when the fs is enabled:
>>
>> main.c:(.text+0x47c): undefined reference to `pdsc_debugfs_del_dev'
>> main.c:(.text+0x8dc): undefined reference to `pdsc_debugfs_add_dev'
>> main.c:(.exit.text+0x14): undefined reference to `pdsc_debugfs_destroy'
>> main.c:(.init.text+0x8): undefined reference to `pdsc_debugfs_create'
>> dev.c:(.text+0x988): undefined reference to `pdsc_debugfs_add_ident'
>> core.c:(.text+0x6b0): undefined reference to `pdsc_debugfs_del_qcq'
>> core.c:(.text+0x998): undefined reference to `pdsc_debugfs_add_qcq'
>> core.c:(.text+0xf0c): undefined reference to `pdsc_debugfs_add_viftype'
>>
>> Add dummy helper functions for these interfaces.
>
> Debugfs should wrap itself. Doesn't this work:
>
> diff --git a/drivers/net/ethernet/amd/pds_core/Makefile b/drivers/net/ethernet/amd/pds_core/Makefile
> index 0abc33ce826c..54d1d5b375ce 100644
> --- a/drivers/net/ethernet/amd/pds_core/Makefile
> +++ b/drivers/net/ethernet/amd/pds_core/Makefile
> @@ -9,6 +9,5 @@ pds_core-y := main.o \
> dev.o \
> adminq.o \
> core.o \
> - fw.o
> -
> -pds_core-$(CONFIG_DEBUG_FS) += debugfs.o
> + fw.o \
> + debugfs.o
Yes, that should do it, and should have been done in the rest of the
change that I made after Leon suggested removing the dummy functions
that I originally had there [0].
Tomorrow when I'm back from vacation I can do a couple of follow-up
patches for this and for the other config tags that Simon pointed out.
sln
[0] https://lore.kernel.org/netdev/20230409112645.GS14869@unreal/
Powered by blists - more mailing lists