From: Joerg Roedel <joro@8bytes.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Alex Williamson <alex.williamson@redhat.com>,
Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: linux-next: build failure after merge of the iommu tree
Date: Thu, 15 Dec 2011 11:09:15 +0100 [thread overview]
Message-ID: <20111215100915.GD4475@8bytes.org> (raw)
In-Reply-To: <20111215154051.e8bb4a174259e910a3045f0e@canb.auug.org.au>
Hi Stephen,
On Thu, Dec 15, 2011 at 03:40:51PM +1100, Stephen Rothwell wrote:
> After merging the iommu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/iommu/amd_iommu.c: In function 'pci_iommuv2_capable':
> drivers/iommu/amd_iommu.c:179:3: error: 'PCI_PRI_CAP' undeclared (first use in this function)
> drivers/iommu/amd_iommu.c:180:3: error: 'PCI_PASID_CAP' undeclared (first use in this function)
> drivers/iommu/amd_iommu.c: In function 'pri_reset_while_enabled':
> drivers/iommu/amd_iommu.c:1981:38: error: 'PCI_PRI_CAP' undeclared (first use in this function)
> drivers/iommu/amd_iommu.c:1981:2: warning: passing argument 2 of 'pci_find_ext_capability' makes integer from pointer without a cast [enabled by default]
> include/linux/pci.h:712:5: note: expected 'int' but argument is of type 'const int *'
> drivers/iommu/amd_iommu.c: In function 'pci_pri_tlp_required':
> drivers/iommu/amd_iommu.c:2045:38: error: 'PCI_PRI_CAP' undeclared (first use in this function)
> drivers/iommu/amd_iommu.c:2045:2: warning: passing argument 2 of 'pci_find_ext_capability' makes integer from pointer without a cast [enabled by default]
> include/linux/pci.h:712:5: note: expected 'int' but argument is of type 'const int *'
>
> Caused by commit 56288ab6e949 ("PCI: Fix PRI and PASID consistency") from
> the pci tree interacting with various commits from the iommu tree.
>
> I have added the following merge fix patch (and can carry it as
> necessary).
Thanks for resolving this too. I already have a patch for this, it was
just not queued yet. I will queue it in my tree and update my next
branch.
Jesse already provided me a branch which I can pull in, so some of the
patches in his tree will also be in the iommu-tree then.
Joerg
next prev parent reply other threads:[~2011-12-15 10:09 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-15 4:40 linux-next: build failure after merge of the iommu tree Stephen Rothwell
2011-12-15 10:09 ` Joerg Roedel [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-12 3:46 Stephen Rothwell
2021-10-12 8:33 ` Marc Zyngier
2021-10-12 11:21 ` Lorenzo Pieralisi
2021-10-13 1:43 ` Bjorn Helgaas
2020-09-21 4:09 Stephen Rothwell
2020-10-13 7:31 ` Stephen Rothwell
2020-10-15 2:43 ` Stephen Rothwell
2019-09-02 6:39 Stephen Rothwell
2019-09-02 14:03 ` Joerg Roedel
2019-09-02 14:26 ` Lendacky, Thomas
2019-09-03 5:28 ` Stephen Rothwell
2015-11-01 11:42 Stephen Rothwell
2015-11-01 15:14 ` Joerg Roedel
2015-11-02 0:15 ` Magnus Damm
2014-11-05 2:47 Stephen Rothwell
2014-11-05 11:16 ` Joerg Roedel
2014-07-08 4:02 Stephen Rothwell
2014-07-08 4:12 ` Alex Williamson
2014-07-08 11:20 ` Joerg Roedel
2011-08-29 3:32 Stephen Rothwell
2011-08-29 5:11 ` Ohad Ben-Cohen
2011-08-29 10:42 ` Joerg Roedel
2011-08-29 8:36 ` 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=20111215100915.GD4475@8bytes.org \
--to=joro@8bytes.org \
--cc=alex.williamson@redhat.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).