From patchwork Wed Jun 16 08:22:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 106421 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5G8SHVG011993 for ; Wed, 16 Jun 2010 08:28:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752438Ab0FPI1s (ORCPT ); Wed, 16 Jun 2010 04:27:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43780 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751641Ab0FPI1f (ORCPT ); Wed, 16 Jun 2010 04:27:35 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5G8RVMH004987 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 16 Jun 2010 04:27:31 -0400 Received: from redhat.com (vpn2-10-123.ams2.redhat.com [10.36.10.123]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5G8RSwS005049; Wed, 16 Jun 2010 04:27:28 -0400 Date: Wed, 16 Jun 2010 11:22:40 +0300 From: "Michael S. Tsirkin" To: Hidetoshi Seto Cc: Rusty Russell , Jesse Barnes , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: Re: [PATCH] pci: fix compilation when CONFIG_PCI_MSI=n Message-ID: <20100616082240.GA3848@redhat.com> References: <201006161421.11148.rusty@rustcorp.com.au> <4C186A87.6040005@jp.fujitsu.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4C186A87.6040005@jp.fujitsu.com> User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 16 Jun 2010 08:28:17 +0000 (UTC) diff --git a/include/linux/pci.h b/include/linux/pci.h index 31d8a12..7cb0084 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -780,11 +780,7 @@ int __must_check pci_set_mwi(struct pci_dev *dev); int pci_try_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); void pci_intx(struct pci_dev *dev, int enable); -#ifdef CONFIG_PCI_MSI void pci_msi_off(struct pci_dev *dev); -#else -static inline void pci_msi_off(struct pci_dev *dev) {} -#endif int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size); int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask); int pcix_get_max_mmrbc(struct pci_dev *dev);