diff options
| author | David S. Miller <davem@davemloft.net> | 2006-05-23 02:07:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-05-23 02:07:22 -0700 |
| commit | 42f142371e48fbc44956d57b4e506bb6ce673cd7 (patch) | |
| tree | cbcf77d8bf8adc923c50e1fd53a8becd81952beb /include/asm-sparc64/pci.h | |
| parent | 353b28bafd1b962359a866ff263a7fad833d29a1 (diff) | |
| download | op-kernel-dev-42f142371e48fbc44956d57b4e506bb6ce673cd7.zip op-kernel-dev-42f142371e48fbc44956d57b4e506bb6ce673cd7.tar.gz | |
[SPARC64]: Respect gfp_t argument to dma_alloc_coherent().
Using asm-generic/dma-mapping.h does not work because pushing
the call down to pci_alloc_coherent() causes the gfp_t argument
of dma_alloc_coherent() to be ignored.
Fix this by implementing things directly, and adding a gfp_t
argument we can use in the internal call down to the PCI DMA
implementation of pci_alloc_coherent().
This fixes massive memory corruption when using the sound driver
layer, which passes things like __GFP_COMP down into these
routines and (correctly) expects that to work.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64/pci.h')
| -rw-r--r-- | include/asm-sparc64/pci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h index 7c5a589..e1ea67b 100644 --- a/include/asm-sparc64/pci.h +++ b/include/asm-sparc64/pci.h @@ -42,7 +42,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) struct pci_dev; struct pci_iommu_ops { - void *(*alloc_consistent)(struct pci_dev *, size_t, dma_addr_t *); + void *(*alloc_consistent)(struct pci_dev *, size_t, dma_addr_t *, gfp_t); void (*free_consistent)(struct pci_dev *, size_t, void *, dma_addr_t); dma_addr_t (*map_single)(struct pci_dev *, void *, size_t, int); void (*unmap_single)(struct pci_dev *, dma_addr_t, size_t, int); @@ -59,7 +59,7 @@ extern struct pci_iommu_ops *pci_iommu_ops; */ static inline void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, dma_addr_t *dma_handle) { - return pci_iommu_ops->alloc_consistent(hwdev, size, dma_handle); + return pci_iommu_ops->alloc_consistent(hwdev, size, dma_handle, GFP_ATOMIC); } /* Free and unmap a consistent DMA buffer. |
