On Thu, Apr 02, 2020 at 04:22:37PM -0700, Aslan Bakirov wrote:
> +static inline int __init cma_declare_contiguous(phys_addr_t base,
> +                     phys_addr_t size, phys_addr_t limit,
> +                     phys_addr_t alignment, unsigned int order_per_bit,
> +                     bool fixed, const char *name, struct cma **res_cma)
> +                     {

This { should be in the first column. 

> -                     addr = memblock_phys_alloc_range(size, alignment,
> -                                                      highmem_start, limit);
> +                     addr = memblock_alloc_range_nid(size, alignment,
> +                              highmem_start, limit, nid, false);

Two extra tabs, not one.