summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-18 19:08:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-18 19:08:25 -0800
commit018cb13eb33383cbc3fb6d3a286ef32ecb816779 (patch)
treedcf098e343efa902b9de8580f3854440030e2ce2 /include
parent00c845dbfe2e966a2efd3818e40f46e286ca1ae6 (diff)
parent96e869d85745df36e3a1bf794ce472cc2b18939b (diff)
Merge branch 'akpm' (patches from Andrew)
Merge misc patches from Andrew Morton: "A few stragglers" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: tools/testing/selftests/Makefile: alphasort the TARGETS list mm/zsmalloc: adjust order of functions ocfs2: fix journal commit deadlock ocfs2/dlm: fix race between dispatched_work and dlm_lockres_grab_inflight_worker ocfs2: reflink: fix slow unlink for refcounted file mm/memory.c:do_shared_fault(): add comment .mailmap: Santosh Shilimkar has moved .mailmap: update akpm@osdl.org lib/show_mem.c: add cma reserved information fs/proc/meminfo.c: include cma info in proc/meminfo mm: cma: split cma-reserved in dmesg log hfsplus: fix longname handling mm/mempolicy.c: remove unnecessary is_valid_nodemask()
Diffstat (limited to 'include')
-rw-r--r--include/linux/cma.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/cma.h b/include/linux/cma.h
index a93438beb33c..9384ba66e975 100644
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -15,6 +15,7 @@
struct cma;
+extern unsigned long totalcma_pages;
extern phys_addr_t cma_get_base(struct cma *cma);
extern unsigned long cma_get_size(struct cma *cma);