manual update from upstream:

[linux-2.6.git] / lib / swiotlb.c

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 5bdeaaea57fda3d5bee69e47c5167de6d218f368..57216f3544cad435e2986df9d83b9dbf4ddf37ad 100644 (file)
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -433,7 +433,7 @@ sync_single(struct device *hwdev, char *dma_addr, size_t size,
 
 void *
 swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 
 void *
 swiotlb_alloc_coherent(struct device *hwdev, size_t size,

-                      dma_addr_t *dma_handle, int flags)
+                      dma_addr_t *dma_handle, gfp_t flags)

 {
        unsigned long dev_addr;
        void *ret;
 {
        unsigned long dev_addr;
        void *ret;