diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-05 13:36:22 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-06-05 13:36:22 +0200 |
| commit | bd63ce27d9d62bc40a962b991cbbbe4f0dc913d2 (patch) | |
| tree | bd998b187b7ea4e9f28c0c61912b701bc6ff6420 /arch/arm/mm | |
| parent | Merge branches 'alignment', 'fixes', 'l2c' (early part) and 'misc' into for-next (diff) | |
| parent | Merge tag 'dt-dma-properties-for-arm' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-bd63ce27d9d62bc40a962b991cbbbe4f0dc913d2.tar.xz linux-bd63ce27d9d62bc40a962b991cbbbe4f0dc913d2.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index b05e08c4734c..85a109bf2e2e 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -885,7 +885,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, static void __dma_page_cpu_to_dev(struct page *page, unsigned long off, size_t size, enum dma_data_direction dir) { - unsigned long paddr; + phys_addr_t paddr; dma_cache_maint_page(page, off, size, dir, dmac_map_area); @@ -901,7 +901,7 @@ static void __dma_page_cpu_to_dev(struct page *page, unsigned long off, static void __dma_page_dev_to_cpu(struct page *page, unsigned long off, size_t size, enum dma_data_direction dir) { - unsigned long paddr = page_to_phys(page) + off; + phys_addr_t paddr = page_to_phys(page) + off; /* FIXME: non-speculating: not required */ /* in any case, don't bother invalidating if DMA to device */ |