linux-kernel - [PATCH repost] pci: fix compilation when CONFIG_PCI

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 16 Jul 2010 17:20:50 +0300
From:	"Michael S. Tsirkin" <mst@...hat.com>
To:	Jesse Barnes <jbarnes@...tuousgeek.org>, vgoyal@...hat.com,
	"David S. Miller" <davem@...emloft.net>,
	"Rafael J. Wysocki" <rjw@...k.pl>, seto.hidetoshi@...fujitsu.com,
	Matt Carlson <mcarlson@...adcom.com>,
	Michael Chan <mchan@...adcom.com>, linux-pci@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH repost] pci: fix compilation when CONFIG_PCI_MSI=n

vers/pci/pci.c:2277: error: redefinition of ‘pci_msi_off’
include/linux/pci.h:786: note: previous definition of ‘pci_msi_off’ was here

No need for ifdef: we must disable the capability at startup even if the
current kernel does not support MSI, otherwise the device won't work.

Signed-off-by: Michael S. Tsirkin <mst@...hat.com>
---

Looks like I didn't tag this old patch of mine clearly enough
so it's still not fixed in -rc5.
It's late in the cycle, but the patch is trivial
and it's a build fix, so ... please consider for 2.6.35.

 include/linux/pci.h |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

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);
-- 
1.7.2.rc0.14.g41c1c
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/