drm/radeon: insist on 32-bit DMA for Cedar on PPC64/PPC64LE

[pandora-kernel.git] / drivers / message / i2o / memory.c

diff --git a/drivers/message/i2o/memory.c b/drivers/message/i2o/memory.c
index f5cc95c..292b41e 100644 (file)
--- a/drivers/message/i2o/memory.c
+++ b/drivers/message/i2o/memory.c
@@ -185,9 +185,9 @@ int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len)
        int dma_64 = 0;
 
        mutex_lock(&mem_lock);
-       if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_64BIT_MASK)) {
+       if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_BIT_MASK(64))) {
                dma_64 = 1;
-               if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+               if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                        mutex_unlock(&mem_lock);
                        return -ENOMEM;
                }
@@ -196,7 +196,7 @@ int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len)
        addr->virt = dma_alloc_coherent(dev, len, &addr->phys, GFP_KERNEL);
 
        if ((sizeof(dma_addr_t) > 4) && dma_64)
-               if (pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+               if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))
                        printk(KERN_WARNING "i2o: unable to set 64-bit DMA");
        mutex_unlock(&mem_lock);