Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] gfp_t: dma-mapping (frv)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Al Viro and committed by
Linus Torvalds
a5da7d3c 43b7eae1

+5 -5
+1 -1
arch/frv/mb93090-mb00/pci-dma-nommu.c
··· 33 33 static DEFINE_SPINLOCK(dma_alloc_lock); 34 34 static LIST_HEAD(dma_alloc_list); 35 35 36 - void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, int gfp) 36 + void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) 37 37 { 38 38 struct dma_alloc_record *new; 39 39 struct list_head *this = &dma_alloc_list;
+1 -1
arch/frv/mb93090-mb00/pci-dma.c
··· 17 17 #include <linux/highmem.h> 18 18 #include <asm/io.h> 19 19 20 - void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, int gfp) 20 + void *dma_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) 21 21 { 22 22 void *ret; 23 23
+1 -1
arch/frv/mm/dma-alloc.c
··· 81 81 * portions of the kernel with single large page TLB entries, and 82 82 * still get unique uncached pages for consistent DMA. 83 83 */ 84 - void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle) 84 + void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle) 85 85 { 86 86 struct vm_struct *area; 87 87 unsigned long page, va, pa;
+1 -1
include/asm-frv/dma-mapping.h
··· 13 13 extern unsigned long __nongprelbss dma_coherent_mem_start; 14 14 extern unsigned long __nongprelbss dma_coherent_mem_end; 15 15 16 - void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, int gfp); 16 + void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp); 17 17 void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle); 18 18 19 19 /*
+1 -1
include/asm-frv/pci.h
··· 32 32 extern void pcibios_penalize_isa_irq(int irq); 33 33 34 34 #ifdef CONFIG_MMU 35 - extern void *consistent_alloc(int gfp, size_t size, dma_addr_t *dma_handle); 35 + extern void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *dma_handle); 36 36 extern void consistent_free(void *vaddr); 37 37 extern void consistent_sync(void *vaddr, size_t size, int direction); 38 38 extern void consistent_sync_page(struct page *page, unsigned long offset,