Merge branch 'akpm' (patches from Andrew Morton) into next

[cascardo/linux.git] / include / linux / dma-contiguous.h

diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h
index 3b28f93..772eab5 100644 (file)
--- a/include/linux/dma-contiguous.h
+++ b/include/linux/dma-contiguous.h
@@ -88,7 +88,8 @@ static inline void dma_contiguous_set_default(struct cma *cma)
 void dma_contiguous_reserve(phys_addr_t addr_limit);
 
 int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
-                                      phys_addr_t limit, struct cma **res_cma);
+                                      phys_addr_t limit, struct cma **res_cma,
+                                      bool fixed);
 
 /**
  * dma_declare_contiguous() - reserve area for contiguous memory handling
@@ -108,7 +109,7 @@ static inline int dma_declare_contiguous(struct device *dev, phys_addr_t size,
 {
        struct cma *cma;
        int ret;
-       ret = dma_contiguous_reserve_area(size, base, limit, &cma);
+       ret = dma_contiguous_reserve_area(size, base, limit, &cma, true);
        if (ret == 0)
                dev_set_cma_area(dev, cma);
 
@@ -136,7 +137,9 @@ static inline void dma_contiguous_set_default(struct cma *cma) { }
 static inline void dma_contiguous_reserve(phys_addr_t limit) { }
 
 static inline int dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
-                                      phys_addr_t limit, struct cma **res_cma) {
+                                      phys_addr_t limit, struct cma **res_cma,
+                                      bool fixed)
+{
        return -ENOSYS;
 }