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
Showing the changes to include/linux (1 of 5 files). Show all
Unified · Split
| @@ -383,6 +383,13 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc); · 382 unmodified lines | ||
| 383 | 383 | void arch_teardown_msi_irq(unsigned int irq); |
| 384 | 384 | int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type); |
| 385 | 385 | void arch_teardown_msi_irqs(struct pci_dev *dev); |
| 386 | +#endif /* CONFIG_PCI_MSI_ARCH_FALLBACKS */ | |
| 387 | + | |
| 388 | +/* | |
| 389 | + * Xen uses non-default msi_domain_ops and hence needs a way to populate sysfs | |
| 390 | + * entries of MSI IRQs. | |
| 391 | + */ | |
| 392 | +#if defined(CONFIG_PCI_XEN) || defined(CONFIG_PCI_MSI_ARCH_FALLBACKS) | |
| 386 | 393 | #ifdef CONFIG_SYSFS |
| 387 | 394 | int msi_device_populate_sysfs(struct device *dev); |
| 388 | 395 | void msi_device_destroy_sysfs(struct device *dev); |
| @@ -390,7 +397,7 @@ void msi_device_destroy_sysfs(struct device *dev); · 1 unmodified line | ||
| 390 | 397 | static inline int msi_device_populate_sysfs(struct device *dev) { return 0; } |
| 391 | 398 | static inline void msi_device_destroy_sysfs(struct device *dev) { } |
| 392 | 399 | #endif /* !CONFIG_SYSFS */ |
| 393 | −#endif /* CONFIG_PCI_MSI_ARCH_FALLBACKS */ | |
| 400 | +#endif /* CONFIG_PCI_XEN || CONFIG_PCI_MSI_ARCH_FALLBACKS */ | |
| 394 | 401 | |
| 395 | 402 | /* |
| 396 | 403 | * The restore hook is still available even for fully irq domain based |