diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-08-01 16:29:29 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-08-13 16:52:33 -0400 |
commit | 364230b9952143eb2062dc071e919fb751540ae8 (patch) | |
tree | 7859a2896a70b8a32e3f55a13fa5399939c9728b /arch | |
parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) |
ARM: use phys_addr_t for DMA zone sizes
In order to specify a DMA zone size of 4GB on LPAE systems, the sizes need
to be 64-bit. So make machine_desc.dma_zone_size and arm_dma_zone_size be
phys_addr_t instead of unsigned long.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/include/asm/mach/arch.h | 2 | ||||
-rw-r--r-- | arch/arm/mm/init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h index 441efc491b50..d91b16857971 100644 --- a/arch/arm/include/asm/mach/arch.h +++ b/arch/arm/include/asm/mach/arch.h | |||
@@ -35,7 +35,7 @@ struct machine_desc { | |||
35 | unsigned int nr_irqs; /* number of IRQs */ | 35 | unsigned int nr_irqs; /* number of IRQs */ |
36 | 36 | ||
37 | #ifdef CONFIG_ZONE_DMA | 37 | #ifdef CONFIG_ZONE_DMA |
38 | unsigned long dma_zone_size; /* size of DMA-able area */ | 38 | phys_addr_t dma_zone_size; /* size of DMA-able area */ |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | unsigned int video_start; /* start of video RAM */ | 41 | unsigned int video_start; /* start of video RAM */ |
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 15225d829d71..c0bb66e69999 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c | |||
@@ -207,7 +207,7 @@ static void __init arm_bootmem_init(unsigned long start_pfn, | |||
207 | 207 | ||
208 | #ifdef CONFIG_ZONE_DMA | 208 | #ifdef CONFIG_ZONE_DMA |
209 | 209 | ||
210 | unsigned long arm_dma_zone_size __read_mostly; | 210 | phys_addr_t arm_dma_zone_size __read_mostly; |
211 | EXPORT_SYMBOL(arm_dma_zone_size); | 211 | EXPORT_SYMBOL(arm_dma_zone_size); |
212 | 212 | ||
213 | /* | 213 | /* |