From: Jason Cooper <jason@lakedaemon•net>
To: Randy Dunlap <rdunlap@infradead•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
linux-pci <linux-pci@vger•kernel.org>
Subject: Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict)
Date: Fri, 9 Aug 2013 14:50:36 -0400 [thread overview]
Message-ID: <20130809185036.GG25111@titan.lakedaemon.net> (raw)
In-Reply-To: <52051BC2.2060004@infradead.org>
Randy,
On Fri, Aug 09, 2013 at 09:41:38AM -0700, Randy Dunlap wrote:
> On 08/09/13 07:59, Jason Cooper wrote:
> > Randy,
> >
> > On Thu, Aug 08, 2013 at 01:03:04PM -0700, Randy Dunlap wrote:
> >> On 08/08/13 00:08, Stephen Rothwell wrote:
> >>> Hi all,
> >>>
> >>> Changes since 20130807:
> >>>
> >>
> >> on i386 and x86_64:
> >> when CONFIG_PCI_MSI is not enabled:
> >>
> >> There are many of these errors:
> >> include/linux/msi.h:65:6: error: expected identifier or '(' before 'void'
> >> include/linux/msi.h:65:6: error: expected ')' before numeric constant
> >>
> >> because arch/x86/include/asm/pci.h defines:
> >> #define default_teardown_msi_irqs NULL
> >
> > Do you have an example config you used?
>
> Sure, attached. (or I have 14 of them)
Thanks, I was able to reproduce the error. I'm not real familiar with
this area of the code, but the relief is it doesn't appear to be caused
by the mvebu changes (well, relief for us ;-) ).
At any rate, give this a spin and see if it works for you
If it's acceptable, I'll do an official patch for Bjorn.
thx,
Jason.
---------->8----------
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index d9e9e6c..6169414 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -138,8 +138,8 @@ void default_restore_msi_irqs(struct pci_dev *dev, int irq);
#else
#define native_setup_msi_irqs NULL
#define native_teardown_msi_irq NULL
-#define default_teardown_msi_irqs NULL
-#define default_restore_msi_irqs NULL
+void __weak default_teardown_msi_irqs(struct pci_dev *dev) { }
+void __weak default_restore_msi_irqs(struct pci_dev *dev, int irq) { }
#endif
#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
next prev parent reply other threads:[~2013-08-09 18:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-08 7:08 linux-next: Tree for Aug 8 Stephen Rothwell
2013-08-08 20:03 ` linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict) Randy Dunlap
2013-08-08 20:17 ` Jason Cooper
2013-08-09 14:59 ` Jason Cooper
2013-08-09 16:41 ` Randy Dunlap
2013-08-09 18:50 ` Jason Cooper [this message]
2013-08-09 19:50 ` Randy Dunlap
2013-08-10 14:01 ` Bjorn Helgaas
2013-08-12 13:18 ` Jason Cooper
2013-08-12 16:38 ` Bjorn Helgaas
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=20130809185036.GG25111@titan.lakedaemon.net \
--to=jason@lakedaemon$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-pci@vger$(echo .)kernel.org \
--cc=rdunlap@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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