diff options
| author | Jin Qian <jinqian@google.com> | 2015-09-29 18:57:35 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2015-11-02 23:22:40 +0530 |
| commit | fc5c4193c96b614531713f81ef441a7637cc8529 (patch) | |
| tree | ce82cbebf6062e2adef63c9bc6e14e9c6b0288c0 | |
| parent | e6b2ff9aff15e2a1c7091fb16e858360d6402dfe (diff) | |
arm64: pass return address to dma_common_contiguous_remap
Added return address to show caller function in /proc/vmallocinfo
Change-Id: Ieb0bbf6ec82b561cea6ff18f0516744050dfc269
[AmitP: cherry-picked and resolved conflict by refactoring changes
from android-3.18 commit 497ead03dee0 "arm64: pass return address to
dma_common_contiguous_remap", based on changes from upstream commit
97942c2862d7 "arm64: dma-mapping: Simplify pgprot handling".]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
arch/arm64/mm/dma-mapping.c
| -rw-r--r-- | arch/arm64/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 99224dcebdc5..d895529268a6 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -172,7 +172,7 @@ static void *__dma_alloc(struct device *dev, size_t size, /* create a coherent mapping */ page = virt_to_page(ptr); coherent_ptr = dma_common_contiguous_remap(page, size, VM_USERMAP, - prot, NULL); + prot, __builtin_return_address(0)); if (!coherent_ptr) goto no_map; |