ARM: msm: Change type of ioremap function
Subsystems (3)
PATCH 1/1 ARM: msm: Change type of ioremap function
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 <[email protected]>
arch/arm/mach-msm/common.h +1 -1
@@ -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;
arch/arm/mach-msm/io.c +1 -1
@@ -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 ) {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
Quoted 7 lines · Laura Abbott
Commit
cd024d4245b2bfbd824b911f11a9756d1d6c167d
(ARM: 7704/1: mm: Usephys_addr_tproperly for ioremap functions) changed the type of the ioremap functions to actually usephys_addr_tinstead of unsigned long. Change the type of thearch_ioremapfunction to usephys_addr_tas well.Signed-off-by Laura Abbott <[email protected]>
Acked-by Stephen Boyd <[email protected]>
Quoted 27 lines
arch/arm/mach-msm/common.h +1
-1@@ -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;arch/arm/mach-msm/io.c +1
-1@@ -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 ) {
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation