diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:11 -0400 |
commit | 284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch) | |
tree | 06c1b5a0f83c90cfb662f756e7781977ce739ce8 /arch/x86/kernel/pci-dma.c | |
parent | 6afd142fd0dfba497246d0fab236c20a7b4bf778 (diff) |
dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
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/x86/kernel/pci-dma.c')
-rw-r--r-- | arch/x86/kernel/pci-dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 0cf2d900422b..136a01d52db0 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
@@ -40,7 +40,7 @@ EXPORT_SYMBOL(bad_dma_address); | |||
40 | to older i386. */ | 40 | to older i386. */ |
41 | struct device x86_dma_fallback_dev = { | 41 | struct device x86_dma_fallback_dev = { |
42 | .init_name = "fallback device", | 42 | .init_name = "fallback device", |
43 | .coherent_dma_mask = DMA_32BIT_MASK, | 43 | .coherent_dma_mask = DMA_BIT_MASK(32), |
44 | .dma_mask = &x86_dma_fallback_dev.coherent_dma_mask, | 44 | .dma_mask = &x86_dma_fallback_dev.coherent_dma_mask, |
45 | }; | 45 | }; |
46 | EXPORT_SYMBOL(x86_dma_fallback_dev); | 46 | EXPORT_SYMBOL(x86_dma_fallback_dev); |
@@ -148,7 +148,7 @@ again: | |||
148 | if (!is_buffer_dma_capable(dma_mask, addr, size)) { | 148 | if (!is_buffer_dma_capable(dma_mask, addr, size)) { |
149 | __free_pages(page, get_order(size)); | 149 | __free_pages(page, get_order(size)); |
150 | 150 | ||
151 | if (dma_mask < DMA_32BIT_MASK && !(flag & GFP_DMA)) { | 151 | if (dma_mask < DMA_BIT_MASK(32) && !(flag & GFP_DMA)) { |
152 | flag = (flag & ~GFP_DMA32) | GFP_DMA; | 152 | flag = (flag & ~GFP_DMA32) | GFP_DMA; |
153 | goto again; | 153 | goto again; |
154 | } | 154 | } |