diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:10 -0400 |
commit | 50cf156af7dc68a44409bef636585ef88ebbab34 (patch) | |
tree | a70e4a9ad805904f6e98bf654d6de7a55fe77e98 /arch | |
parent | e911e0d9af90e4f1b4f2cf183a0993f9fed9f9c6 (diff) |
dma-mapping: replace all DMA_40BIT_MASK macro with DMA_BIT_MASK(40)
Replace all DMA_40BIT_MASK macro with DMA_BIT_MASK(40)
Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/kernel/pci-dma.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/pci-dma.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c index e4cb443bb988..8f34f3ddb83b 100644 --- a/arch/ia64/kernel/pci-dma.c +++ b/arch/ia64/kernel/pci-dma.c | |||
@@ -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 | } |
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 90f5b9ef5def..0cf2d900422b 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
@@ -258,7 +258,7 @@ int dma_supported(struct device *dev, u64 mask) | |||
258 | SAC for these. Assume all masks <= 40 bits are of this | 258 | SAC for these. Assume all masks <= 40 bits are of this |
259 | type. Normally this doesn't make any difference, but gives | 259 | type. Normally this doesn't make any difference, but gives |
260 | more gentle handling of IOMMU overflow. */ | 260 | more gentle handling of IOMMU overflow. */ |
261 | if (iommu_sac_force && (mask >= DMA_40BIT_MASK)) { | 261 | if (iommu_sac_force && (mask >= DMA_BIT_MASK(40))) { |
262 | dev_info(dev, "Force SAC with mask %Lx\n", mask); | 262 | dev_info(dev, "Force SAC with mask %Lx\n", mask); |
263 | return 0; | 263 | return 0; |
264 | } | 264 | } |