diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-27 09:42:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-27 09:42:56 -0700 |
| commit | 4e893b5aa4ac2c8a56a40d18fe87e9d2295e5dcf (patch) | |
| tree | 4afbff55653759c875f790a44d7f1fcb7caaa3f3 /kernel/irq | |
| parent | 957f3f8e5343041ddb9a1265ab661db259cc712e (diff) | |
| parent | 335b4223466dd75f9f3ea4918187afbadd22e5c8 (diff) | |
| download | linux-4e893b5aa4ac2c8a56a40d18fe87e9d2295e5dcf.tar.gz linux-4e893b5aa4ac2c8a56a40d18fe87e9d2295e5dcf.tar.bz2 linux-4e893b5aa4ac2c8a56a40d18fe87e9d2295e5dcf.zip | |
Merge tag 'for-linus-6.4-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- a double free fix in the Xen pvcalls backend driver
- a fix for a regression causing the MSI related sysfs entries to not
being created in Xen PV guests
- a fix in the Xen blkfront driver for handling insane input data
better
* tag 'for-linus-6.4-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
x86/pci/xen: populate MSI sysfs entries
xen/pvcalls-back: fix double frees with pvcalls_new_active_socket()
xen/blkfront: Only check REQ_FUA for writes
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/msi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 7a97bcb086bf..b4c31a5c1147 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -542,7 +542,7 @@ fail: return ret; } -#ifdef CONFIG_PCI_MSI_ARCH_FALLBACKS +#if defined(CONFIG_PCI_MSI_ARCH_FALLBACKS) || defined(CONFIG_PCI_XEN) /** * msi_device_populate_sysfs - Populate msi_irqs sysfs entries for a device * @dev: The device (PCI, platform etc) which will get sysfs entries @@ -574,7 +574,7 @@ void msi_device_destroy_sysfs(struct device *dev) msi_for_each_desc(desc, dev, MSI_DESC_ALL) msi_sysfs_remove_desc(dev, desc); } -#endif /* CONFIG_PCI_MSI_ARCH_FALLBACK */ +#endif /* CONFIG_PCI_MSI_ARCH_FALLBACK || CONFIG_PCI_XEN */ #else /* CONFIG_SYSFS */ static inline int msi_sysfs_create_group(struct device *dev) { return 0; } static inline int msi_sysfs_populate_desc(struct device *dev, struct msi_desc *desc) { return 0; } |