Merge tag 'pci-v6.19-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

torvalds · torvalds · commit d81585830017 · 2026-01-16T12:24:22.000-08:00
Pull PCI fix from Bjorn Helgaas:

 - Add a pci_free_irq_vectors() stub to fix a build issue when
   CONFIG_PCI is not set (Boqun Feng)

* tag 'pci-v6.19-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI: Provide pci_free_irq_vectors() stub
diff --git a/include/linux/pci.h b/include/linux/pci.h
@@ -2210,6 +2210,10 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,
 {
 	return -ENOSPC;
 }
+
+static inline void pci_free_irq_vectors(struct pci_dev *dev)
+{
+}
 #endif /* CONFIG_PCI */
 
 /* Include architecture-dependent settings and functions */

Original file line number	Diff line number	Diff line change
`@@ -2210,6 +2210,10 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,`
`2210`	`2210`	`{`
`2211`	`2211`	`return -ENOSPC;`
`2212`	`2212`	`}`
	`2213`	`+`
	`2214`	`+static inline void pci_free_irq_vectors(struct pci_dev *dev)`
	`2215`	`+{`
	`2216`	`+}`
`2213`	`2217`	`#endif /* CONFIG_PCI */`
`2214`	`2218`
`2215`	`2219`	`/* Include architecture-dependent settings and functions */`