From patchwork Fri Aug 9 18:50:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Cooper X-Patchwork-Id: 2842083 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 49C959F294 for ; Fri, 9 Aug 2013 18:51:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 67E6E203B6 for ; Fri, 9 Aug 2013 18:51:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E8912037B for ; Fri, 9 Aug 2013 18:51:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030687Ab3HISup (ORCPT ); Fri, 9 Aug 2013 14:50:45 -0400 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:25015 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030670Ab3HISuo (ORCPT ); Fri, 9 Aug 2013 14:50:44 -0400 Received: from pool-72-84-113-162.nrflva.fios.verizon.net ([72.84.113.162] helo=titan) by mho-02-ewr.mailhop.org with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1V7rlo-0009p3-R3; Fri, 09 Aug 2013 18:50:40 +0000 Received: from titan.lakedaemon.net (localhost [127.0.0.1]) by titan (Postfix) with ESMTP id E1944481CDD; Fri, 9 Aug 2013 14:50:36 -0400 (EDT) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 72.84.113.162 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX1+tMjzLbnDcE2WBnrrzD2r7X0OncrZKL44= Date: Fri, 9 Aug 2013 14:50:36 -0400 From: Jason Cooper To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci Subject: Re: linux-next: Tree for Aug 8 (not CONFIG_PCI_MSI conflict) Message-ID: <20130809185036.GG25111@titan.lakedaemon.net> References: <20130808170822.82bf33d3cf5100f5e2646815@canb.auug.org.au> <5203F978.2050504@infradead.org> <20130809145939.GE25111@titan.lakedaemon.net> <52051BC2.2060004@infradead.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <52051BC2.2060004@infradead.org> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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---------- Acked-by: Randy Dunlap --- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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)