diff options
Diffstat (limited to 'arch/ia64/kernel/pci-dma.c')
-rw-r--r-- | arch/ia64/kernel/pci-dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index e4cb443bb988..eb987386f691 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c | |||
@@ -37,7 +37,7 @@ int force_iommu __read_mostly; | |||
37 | to i386. */ | 37 | to i386. */ |
38 | struct device fallback_dev = { | 38 | struct device fallback_dev = { |
39 | .init_name = "fallback device", | 39 | .init_name = "fallback device", |
40 | .coherent_dma_mask = DMA_32BIT_MASK, | 40 | .coherent_dma_mask = DMA_BIT_MASK(32), |
41 | .dma_mask = &fallback_dev.coherent_dma_mask, | 41 | .dma_mask = &fallback_dev.coherent_dma_mask, |
42 | }; | 42 | }; |
43 | 43 | ||
@@ -75,7 +75,7 @@ int iommu_dma_supported(struct device *dev, u64 mask) | |||
75 | /* Copied from i386. Doesn't make much sense, because it will | 75 | /* Copied from i386. Doesn't make much sense, because it will |
76 | only work for pci_alloc_coherent. | 76 | only work for pci_alloc_coherent. |
77 | The caller just has to use GFP_DMA in this case. */ | 77 | The caller just has to use GFP_DMA in this case. */ |
78 | if (mask < DMA_24BIT_MASK) | 78 | if (mask < DMA_BIT_MASK(24)) |
79 | return 0; | 79 | return 0; |
80 | 80 | ||
81 | /* Tell the device to use SAC when IOMMU force is on. This | 81 | /* Tell the device to use SAC when IOMMU force is on. This |
@@ -90,7 +90,7 @@ int iommu_dma_supported(struct device *dev, u64 mask) | |||
90 | SAC for these. Assume all masks <= 40 bits are of this | 90 | SAC for these. Assume all masks <= 40 bits are of this |
91 | type. Normally this doesn't make any difference, but gives | 91 | type. Normally this doesn't make any difference, but gives |
92 | more gentle handling of IOMMU overflow. */ | 92 | more gentle handling of IOMMU overflow. */ |
93 | if (iommu_sac_force && (mask >= DMA_40BIT_MASK)) { | 93 | if (iommu_sac_force && (mask >= DMA_BIT_MASK(40))) { |
94 | dev_info(dev, "Force SAC with mask %lx\n", mask); | 94 | dev_info(dev, "Force SAC with mask %lx\n", mask); |
95 | return 0; | 95 | return 0; |
96 | } | 96 | } |