diff options
| author | Lucas Stach <dev@lynxeye.de> | 2015-02-24 22:00:18 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-25 08:36:48 +0100 |
| commit | a0513aadb3ac06dffd09d09d968f9c1347229867 (patch) | |
| tree | 381cd47ad94f26d058ecb733b17fbc948cb6bcad | |
| parent | 4fd1e71050d1015088efcdd03c613f80390f80a5 (diff) | |
| download | barebox-a0513aadb3ac06dffd09d09d968f9c1347229867.tar.gz barebox-a0513aadb3ac06dffd09d09d968f9c1347229867.tar.xz | |
arm: virt_to_phys should take a volatile ptr
So users can pass in device memory pointers without provoking
warnings.
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/cpu/mmu.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/mmu.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c index e733ec4b81..aaf66d492a 100644 --- a/arch/arm/cpu/mmu.c +++ b/arch/arm/cpu/mmu.c @@ -393,7 +393,7 @@ void *dma_alloc_coherent(size_t size) return ret; } -unsigned long virt_to_phys(void *virt) +unsigned long virt_to_phys(volatile void *virt) { return (unsigned long)virt; } diff --git a/arch/arm/include/asm/mmu.h b/arch/arm/include/asm/mmu.h index 4234979190..c6e425f02d 100644 --- a/arch/arm/include/asm/mmu.h +++ b/arch/arm/include/asm/mmu.h @@ -39,7 +39,7 @@ void dma_free_coherent(void *mem, size_t size); void dma_clean_range(unsigned long, unsigned long); void dma_flush_range(unsigned long, unsigned long); void dma_inv_range(unsigned long, unsigned long); -unsigned long virt_to_phys(void *virt); +unsigned long virt_to_phys(volatile void *virt); void *phys_to_virt(unsigned long phys); void remap_range(void *_start, size_t size, uint32_t flags); void *map_io_sections(unsigned long physaddr, void *start, size_t size); @@ -62,7 +62,7 @@ static inline void *phys_to_virt(unsigned long phys) return (void *)phys; } -static inline unsigned long virt_to_phys(void *mem) +static inline unsigned long virt_to_phys(volatile void *mem) { return (unsigned long)mem; } |