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

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

[PATCH] gfp_t: dma-mapping (amd64) 



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

arch/x86_64/kernel/pci-gart.c

+2 −2
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ static void flush_gart(struct device *dev) 


/* Allocate DMA memory on node near device */

noinline

static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order)

static void *dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)

{

	struct page *page;

	int node;
@@ -204,7 +204,7 @@ static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order) 
 */

void *

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

		   unsigned gfp)

		   gfp_t gfp)

{

	void *memory;

	unsigned long dma_mask = 0;

arch/x86_64/kernel/pci-nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ EXPORT_SYMBOL(iommu_sac_force); 
 */



void *dma_alloc_coherent(struct device *hwdev, size_t size,

			 dma_addr_t *dma_handle, unsigned gfp)

			 dma_addr_t *dma_handle, gfp_t gfp)

{

	void *ret;

	u64 mask;

include/asm-x86_64/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ extern dma_addr_t bad_dma_address; 
	(swiotlb ? swiotlb_dma_mapping_error(x) : ((x) == bad_dma_address))



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

			 unsigned gfp);

			 gfp_t gfp);

void dma_free_coherent(struct device *dev, size_t size, void *vaddr,

			 dma_addr_t dma_handle);