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
Merge remote-tracking branches 'asoc/fix/ac97', 'asoc/fix/atmel', 'asoc/fix/intel...
[firefly-linux-kernel-4.4.55.git]
/
mm
/
cma.c
diff --git
a/mm/cma.c
b/mm/cma.c
index f8917629cbdd43da2bb4d0392f5f9198701e9cd7..a85ae28709a330b8caa9d0ee8a6af264efa8ed26 100644
(file)
--- a/
mm/cma.c
+++ b/
mm/cma.c
@@
-337,6
+337,7
@@
int __init cma_declare_contiguous(phys_addr_t base,
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;