projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/vsprintf.c: replace while with do-while in skip_atoi
[firefly-linux-kernel-4.4.55.git]
/
mm
/
cma.c
diff --git
a/mm/cma.c
b/mm/cma.c
index a85ae28709a330b8caa9d0ee8a6af264efa8ed26..75016fd1de906280490352006ffc6845c90ddc46 100644
(file)
--- a/
mm/cma.c
+++ b/
mm/cma.c
@@
-199,6
+199,7
@@
int __init cma_init_reserved_mem(phys_addr_t base, phys_addr_t size,
cma->order_per_bit = order_per_bit;
*res_cma = cma;
cma_area_count++;
cma->order_per_bit = order_per_bit;
*res_cma = cma;
cma_area_count++;
+ totalcma_pages += (size / PAGE_SIZE);
return 0;
}
return 0;
}
@@
-337,7
+338,6
@@
int __init cma_declare_contiguous(phys_addr_t base,
if (ret)
goto err;
if (ret)
goto err;
- totalcma_pages += (size / PAGE_SIZE);
pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M,
&base);
return 0;
pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M,
&base);
return 0;