Commit 55c5d74b authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: dma-mapping (alpha) 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 06a54497

arch/alpha/kernel/pci-noop.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/asm-alpha/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -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);