diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-10-18 08:19:50 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-10-18 08:19:52 +0200 |
commit | c5fe381d30fd96e06840fb5567fbeab20fa192ca (patch) | |
tree | 78cca2c69a571e9fca9e038d00f48ecd648556f0 /arch | |
parent | f78b9eb8a0d40e4ae0261e860ba99b4503e68124 (diff) | |
download | barebox-c5fe381d30fd96e06840fb5567fbeab20fa192ca.tar.gz barebox-c5fe381d30fd96e06840fb5567fbeab20fa192ca.tar.xz |
ARM: mmu: rename dma_alloc
a function named dma_alloc is already declared in include/dma.h, so when
we want to include that file we must rename the function.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/mmu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c index f6c44e3e25..3f00acdb29 100644 --- a/arch/arm/cpu/mmu.c +++ b/arch/arm/cpu/mmu.c @@ -497,7 +497,7 @@ void mmu_disable(void) __mmu_cache_off(); } -static void *dma_alloc(size_t size, dma_addr_t *dma_handle, unsigned flags) +static void *dma_alloc_map(size_t size, dma_addr_t *dma_handle, unsigned flags) { void *ret; @@ -515,12 +515,12 @@ static void *dma_alloc(size_t size, dma_addr_t *dma_handle, unsigned flags) void *dma_alloc_coherent(size_t size, dma_addr_t *dma_handle) { - return dma_alloc(size, dma_handle, MAP_UNCACHED); + return dma_alloc_map(size, dma_handle, MAP_UNCACHED); } void *dma_alloc_writecombine(size_t size, dma_addr_t *dma_handle) { - return dma_alloc(size, dma_handle, ARCH_MAP_WRITECOMBINE); + return dma_alloc_map(size, dma_handle, ARCH_MAP_WRITECOMBINE); } unsigned long virt_to_phys(volatile void *virt) |