summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-06-05 12:36:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-06-05 12:36:22 +0100
commitbd63ce27d9d62bc40a962b991cbbbe4f0dc913d2 (patch)
treebd998b187b7ea4e9f28c0c61912b701bc6ff6420 /arch/arm/mm
parent1fb333489fb917c704ad43e51b45c12f52215a9c (diff)
parent6b74f61a471ad0f3a5e919e314d4f60cd3966f5e (diff)
downloadop-kernel-dev-bd63ce27d9d62bc40a962b991cbbbe4f0dc913d2.zip
op-kernel-dev-bd63ce27d9d62bc40a962b991cbbbe4f0dc913d2.tar.gz
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/dma-mapping.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index b05e08c..85a109b 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 */
OpenPOWER on IntegriCloud