Commit 06a54497 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: dma-mapping (ia64) 



... and related annotations for amd64 - swiotlb code is shared, but
prototypes are not.

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

arch/ia64/hp/common/hwsw_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ hwsw_init (void) 
}



void *

hwsw_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flags)

hwsw_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags)

{

	if (use_swiotlb(dev))

		return swiotlb_alloc_coherent(dev, size, dma_handle, flags);

arch/ia64/hp/common/sba_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ void sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, int dir) 
 * See Documentation/DMA-mapping.txt

 */

void *

sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flags)

sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags)

{

	struct ioc *ioc;

	void *addr;

arch/ia64/lib/swiotlb.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ sync_single(struct device *hwdev, char *dma_addr, size_t size, int dir) 


void *

swiotlb_alloc_coherent(struct device *hwdev, size_t size,

		       dma_addr_t *dma_handle, int flags)

		       dma_addr_t *dma_handle, gfp_t flags)

{

	unsigned long dev_addr;

	void *ret;

arch/ia64/sn/pci/pci_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ EXPORT_SYMBOL(sn_dma_set_mask); 
 * more information.

 */

void *sn_dma_alloc_coherent(struct device *dev, size_t size,

			    dma_addr_t * dma_handle, int flags)

			    dma_addr_t * dma_handle, gfp_t flags)

{

	void *cpuaddr;

	unsigned long phys_addr;

include/asm-ia64/machvec.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ typedef int ia64_mv_pci_legacy_write_t (struct pci_bus *, u16 port, u32 val, 


/* DMA-mapping interface: */

typedef void ia64_mv_dma_init (void);

typedef void *ia64_mv_dma_alloc_coherent (struct device *, size_t, dma_addr_t *, int);

typedef void *ia64_mv_dma_alloc_coherent (struct device *, size_t, dma_addr_t *, gfp_t);

typedef void ia64_mv_dma_free_coherent (struct device *, size_t, void *, dma_addr_t);

typedef dma_addr_t ia64_mv_dma_map_single (struct device *, void *, size_t, int);

typedef void ia64_mv_dma_unmap_single (struct device *, dma_addr_t, size_t, int);