Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c1fb41f authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: dma-mapping (parisc) 



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

arch/parisc/kernel/pci-dma.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -349,7 +349,7 @@ pcxl_dma_init(void) 




__initcall(pcxl_dma_init);

__initcall(pcxl_dma_init);





static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, int flag)

static void * pa11_dma_alloc_consistent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag)

{

{

	unsigned long vaddr;

	unsigned long vaddr;

	unsigned long paddr;

	unsigned long paddr;
@@ -502,13 +502,13 @@ struct hppa_dma_ops pcxl_dma_ops = { 
};

};





static void *fail_alloc_consistent(struct device *dev, size_t size,

static void *fail_alloc_consistent(struct device *dev, size_t size,

				   dma_addr_t *dma_handle, int flag)

				   dma_addr_t *dma_handle, gfp_t flag)

{

{

	return NULL;

	return NULL;

}

}





static void *pa11_dma_alloc_noncoherent(struct device *dev, size_t size,

static void *pa11_dma_alloc_noncoherent(struct device *dev, size_t size,

					  dma_addr_t *dma_handle, int flag)

					  dma_addr_t *dma_handle, gfp_t flag)

{

{

	void *addr = NULL;

	void *addr = NULL;

drivers/parisc/ccio-dma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -836,7 +836,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size, 
 * This function implements the pci_alloc_consistent function.

 * This function implements the pci_alloc_consistent function.

 */

 */

static void * 

static void * 

ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, int flag)

ccio_alloc_consistent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag)

{

{

      void *ret;

      void *ret;

#if 0

#if 0

drivers/parisc/sba_iommu.c

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

 * See Documentation/DMA-mapping.txt

 */

 */

static void *sba_alloc_consistent(struct device *hwdev, size_t size,

static void *sba_alloc_consistent(struct device *hwdev, size_t size,

					dma_addr_t *dma_handle, int gfp)

					dma_addr_t *dma_handle, gfp_t gfp)

{

{

	void *ret;

	void *ret;

include/asm-parisc/dma-mapping.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -9,8 +9,8 @@ 
/* See Documentation/DMA-mapping.txt */

/* See Documentation/DMA-mapping.txt */

struct hppa_dma_ops {

struct hppa_dma_ops {

	int  (*dma_supported)(struct device *dev, u64 mask);

	int  (*dma_supported)(struct device *dev, u64 mask);

	void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *iova, int flag);

	void *(*alloc_consistent)(struct device *dev, size_t size, dma_addr_t *iova, gfp_t flag);

	void *(*alloc_noncoherent)(struct device *dev, size_t size, dma_addr_t *iova, int flag);

	void *(*alloc_noncoherent)(struct device *dev, size_t size, dma_addr_t *iova, gfp_t flag);

	void (*free_consistent)(struct device *dev, size_t size, void *vaddr, dma_addr_t iova);

	void (*free_consistent)(struct device *dev, size_t size, void *vaddr, dma_addr_t iova);

	dma_addr_t (*map_single)(struct device *dev, void *addr, size_t size, enum dma_data_direction direction);

	dma_addr_t (*map_single)(struct device *dev, void *addr, size_t size, enum dma_data_direction direction);

	void (*unmap_single)(struct device *dev, dma_addr_t iova, size_t size, enum dma_data_direction direction);

	void (*unmap_single)(struct device *dev, dma_addr_t iova, size_t size, enum dma_data_direction direction);
@@ -49,14 +49,14 @@ extern struct hppa_dma_ops *hppa_dma_ops; 




static inline void *

static inline void *

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,

		   int flag)

		   gfp_t flag)

{

{

	return hppa_dma_ops->alloc_consistent(dev, size, dma_handle, flag);

	return hppa_dma_ops->alloc_consistent(dev, size, dma_handle, flag);

}

}





static inline void *

static inline void *

dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle,

dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle,

		      int flag)

		      gfp_t flag)

{

{

	return hppa_dma_ops->alloc_noncoherent(dev, size, dma_handle, flag);

	return hppa_dma_ops->alloc_noncoherent(dev, size, dma_handle, flag);

}

}