diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-28 14:23:06 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-28 14:23:06 +1000 |
| commit | 2864697cefb6e7596e39aef933b4131f6c9fa9e1 (patch) | |
| tree | 2d5ad000593a07e28e506a0a3f581ea242a9ff4b /arch/x86/kernel/pci-dma.c | |
| parent | 3c2ee2d9f41ef43a581b26b677d2b4054ccbd200 (diff) | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
Merge commit 'tip/iommu-for-powerpc' into next
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index 1a041bcf506b..3c945c0b3501 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c @@ -147,7 +147,7 @@ again: return NULL; addr = page_to_phys(page); - if (!is_buffer_dma_capable(dma_mask, addr, size)) { + if (addr + size > dma_mask) { __free_pages(page, get_order(size)); if (dma_mask < DMA_BIT_MASK(32) && !(flag & GFP_DMA)) { |