On Thu, Jun 12, 2014 at 12:21:46PM +0900, Joonsoo Kim wrote:
> Conventionally, we put output param to the end of param list.
> cma_declare_contiguous() doesn't look like that, so change it.
If you says "Conventionally", I'd like to suggest one more thing.
Conventionally, we put 'base' ahead 'size' but dma_contiguous_reserve_area
is opposite.
>
> Additionally, move down cma_areas reference code to the position
> where it is really needed.
>
> Signed-off-by: Joonsoo Kim <iamjoonsoo....@lge.com>
>
> diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c
> b/arch/powerpc/kvm/book3s_hv_builtin.c
> index 28ec226..97613ea 100644
> --- a/arch/powerpc/kvm/book3s_hv_builtin.c
> +++ b/arch/powerpc/kvm/book3s_hv_builtin.c
> @@ -184,7 +184,7 @@ void __init kvm_cma_reserve(void)
>
> align_size = max(kvm_rma_pages << PAGE_SHIFT, align_size);
> cma_declare_contiguous(selected_size, 0, 0, align_size,
> - KVM_CMA_CHUNK_ORDER - PAGE_SHIFT, &kvm_cma, false);
> + KVM_CMA_CHUNK_ORDER - PAGE_SHIFT, false, &kvm_cma);
> }
> }
>
> diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
> index f177f73..bfd4553 100644
> --- a/drivers/base/dma-contiguous.c
> +++ b/drivers/base/dma-contiguous.c
> @@ -149,7 +149,7 @@ int __init dma_contiguous_reserve_area(phys_addr_t size,
> phys_addr_t base,
> {
> int ret;
>
> - ret = cma_declare_contiguous(size, base, limit, 0, 0, res_cma, fixed);
> + ret = cma_declare_contiguous(size, base, limit, 0, 0, fixed, res_cma);
> if (ret)
> return ret;
>
> diff --git a/include/linux/cma.h b/include/linux/cma.h
> index e38efe9..e53eead 100644
> --- a/include/linux/cma.h
> +++ b/include/linux/cma.h
> @@ -6,7 +6,7 @@ struct cma;
> extern int __init cma_declare_contiguous(phys_addr_t size,
> phys_addr_t base, phys_addr_t limit,
> phys_addr_t alignment, int order_per_bit,
> - struct cma **res_cma, bool fixed);
> + bool fixed, struct cma **res_cma);
> extern struct page *cma_alloc(struct cma *cma, int count, unsigned int
> align);
> extern bool cma_release(struct cma *cma, struct page *pages, int count);
> #endif
> diff --git a/mm/cma.c b/mm/cma.c
> index 01a0713..22a5b23 100644
> --- a/mm/cma.c
> +++ b/mm/cma.c
> @@ -142,8 +142,8 @@ core_initcall(cma_init_reserved_areas);
> * @limit: End address of the reserved memory (optional, 0 for any).
> * @alignment: Alignment for the contiguous memory area, should be power of 2
> * @order_per_bit: Order of pages represented by one bit on bitmap.
> - * @res_cma: Pointer to store the created cma region.
> * @fixed: hint about where to place the reserved area
> + * @res_cma: Pointer to store the created cma region.
> *
> * This function reserves memory from early allocator. It should be
> * called by arch specific code once the early allocator (memblock or
> bootmem)
> @@ -156,9 +156,9 @@ core_initcall(cma_init_reserved_areas);
> int __init cma_declare_contiguous(phys_addr_t size,
> phys_addr_t base, phys_addr_t limit,
> phys_addr_t alignment, int order_per_bit,
> - struct cma **res_cma, bool fixed)
> + bool fixed, struct cma **res_cma)
> {
> - struct cma *cma = &cma_areas[cma_area_count];
> + struct cma *cma;
> int ret = 0;
>
> pr_debug("%s(size %lx, base %08lx, limit %08lx alignment %08lx)\n",
> @@ -214,6 +214,7 @@ int __init cma_declare_contiguous(phys_addr_t size,
> * Each reserved area must be initialised later, when more kernel
> * subsystems (like slab allocator) are available.
> */
> + cma = &cma_areas[cma_area_count];
> cma->base_pfn = PFN_DOWN(base);
> cma->count = size >> PAGE_SHIFT;
> cma->order_per_bit = order_per_bit;
> --
> 1.7.9.5
--
Kind regards,
Minchan Kim
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
