Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'pci-v5.9-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas:
"Fix P2PDMA build issue (Christoph Hellwig)"
* tag 'pci-v5.9-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI/P2PDMA: Fix build without DMA ops
+6
-4
+6
-4
drivers/pci/p2pdma.c
+6
-4
drivers/pci/p2pdma.c
···
556
556
return -1;
557
557
558
558
for (i = 0; i < num_clients; i++) {
559
-
if (IS_ENABLED(CONFIG_DMA_VIRT_OPS) &&
560
-
clients[i]->dma_ops == &dma_virt_ops) {
559
+
#ifdef CONFIG_DMA_VIRT_OPS
560
+
if (clients[i]->dma_ops == &dma_virt_ops) {
561
561
if (verbose)
562
562
dev_warn(clients[i],
563
563
"cannot be used for peer-to-peer DMA because the driver makes use of dma_virt_ops\n");
564
564
return -1;
565
565
}
566
+
#endif
566
567
567
568
pci_client = find_parent_pci_dev(clients[i]);
568
569
if (!pci_client) {
···
843
842
* this should never happen because it will be prevented
844
843
* by the check in pci_p2pdma_distance_many()
845
844
*/
846
-
if (WARN_ON_ONCE(IS_ENABLED(CONFIG_DMA_VIRT_OPS) &&
847
-
dev->dma_ops == &dma_virt_ops))
845
+
#ifdef CONFIG_DMA_VIRT_OPS
846
+
if (WARN_ON_ONCE(dev->dma_ops == &dma_virt_ops))
848
847
return 0;
848
+
#endif
849
849
850
850
for_each_sg(sg, s, nents, i) {
851
851
paddr = sg_phys(s);