[GIT,pull] irq/urgent for v6.2

Message ID 167676366161.269954.1941292974323519398.tglx@xen13
State New
Headers
Series [GIT,pull] irq/urgent for v6.2 |

Commit Message

Thomas Gleixner Feb. 18, 2023, 11:42 p.m. UTC
  Linus,

please pull the latest irq/urgent branch from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2023-02-19

up to:  2b129f0b24ab: PCI/MSI: Provide missing stubs for CONFIG_PCI_MSI=n


A single fix for the PCI/MSI infrastructure:

 The addition of the new alloc/free interfaces in this cycle forgot to
 add stub functions for pci_msix_alloc_irq_at() and pci_msix_free_irq()
 for the CONFIG_PCI_MSI=n case


Thanks,

	tglx

------------------>
Reinette Chatre (1):
      PCI/MSI: Provide missing stubs for CONFIG_PCI_MSI=n


 include/linux/pci.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)
  

Comments

pr-tracker-bot@kernel.org Feb. 19, 2023, 2:07 a.m. UTC | #1
The pull request you sent on Sun, 19 Feb 2023 00:42:23 +0100 (CET):

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2023-02-19

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a33d946cbb8709339a856d7da406a7a670e86a60

Thank you!
  

Patch

diff --git a/include/linux/pci.h b/include/linux/pci.h
index adffd65e84b4..254c8a4126a8 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1621,6 +1621,18 @@  pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,
 					      flags, NULL);
 }
 
+static inline struct msi_map pci_msix_alloc_irq_at(struct pci_dev *dev, unsigned int index,
+						   const struct irq_affinity_desc *affdesc)
+{
+	struct msi_map map = { .index = -ENOSYS, };
+
+	return map;
+}
+
+static inline void pci_msix_free_irq(struct pci_dev *pdev, struct msi_map map)
+{
+}
+
 static inline void pci_free_irq_vectors(struct pci_dev *dev)
 {
 }