Skip to content

Commit

Permalink
[PATCH] gfp_t: dma-mapping (alpha)
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Oct 28, 2005
1 parent 06a5449 commit 55c5d74
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/alpha/kernel/pci-noop.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask)

void *
dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, int gfp)
dma_addr_t *dma_handle, gfp_t gfp)
{
void *ret;

Expand Down
2 changes: 1 addition & 1 deletion include/asm-alpha/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#else /* no PCI - no IOMMU. */

void *dma_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, int gfp);
dma_addr_t *dma_handle, gfp_t gfp);
int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
enum dma_data_direction direction);

Expand Down

0 comments on commit 55c5d74

Please sign in to comment.