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

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

[PATCH] gfp_t: dma-mapping (frv) 



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

arch/frv/mb93090-mb00/pci-dma-nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct dma_alloc_record { 
static DEFINE_SPINLOCK(dma_alloc_lock);

static LIST_HEAD(dma_alloc_list);



void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, int gfp)

void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t gfp)

{

	struct dma_alloc_record *new;

	struct list_head *this = &dma_alloc_list;

arch/frv/mb93090-mb00/pci-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/highmem.h>

#include <asm/io.h>



void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, int gfp)

void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t gfp)

{

	void *ret;

arch/frv/mm/dma-alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static int map_page(unsigned long va, unsigned long pa, pgprot_t prot) 
 * portions of the kernel with single large page TLB entries, and

 * still get unique uncached pages for consistent DMA.

 */

void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle)

void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle)

{

	struct vm_struct *area;

	unsigned long page, va, pa;

include/asm-frv/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
extern unsigned long __nongprelbss dma_coherent_mem_start;

extern unsigned long __nongprelbss dma_coherent_mem_end;



void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, int gfp);

void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp);

void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle);



/*

include/asm-frv/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ extern void pcibios_set_master(struct pci_dev *dev); 
extern void pcibios_penalize_isa_irq(int irq);



#ifdef CONFIG_MMU

extern void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle);

extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle);

extern void consistent_free(void *vaddr);

extern void consistent_sync(void *vaddr, size_t size, int direction);

extern void consistent_sync_page(struct page *page, unsigned long offset,