From b012a40201a4269ba0603fad2dcd850913306200 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bjorn.helgaas@hp.com> Date: Mon, 15 Mar 2004 06:22:13 -0800 Subject: [PATCH] [PATCH] ia64: move consistent_dma_mask to the generic device The patch that moved and renamed consistent_dma_mask neglected to fix up arch/ia64/hp/common/sba_iommu.c. --- arch/ia64/hp/common/sba_iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 7e8a4c09ffc3..fcdfe4587439 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -1055,13 +1055,13 @@ sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, int *dma_handle = virt_to_phys(addr); #ifdef ALLOW_IOV_BYPASS - ASSERT(to_pci_dev(dev)->consistent_dma_mask); + ASSERT(dev->coherent_dma_mask); /* ** Check if the PCI device can DMA to ptr... if so, just return ptr */ - if (likely((*dma_handle & ~to_pci_dev(dev)->consistent_dma_mask) == 0)) { + if (likely((*dma_handle & ~dev->coherent_dma_mask) == 0)) { DBG_BYPASS("sba_alloc_coherent() bypass mask/addr: 0x%lx/0x%lx\n", - to_pci_dev(dev)->consistent_dma_mask, *dma_handle); + dev->coherent_dma_mask, *dma_handle); return addr; } -- 2.30.9