From: Robin Murphy <robin.murphy@arm.com>
To: Claire Chang <tientzu@chromium.org>,
konrad.wilk@oracle.com, hch@lst.de, m.szyprowski@samsung.com,
Will Deacon <will@kernel.org>,
sstabellini@kernel.org
Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
tfiga@chromium.org, Nicolas Boichat <drinkcat@chromium.org>,
kernel test robot <lkp@intel.com>
Subject: Re: [PATCH v2] swiotlb: fix implicit debugfs_create_dir declaration
Date: Tue, 29 Jun 2021 13:52:14 +0100 [thread overview]
Message-ID: <7f544c68-721c-bbcc-3614-cbadce7261a9@arm.com> (raw)
In-Reply-To: <20210629121625.3633999-1-tientzu@chromium.org>
On 2021-06-29 13:16, Claire Chang wrote:
> Remove the ifdef to fix implicit function declaration for other pools.
>
> Fixes: 1d9f94400a7a ("swiotlb: Refactor swiotlb_create_debugfs")
There doesn't appear to be a problem with that commit - AFAICS it's
461021875c50 ("swiotlb: Add restricted DMA pool initialization") which
introduces a reference to debugfs_create_dir() outside the existing
#ifdef guards.
FWIW (assuming it's the real problem) I'd be inclined to factor out the
debugfs bits from rmem_swiotlb_device_init() into a separate
rmem_swiotlb_debugfs_init() (or similar) function which can live
alongside the others under the #ifdef and be stubbed out in an #else case.
Robin.
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Claire Chang <tientzu@chromium.org>
> ---
> kernel/dma/swiotlb.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
> index 0ffbaae9fba2..8ae0bef392c3 100644
> --- a/kernel/dma/swiotlb.c
> +++ b/kernel/dma/swiotlb.c
> @@ -36,9 +36,7 @@
> #include <linux/scatterlist.h>
> #include <linux/mem_encrypt.h>
> #include <linux/set_memory.h>
> -#ifdef CONFIG_DEBUG_FS
> #include <linux/debugfs.h>
> -#endif
> #ifdef CONFIG_DMA_RESTRICTED_POOL
> #include <linux/io.h>
> #include <linux/of.h>
> @@ -686,7 +684,6 @@ bool is_swiotlb_active(struct device *dev)
> }
> EXPORT_SYMBOL_GPL(is_swiotlb_active);
>
> -#ifdef CONFIG_DEBUG_FS
> static struct dentry *debugfs_dir;
>
> static void swiotlb_create_debugfs_files(struct io_tlb_mem *mem)
> @@ -709,8 +706,6 @@ static int __init swiotlb_create_default_debugfs(void)
>
> late_initcall(swiotlb_create_default_debugfs);
>
> -#endif
> -
> #ifdef CONFIG_DMA_RESTRICTED_POOL
> struct page *swiotlb_alloc(struct device *dev, size_t size)
> {
>
next prev parent reply other threads:[~2021-06-29 12:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 12:16 Claire Chang
2021-06-29 12:52 ` Robin Murphy [this message]
2021-06-30 4:07 ` Claire Chang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7f544c68-721c-bbcc-3614-cbadce7261a9@arm.com \
--to=robin.murphy@arm.com \
--cc=drinkcat@chromium.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=m.szyprowski@samsung.com \
--cc=sstabellini@kernel.org \
--cc=tfiga@chromium.org \
--cc=tientzu@chromium.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®