On 05/02/13 10:11, Laura Abbott wrote:
> Commit cd024d4245b2bfbd824b911f11a9756d1d6c167d
> (ARM: 7704/1: mm: Use phys_addr_t properly for ioremap functions)
> changed the type of the ioremap functions to actually use phys_addr_t
> instead of unsigned long. Change the type of the arch_ioremap function
> to use phys_addr_t as well.
>
> Signed-off-by: Laura Abbott <lauraa@xxxxxxxxxxxxxx>
Acked-by: Stephen Boyd <sboyd@xxxxxxxxxxxxxx>
>
> diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
> index ce8215a..421cf77 100644
> --- a/arch/arm/mach-msm/common.h
> +++ b/arch/arm/mach-msm/common.h
> @@ -23,7 +23,7 @@ extern void msm_map_msm8x60_io(void);
> extern void msm_map_msm8960_io(void);
> extern void msm_map_qsd8x50_io(void);
>
> -extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size,
> +extern void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size,
> unsigned int mtype, void *caller);
>
> extern struct smp_operations msm_smp_ops;
> diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
> index 123ef9c..fd65b6d 100644
> --- a/arch/arm/mach-msm/io.c
> +++ b/arch/arm/mach-msm/io.c
> @@ -172,7 +172,7 @@ void __init msm_map_msm7x30_io(void)
> }
> #endif /* CONFIG_ARCH_MSM7X30 */
>
> -void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size,
> +void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size,
> unsigned int mtype, void *caller)
> {
> if (mtype == MT_DEVICE) {
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
