pci: fix compilation when CONFIG_PCI_MSI=n
PATCH 1/1 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.
---
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(-)
include/linux/pci.h +0 -4
@@ -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);
Signature · 1 line
1.7.2.rc0.14.g41c1c
Quoted 6 lines · On Fri, 16 Jul 2010 17:20:50 +0300 "Michael S. Tsirkin" <[email protected]> wrote:
vers/pci/pci.c:2277: error: redefinition of ‘pci_msi_off’include/linux/pci.h:786: note: previous definition of ‘pci_msi_off’ was hereNo 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.
Quoted 7 lines
Signed-off-by Michael S. Tsirkin <[email protected]>---
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.
I thought this was supposed to go via the virtualization tree... But I can pick it up and try to send to Linus.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 6 lines · On Fri, 16 Jul 2010 17:20:50 +0300 "Michael S. Tsirkin" <[email protected]> wrote:
vers/pci/pci.c:2277: error: redefinition of ‘pci_msi_off’include/linux/pci.h:786: note: previous definition of ‘pci_msi_off’ was hereNo 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.
Quoted 7 lines
Signed-off-by Michael S. Tsirkin <[email protected]>---
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.
I don't see the same context in the current tree. So this patch must be against the virtualization tree I guess?
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
Quoted 12 lines · Jesse Barnes
Quoted 9 lines · On Fri, 16 Jul 2010 17:20:50 +0300 "Michael S. Tsirkin" <[email protected]> wrote:
vers/pci/pci.c:2277: error: redefinition of ‘pci_msi_off’include/linux/pci.h:786: note: previous definition of ‘pci_msi_off’ was hereNo 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 <[email protected]>---
Quoted 7 lines
Quoted 4 lines
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.I don't see the same context in the current tree. So this patch must be against the virtualization tree I guess?
Yes, looks like it got fixed in the virtualization tree. Thanks,
MST