diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-23 21:40:43 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-23 21:40:43 +0400 |
| commit | 1faadface9c5d000bb16e42c89f24859337cf2db (patch) | |
| tree | 081a296ff0387a516937f96ddadccf6976137497 /include/asm-sparc64/pci.h | |
| parent | 9cfe864842c755ea6dd683e2449016c7c4ca9867 (diff) | |
| parent | 42f142371e48fbc44956d57b4e506bb6ce673cd7 (diff) | |
| download | linux-1faadface9c5d000bb16e42c89f24859337cf2db.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Respect gfp_t argument to dma_alloc_coherent().
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 7c5a589ea437..e1ea67bc32f2 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. |