diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:22 +0200 |
| commit | dd3c898d06a55a4c6fe94dae3f732a541e983432 (patch) | |
| tree | 9f8ea0b057a6a1b52c948214d27ccde9378326a9 /arch/arm/cpu/mmu.c | |
| parent | 649f558483f9959c0ac4123da8c7b647d9808be5 (diff) | |
| parent | 40faf584cd60c1e0e083ac75eb9ef5f9e7c071d0 (diff) | |
| download | barebox-dd3c898d06a55a4c6fe94dae3f732a541e983432.tar.gz barebox-dd3c898d06a55a4c6fe94dae3f732a541e983432.tar.xz | |
Merge branch 'for-next/dma-cache-align'
Diffstat (limited to 'arch/arm/cpu/mmu.c')
| -rw-r--r-- | arch/arm/cpu/mmu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c index c19f9311cd..55b07a46d1 100644 --- a/arch/arm/cpu/mmu.c +++ b/arch/arm/cpu/mmu.c @@ -299,11 +299,9 @@ void *dma_alloc_coherent(size_t size) size = PAGE_ALIGN(size); ret = xmemalign(4096, size); -#ifdef CONFIG_MMU dma_inv_range((unsigned long)ret, (unsigned long)ret + size); remap_range(ret, size, PTE_FLAGS_UNCACHED); -#endif return ret; } @@ -320,9 +318,7 @@ void *phys_to_virt(unsigned long phys) void dma_free_coherent(void *mem, size_t size) { -#ifdef CONFIG_MMU remap_range(mem, size, PTE_FLAGS_CACHED); -#endif free(mem); } |