tools headers UAPI: Sync linux/prctl.h with the kernel sources

[linux-2.6-microblaze.git] / mm / cma.c

diff --git a/mm/cma.c b/mm/cma.c
index cdad8c4..995e154 100644 (file)
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -79,7 +79,7 @@ static unsigned long cma_bitmap_pages_to_bits(const struct cma *cma,
 }
 
 static void cma_clear_bitmap(struct cma *cma, unsigned long pfn,
-                            unsigned int count)
+                            unsigned long count)
 {
        unsigned long bitmap_no, bitmap_count;
        unsigned long flags;
@@ -423,21 +423,21 @@ static inline void cma_debug_show_areas(struct cma *cma) { }
  * This function allocates part of contiguous memory on specific
  * contiguous memory area.
  */
-struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,
-                      bool no_warn)
+struct page *cma_alloc(struct cma *cma, unsigned long count,
+                      unsigned int align, bool no_warn)
 {
        unsigned long mask, offset;
        unsigned long pfn = -1;
        unsigned long start = 0;
        unsigned long bitmap_maxno, bitmap_no, bitmap_count;
-       size_t i;
+       unsigned long i;
        struct page *page = NULL;
        int ret = -ENOMEM;
 
        if (!cma || !cma->count || !cma->bitmap)
                goto out;
 
-       pr_debug("%s(cma %p, count %zu, align %d)\n", __func__, (void *)cma,
+       pr_debug("%s(cma %p, count %lu, align %d)\n", __func__, (void *)cma,
                 count, align);
 
        if (!count)
@@ -505,7 +505,7 @@ struct page *cma_alloc(struct cma *cma, size_t count, unsigned int align,
        }
 
        if (ret && !no_warn) {
-               pr_err_ratelimited("%s: %s: alloc failed, req-size: %zu pages, ret: %d\n",
+               pr_err_ratelimited("%s: %s: alloc failed, req-size: %lu pages, ret: %d\n",
                                   __func__, cma->name, count, ret);
                cma_debug_show_areas(cma);
        }
@@ -534,14 +534,15 @@ out:
  * It returns false when provided pages do not belong to contiguous area and
  * true otherwise.
  */
-bool cma_release(struct cma *cma, const struct page *pages, unsigned int count)
+bool cma_release(struct cma *cma, const struct page *pages,
+                unsigned long count)
 {
        unsigned long pfn;
 
        if (!cma || !pages)
                return false;
 
-       pr_debug("%s(page %p, count %u)\n", __func__, (void *)pages, count);
+       pr_debug("%s(page %p, count %lu)\n", __func__, (void *)pages, count);
 
        pfn = page_to_pfn(pages);