---

yaml --- r: 10153 b: refs/heads/master c: 5fb5cbe h: refs/heads/master i: 10151: d3527ee v: v3
git-mirror · Oct 28, 2005 · 378b566 · 378b566
1 parent 86b976b
commit 378b566
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f80aabb03a33702d934fbc3c02fd96471816d82e
+refs/heads/master: 5fb5cbed6e5ba4cbaf7284a23d42eb878bb7da24
diff --git a/trunk/arch/xtensa/kernel/pci-dma.c b/trunk/arch/xtensa/kernel/pci-dma.c
@@ -29,7 +29,7 @@
  */
 
 void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, int gfp)
+dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)
 {
 	void *ret;
 

diff --git a/trunk/include/asm-xtensa/dma-mapping.h b/trunk/include/asm-xtensa/dma-mapping.h
@@ -28,7 +28,7 @@ extern void consistent_sync(void*, size_t, int);
 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
 
 void *dma_alloc_coherent(struct device *dev, size_t size,
-			   dma_addr_t *dma_handle, int flag);
+			   dma_addr_t *dma_handle, gfp_t flag);
 
 void dma_free_coherent(struct device *dev, size_t size,
 			 void *vaddr, dma_addr_t dma_handle);
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ @@
      */
     void *
-    dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, int gfp)
+    dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp)
     {
     	void *ret;
@@ Expand Down @@