Browse Source

[PATCH] gfp_t: dma-mapping (alpha)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Al Viro 19 years ago
parent
commit
55c5d74b3a
2 changed files with 2 additions and 2 deletions
  1. 1 1
      arch/alpha/kernel/pci-noop.c
  2. 1 1
      include/asm-alpha/dma-mapping.h

+ 1 - 1
arch/alpha/kernel/pci-noop.c

@@ -154,7 +154,7 @@ pci_dma_supported(struct pci_dev *hwdev, dma_addr_t mask)
 
 
 void *
 void *
 dma_alloc_coherent(struct device *dev, size_t size,
 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;
 	void *ret;
 
 

+ 1 - 1
include/asm-alpha/dma-mapping.h

@@ -31,7 +31,7 @@
 #else	/* no PCI - no IOMMU. */
 #else	/* no PCI - no IOMMU. */
 
 
 void *dma_alloc_coherent(struct device *dev, size_t size,
 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,
 int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 	       enum dma_data_direction direction);
 	       enum dma_data_direction direction);