From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joerg Roedel <jroedel@suse.de>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
<linux-kernel@vger.kernel.org>, <linux-next@vger.kernel.org>,
Scott Wood <oss@buserror.net>, <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [PATCH -next] soc/qbman: fix implicit header dependency now causing build fails
Date: Wed, 3 May 2017 09:38:01 +1000 [thread overview]
Message-ID: <20170503093801.7c8fb4b4@canb.auug.org.au> (raw)
In-Reply-To: <20170502222112.16720-1-paul.gortmaker@windriver.com>
Hi all,
On Tue, 2 May 2017 18:21:12 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> In commit 461a6946b1f9 ("iommu: Remove pci.h include from
> trace/events/iommu.h") that header shuffle uncovered an implicit
> include in this driver, manifesting as:
>
> CC drivers/soc/fsl/qbman/qman_portal.o
> drivers/soc/fsl/qbman/qman_portal.c: In function 'qman_portal_probe':
> drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration of function 'dma_set_mask'
> drivers/soc/fsl/qbman/qman_portal.c:299:2: error: implicit declaration of function 'DMA_BIT_MASK'
> if (dma_set_mask(dev, DMA_BIT_MASK(40))) {
> ^
>
> on the corenet32_smp_defconfig (and 64 bit respectively.) The above
> commit was singled out via git bisect.
>
> The header it was implictly relying on getting was dma-mapping.h - so
> we explicitly add it here.
>
> Fixes: 461a6946b1f9 ("iommu: Remove pci.h include from trace/events/iommu.h")
> Cc: Joerg Roedel <jroedel@suse.de>
> Cc: Scott Wood <oss@buserror.net>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
> drivers/soc/fsl/qbman/qman_portal.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/soc/fsl/qbman/qman_portal.c b/drivers/soc/fsl/qbman/qman_portal.c
> index adbaa30d3c5a..4a6a8ae5e0aa 100644
> --- a/drivers/soc/fsl/qbman/qman_portal.c
> +++ b/drivers/soc/fsl/qbman/qman_portal.c
> @@ -30,6 +30,8 @@
>
> #include "qman_priv.h"
>
> +#include <linux/dma-mapping.h>
> +
> struct qman_portal *qman_dma_portal;
> EXPORT_SYMBOL(qman_dma_portal);
>
> --
> 2.11.0
Thanks, Paul, I was just getting around to looking into that build
failure. I will add this to linux-next as a merge fix patch for the
merge of the iommu tree until Joerg gets around to including it in his
tree.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-05-02 23:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 22:21 [PATCH -next] soc/qbman: fix implicit header dependency now causing build fails Paul Gortmaker
2017-05-02 23:38 ` Stephen Rothwell [this message]
2017-05-03 8:42 ` Joerg Roedel
2017-05-03 9:15 ` Stephen Rothwell
2017-05-03 10:26 ` Joerg Roedel
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=20170503093801.7c8fb4b4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=oss@buserror.net \
--cc=paul.gortmaker@windriver.com \
/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;
as well as URLs for NNTP newsgroup(s).